Update FileSystem submodule and apply the result of the cascading versions

build/artifacts.props

@@ -11,13 +11,57 @@
 
   <ItemGroup>
     <PackageArtifact Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Antiforgery" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Category="ship" Metapackage="true" RuntimeStore="true" HostingStartup="true" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Cookies" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Core" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Facebook" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Google" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.JwtBearer" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.OAuth" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Twitter" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Authorization.Policy" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Authorization" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Category="ship" Metapackage="true" RuntimeStore="true" HostingStartup="true" />
+    <PackageArtifact Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Buffering" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.CertificateGeneration.Task" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Certificates.Configuration.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.CookiePolicy" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Cors" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Cryptography.Internal" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.Extensions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.Redis" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.DataProtection.SystemWeb" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.DataProtection" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.Elm" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Diagnostics" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Hosting.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Hosting.WindowsServices" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Hosting" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Html.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Http.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Http.Extensions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Http.Features" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Http" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.HttpOverrides" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Identity.Specification.Tests" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Identity" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Localization.Routing" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Localization" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.MiddlewareAnalysis" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.ApiExplorer" Category="ship" Metapackage="true" RuntimeStore="true"/>
@@ -27,6 +71,7 @@
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Localization" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Razor" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc.RazorPages" Category="ship" Metapackage="true" RuntimeStore="true"/>
@@ -37,17 +82,44 @@
     <PackageArtifact Include="Microsoft.AspNetCore.Mvc" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.NodeServices.Sockets" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.NodeServices" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Owin" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Proxy" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.RangeHelper.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Razor.Language" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Razor.Runtime" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Razor" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.ResponseCaching" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.ResponseCompression" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Rewrite" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Routing.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Routing" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Server.HttpSys" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Server.IISIntegration" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.Server.IntegrationTesting" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Core" Category="ship" Metapackage="true" RuntimeStore="true" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Https" Category="ship" Metapackage="true" RuntimeStore="true" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Category="ship" Metapackage="true" RuntimeStore="true" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Category="noship" />
     <PackageArtifact Include="Microsoft.AspNetCore.Server.Kestrel" Category="ship" Metapackage="true" RuntimeStore="true" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Session" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.SpaServices" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore.SpaTemplates" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.StaticFiles" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.TestHost" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Testing" Category="noship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.WebSockets" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.AspNetCore.WebUtilities" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.AspNetCore" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.CodeAnalysis.Razor.Workspaces" Category="shipoob" />
+    <PackageArtifact Include="Microsoft.CodeAnalysis.Razor" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.CodeAnalysis.Remote.Razor" Category="shipoob" />
     <PackageArtifact Include="Microsoft.Data.Sqlite.Core" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.Data.Sqlite" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.DotNet.Watcher.Tools" Category="ship" LZMATools="true" />
     <PackageArtifact Include="Microsoft.DotNet.Web.ItemTemplates" Category="shipoob" />
     <PackageArtifact Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Category="shipoob" />
     <PackageArtifact Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Category="shipoob" />
@@ -63,8 +135,52 @@
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Category="ship" LZMATools="true" />
     <PackageArtifact Include="Microsoft.EntityFrameworkCore.Tools" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.EntityFrameworkCore" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Caching.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Caching.Memory" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Caching.Redis" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Caching.SqlConfig.Tools" Category="ship" LZMATools="true" />
+    <PackageArtifact Include="Microsoft.Extensions.Caching.SqlServer" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.AzureKeyVault" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.Binder" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.CommandLine" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.DockerSecrets" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.FileExtensions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.Ini" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.Json" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.UserSecrets" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.Xml" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Configuration" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.DiagnosticAdapter" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.FileProviders.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.FileProviders.Composite" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.FileProviders.Embedded" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.FileProviders.Physical" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.FileSystemGlobbing" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Hosting.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.Extensions.Identity.Core" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.Extensions.Identity.Stores" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Localization.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Localization" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Logging.Abstractions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Logging.AzureAppServices" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Logging.Configuration" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Logging.Console" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Logging.Debug" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Logging.EventLog" Category="ship" />
+    <PackageArtifact Include="Microsoft.Extensions.Logging.EventSource" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Logging.Testing" Category="noship" />
+    <PackageArtifact Include="Microsoft.Extensions.Logging.TraceSource" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Logging" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Options.ConfigurationExtensions" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.Options" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Extensions.SecretManager.Tools" Category="ship" LZMATools="true" />
+    <PackageArtifact Include="Microsoft.Extensions.WebEncoders" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Net.Http.Headers" Category="ship" Metapackage="true" RuntimeStore="true"/>
+    <PackageArtifact Include="Microsoft.Owin.Security.Interop" Category="ship" />
+    <PackageArtifact Include="Microsoft.VisualStudio.LanguageServices.Razor" Category="shipoob" />
+    <PackageArtifact Include="Microsoft.VisualStudio.Web.BrowserLink" Category="ship" Metapackage="true" RuntimeStore="true"/>
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Contracts" Category="ship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Core" Category="ship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Category="ship" LZMA="true" />
@@ -74,5 +190,8 @@
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Utils" Category="ship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration" Category="ship" />
     <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Category="ship" />
