Просмотр исходного кода

Prepare infrastructure for the 2.1.3 patch

Nate McMaster 7 лет назад
Родитель
Сommit
6b8aac13e0
49 измененных файлов с 323 добавлено и 307 удалено
  1. 215 0
      build/artifacts.props
  2. 0 217
      build/external-dependencies.props
  3. 5 3
      build/repo.targets
  4. 40 39
      build/submodules.props
  5. 17 2
      build/tools/NuspecBaselineGenerator/Program.cs
  6. 2 2
      korebuild-lock.txt
  7. 1 1
      modules/AADIntegration
  8. 1 1
      modules/Antiforgery
  9. 1 1
      modules/AzureIntegration
  10. 1 1
      modules/BasicMiddleware
  11. 1 1
      modules/BrowserLink
  12. 1 1
      modules/CORS
  13. 1 1
      modules/Caching
  14. 1 1
      modules/Common
  15. 1 1
      modules/Configuration
  16. 1 1
      modules/DataProtection
  17. 1 1
      modules/DependencyInjection
  18. 1 1
      modules/Diagnostics
  19. 1 1
      modules/DotNetTools
  20. 1 1
      modules/EntityFrameworkCore
  21. 1 1
      modules/FileSystem
  22. 1 1
      modules/Hosting
  23. 1 1
      modules/HtmlAbstractions
  24. 1 1
      modules/HttpAbstractions
  25. 1 1
      modules/HttpClientFactory
  26. 1 1
      modules/HttpSysServer
  27. 1 1
      modules/IISIntegration
  28. 1 1
      modules/Identity
  29. 1 1
      modules/JavaScriptServices
  30. 1 1
      modules/JsonPatch
  31. 1 1
      modules/KestrelHttpServer
  32. 1 1
      modules/Localization
  33. 1 1
      modules/Logging
  34. 1 1
      modules/MetaPackages
  35. 1 1
      modules/Mvc
  36. 1 1
      modules/MvcPrecompilation
  37. 1 1
      modules/Options
  38. 1 1
      modules/Razor
  39. 1 1
      modules/ResponseCaching
  40. 1 1
      modules/Routing
  41. 1 1
      modules/Scaffolding
  42. 1 1
      modules/Security
  43. 1 1
      modules/ServerTests
  44. 1 1
      modules/Session
  45. 1 1
      modules/SignalR
  46. 1 1
      modules/StaticFiles
  47. 1 1
      modules/Templating
  48. 1 1
      modules/WebSockets
  49. 2 2
      version.props

+ 215 - 0
build/artifacts.props

@@ -20,16 +20,79 @@
   </ItemDefinitionGroup>
 
   <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" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.OAuth" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.Twitter" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication.WsFederation" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Authentication" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Authorization.Policy" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <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" />
@@ -42,12 +105,57 @@
     <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" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Analyzers" Analyzer="true" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.ApiExplorer" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Core" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Cors" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.DataAnnotations" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Formatters.Json" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Localization" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" Category="shipoob" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Razor" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.RazorPages" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.TagHelpers" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Testing" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.ViewFeatures" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Category="ship" />
+    <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" 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" />
@@ -56,13 +164,120 @@
     <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.SignalR.Redis" AllMetapackage="true" Category="ship" />
     <PackageArtifact Include="Microsoft.AspNetCore.SignalR" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <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" />
+    <PackageArtifact Include="Microsoft.CodeAnalysis.Remote.Razor" Category="shipoob" />
     <PackageArtifact Include="Microsoft.DotNet.Web.Client.ItemTemplates" Category="shipoob" />
     <PackageArtifact Include="Microsoft.DotNet.Web.ItemTemplates" Category="shipoob" />
     <PackageArtifact Include="Microsoft.DotNet.Web.ProjectTemplates.2.1" Category="shipoob" />
     <PackageArtifact Include="Microsoft.DotNet.Web.Spa.ProjectTemplates" Category="shipoob" />
+    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Abstractions" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Analyzers" Analyzer="true" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Design" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.EntityFrameworkCore.DocumentDb" Category="noship" />
+    <PackageArtifact Include="Microsoft.EntityFrameworkCore.InMemory" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Proxies" Category="ship" />
+    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Category="ship" />
+    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Relational" AllMetapackage="true" AppMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Specification.Tests" Category="ship" />
+    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Sqlite.Core" AllMetapackage="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Sqlite" AllMetapackage="true" Category="ship" />
+    <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" />
+    <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore" LZMA="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Templating" LZMA="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Utils" LZMA="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration" LZMA="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" LZMA="true" Category="ship" />
+    <PackageArtifact Include="Microsoft.Web.Xdt.Extensions" Category="shipoob" />
+    <PackageArtifact Include="RazorPageGenerator" Category="noship" />
   </ItemGroup>
 
 </Project>

