diff --git a/build/artifacts.props b/build/artifacts.props
index 33c0a6d127..583384852a 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -21,16 +21,25 @@
 
   <ItemGroup>
     <PackageArtifact Include="dotnet-aspnet-codegenerator" Category="ship" />
+    <PackageArtifact Include="dotnet-dev-certs" Category="ship" />
     <PackageArtifact Include="dotnet-ef" Category="ship" />
+    <PackageArtifact Include="dotnet-sql-cache" Category="ship" />
+    <PackageArtifact Include="dotnet-user-secrets" Category="ship" />
+    <PackageArtifact Include="dotnet-watch" Category="ship" />
     <PackageArtifact Include="Internal.AspNetCore.Universe.Lineup" Category="noship" PackageType="Lineup" />
     <PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.All" Category="ship" LZMA="true" />
     <PackageArtifact Include="Microsoft.AspNetCore.Analyzers" Category="shipoob" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Antiforgery" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.App" Category="ship" LZMA="true" />
     <PackageArtifact Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" AllMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.AspNetCoreModule" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.AspNetCoreModuleV1" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" LZMA="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" LZMA="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Cookies" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Core" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Facebook" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Google" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Authentication.JwtBearer" AllMetapackage="true" AppMetapackage="true" Category="ship" />
@@ -44,18 +53,46 @@
     <PackageArtifact Include="Microsoft.AspNetCore.Authorization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" AllMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" AllMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Buffering" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Certificates.Generation.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Connections.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.CookiePolicy" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Cors" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Cryptography.Internal" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.AzureKeyVault" AllMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.AzureStorage" AllMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.Extensions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.Redis" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.SystemWeb" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.DataProtection" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Category="shipoob" />
     <PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.Elm" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.Identity.Service" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Diagnostics" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.HostFiltering" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Hosting.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Hosting.WindowsServices" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Hosting" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Html.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Http.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Http.Connections.Client" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Http.Connections.Common" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Http.Connections" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Http.Extensions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Http.Features" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Http" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.HttpOverrides" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.HttpsPolicy" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.HttpSys.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Identity.Service.Abstractions" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Identity.Service.AzureKeyVault" Category="noship" />
@@ -68,6 +105,9 @@
     <PackageArtifact Include="Microsoft.AspNetCore.Identity.Specification.Tests" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Identity.UI" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Identity" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.JsonPatch" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Localization.Routing" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Localization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.MiddlewareAnalysis" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Analyzers.Experimental" Analyzer="true" Category="shipoob" />
@@ -91,18 +131,31 @@
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.NodeServices.Sockets" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.NodeServices" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Owin" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.RangeHelper.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Razor.Design" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Razor.Language" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Razor.Runtime" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Razor" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.ResponseCaching" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.ResponseCompression" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Rewrite" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Routing.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Routing" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Server.HttpSys" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Server.IIS" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Server.IISIntegration" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="0.5.0" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Core" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Https" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" AllMetapackage="true" AppMetapackage="false" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Session" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Client.Core" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Client" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Common" AllMetapackage="true" AppMetapackage="true" Category="ship" />
@@ -114,7 +167,9 @@
     <PackageArtifact Include="Microsoft.AspNetCore.SpaServices.Extensions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.SpaServices" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.StaticFiles" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.TestHost" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.WebSockets" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.WebUtilities" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.CodeAnalysis.Razor.Workspaces" Category="shipoob" />
     <PackageArtifact Include="Microsoft.CodeAnalysis.Razor" AllMetapackage="true" AppMetapackage="true" Category="ship" />
@@ -137,16 +192,82 @@
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.SqlServer" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Tools" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.EntityFrameworkCore" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.ActivatorUtilities.Sources" Category="noship" />
     <PackageArtifact Include="Microsoft.Extensions.ApplicationModelDetection" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.Buffers.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.Buffers.Testing.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.Caching.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Caching.Memory" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Caching.Redis" AllMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Caching.SqlServer" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.CommandLineUtils.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.AzureKeyVault" AllMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.Binder" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.CommandLine" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.EnvironmentVariables" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.FileExtensions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.Ini" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.Json" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.KeyPerFile" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.UserSecrets" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.Xml" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Configuration" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.DependencyInjection.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.DependencyInjection" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Category="noship" />
     <PackageArtifact Include="Microsoft.Extensions.Diagnostics.HealthChecks" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.FileProviders.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.FileProviders.Composite" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.FileProviders.Embedded" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.FileProviders.Physical" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.FileSystemGlobbing" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.HashCodeCombiner.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.Hosting.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Hosting" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Http.Polly" AllMetapackage="false" AppMetapackage="false" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Http" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Identity.Core" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.Extensions.Identity.Stores" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Localization.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Localization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Logging.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Logging.Analyzers" Analyzer="true" Category="shipoob" />