+    <PackageArtifact Include="Microsoft.Web.Xdt.Extensions" Category="shipoob" />
+    <PackageArtifact Include="RazorPageGenerator" Category="noship" />
   </ItemGroup>
+
 </Project>

build/dependencies.props

@@ -245,26 +245,8 @@
     <ExternalDependency Include="Microsoft.Win32.Registry" Version="4.4.0" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Moq" Version="4.7.49" Source="$(DefaultNuGetFeed)" Private="true"/>
     <ExternalDependency Include="NETStandard.Library" Version="2.0.1" Source="$(DefaultNuGetFeed)">
-      <NoWarn>KRB2004</NoWarn>
-      <VariableName>NETStandardImplicitPackageVersion</VariableName>
-      <TargetFramework>netstandard2.0</TargetFramework>
-    </ExternalDependency>
-    <ExternalDependency Include="NETStandard.Library" Version="2.0.1" Source="$(DefaultNuGetFeed)">
-      <NoWarn>KRB2004</NoWarn>
       <VariableName>NETStandardLibrary20PackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="NETStandard.Library" Version="2.0.1" Source="$(DefaultNuGetFeed)">
-      <!-- We have a dependency on NS.Library from the .NET Framework tfm in aspnet/EventNotification. -->
-      <NoWarn>KRB2004</NoWarn>
-      <VariableName>NETStandardLibraryPackageVersion</VariableName>
-      <TargetFramework>net461</TargetFramework>
-    </ExternalDependency>
-    <ExternalDependency Include="NETStandard.Library" Version="2.0.1" Source="$(DefaultNuGetFeed)">
-      <!-- We have a dependency on NS.Library from a few .NET Framework packages in aspnet/Razor. -->
-      <NoWarn>KRB2004</NoWarn>
-      <VariableName>NETStandardLibraryPackageVersion</VariableName>
-      <TargetFramework>net46</TargetFramework>
-    </ExternalDependency>
     <ExternalDependency Include="Newtonsoft.Json.Bson" Version="1.0.1" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Newtonsoft.Json" Version="9.0.1" Source="$(DefaultNuGetFeed)" Private="true">
       <!-- This version is used by tooling packages to match what is in VS and MSBuild. -->
@@ -337,141 +319,13 @@ not building again in this patch.
 
   <!-- Shipped dependencies from previous builds -->
 
-  <!-- 2.0.1 -->
-  <ItemGroup>
-    <ExternalDependency Include="Microsoft.AspNetCore.Antiforgery" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" HostingStartup="true" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Core" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Facebook" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Google" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.OAuth" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Twitter" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Authorization.Policy" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Authorization" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" HostingStartup="true" />
-    <ExternalDependency Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.CookiePolicy" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Cors" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Cryptography.Internal" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.3.1" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Hosting" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Http.Extensions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Http.Features" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Http" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.HttpOverrides" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Localization.Routing" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Localization" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Owin" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Razor.Language" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Razor.Runtime" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Razor" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCaching" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCompression" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Rewrite" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Routing" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Server.HttpSys" Version="2.0.2" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.Session" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.TestHost" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.AspNetCore.WebSockets" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.AspNetCore.WebUtilities" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.CodeAnalysis.Razor" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Localization.Abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Localization" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Net.Http.Headers" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Owin.Security.Interop" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.1" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-  </ItemGroup>
-
-<!-- Shipoob packages from the previous build -->
-<!--
-<PackageArtifact Include="Microsoft.CodeAnalysis.Razor.Workspaces" Category="shipoob" />
-<PackageArtifact Include="Microsoft.CodeAnalysis.Remote.Razor" Category="shipoob" />
-<PackageArtifact Include="Microsoft.VisualStudio.LanguageServices.Razor" Category="shipoob" />
-<PackageArtifact Include="Microsoft.Web.Xdt.Extensions" Category="shipoob" />
-  -->
-
   <!-- 2.0.0 -->
   <ItemGroup>