+ 0 - 217
build/external-dependencies.props

@@ -161,223 +161,6 @@
   <ItemGroup>
     <!-- Versions of our packages produced from the last patch -->
 
-    <!-- 2.1.1 -->
-    <ExternalDependency Include="dotnet-aspnet-codegenerator" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="dotnet-dev-certs" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="dotnet-ef" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="dotnet-sql-cache" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="dotnet-user-secrets" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="dotnet-watch" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Antiforgery" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.1.1" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.AspNetCoreModule" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.AspNetCoreModuleV1" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="2.1.1" LZMA="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="2.1.1" LZMA="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Core" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Facebook" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Google" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.OAuth" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Twitter" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.WsFederation" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authentication" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authorization.Policy" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Authorization" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.1.1" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.1.1" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.BenchmarkRunner.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Buffering" Version="0.4.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Certificates.Generation.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.CookiePolicy" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Cors" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Cryptography.Internal" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="2.1.1" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="2.1.1" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Extensions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.4.1" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="2.1.1" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Diagnostics.Elm" Version="0.4.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.HostFiltering" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Html.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Http.Extensions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Http.Features" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Http" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.HttpOverrides" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.HttpsPolicy" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.HttpSys.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.JsonPatch" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Localization.Routing" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Localization" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Analyzers.Experimental" Version="0.1.1" Analyzer="true" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Analyzers" Version="2.1.1" Analyzer="true" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Cors" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Localization" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X" Version="2.1.1" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.NodeServices.Sockets" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.NodeServices" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Owin" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.RangeHelper.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Razor.Language" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Razor.Runtime" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Razor" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCaching" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCompression" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Rewrite" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Routing" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Server.HttpSys" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Server.IIS" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="0.5.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.Session" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.SpaServices" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.TestHost" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.WebSockets" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.AspNetCore.WebUtilities" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.CodeAnalysis.Razor.Workspaces" Version="2.1.1" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.CodeAnalysis.Razor" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.CodeAnalysis.Remote.Razor" Version="2.1.1" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Analyzers" Version="2.1.1" Analyzer="true" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Design" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.EntityFrameworkCore.DocumentDb" Version="0.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Proxies" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Relational" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Specification.Tests" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.1.1" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.1" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.EntityFrameworkCore" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.ApplicationModelDetection" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Buffers.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Buffers.Testing.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Caching.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Caching.Memory" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Caching.Redis" Version="2.1.1" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Caching.SqlServer" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="2.1.1" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.CommandLine" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Ini" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration.Xml" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Configuration" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Composite" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Embedded" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Physical" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.FileSystemGlobbing" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Hosting" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Http.Polly" Version="2.1.1" AllMetapackage="false" AppMetapackage="false" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Http" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Localization.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Localization" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Analyzers" Version="0.1.1" Analyzer="true" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.AzureAppServices" Version="2.1.1" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Configuration" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.EventLog" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.EventSource" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.Testing" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging.TraceSource" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Logging" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.ObjectMethodExecutor.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.ObjectPool" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Options" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.Primitives" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Extensions.Process.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.PropertyActivator.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.PropertyHelper.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.RazorViews.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.SecurityHelper.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.StackTrace.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.ValueStopwatch.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.WebEncoders.Sources" Version="2.1.1" Category="noship" />
-    <ExternalDependency Include="Microsoft.Extensions.WebEncoders" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Net.Http.Headers" Version="2.1.1" AllMetapackage="true" AppMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.NET.Sdk.Razor" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="Microsoft.Owin.Security.Interop" Version="2.1.1" Category="ship" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Editor.Razor" Version="2.1.1" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.VisualStudio.LanguageServices.Razor" Version="2.1.1" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Mac.LanguageServices.Razor" Version="2.1.1" Category="shipoob" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.1.1" AllMetapackage="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Contracts" Version="2.1.1" LZMA="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Core" Version="2.1.1" LZMA="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.1" LZMA="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore" Version="2.1.1" LZMA="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Templating" Version="2.1.1" LZMA="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Utils" Version="2.1.1" LZMA="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration" Version="2.1.1" LZMA="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Version="2.1.1" LZMA="true" Category="ship" />
-    <ExternalDependency Include="Microsoft.Web.Xdt.Extensions" Version="2.1.1" Category="shipoob" />
-    <ExternalDependency Include="RazorPageGenerator" Version="2.1.1" Category="noship" />
-
     <!-- 2.1.0 -->
     <ExternalDependency Include="Microsoft.AspNetCore.Testing" Version="2.1.0" Category="noship" />
     <ExternalDependency Include="Microsoft.Data.Sqlite.Core" Version="2.1.0" AllMetapackage="true" Category="ship" />