+    <PackageArtifact Include="Microsoft.Extensions.Logging.AzureAppServices" AllMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Logging.Configuration" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Logging.Console" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Logging.Debug" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Logging.EventLog" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Logging.EventSource" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Logging.Testing" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.Logging.TraceSource" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Logging" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.ObjectMethodExecutor.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.ObjectPool" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Options.ConfigurationExtensions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Options" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.ParameterDefaultValue.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.Primitives" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Process.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.PropertyActivator.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.PropertyHelper.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.RazorViews.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.SecurityHelper.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.StackTrace.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.TypeNameHelper.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.ValueStopwatch.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.WebEncoders.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.WebEncoders" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Net.Http.Headers" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.NET.Sdk.Razor" Category="ship" />
     <PackageArtifact Include="Microsoft.Owin.Security.Interop" Category="ship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Editor.Razor" Category="shipoob" />
     <PackageArtifact Include="Microsoft.VisualStudio.LanguageServices.Razor" Category="shipoob" />
     <PackageArtifact Include="Microsoft.VisualStudio.Mac.LanguageServices.Razor" Category="shipoob" />
+    <PackageArtifact Include="Microsoft.VisualStudio.Web.BrowserLink" AllMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Contracts" LZMA="true" Category="ship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Core" LZMA="true" Category="ship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" LZMA="true" Category="ship" />
diff --git a/build/dependencies.props b/build/dependencies.props
index 2464ada95d..fac18bfc97 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -4,6 +4,10 @@
     <!-- MicrosoftNETCoreApp21PackageVersion is assigned at the bottom so it can automatically pick up MicrosoftNETCoreAppPackageVersion in an orchestrated build. -->
     <MicrosoftNETCoreAppPackageVersion>2.1.0</MicrosoftNETCoreAppPackageVersion>
     <MicrosoftNETCoreDotNetAppHostPackageVersion>2.1.0</MicrosoftNETCoreDotNetAppHostPackageVersion>
+    <SystemDataSqlClientPackageVersion>4.5.0</SystemDataSqlClientPackageVersion>
+    <SystemMemoryPackageVersion>4.5.0</SystemMemoryPackageVersion>
+    <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
+    <SystemThreadingTasksExtensionsPackageVersion>4.5.0</SystemThreadingTasksExtensionsPackageVersion>
   </PropertyGroup>
 
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition="'$(DotNetPackageVersionPropsPath)' != ''" />
@@ -101,13 +105,11 @@
     <SystemBuffersPackageVersion>4.5.0</SystemBuffersPackageVersion>
     <SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
     <SystemComponentModelAnnotationsPackageVersion>4.5.0</SystemComponentModelAnnotationsPackageVersion>
-    <SystemDataSqlClientPackageVersion>4.5.0</SystemDataSqlClientPackageVersion>
     <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
     <SystemDiagnosticsEventLogPackageVersion>4.5.0</SystemDiagnosticsEventLogPackageVersion>
     <SystemIdentityModelTokensJwtPackageVersion>5.2.0</SystemIdentityModelTokensJwtPackageVersion>
     <SystemInteractiveAsyncPackageVersion>3.1.1</SystemInteractiveAsyncPackageVersion>
     <SystemIOPipelinesPackageVersion>4.5.0</SystemIOPipelinesPackageVersion>
-    <SystemMemoryPackageVersion>4.5.0</SystemMemoryPackageVersion>
     <SystemNetHttpPackageVersion>4.3.2</SystemNetHttpPackageVersion>
     <SystemNetHttpWinHttpHandlerPackageVersion>4.5.0</SystemNetHttpWinHttpHandlerPackageVersion>
     <SystemNetWebSocketsWebSocketProtocolPackageVersion>4.5.0</SystemNetWebSocketsWebSocketProtocolPackageVersion>