-    <ExternalDependency Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
     <ExternalDependency Include="Microsoft.AspNetCore.JsonPatch" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Caching.Abstractions" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Caching.Memory" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Caching.Redis" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Caching.SqlServer" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Configuration" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Ini" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Xml" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
     <ExternalDependency Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
     <ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.DiagnosticAdapter" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Abstractions" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Composite" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Embedded" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Physical" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.FileSystemGlobbing" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Logging" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Configuration" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Console" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Logging.EventSource" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Logging.TraceSource" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
     <ExternalDependency Include="Microsoft.Extensions.ObjectPool" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Options" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
     <ExternalDependency Include="Microsoft.Extensions.Primitives" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.Extensions.WebEncoders" Version="2.0.0" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true"/>
-    <ExternalDependency Include="Microsoft.DotNet.Watcher.Tools" Version="2.0.0" Source="$(DefaultNuGetFeed)" LZMATools="true" />
-    <ExternalDependency Include="Microsoft.Extensions.Caching.SqlConfig.Tools" Version="2.0.0" Source="$(DefaultNuGetFeed)" LZMATools="true" />
-    <ExternalDependency Include="Microsoft.Extensions.SecretManager.Tools" Version="2.0.0" Source="$(DefaultNuGetFeed)" LZMATools="true" />
-  </ItemGroup>
-
-  <!-- Non-shipped dependencies from previous builds -->
-  <PropertyGroup>
-    <AspNetCoreOct2017Patch>https://dotnet.myget.org/F/aspnet-2-0-2-october2017-patch-public/api/v3/index.json</AspNetCoreOct2017Patch>
-  </PropertyGroup>
-
-  <!-- 2.0.1 -->
-  <ItemGroup>
-    <ExternalDependency Include="Microsoft.AspNetCore.Certificates.Configuration.Sources" Version="2.0.1-rtm-207" Source="$(AspNetCoreOct2017Patch)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Version="2.0.1-rtm-207" Source="$(AspNetCoreOct2017Patch)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.AspNetCore.RangeHelper.Sources" Version="2.0.1-rtm-207" Source="$(AspNetCoreOct2017Patch)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Version="2.0.1-rtm-207" Source="$(AspNetCoreOct2017Patch)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Version="2.0.1-rtm-207" Source="$(AspNetCoreOct2017Patch)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="0.4.1-rtm-207" Source="$(AspNetCoreOct2017Patch)" Private="true" Mirror="true" />
-    <ExternalDependency Include="RazorPageGenerator" Version="2.0.1-rtm-207" Source="$(AspNetCoreOct2017Patch)" Private="true" Mirror="true" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -479,13 +333,11 @@ not building again in this patch.
   </PropertyGroup>
   <!-- 2.0.0 -->
   <ItemGroup>
-    <ExternalDependency Include="Microsoft.AspNetCore.Testing" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
     <ExternalDependency Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
     <ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
     <ExternalDependency Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
     <ExternalDependency Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
     <ExternalDependency Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Testing" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
     <ExternalDependency Include="Microsoft.Extensions.ObjectMethodExecutor.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
     <ExternalDependency Include="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
     <ExternalDependency Include="Microsoft.Extensions.Process.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />

build/submodules.props

@@ -7,53 +7,53 @@
 
   <ItemGroup>
     <!-- Repos being patched -->
+    <Repository Include="Antiforgery" />
+    <Repository Include="AzureIntegration" />
+    <Repository Include="BasicMiddleware" />
+    <Repository Include="BrowserLink" />
+    <Repository Include="Caching" />
+    <Repository Include="Configuration" />
+    <Repository Include="CORS" />
+    <Repository Include="DataProtection" />
     <Repository Include="Diagnostics" />
+    <Repository Include="DotNetTools" />
     <Repository Include="EntityFrameworkCore" />
+    <Repository Include="EventNotification" />
+    <Repository Include="FileSystem" />
+    <Repository Include="Hosting" />
+    <Repository Include="HtmlAbstractions" />
+    <Repository Include="HttpAbstractions" />
+    <Repository Include="HttpSysServer" />
     <Repository Include="Identity" />
+    <Repository Include="IISIntegration" />
     <Repository Include="JavaScriptServices" />
     <Repository Include="KestrelHttpServer" />