+ 5 - 3
build/repo.targets

@@ -41,14 +41,16 @@
     <MSBuild Projects="$(MSBuildProjectFullPath)"
              Targets="GetArtifactInfo"
              Properties="$(DesignTimeBuildProps);RepositoryRoot=%(Repository.RootPath);Configuration=$(Configuration);BuildNumber=$(BuildNumber);DesignTimeBuild=true"
-             ContinueOnError="WarnAndContinue">
+             ContinueOnError="WarnAndContinue"
+             Condition="'%(Repository.Identity)' != ''">
       <Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
     </MSBuild>
 
     <MSBuild Projects="$(MSBuildProjectFullPath)"
              Targets="ResolveSolutions"
              Properties="RepositoryRoot=%(Repository.RootPath);Configuration=$(Configuration);BuildNumber=$(BuildNumber)"
-             ContinueOnError="WarnAndContinue">
+             ContinueOnError="WarnAndContinue"
+             Condition="'%(Repository.Identity)' != ''">
       <Output TaskParameter="TargetOutputs" ItemName="Solution" Condition="'%(Repository.Build)' == 'true'" />
       <Output TaskParameter="TargetOutputs" ItemName="_NoBuildSolution" Condition="'%(Repository.Build)' != 'true'" />
     </MSBuild>
@@ -257,7 +259,7 @@
   </Target>
 
   <Target Name="VerifyAllReposHaveNuGetPackageVerifier" DependsOnTargets="_PrepareRepositories">
-    <Error Condition="!Exists('%(Repository.RootPath)NuGetPackageVerifier.json')"
+    <Error Condition="'%(Repository.Identity)' != '' AND !Exists('%(Repository.RootPath)NuGetPackageVerifier.json')"
            Text="Repository %(Repository.Identity) is missing NuGetPackageVerifier.json. Expected file to exist in %(Repository.RootPath)NuGetPackageVerifier.json" />
   </Target>
 

+ 40 - 39
build/submodules.props

@@ -6,54 +6,55 @@
   </ItemDefinitionGroup>
 
   <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="StaticFiles" />
+    <Repository Include="WebSockets" />
+    <!-- <Repository Include="Templating" /> -->
   </ItemGroup>
 
   <ItemGroup>
-    <ShippedRepository Include="AADIntegration" />
-    <ShippedRepository Include="Antiforgery" />
-    <ShippedRepository Include="AuthSamples" />
-    <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="Diagnostics" />
-    <ShippedRepository Include="DotNetTools" />
-    <ShippedRepository Include="EntityFrameworkCore" />
     <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="JavaScriptServices" />
-    <ShippedRepository Include="JsonPatch" />
-    <ShippedRepository Include="Localization" />
-    <ShippedRepository Include="Logging" />
     <ShippedRepository Include="Microsoft.Data.Sqlite" />
-    <ShippedRepository Include="MusicStore" />
-    <ShippedRepository Include="Mvc" />
-    <ShippedRepository Include="MvcPrecompilation" />
-    <ShippedRepository Include="Options" />
-    <ShippedRepository Include="Razor" />
-    <ShippedRepository Include="ResponseCaching" />
-    <ShippedRepository Include="Routing" />
-    <ShippedRepository Include="Scaffolding" />
-    <ShippedRepository Include="Security" />
-    <ShippedRepository Include="ServerTests" />
-    <ShippedRepository Include="Session" />
-    <ShippedRepository Include="StaticFiles" />
     <ShippedRepository Include="Testing" />
-    <ShippedRepository Include="WebSockets" />
   </ItemGroup>
 </Project>

+ 17 - 2
build/tools/NuspecBaselineGenerator/Program.cs

@@ -15,14 +15,17 @@ namespace NuspecBaselineGenerator
 
         [Required]
         [DirectoryExists]
