Adapt dev to release/2.1

.gitmodules

@@ -1,196 +1,196 @@
 [submodule "modules/AADIntegration"]
 	path = modules/AADIntegration
 	url = https://github.com/aspnet/AADIntegration.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Antiforgery"]
 	path = modules/Antiforgery
 	url = https://github.com/aspnet/Antiforgery.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/AuthSamples"]
 	path = modules/AuthSamples
 	url = https://github.com/aspnet/AuthSamples.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/AzureIntegration"]
 	path = modules/AzureIntegration
 	url = https://github.com/aspnet/AzureIntegration.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/BasicMiddleware"]
 	path = modules/BasicMiddleware
 	url = https://github.com/aspnet/BasicMiddleware.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/BrowserLink"]
 	path = modules/BrowserLink
 	url = https://github.com/aspnet/BrowserLink.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Caching"]
 	path = modules/Caching
 	url = https://github.com/aspnet/Caching.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Common"]
 	path = modules/Common
 	url = https://github.com/aspnet/Common.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Configuration"]
 	path = modules/Configuration
 	url = https://github.com/aspnet/Configuration.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/CORS"]
 	path = modules/CORS
 	url = https://github.com/aspnet/CORS.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/DataProtection"]
 	path = modules/DataProtection
 	url = https://github.com/aspnet/DataProtection.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/DependencyInjection"]
 	path = modules/DependencyInjection
 	url = https://github.com/aspnet/DependencyInjection.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Diagnostics"]
 	path = modules/Diagnostics
 	url = https://github.com/aspnet/Diagnostics.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/DotNetTools"]
 	path = modules/DotNetTools
 	url = https://github.com/aspnet/DotNetTools.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/EntityFrameworkCore"]
 	path = modules/EntityFrameworkCore
 	url = https://github.com/aspnet/EntityFrameworkCore.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/EventNotification"]
 	path = modules/EventNotification
 	url = https://github.com/aspnet/EventNotification.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/FileSystem"]
 	path = modules/FileSystem
 	url = https://github.com/aspnet/FileSystem.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Hosting"]
 	path = modules/Hosting
 	url = https://github.com/aspnet/Hosting.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/HtmlAbstractions"]
 	path = modules/HtmlAbstractions
 	url = https://github.com/aspnet/HtmlAbstractions.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/HttpAbstractions"]
 	path = modules/HttpAbstractions
 	url = https://github.com/aspnet/HttpAbstractions.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/HttpClientFactory"]
 	path = modules/HttpClientFactory
 	url = https://github.com/aspnet/HttpClientFactory.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/HttpSysServer"]
 	path = modules/HttpSysServer
 	url = https://github.com/aspnet/HttpSysServer.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Identity"]
 	path = modules/Identity
 	url = https://github.com/aspnet/Identity.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/IISIntegration"]
 	path = modules/IISIntegration
 	url = https://github.com/aspnet/IISIntegration.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/JavaScriptServices"]
 	path = modules/JavaScriptServices
 	url = https://github.com/aspnet/JavaScriptServices.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/JsonPatch"]
 	path = modules/JsonPatch
 	url = https://github.com/aspnet/JsonPatch.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/KestrelHttpServer"]
 	path = modules/KestrelHttpServer
 	url = https://github.com/aspnet/KestrelHttpServer.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Localization"]
 	path = modules/Localization
 	url = https://github.com/aspnet/Localization.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Logging"]
 	path = modules/Logging
 	url = https://github.com/aspnet/Logging.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/MetaPackages"]
 	path = modules/MetaPackages
 	url = https://github.com/aspnet/MetaPackages.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Microsoft.Data.Sqlite"]
 	path = modules/Microsoft.Data.Sqlite
 	url = https://github.com/aspnet/Microsoft.Data.Sqlite.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/MusicStore"]
 	path = modules/MusicStore
 	url = https://github.com/aspnet/MusicStore.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Mvc"]
 	path = modules/Mvc
 	url = https://github.com/aspnet/Mvc.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/MvcPrecompilation"]
 	path = modules/MvcPrecompilation
 	url = https://github.com/aspnet/MvcPrecompilation.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Options"]
 	path = modules/Options
 	url = https://github.com/aspnet/Options.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Proxy"]
 	path = modules/Proxy
 	url = https://github.com/aspnet/Proxy.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Razor"]
 	path = modules/Razor
 	url = https://github.com/aspnet/Razor.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/ResponseCaching"]
 	path = modules/ResponseCaching
 	url = https://github.com/aspnet/ResponseCaching.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Routing"]
 	path = modules/Routing
 	url = https://github.com/aspnet/Routing.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Scaffolding"]
 	path = modules/Scaffolding
 	url = https://github.com/aspnet/Scaffolding.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Security"]
 	path = modules/Security
 	url = https://github.com/aspnet/Security.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/ServerTests"]
 	path = modules/ServerTests
 	url = https://github.com/aspnet/ServerTests.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Session"]
 	path = modules/Session
 	url = https://github.com/aspnet/Session.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/SignalR"]
 	path = modules/SignalR
 	url = https://github.com/aspnet/SignalR.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/StaticFiles"]
 	path = modules/StaticFiles
 	url = https://github.com/aspnet/StaticFiles.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Templating"]
 	path = modules/Templating
 	url = https://github.com/aspnet/Templating.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/Testing"]
 	path = modules/Testing
 	url = https://github.com/aspnet/Testing.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/WebSockets"]
 	path = modules/WebSockets
 	url = https://github.com/aspnet/WebSockets.git