+    <Repository Include="Localization" />
+    <Repository Include="Logging" />
     <Repository Include="MetaPackages" />
     <Repository Include="Microsoft.Data.Sqlite" />
     <Repository Include="Mvc" />
     <Repository Include="MvcPrecompilation" />
+    <Repository Include="Options" />
+    <Repository Include="Proxy" />
+    <Repository Include="Razor" />
+    <Repository Include="ResponseCaching" />
+    <Repository Include="Routing" />
     <Repository Include="Scaffolding" />
+    <Repository Include="Security" />
+    <Repository Include="ServerTests" />
+    <Repository Include="Session" />
+    <Repository Include="StaticFiles" />
+    <Repository Include="Testing" />
+    <Repository Include="WebSockets" />
 
     <!--
     Repos not building this patch.
     Build tools will *verify* that these repos will be unaffected
     by the patch update and do not need updating.
     -->
-    <ShippedRepository Include="Antiforgery" />
-    <ShippedRepository Include="AzureIntegration" />
-    <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="HttpSysServer" />
-    <ShippedRepository Include="IISIntegration" />
     <ShippedRepository Include="JsonPatch" />
-    <ShippedRepository Include="Localization" />
-    <ShippedRepository Include="Logging" />
-    <ShippedRepository Include="Options" />
-    <ShippedRepository Include="Proxy" />
-    <ShippedRepository Include="Razor" />
-    <ShippedRepository Include="ResponseCaching" />
-    <ShippedRepository Include="Routing" />
-    <ShippedRepository Include="Security" />
-    <ShippedRepository Include="ServerTests" />
-    <ShippedRepository Include="Session" />
-    <ShippedRepository Include="StaticFiles" />
-    <ShippedRepository Include="Testing" />
-    <ShippedRepository Include="WebSockets" />
   </ItemGroup>
 </Project>

korebuild-lock.txt

@@ -1,2 +1,2 @@
-version:2.0.5-rtm-10014
-commithash:768d13aef913e058dfa3bc7bafca48bc93c7e0ab
+version:2.0.5-rtm-10016
+commithash:02bda79ac9c564229da734a836f258d6c1321eb7

korebuild.json

@@ -1,4 +1,4 @@
 {
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.0.0/tools/korebuild.schema.json",
-  "channel": "release/2.0.0"
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.0/tools/korebuild.schema.json",
+  "channel": "release/2.0"
 }

modules/Antiforgery

@@ -1 +1 @@
-Subproject commit 06b53886bd9bfafa3e96da22d61edcbad8db3842
+Subproject commit af5623fb4bdeb5d5aa6f10a213f6f10bafd7334a

modules/AzureIntegration

@@ -1 +1 @@
-Subproject commit 714ea279ca648cd2fce0a302af9d79c708b0e954
+Subproject commit 8cbc8e6a8c9c84429e5fb2908e8c5a3b6d91da19

modules/BasicMiddleware

@@ -1 +1 @@
-Subproject commit 8319d8eb0f2711e97ce86c9d98ec7a71d4710a21
+Subproject commit 8fd34cbb2f62cdf43a892289439b4bdf54ff9699

modules/BrowserLink

@@ -1 +1 @@
-Subproject commit d35de0ae6ba7f5a670387192ef0a5c5fef94a073
+Subproject commit 264e797c42d51b7eeb074e8da739f7888c67602e

modules/CORS

@@ -1 +1 @@
-Subproject commit 5a617d8cf152ed6cad54f93cecb8dc4dcdc47224
+Subproject commit 54018f1f97257ffae920e98525fcabfcf7f058cf

modules/Caching

@@ -1 +1 @@
-Subproject commit f3541e918714cdad4c24968292470b9531095b92
+Subproject commit d3c4b58119652b7c566fb00fcf19b907d9db18bc

modules/Configuration

@@ -1 +1 @@
-Subproject commit 99777e88f936170830708fc51482fc23acc2dfec
+Subproject commit c3f21a72efad1174ea5086e021c4798a439824d0

modules/DataProtection

@@ -1 +1 @@
-Subproject commit 7cc58239c477bcc91349f9bd217723ca46ab2da9
+Subproject commit c4c6e1b0e9667662646939139205e12bf57e865c

modules/Diagnostics

@@ -1 +1 @@
-Subproject commit e10016ae41eb75199a294bb5360387dcd11c9f27
+Subproject commit df09b976698fc024a944aaa918987c6fd78b8420

modules/DotNetTools