-        [Argument(0)]
+        [Argument(0, Description = "Path(s) to directories containing .nupkg files from previous releases.")]
         public string[] Directories { get; }
 
         [Required]
-        [Option]
+        [Option(Description = "The path to the artifacts.props file")]
         [FileExists]
         public string Artifacts { get; }
 
+        [Option(Description = "Show verbose output")]
+        public bool Verbose { get; }
+
         private void OnExecute()
         {
             var doc = XDocument.Load(Artifacts);
@@ -35,10 +38,13 @@ namespace NuspecBaselineGenerator
                     {
                         var identity = reader.GetIdentity();
                         versions.Add((identity.Id, identity.Version.ToNormalizedString()));
+                        LogVerbose($"Found package {identity.Id}/{identity.Version} ({nupkg})");
                     }
                 }
             }
 
+            LogVerbose($"Found {versions.Count} package(s)");
+
             void WriteAttribute(XElement element, string attr)
             {
                 var attribute = element.Attribute(attr);
@@ -68,5 +74,14 @@ namespace NuspecBaselineGenerator
                 Console.WriteLine(" />");
             }
         }
+
+        private void LogVerbose(string message)
+        {
+            if (!Verbose)
+            {
+                return;
+            }
+            Console.WriteLine(message);
+        }
     }
 }

+ 2 - 2
korebuild-lock.txt

@@ -1,2 +1,2 @@
-version:2.1.1-rtm-15793
-commithash:988313f4b064d6c69fc6f7b845b6384a6af3447a
+version:2.1.3-rtm-15795
+commithash:866028c9d39a52bbdef2ee6c1406493d1c0a0290

+ 1 - 1
modules/AADIntegration

@@ -1 +1 @@
-Subproject commit 111b8d812dcae225bc20e115680dbf2b62da1ed9
+Subproject commit bb49eeebe64905ce705f0e70f59869085adc9dce

+ 1 - 1
modules/Antiforgery

@@ -1 +1 @@
-Subproject commit 443fe51456f5b36166e0e34f44044392e99a1217
+Subproject commit c26db4bb8f276c6582c3beae561342c1126eee83

+ 1 - 1
modules/AzureIntegration

@@ -1 +1 @@
-Subproject commit 41c0cfb1a8c93547b2fd8736208227a3d8c6c4c1
+Subproject commit d65c138c80b474841ce7324cd609ea6533d7345a

+ 1 - 1
modules/BasicMiddleware

@@ -1 +1 @@
-Subproject commit 8c7e7357d40663abd8c82f7e24963d0c857cf117
+Subproject commit d6a29161ee5fffd91b3269380325970d42e5d9f0

+ 1 - 1
modules/BrowserLink

@@ -1 +1 @@
-Subproject commit 3a52b689fb752811cdd1ad90695f35289e03d4d8
+Subproject commit f818b554fd86c3a476abfd602c5045cd3039b853

+ 1 - 1
modules/CORS

@@ -1 +1 @@
-Subproject commit ccd4d50d6fb9d17466d582f31f7a8618914b9a68
+Subproject commit d9f5f35b7a3a7c7512e8fecad43e5ff4ffd6b587

+ 1 - 1
modules/Caching

@@ -1 +1 @@
-Subproject commit cd592226aea44b0e6be413f636cfa552863c7a95
+Subproject commit 4dc546ecf47cfe64104457b783e172a9f4ee36be

+ 1 - 1
modules/Common

@@ -1 +1 @@
-Subproject commit 3225f2a78ee19507372b0b1ada2f8739e667bf09
+Subproject commit 6db5f353092a3191cee71853fbbcebf81f1ce259

+ 1 - 1
modules/Configuration

@@ -1 +1 @@
-Subproject commit 4fb6f1211155833e8b72a789c23db55893d8a0b7
+Subproject commit 143012a16f63a9c666d26ec053db6fd24965e3de

+ 1 - 1
modules/DataProtection

@@ -1 +1 @@
-Subproject commit b40fa1bdfbaefd48064504d5cb993b6e36daf943
+Subproject commit 7803b6ba25f7fd12828e5a09dbb321af129933b4

+ 1 - 1
modules/DependencyInjection

@@ -1 +1 @@
-Subproject commit 960aa7c28783c26b42554cfe406e2d9d8986e98f
+Subproject commit 4dca2813ae6e131c3d0d109656709283864fdf6c

+ 1 - 1
modules/Diagnostics