@@ -115,7 +117,6 @@
     <SystemReactiveLinqPackageVersion>3.1.1</SystemReactiveLinqPackageVersion>
     <SystemReflectionEmitPackageVersion>4.3.0</SystemReflectionEmitPackageVersion>
     <SystemReflectionMetadataPackageVersion>1.6.0</SystemReflectionMetadataPackageVersion>
-    <SystemRuntimeCompilerServicesUnsafePackageVersion>4.5.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
     <SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion>
     <SystemSecurityCryptographyCngPackageVersion>4.5.0</SystemSecurityCryptographyCngPackageVersion>
     <SystemSecurityCryptographyXmlPackageVersion>4.5.0</SystemSecurityCryptographyXmlPackageVersion>
@@ -125,7 +126,6 @@
     <SystemTextEncodingsWebPackageVersion>4.5.0</SystemTextEncodingsWebPackageVersion>
     <SystemThreadingChannelsPackageVersion>4.5.0</SystemThreadingChannelsPackageVersion>
     <SystemThreadingTasksDataflowPackageVersion>4.9.0</SystemThreadingTasksDataflowPackageVersion>
-    <SystemThreadingTasksExtensionsPackageVersion>4.5.0</SystemThreadingTasksExtensionsPackageVersion>
     <SystemValueTuplePackageVersion>4.5.0</SystemValueTuplePackageVersion>
     <Utf8JsonPackageVersion>1.3.7</Utf8JsonPackageVersion>
     <VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion>
diff --git a/build/external-dependencies.props b/build/external-dependencies.props
index 30d47c4ccf..4fe479655a 100644
--- a/build/external-dependencies.props
+++ b/build/external-dependencies.props
@@ -160,131 +160,10 @@
 
   <ItemGroup>
     <!-- Versions of our packages produced from the last patch -->
-    <ExternalDependency Include="dotnet-dev-certs" Version="2.1.0" Category="ship" />
-    <ExternalDependency Include="dotnet-sql-cache" Version="2.1.0" Category="ship" />
-    <ExternalDependency Include="dotnet-user-secrets" Version="2.1.0" Category="ship" />
-    <ExternalDependency Include="dotnet-watch" Version="2.1.0" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Antiforgery" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.AspNetCoreModule" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.AspNetCoreModuleV1" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Core" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Buffering" Version="0.4.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Certificates.Generation.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Cors" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Cryptography.Internal" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="2.1.0" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.1.0" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.4.0" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.1.0" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="2.1.0" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.AspNetCore.HostFiltering" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.1.0" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Hosting" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Http.Extensions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Http.Features" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Http" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.HttpOverrides" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.HttpsPolicy" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.HttpSys.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.JsonPatch" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Localization.Routing" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Localization" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Owin" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCaching" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCompression" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Rewrite" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Routing" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Server.IIS" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="0.5.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Session" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.TestHost" Version="2.1.0" Category="ship" />
     <ExternalDependency Include="Microsoft.AspNetCore.Testing" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.WebUtilities" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.Data.Sqlite.Core" Version="2.1.0" AllMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.Data.Sqlite" Version="2.1.0" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Buffers.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Buffers.Testing.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Caching.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Caching.Memory" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Caching.Redis" Version="2.1.0" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Caching.SqlServer" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.0" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Ini" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Xml" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="2.1.0" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
     <ExternalDependency Include="Microsoft.Extensions.DiagnosticAdapter" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Composite" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Embedded" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Physical" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.FileSystemGlobbing" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Hosting" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Http.Polly" Version="2.1.0" AllMetapackage="false" AppMetapackage="false" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Http" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Localization.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Localization" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Analyzers" Version="0.1.0" Analyzer="true" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.0" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Configuration" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Console" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Debug" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.EventLog" Version="2.1.0" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.EventSource" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Testing" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.TraceSource" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.ObjectMethodExecutor.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.ObjectPool" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Options" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Primitives" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Process.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.PropertyActivator.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.PropertyHelper.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.RazorViews.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.SecurityHelper.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.StackTrace.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.ValueStopwatch.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.WebEncoders.Sources" Version="2.1.0" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.WebEncoders" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Net.Http.Headers" Version="2.1.0" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.0" AllMetapackage="true" Category="ship" />
   </ItemGroup>
 
 </Project>
diff --git a/build/submodules.props b/build/submodules.props
index 2833c6e1ab..3ed74a06e6 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -7,53 +7,53 @@
 
   <ItemGroup>
     <Repository Include="AADIntegration" />