@@ -1 +1 @@
-Subproject commit 8586b2d47d9d3e54cb349bcb156bc4bb20426e5b
+Subproject commit 78b8c3337d4725b9108422cd98c951facc9067c2

modules/EntityFrameworkCore

@@ -1 +1 @@
-Subproject commit 984c2c87d67d996e2a3c578ff1a7e8e1c4e0da80
+Subproject commit b9309a7e825e0283354e6b4e4480ca74e8b2888e

modules/EventNotification

@@ -1 +1 @@
-Subproject commit b6ed5ce7534a7ead28cbe4bc6dc0458f53b0d4f7
+Subproject commit 055ae09952d92d2484b00dbf0724e7f9d187d12f

modules/FileSystem

@@ -1 +1 @@
-Subproject commit 73a4b45edbb14b6f3f5063400ab67f83230d5414
+Subproject commit 3d57b55d72399fddeb8eadca118b44a8c979c912

modules/Hosting

@@ -1 +1 @@
-Subproject commit 86df76440b450daa3972d5b317026b58f718b803
+Subproject commit 844f6a57af553d1cb89c113a5254470b735a1bd9

modules/HtmlAbstractions

@@ -1 +1 @@
-Subproject commit dd02e6829ef4210795c17d198a97465e9b1875ea
+Subproject commit ab623aeb00dd27c9a55c9a4f1662b5304f9acfb4

modules/HttpAbstractions

@@ -1 +1 @@
-Subproject commit 9cfc7502c15bf0f2240121d7d68b515fe16a8c95
+Subproject commit 022f96fc7078d2879ab3ca78680ef6861f66ec54

modules/HttpSysServer

@@ -1 +1 @@
-Subproject commit 1b5ba87bbb80d798bebdf73711a09a846205c19b
+Subproject commit b85f18fe18f511df0af442f5c9d3485c09b909d0

modules/IISIntegration

@@ -1 +1 @@
-Subproject commit f270358b27174f0f6a6afae44715f8176bd9d486
+Subproject commit 346315f5c0f5f6ea064fb4f0fffe930d3717d91c

modules/Identity

@@ -1 +1 @@
-Subproject commit 0ab57e8184f524928b4e58791172b5a9d98940b1
+Subproject commit 15a82284ce52dc8932c49f3246763f3ea05a3568

modules/JavaScriptServices

@@ -1 +1 @@
-Subproject commit 79fd6debad12fd4e9b7fbe5af125fa05ab402c00
+Subproject commit 44d39bc0d42c7f6c5a3f61cdeead4d70f625b6e2

modules/KestrelHttpServer

@@ -1 +1 @@
-Subproject commit 35a9432ce8e1bdd003309785e6ab1fa857c6eecc
+Subproject commit 4e5bcf3f021eda3b6875fbf5768158cff21d8971

modules/Localization

@@ -1 +1 @@
-Subproject commit 4ee17ae30bfbd464e11ceb28a5e4ee00c6141725
+Subproject commit beacd97a93a768b333e4ab30c710fbd32150a2dc

modules/Logging

@@ -1 +1 @@
-Subproject commit 6f6781e3fe98a7d8005f7b8e13e9e302c4067119
+Subproject commit c2bf63ed67058ed86dd66f6fea85532b5ed4f67a

modules/MetaPackages

@@ -1 +1 @@
-Subproject commit 57e644b813bf51a7e73e092995dc8511511074ba
+Subproject commit c5dc6f6959af04bfe0862acaf6db9d3086dcf07f

modules/Microsoft.Data.Sqlite

@@ -1 +1 @@
-Subproject commit 20cc6f45334c0d715d0b5387165cd5fddb5133c8
+Subproject commit da74078a40763971fe12494de9f1dbdb8daf46ab

modules/Mvc

@@ -1 +1 @@
-Subproject commit c9e2d585a49e861fe0c2f4846dedb44cba997b16
+Subproject commit aeab6e295efdc0b1d89c375b62a84fe3b6ba969e

modules/MvcPrecompilation

@@ -1 +1 @@
-Subproject commit 46d5f4e3d056310955f180da6af9ebe1333a0534
+Subproject commit ff55ddbd92b0266ac28d9f486704376dc127f611

modules/Options

@@ -1 +1 @@
-Subproject commit 0ea1fec42203b95785d6beade2e8ea6a93cdf47b
+Subproject commit e8275d1dee8a4e8b03f0d87e81ebc8ef586e2fb7

modules/Proxy

@@ -1 +1 @@
-Subproject commit f0bec28f34e41824019c5eb87de67c73173e6a26
+Subproject commit 466558481201e2fdedbd2d7d5fdfe288aae85a98