@@ -1 +1 @@
-Subproject commit dedefd7043d8cdf2d38487aa2415084597ec25e1
+Subproject commit d1b1a8097be41bd9c4408c554b190a43f3eafb99

+ 1 - 1
modules/DotNetTools

@@ -1 +1 @@
-Subproject commit ee20ecf20e4ac1f2aaffac591580d2fdc6d6f6de
+Subproject commit 4d3886fa378e61ccc21e8b8adb5e1666de0ecb40

+ 1 - 1
modules/EntityFrameworkCore

@@ -1 +1 @@
-Subproject commit d6071c9e4c3d9fb2d1e7943aad7b77b2361ddf62
+Subproject commit da195a12c43046327ba589d20e5936ae77f190b4

+ 1 - 1
modules/FileSystem

@@ -1 +1 @@
-Subproject commit 36f88e9b39b9c88a302110970c7761996f15ca3e
+Subproject commit cb0eb99f2481695d48669a3daa3b34a138e3c9d1

+ 1 - 1
modules/Hosting

@@ -1 +1 @@
-Subproject commit 72c28fa87555d60925e6bbab2d2e9dd8da752492
+Subproject commit cf4654189f59386d38afd66c9250cb1c423ecce6

+ 1 - 1
modules/HtmlAbstractions

@@ -1 +1 @@
-Subproject commit 256f7755bae10204ba6c3b669d2289b7de33308a
+Subproject commit 47c5edd37aad2a12d14c9dea8cfb22ef48ddb005

+ 1 - 1
modules/HttpAbstractions

@@ -1 +1 @@
-Subproject commit f47b5e9f9e29c16f002c86de6d908bafd4cd9783
+Subproject commit 78ce5dd2bef4e4d37fb23d2b76770421196e1085

+ 1 - 1
modules/HttpClientFactory

@@ -1 +1 @@
-Subproject commit 39885c573a70beba534001e4639ff05358fd94aa
+Subproject commit 3495644354aa4bf8fc14304c2e939fb9027f857f

+ 1 - 1
modules/HttpSysServer

@@ -1 +1 @@
-Subproject commit 2e4a9f8987389fd9342d952316a5d51cc6962f8b
+Subproject commit cbbe2975bcc1a8b1b44d0bd015d0b77a6c725c5a

+ 1 - 1
modules/IISIntegration

@@ -1 +1 @@
-Subproject commit 278a4794a8091da5c72c8900fe6dc1cfda58e301
+Subproject commit 4aa93d0bef9e39f533913527713daca14382cbbc

+ 1 - 1
modules/Identity

@@ -1 +1 @@
-Subproject commit 788e324115196d9fb1e15693266943a607644f87
+Subproject commit 7fbb5588fc9ebb976b24f97264b51962a8f0087b

+ 1 - 1
modules/JavaScriptServices

@@ -1 +1 @@
-Subproject commit d65a4f3b6dff8b6508a9db2b91db495bcb0a6af9
+Subproject commit a04813edc3456446dfb2e8059a7589f9d405db16

+ 1 - 1
modules/JsonPatch

@@ -1 +1 @@
-Subproject commit 1780662ac507c9b21bf7054bc1f68ccd07ed93ff
+Subproject commit 5d39e86f1985d99d0c530e312d5b478ddc8682a4

+ 1 - 1
modules/KestrelHttpServer

@@ -1 +1 @@
-Subproject commit 11ddd9174c7c2af231ad70cf3efad85012e2fd73
+Subproject commit 7f49500ffac8c0d6528ba9c7e331aed6683f89fa

+ 1 - 1
modules/Localization

@@ -1 +1 @@
-Subproject commit ebe067fa0faa6db33f56fa08fa34921477993379
+Subproject commit bd43a693aac3decd8137816496f84c1842b846ad

+ 1 - 1
modules/Logging

@@ -1 +1 @@
-Subproject commit 7b9db0d874046496ee76547558808151e9a267d5
+Subproject commit 13c6e50447e0922522ad75199c1c359c5a589cd4

+ 1 - 1
modules/MetaPackages

@@ -1 +1 @@
-Subproject commit 337c3a3a7013709e07fa47c7bc5b5745092c5389
+Subproject commit e4d891c6f67c9f8e3105081d338091b05f357296

+ 1 - 1
modules/Mvc

@@ -1 +1 @@
-Subproject commit 9d3243c38d1ecd6bb004d040aefb567b3bedd332
+Subproject commit 78fc49ba0c8ad7859e1f3a8aa6c3d17c7cd11f5a