+    <Repository Include="Antiforgery" />
     <Repository Include="AuthSamples" />
     <Repository Include="AzureIntegration" />
+    <Repository Include="BasicMiddleware" />
+    <Repository Include="BrowserLink" />
+    <Repository Include="Caching" />
+    <Repository Include="Common" />
+    <Repository Include="Configuration" />
+    <Repository Include="CORS" />
+    <Repository Include="DataProtection" />
+    <Repository Include="DependencyInjection" />
     <Repository Include="Diagnostics" />
+    <Repository Include="DotNetTools" />
     <Repository Include="EntityFrameworkCore" />
+    <Repository Include="FileSystem" />
+    <Repository Include="Hosting" />
+    <Repository Include="HtmlAbstractions" />
+    <Repository Include="HttpAbstractions" />
+    <Repository Include="HttpClientFactory" />
+    <Repository Include="HttpSysServer" />
     <Repository Include="Identity" />
+    <Repository Include="IISIntegration" />
     <Repository Include="JavaScriptServices" />
+    <Repository Include="JsonPatch" />
     <Repository Include="KestrelHttpServer" />
+    <Repository Include="Localization" />
+    <Repository Include="Logging" />
     <Repository Include="MetaPackages" />
     <Repository Include="MusicStore" />
     <Repository Include="Mvc" />
     <Repository Include="MvcPrecompilation" />
+    <Repository Include="Options" />
     <Repository Include="Razor" />
+    <Repository Include="ResponseCaching" />
+    <Repository Include="Routing" />
     <Repository Include="Scaffolding" />
     <Repository Include="Security" />
+    <Repository Include="ServerTests" />
+    <Repository Include="Session" />
     <Repository Include="SignalR" />
-    <Repository Include="WebSockets" />
     <Repository Include="StaticFiles" />
+    <Repository Include="WebSockets" />
   </ItemGroup>
 
   <ItemGroup>
-    <ShippedRepository Include="Antiforgery" />
-    <ShippedRepository Include="BasicMiddleware" />
-    <ShippedRepository Include="BrowserLink" />
-    <ShippedRepository Include="Caching" />
-    <ShippedRepository Include="Common" />
-    <ShippedRepository Include="Configuration" />
-    <ShippedRepository Include="CORS" />
-    <ShippedRepository Include="DataProtection" />
-    <ShippedRepository Include="DependencyInjection" />
-    <ShippedRepository Include="DotNetTools" />
     <ShippedRepository Include="EventNotification" />
-    <ShippedRepository Include="FileSystem" />
-    <ShippedRepository Include="Hosting" />
-    <ShippedRepository Include="HtmlAbstractions" />
-    <ShippedRepository Include="HttpAbstractions" />
-    <ShippedRepository Include="HttpClientFactory" />
-    <ShippedRepository Include="HttpSysServer" />
-    <ShippedRepository Include="IISIntegration" />
-    <ShippedRepository Include="JsonPatch" />
-    <ShippedRepository Include="Localization" />
-    <ShippedRepository Include="Logging" />
     <ShippedRepository Include="Microsoft.Data.Sqlite" />
-    <ShippedRepository Include="Options" />
-    <ShippedRepository Include="ResponseCaching" />
-    <ShippedRepository Include="Routing" />
-    <ShippedRepository Include="ServerTests" />
-    <ShippedRepository Include="Session" />
     <ShippedRepository Include="Testing" />
   </ItemGroup>
 </Project>