modules/Razor

@@ -1 +1 @@
-Subproject commit cff2ef2e0a3a6a24c689505dcbdceec228cd6d20
+Subproject commit 386840c82b3122d06c5139955f70a2a87f2d1d0a

modules/ResponseCaching

@@ -1 +1 @@
-Subproject commit b0362dab9cd4c5bf8de364694d4880ab2c948be5
+Subproject commit d4606fe791f7b4fe746003dff6553498f039edb1

modules/Routing

@@ -1 +1 @@
-Subproject commit 763aa1447e340c4d6607b1542183817d5f08e257
+Subproject commit c3cdbf67f0606cd95eafe4194924e1ca6439da20

modules/Scaffolding

@@ -1 +1 @@
-Subproject commit 793c266455bf499d0d30434a4ef47cf673dd81c8
+Subproject commit 4361c9bb778f2ce9d2557eaa1cf6d5d682337670

modules/Security

@@ -1 +1 @@
-Subproject commit 598188a29a02d7793c4fe15fbe9c88197eb81a8a
+Subproject commit 36e6ab673eaf305e604333be01fc909be0fd1125

modules/ServerTests

@@ -1 +1 @@
-Subproject commit 9533c2c6435fb86137de0914a93e76a04567eef5
+Subproject commit 0c313bb2164330b127e8941f91c67930bf550453

modules/Session

@@ -1 +1 @@
-Subproject commit 6cbe68fb3c40bbf5e9c9ca2e87b0e4d51d3964f1
+Subproject commit 643c53de3d75479559391e3ffde3e24f5feb5e73

modules/StaticFiles

@@ -1 +1 @@
-Subproject commit f83ec642e7421f6ae133d4ef459a20729c9c16fb
+Subproject commit 6be7940dda62d06c40b6e0144f1fbe0adf66c6c4

modules/Templating

@@ -1 +1 @@
-Subproject commit e3674db32e34f4b43671e978eb9902b3b11fb214
+Subproject commit c786c029f45547fd3d01be534c4634c974fe7377

modules/Testing

@@ -1 +1 @@
-Subproject commit e270986c142758ab529d6635394c76482f9c5416
+Subproject commit 7d50390d3ae3e1eea19cac017062e402e4cc212b

modules/WebSockets

@@ -1 +1 @@
-Subproject commit 5a9214e3355be3d4b8eec873e3d51e5737e061f0
+Subproject commit 32c29cb3c4ac317e93010341fc597045388d03b4

scripts/PatchVersionPrefix.ps1

@@ -14,27 +14,7 @@ param(
 
 $ErrorActionPreference = 'Stop'
 
-function SaveXml($xml, [string]$path) {
-    Write-Verbose "Saving to $path"
-    $ErrorActionPreference = 'stop'
-
-    $settings = New-Object System.XML.XmlWriterSettings
-    $settings.OmitXmlDeclaration = $true
-    $settings.Encoding = New-Object System.Text.UTF8Encoding( $true )
-    $writer = [System.XML.XMLTextWriter]::Create($path, $settings)
-    $xml.Save($writer)
-    $writer.Close()
-}
-
-function LoadXml([string]$path) {
-    Write-Verbose "Reading to $path"
-
-    $ErrorActionPreference = 'stop'
-    $obj = new-object xml
-    $obj.PreserveWhitespace = $true
-    $obj.Load($path)
-    return $obj
-}
+Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1"
 
 function BumpPatch([System.Xml.XmlNode]$node) {
     if (-not $node) {

scripts/common.psm1

@@ -64,3 +64,25 @@ function Get-Submodules {
 
     return $submodules
 }
+
+function SaveXml([xml]$xml, [string]$path) {
+    Write-Verbose "Saving to $path"
+    $ErrorActionPreference = 'stop'
+
+    $settings = New-Object System.XML.XmlWriterSettings
+    $settings.OmitXmlDeclaration = $true
+    $settings.Encoding = New-Object System.Text.UTF8Encoding( $true )
+    $writer = [System.XML.XMLTextWriter]::Create($path, $settings)
+    $xml.Save($writer)
+    $writer.Close()
+}
+
+function LoadXml([string]$path) {
+    Write-Verbose "Reading to $path"
+
+    $ErrorActionPreference = 'stop'
+    $obj = new-object xml
+    $obj.PreserveWhitespace = $true
+    $obj.Load($path)
+    return $obj
+}