+ 1 - 1
modules/MvcPrecompilation

@@ -1 +1 @@
-Subproject commit c6b52cf95a9c2b35d6acd380d85613354249f2fd
+Subproject commit 7bf7b14cf8540fa9b558a75a9ed9bfc0a10d29f8

+ 1 - 1
modules/Options

@@ -1 +1 @@
-Subproject commit bee9916eebb1071eb57efbe2674a95d774e90337
+Subproject commit 8aee0a21430299dab73d59b661564997215912c5

+ 1 - 1
modules/Razor

@@ -1 +1 @@
-Subproject commit 67bbd067d53e230c7159c04a7a58e56f5202d083
+Subproject commit c7fafa1e639ad30b39c608d7c264ae2bce98121f

+ 1 - 1
modules/ResponseCaching

@@ -1 +1 @@
-Subproject commit 9e7c650c8a22158fc1099fa1f028bca93166fc8a
+Subproject commit 88796f41f879e201504d1d21fb2a6b45032d5e40

+ 1 - 1
modules/Routing

@@ -1 +1 @@
-Subproject commit 12912ae6eb34c780e85b0a44a9b6e40e0520ad67
+Subproject commit ebab62c7666b26fe0f98546cbb210352a7fa1d1d

+ 1 - 1
modules/Scaffolding

@@ -1 +1 @@
-Subproject commit 7a7f6e0d05f8a2432b6489c760abdfbf1ca0af7a
+Subproject commit 9bcbfb021e6b5d64dd849e885b4cefd0cb3178b0

+ 1 - 1
modules/Security

@@ -1 +1 @@
-Subproject commit ac1a9ef6d183a94646a4b5e57b7be1c6e53b5605
+Subproject commit 26fbad061475e4cf8d27d0e364048a924ead953b

+ 1 - 1
modules/ServerTests

@@ -1 +1 @@
-Subproject commit e4da0155910aad63360d47822d6b8affd4a2f61b
+Subproject commit 60564e7d5bb63ae2d6cc0137c5fbd508eddd2e17

+ 1 - 1
modules/Session

@@ -1 +1 @@
-Subproject commit 2d910089bc05f4ef35bb5807b648ebf557c7a408
+Subproject commit 246aedb5bf97059d25cc3e2d8de715de5156f6f6

+ 1 - 1
modules/SignalR

@@ -1 +1 @@
-Subproject commit 559d93c15e10c2025ec9406612c0eaabb1fd7e2b
+Subproject commit 6c0770398de0221ac0fc30550aec9a9f649e9317

+ 1 - 1
modules/StaticFiles

@@ -1 +1 @@
-Subproject commit 8109246248cfff0a67d1a9774bff443c8b6e7f23
+Subproject commit d1235cdda0c40541cf8e50f475f6d2168d624eb9

+ 1 - 1
modules/Templating

@@ -1 +1 @@
-Subproject commit 4ff022bd7010a7b517d265ef3e121e4995f324f4
+Subproject commit a6b303c83c1cd4d4e0d302e07064713eafa3ed39

+ 1 - 1
modules/WebSockets

@@ -1 +1 @@
-Subproject commit 76e31009e3f13c8deddd6c1829e05726924185cb
+Subproject commit 7922b27c65a94ba952aefc1306aaa1f7e5f5c58d

+ 2 - 2
version.props

@@ -2,14 +2,14 @@
   <PropertyGroup>
     <AspNetCoreMajorVersion>2</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>2</AspNetCorePatchVersion>
+    <AspNetCorePatchVersion>3</AspNetCorePatchVersion>
     <VersionPrefix>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion)</VersionPrefix>
     <PrereleaseVersionLabel>rtm</PrereleaseVersionLabel>
 
     <!-- The 'human friendly' version to display in installers. In pre-release builds, this might be "2.0.7 Preview 2" -->
     <PackageBrandingVersion>$(VersionPrefix)</PackageBrandingVersion>
 
-    <ExperimentalVersionPrefix>0.1.2</ExperimentalVersionPrefix>
+    <ExperimentalVersionPrefix>0.1.3</ExperimentalVersionPrefix>
     <ExperimentalVersionSuffix>rtm</ExperimentalVersionSuffix>
 
     <PackageVersionSuffix Condition=" '$(IsFinalBuild)' != 'true' AND '$(PrereleaseVersionLabel)' != '' ">$(PrereleaseVersionLabel)</PackageVersionSuffix>