diff --git a/modules/Antiforgery b/modules/Antiforgery
index c2e4c72a32..24cf5b1cc8 160000
--- a/modules/Antiforgery
+++ b/modules/Antiforgery
@@ -1 +1 @@
-Subproject commit c2e4c72a32741689f2636f5f2e53d1c81a27e0b6
+Subproject commit 24cf5b1cc86e2c395f7622c1a9a91b209e5ff82b
diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware
index 901efb04a9..999ed531cb 160000
--- a/modules/BasicMiddleware
+++ b/modules/BasicMiddleware
@@ -1 +1 @@
-Subproject commit 901efb04a93f95d33f3257f58b1f0608b02185ba
+Subproject commit 999ed531cb25cc4f2c31f84c7144b9e401943aa9
diff --git a/modules/BrowserLink b/modules/BrowserLink
index 904fc27184..ba0dfea555 160000
--- a/modules/BrowserLink
+++ b/modules/BrowserLink
@@ -1 +1 @@
-Subproject commit 904fc27184ca36b2ea1028767fd34d2b0a307111
+Subproject commit ba0dfea5556dbd73d7f239845ac9da129bce2d35
diff --git a/modules/CORS b/modules/CORS
index b7e4884b86..5fd4b0af55 160000
--- a/modules/CORS
+++ b/modules/CORS
@@ -1 +1 @@
-Subproject commit b7e4884b863bca074581cb88079bfbf3c9d9e277
+Subproject commit 5fd4b0af55f5d486e2c40a5801f106662d797392
diff --git a/modules/Caching b/modules/Caching
index aa60e678e0..b6a7abd721 160000
--- a/modules/Caching
+++ b/modules/Caching
@@ -1 +1 @@
-Subproject commit aa60e678e0255b9d77bd20af2877a3edf69e8b33
+Subproject commit b6a7abd721b6a3ad0386cbf36b88420ddacd700c
diff --git a/modules/Common b/modules/Common
index 8010d565d3..dcc0f3ba2a 160000
--- a/modules/Common
+++ b/modules/Common
@@ -1 +1 @@
-Subproject commit 8010d565d3ff22ceacebb38099de62a74874daea
+Subproject commit dcc0f3ba2aef1cd6b0c6403171af7c91e6094382
diff --git a/modules/Configuration b/modules/Configuration
index 54bc7d8aef..2679cfd946 160000
--- a/modules/Configuration
+++ b/modules/Configuration
@@ -1 +1 @@
-Subproject commit 54bc7d8aef9afc03e9e8cb9e34fae387b60abd3c
+Subproject commit 2679cfd94694a29230726708717ab9c4579a5d80
diff --git a/modules/DataProtection b/modules/DataProtection
index 2ca2677388..a3667dab27 160000
--- a/modules/DataProtection
+++ b/modules/DataProtection
@@ -1 +1 @@
-Subproject commit 2ca26773880ecf7495e703769a13758eb9782597
+Subproject commit a3667dab27535efe9815022305fc3f817e4a7780
diff --git a/modules/DependencyInjection b/modules/DependencyInjection
index e76577449b..930037a4f8 160000
--- a/modules/DependencyInjection
+++ b/modules/DependencyInjection
@@ -1 +1 @@
-Subproject commit e76577449b92a9dc915ec2c4495df1e158cd4692
+Subproject commit 930037a4f8b74a9c1e30d881507a05bea0a7c2e0
diff --git a/modules/DotNetTools b/modules/DotNetTools
index 9b7f097870..0ce4004cde 160000
--- a/modules/DotNetTools
+++ b/modules/DotNetTools
@@ -1 +1 @@
-Subproject commit 9b7f097870af894b6ceb375ae9ba3825100a354c
+Subproject commit 0ce4004cde8798b377608f14bc54bafcb0dc52af
diff --git a/modules/FileSystem b/modules/FileSystem
index 61ac940d1b..7923b2c69f 160000
--- a/modules/FileSystem
+++ b/modules/FileSystem
@@ -1 +1 @@
-Subproject commit 61ac940d1b30aca3f93fcf5a693ca9b4aee55f42
+Subproject commit 7923b2c69fbf51e160f46d48f80f14e6742e0ab4
diff --git a/modules/Hosting b/modules/Hosting
index 04d6e71e7f..1596c2ba55 160000
--- a/modules/Hosting
+++ b/modules/Hosting
@@ -1 +1 @@
-Subproject commit 04d6e71e7f60e853c56d073bdbe777084074b01b
+Subproject commit 1596c2ba5508fceefd929228b4e5e95e50b1d4d4
diff --git a/modules/HtmlAbstractions b/modules/HtmlAbstractions
index f4b98641d2..4764c44e93 160000
--- a/modules/HtmlAbstractions
+++ b/modules/HtmlAbstractions
@@ -1 +1 @@
-Subproject commit f4b98641d2ae8f95682bed02802dea5beffc9b46
+Subproject commit 4764c44e93d0bb772def90285d16572bc2bc376c
diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions
index c08f320967..b8be770d37 160000
--- a/modules/HttpAbstractions
+++ b/modules/HttpAbstractions
@@ -1 +1 @@
-Subproject commit c08f32096762a586a32c19b5ca2b8f9ab2387a32
+Subproject commit b8be770d371134f8f6618212569ed69c341daffe
diff --git a/modules/HttpClientFactory b/modules/HttpClientFactory
index 500ebbb244..ad4c84b743 160000
--- a/modules/HttpClientFactory
+++ b/modules/HttpClientFactory
@@ -1 +1 @@
-Subproject commit 500ebbb2442d4ee2a0e651335e797d76b73c06f5
+Subproject commit ad4c84b74397a776efd93405188a6d738f7ab3bc
diff --git a/modules/HttpSysServer b/modules/HttpSysServer
index 360be36926..5bc05b26de 160000
--- a/modules/HttpSysServer
+++ b/modules/HttpSysServer
@@ -1 +1 @@
-Subproject commit 360be3692612eff565797887790ad8685c942555
+Subproject commit 5bc05b26de50fb93a9f79180ee9a039f4bc50b9f
diff --git a/modules/IISIntegration b/modules/IISIntegration
index 36f657deb7..27750d669e 160000
--- a/modules/IISIntegration
+++ b/modules/IISIntegration
@@ -1 +1 @@
-Subproject commit 36f657deb78195775fa63bb10de09e48435a851b
+Subproject commit 27750d669e1cf686d5b1a0753bac3e3b600e777e
diff --git a/modules/JsonPatch b/modules/JsonPatch
index e3a21b2a92..d89db5fcd7 160000
--- a/modules/JsonPatch
+++ b/modules/JsonPatch
@@ -1 +1 @@
-Subproject commit e3a21b2a92ddc8d971f4f21c617bb69ca0ae3761
+Subproject commit d89db5fcd7302d08a94a995f280fb30f715b0b16
diff --git a/modules/Localization b/modules/Localization
index c69da9db06..02beb0ab58 160000
--- a/modules/Localization
+++ b/modules/Localization
@@ -1 +1 @@
-Subproject commit c69da9db065ec6e195b2efdceb8b89d8c3ea362a
+Subproject commit 02beb0ab58b50fdd7da09bacdc1a5f41317e6cb9
diff --git a/modules/Logging b/modules/Logging
index 14c12fdfd0..a0398f0baf 160000
--- a/modules/Logging
+++ b/modules/Logging
@@ -1 +1 @@
-Subproject commit 14c12fdfd0c5f2ce9bf6557d7d915c4fa143dc51
+Subproject commit a0398f0baf9ecc8e5fb6afc3a9b89f0d49cf041e
diff --git a/modules/Options b/modules/Options
index 432017ceb8..686e26b3a2 160000
--- a/modules/Options
+++ b/modules/Options
@@ -1 +1 @@
-Subproject commit 432017ceb8690b43f8616194f3079295f4dafee0
+Subproject commit 686e26b3a2999c841d736b689b0a1a768fdecbf8
diff --git a/modules/ResponseCaching b/modules/ResponseCaching
index ca86f693f0..4b707e2fe8 160000
--- a/modules/ResponseCaching
+++ b/modules/ResponseCaching
@@ -1 +1 @@
-Subproject commit ca86f693f010cab258f1fea84752adf2c0fed000
+Subproject commit 4b707e2fe801048946b5fdf5bc63638b891fc556
diff --git a/modules/Routing b/modules/Routing
index 7aeda0427c..37c499e1e1 160000
--- a/modules/Routing
+++ b/modules/Routing
@@ -1 +1 @@
-Subproject commit 7aeda0427c8f7c3ed43428ea3ec2836ebca19b26
+Subproject commit 37c499e1e151f3922e8b98515daa220c9f707e57
diff --git a/modules/ServerTests b/modules/ServerTests
index 9db1fc8e55..ad246441c5 160000
--- a/modules/ServerTests
+++ b/modules/ServerTests
@@ -1 +1 @@
-Subproject commit 9db1fc8e556b7ea4d659ca8aafb627a7ebb3f93c
+Subproject commit ad246441c5209274f675df0c1befb3274b8c0b92
diff --git a/modules/Session b/modules/Session
index 3b0566d8f3..d0815aefe1 160000
--- a/modules/Session
+++ b/modules/Session
@@ -1 +1 @@
-Subproject commit 3b0566d8f366413c73ccc70b21f1692356b1df29
+Subproject commit d0815aefe1aa667150983db83a22059b54ae484f