-	branch = dev
+	branch = release/2.1
 [submodule "modules/WebHooks"]
 	path = modules/WebHooks
 	url = https://github.com/aspnet/WebHooks.git
-	branch = dev
+	branch = release/2.1

korebuild-lock.txt

@@ -1,2 +1,2 @@
-version:2.1.0-preview3-17032
+version:2.1.0-rc1-15770
-commithash:d3d9c5682617da4d0a69372aae5d736ed733d156
+commithash:a2abdc6fa0e8a1a465e830100950f1ecc698ab28

korebuild.json

@@ -1,6 +1,6 @@
 {
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json",
-  "channel": "dev",
+  "channel": "release/2.1",
   "toolsets": {
     "nodejs": {
       "minVersion": "8.0",

version.props

@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.2.0</VersionPrefix>
+    <VersionPrefix>2.1.0</VersionPrefix>
-    <VersionSuffix>preview1</VersionSuffix>
+    <VersionSuffix>rc1</VersionSuffix>
 
-    <ExperimentalVersionPrefix>0.2.0</ExperimentalVersionPrefix>
+    <ExperimentalVersionPrefix>0.1.0</ExperimentalVersionPrefix>
-    <ExperimentalVersionSuffix>alpha1</ExperimentalVersionSuffix>
+    <ExperimentalVersionSuffix>alpha2</ExperimentalVersionSuffix>
 
 
     <PackageVersion Condition=" '$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
@@ -23,8 +23,7 @@
     <ExperimentalPackageVersion Condition=" '$(IsFinalBuild)' == 'true' AND '$(ExperimentalVersionSuffix)' != 'rtm' ">$(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final</ExperimentalPackageVersion>
     <ExperimentalVersionSuffix Condition=" '$(ExperimentalVersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(ExperimentalVersionSuffix)-$(BuildNumber)</ExperimentalVersionSuffix>
 
-    <!-- Even though we build from 'dev', this is set to 'master' to align with the dotnet-CLI channel name for their 'dev' branch. -->
+    <SharedFxCliBlobChannel>release/2.1</SharedFxCliBlobChannel>
-    <SharedFxCliBlobChannel>master</SharedFxCliBlobChannel>
   </PropertyGroup>
 
 </Project>