diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index e46c3a157b..bbcc652f82 100644
--- a/build/RepositoryBuild.targets
+++ b/build/RepositoryBuild.targets
@@ -1,5 +1,5 @@
 <Project>
-  <Target Name="_BuildRepositories">
+  <Target Name="_BuildRepositories" Condition=" @(RepositoryBuildOrder->Count()) != 0 ">
     <ItemGroup>
       <BatchedRepository Include="$(MSBuildProjectFullPath)">
         <BuildGroup>%(RepositoryBuildOrder.Order)</BuildGroup>
diff --git a/build/Templating.targets b/build/Templating.targets
index 24dc7eef78..54cebd94f4 100644
--- a/build/Templating.targets
+++ b/build/Templating.targets
@@ -40,7 +40,8 @@
     <MSBuild Projects="$(MSBuildProjectFullPath)"
              Targets="GetArtifactInfo"
              Properties="RepositoryRoot=%(Repository.RootPath);Configuration=$(Configuration);BuildNumber=$(BuildNumber);IsFinalBuild=true"
-             ContinueOnError="WarnAndContinue">
+             ContinueOnError="WarnAndContinue"
+             Condition=" '%(Repository.Identity)' != ''">
       <Output TaskParameter="TargetOutputs" ItemName="FinalBuildArtifactInfo" />
     </MSBuild>
 
diff --git a/build/artifacts.props b/build/artifacts.props
index 659d741f28..eec23a6efe 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -10,189 +10,10 @@
   </ItemDefinitionGroup>
 
   <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.WsFederation" Category="ship" Metapackage="false" RuntimeStore="false"/>
-    <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"/>
-    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Core" Category="ship" Metapackage="true" RuntimeStore="true"/>
-    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Cors" Category="ship" Metapackage="true" RuntimeStore="true"/>
-    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Category="ship" Metapackage="true" RuntimeStore="true"/>
-    <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"/>
-    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.TagHelpers" Category="ship" Metapackage="true" RuntimeStore="true"/>
-    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.Testing" Category="noship" />
-    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Category="ship" Metapackage="true" RuntimeStore="true"/>
-    <PackageArtifact Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Category="ship" />
-    <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" />
-    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Design" Category="ship" Metapackage="true" RuntimeStore="true"/>
-    <PackageArtifact Include="Microsoft.EntityFrameworkCore.InMemory" Category="ship" Metapackage="true" RuntimeStore="true"/>
-    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests" Category="ship" />
-    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Category="ship" />
-    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Relational" Category="ship" Metapackage="true" RuntimeStore="true"/>
-    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Specification.Tests" Category="ship" />
-    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Category="ship" Metapackage="true" RuntimeStore="true"/>
-    <PackageArtifact Include="Microsoft.EntityFrameworkCore.Sqlite" Category="ship" Metapackage="true" RuntimeStore="true"/>
-    <PackageArtifact Include="Microsoft.EntityFrameworkCore.SqlServer" Category="ship" Metapackage="true" RuntimeStore="true"/>
-    <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" />
-    <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore" Category="ship" />
-    <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Templating" Category="ship" />
-    <PackageArtifact Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Category="ship" LZMATools="true" />
-    <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>
diff --git a/build/dependencies.props b/build/dependencies.props
index 25f05e3086..68c13b214f 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,4 +1,4 @@
-<Project>
+<Project>
 
   <ItemDefinitionGroup>
     <ExternalDependency>
@@ -197,7 +197,7 @@
       <TargetFramework>netcoreapp2.0</TargetFramework>
     </ExternalDependency>
     <ExternalDependency Include="Libuv" Version="1.10.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="BenchmarkDotNet" Version="0.10.3" Source="$(DefaultNuGetFeed)" Private="true"/>
+    <ExternalDependency Include="BenchmarkDotNet" Version="0.10.3" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="EntityFramework" Version="6.1.3" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="FSharp.Core" Version="4.2.1" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" Source="$(DefaultNuGetFeed)" />
@@ -208,7 +208,7 @@
     <ExternalDependency Include="Microsoft.Build.Tasks.Core" Version="15.3.409" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Microsoft.Build.Utilities.Core" Version="15.3.409" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Microsoft.Build" Version="15.3.409" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.CodeAnalysis.Common" Version="2.3.1" Source="$(DefaultNuGetFeed)" >
+    <ExternalDependency Include="Microsoft.CodeAnalysis.Common" Version="2.3.1" Source="$(DefaultNuGetFeed)">
       <!-- This version is used by the Razor runtime packages and any other piece of aspnetcore that uses Roslyn. -->
       <NoWarn>KRB2004</NoWarn>
     </ExternalDependency>
@@ -216,24 +216,24 @@
       <!-- This version is used by the Razor runtime packages and any other piece of aspnetcore that uses Roslyn. -->
       <NoWarn>KRB2004</NoWarn>
     </ExternalDependency>
-    <ExternalDependency Include="Microsoft.CodeAnalysis.CSharp" Version="2.3.1" Source="$(DefaultNuGetFeed)" >
+    <ExternalDependency Include="Microsoft.CodeAnalysis.CSharp" Version="2.3.1" Source="$(DefaultNuGetFeed)">
       <!-- This version is used by the Razor runtime packages and any other piece of aspnetcore that uses Roslyn. -->
       <NoWarn>KRB2004</NoWarn>
     </ExternalDependency>
-    <ExternalDependency Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="2.3.1" Source="$(DefaultNuGetFeed)" >
+    <ExternalDependency Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="2.3.1" Source="$(DefaultNuGetFeed)">
       <!-- This version is used by the Razor runtime packages and any other piece of aspnetcore that uses Roslyn. -->
       <NoWarn>KRB2004</NoWarn>
     </ExternalDependency>
     <ExternalDependency Include="Microsoft.CSharp" Version="4.4.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-rc3-003121" Source="$(DefaultNuGetFeed)" Private="true"/>
+    <ExternalDependency Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-rc3-003121" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.14.1" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="2.1.4" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="5.2.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.NET.Test.Sdk" Version="15.3.0" Source="$(DefaultNuGetFeed)" Private="true"/>
+    <ExternalDependency Include="Microsoft.NET.Test.Sdk" Version="15.6.1" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Microsoft.Owin.Security.Cookies" Version="3.0.1" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Microsoft.Owin.Security" Version="3.0.1" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.Owin.Testing" Version="3.0.1" Source="$(DefaultNuGetFeed)" Private="true"/>
+    <ExternalDependency Include="Microsoft.Owin.Testing" Version="3.0.1" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="Microsoft.VisualStudio.Editor" Version="15.0.26606" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="Microsoft.VisualStudio.OLE.Interop" Version="7.10.6070" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="Microsoft.VisualStudio.Shell.15.0" Version="15.0.26606" Source="$(DefaultNuGetFeed)" Private="true" />
@@ -243,9 +243,9 @@
     <ExternalDependency Include="Microsoft.VisualStudio.Shell.Interop.8.0" Version="8.0.50727" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="Microsoft.VisualStudio.Shell.Interop.9.0" Version="9.0.30729" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="Microsoft.VisualStudio.Shell.Interop" Version="7.10.6071" Source="$(DefaultNuGetFeed)" Private="true" />
-    <ExternalDependency Include="Microsoft.Web.Xdt" Version="1.4.0" Source="$(DefaultNuGetFeed)"/>
+    <ExternalDependency Include="Microsoft.Web.Xdt" Version="1.4.0" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Microsoft.Win32.Registry" Version="4.4.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Moq" Version="4.7.49" Source="$(DefaultNuGetFeed)" Private="true"/>
+    <ExternalDependency Include="Moq" Version="4.7.49" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="NETStandard.Library" Version="2.0.1" Source="$(DefaultNuGetFeed)">
       <VariableName>NETStandardLibrary20PackageVersion</VariableName>
     </ExternalDependency>
@@ -260,45 +260,45 @@
       <NoWarn>KRB2004</NoWarn>
       <VariableName>NewtonsoftJsonRuntimePackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="NuGet.Frameworks" Version="4.0.0" Source="$(DefaultNuGetFeed)"/>
-    <ExternalDependency Include="Remotion.Linq" Version="2.1.1" Source="$(DefaultNuGetFeed)"/>
+    <ExternalDependency Include="NuGet.Frameworks" Version="4.0.0" Source="$(DefaultNuGetFeed)" />
+    <ExternalDependency Include="Remotion.Linq" Version="2.1.1" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Serilog.Extensions.Logging" Version="1.4.0" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="Serilog.Sinks.File" Version="3.2.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="SQLitePCLRaw.bundle_green" Version="1.1.7" Source="$(DefaultNuGetFeed)"/>
+    <ExternalDependency Include="SQLitePCLRaw.bundle_green" Version="1.1.7" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="SQLitePCLRaw.core" Version="1.1.7" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="StackExchange.Redis.StrongName" Version="1.2.4" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="StreamJsonRpc" Version="1.1.92" Source="$(DefaultNuGetFeed)" Private="true"/>
-    <ExternalDependency Include="StyleCop.Analyzers" Version="1.0.0" Source="$(DefaultNuGetFeed)" Private="true"/>
+    <ExternalDependency Include="StreamJsonRpc" Version="1.1.92" Source="$(DefaultNuGetFeed)" Private="true" />
+    <ExternalDependency Include="StyleCop.Analyzers" Version="1.0.0" Source="$(DefaultNuGetFeed)" Private="true" />
     <ExternalDependency Include="System.Buffers" Version="4.4.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="System.Collections.Immutable" Version="1.4.0" Source="$(DefaultNuGetFeed)"/>
+    <ExternalDependency Include="System.Collections.Immutable" Version="1.4.0" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="System.ComponentModel.Annotations" Version="4.4.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="System.Diagnostics.DiagnosticSource" Version="4.4.1" Source="$(DefaultNuGetFeed)"/>
+    <ExternalDependency Include="System.Diagnostics.DiagnosticSource" Version="4.4.1" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="System.IdentityModel.Tokens.Jwt" Version="5.2.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="System.Interactive.Async" Version="3.1.1" Source="$(DefaultNuGetFeed)"/>
+    <ExternalDependency Include="System.Interactive.Async" Version="3.1.1" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="System.Net.Http.WinHttpHandler" Version="4.4.0" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="System.Numerics.Vectors" Version="4.4.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="System.Reflection.Metadata" Version="1.5.0" Source="$(DefaultNuGetFeed)"/>
-    <ExternalDependency Include="System.Runtime.CompilerServices.Unsafe" Version="4.4.0" Source="$(DefaultNuGetFeed)"/>
+    <ExternalDependency Include="System.Reflection.Metadata" Version="1.5.0" Source="$(DefaultNuGetFeed)" />
+    <ExternalDependency Include="System.Runtime.CompilerServices.Unsafe" Version="4.4.0" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="System.Security.Cryptography.Xml" Version="4.4.0" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="System.Security.Principal.Windows" Version="4.4.0" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="System.Text.Encodings.Web" Version="4.4.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="System.Threading.Tasks.Dataflow" Version="4.8.0" Source="$(DefaultNuGetFeed)"/>
-    <ExternalDependency Include="System.Threading.Tasks.Extensions" Version="4.4.0" Source="$(DefaultNuGetFeed)"/>
+    <ExternalDependency Include="System.Threading.Tasks.Dataflow" Version="4.8.0" Source="$(DefaultNuGetFeed)" />
+    <ExternalDependency Include="System.Threading.Tasks.Extensions" Version="4.4.0" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="System.ValueTuple" Version="4.4.0" Source="$(DefaultNuGetFeed)" />
     <ExternalDependency Include="WindowsAzure.Storage" Version="8.1.4" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="xunit.abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Private="true"/>
-    <ExternalDependency Include="xunit.assert" Version="2.2.0" Source="$(DefaultNuGetFeed)" Private="true">
+    <ExternalDependency Include="xunit.abstractions" Version="2.0.1" Source="$(DefaultNuGetFeed)" Private="true" />
+    <ExternalDependency Include="xunit.assert" Version="2.3.1" Source="$(DefaultNuGetFeed)" Private="true">
       <!-- EF's benchmarks use a different version of xunit.assert -->
       <NoWarn>KRB2004</NoWarn>
       <VariableName>XunitAssertStablePackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="xunit.assert" Version="2.3.0-beta2-build3683" Source="$(DefaultNuGetFeed)" Private="true">
+    <ExternalDependency Include="xunit.assert" Version="2.3.1" Source="$(DefaultNuGetFeed)" Private="true">
       <!-- EF's benchmarks use a different version of xunit.assert -->
       <NoWarn>KRB2004</NoWarn>
     </ExternalDependency>
     <ExternalDependency Include="xunit.extensibility.core" Version="2.2.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="xunit.runner.visualstudio" Version="2.3.0" Source="$(DefaultNuGetFeed)" Private="true">
+    <ExternalDependency Include="xunit.runner.visualstudio" Version="2.3.1" Source="$(DefaultNuGetFeed)" Private="true">
       <VariableName>XunitRunnerVisualStudioPackageVersion</VariableName>
     </ExternalDependency>
     <ExternalDependency Include="xunit" Version="2.2.0" Source="$(DefaultNuGetFeed)">
@@ -306,7 +306,7 @@
       <NoWarn>KRB2004</NoWarn>
       <VariableName>XunitStablePackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="xunit" Version="2.3.0-beta2-build3683" Source="$(DefaultNuGetFeed)" Private="true">
+    <ExternalDependency Include="xunit" Version="2.3.1" Source="$(DefaultNuGetFeed)" Private="true">
       <!-- It is okay to have multiple versions of test-only dependencies. -->
       <NoWarn>KRB2004</NoWarn>
     </ExternalDependency>
@@ -320,19 +320,202 @@ not building again in this patch.
 -->
 
   <!-- Shipped dependencies from previous builds -->
-
-  <!-- 2.0.0 -->
-  <ItemGroup>
-    <ExternalDependency Include="Microsoft.AspNetCore.JsonPatch" 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.ObjectPool" 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"/>
-  </ItemGroup>
-
   <PropertyGroup>
     <AspNetCoreMasterFeed>https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json</AspNetCoreMasterFeed>
   </PropertyGroup>
+
+  <!-- 2.0.6 -->
+  <ItemGroup>
+    <ExternalDependency Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Source="$(DefaultNuGetFeed)" Version="0.3.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Antiforgery" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" HostingStartup="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Cookies" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Core" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Facebook" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Google" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.JwtBearer" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.OAuth" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.WsFederation" Source="$(DefaultNuGetFeed)" Metapackage="false" RuntimeStore="false" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Twitter" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authorization.Policy" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authorization" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" HostingStartup="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Source="$(DefaultNuGetFeed)" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Buffering" Source="$(AspNetCoreMasterFeed)" Version="2.0.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.CertificateGeneration.Task" Source="$(AspNetCoreMasterFeed)" Version="2.0.1-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Certificates.Configuration.Sources" Source="$(AspNetCoreMasterFeed)" Version="2.0.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Source="$(AspNetCoreMasterFeed)" Version="2.0.3-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.CookiePolicy" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Cors" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Cryptography.Internal" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Extensions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Redis" Source="$(DefaultNuGetFeed)" Version="0.3.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.SystemWeb" Source="$(DefaultNuGetFeed)" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Diagnostics.Elm" Source="$(AspNetCoreMasterFeed)" Version="0.3.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Diagnostics" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.WindowsServices" Source="$(DefaultNuGetFeed)" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Hosting" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Html.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Http.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Http.Extensions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Http.Features" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Http" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.HttpOverrides" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Identity.Specification.Tests" Source="$(DefaultNuGetFeed)" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Identity" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Localization.Routing" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Localization" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.MiddlewareAnalysis" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.ApiExplorer" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Core" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Cors" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Localization" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Razor" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.RazorPages" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.TagHelpers" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Testing" Source="$(AspNetCoreMasterFeed)" Version="2.0.3-alpha1-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Source="$(DefaultNuGetFeed)" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.NodeServices.Sockets" Source="$(AspNetCoreMasterFeed)" Version="2.0.3-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.NodeServices" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Owin" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Proxy" Source="$(AspNetCoreMasterFeed)" Version="0.3.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.RangeHelper.Sources" Source="$(AspNetCoreMasterFeed)" Version="2.0.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Razor.Language" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Razor.Runtime" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Source="$(AspNetCoreMasterFeed)" Version="2.0.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Razor" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCaching" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCompression" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Rewrite" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Routing.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Source="$(AspNetCoreMasterFeed)" Version="2.0.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Routing" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.HttpSys" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.IISIntegration" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.IntegrationTesting" Source="$(AspNetCoreMasterFeed)" Version="0.4.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel.Core" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel.Https" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Source="$(AspNetCoreMasterFeed)" Version="2.0.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Session" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.SpaServices" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.StaticFiles" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.TestHost" Source="$(DefaultNuGetFeed)" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Testing" Source="$(AspNetCoreMasterFeed)" Version="2.0.1-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.WebSockets" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.WebUtilities" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.CodeAnalysis.Razor.Workspaces" Source="$(AspNetCoreMasterFeed)" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.CodeAnalysis.Razor" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.CodeAnalysis.Remote.Razor" Source="$(AspNetCoreMasterFeed)" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Data.Sqlite.Core" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Data.Sqlite" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.DotNet.Watcher.Tools" Source="$(DefaultNuGetFeed)" LZMATools="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Design" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.InMemory" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests" Source="$(DefaultNuGetFeed)" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Source="$(DefaultNuGetFeed)" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Relational" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Specification.Tests" Source="$(DefaultNuGetFeed)" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Sqlite" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.SqlServer" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Source="$(DefaultNuGetFeed)" LZMATools="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Tools" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Extensions.Caching.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Caching.Memory" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Caching.Redis" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Caching.SqlConfig.Tools" Source="$(DefaultNuGetFeed)" LZMATools="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Caching.SqlServer" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.AzureKeyVault" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Binder" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.CommandLine" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.DockerSecrets" Source="$(AspNetCoreMasterFeed)" Version="2.0.1-rtm-10011" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.FileExtensions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Ini" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Json" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.UserSecrets" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Xml" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.DiagnosticAdapter" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Composite" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Embedded" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Physical" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.FileSystemGlobbing" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Hosting.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Extensions.Identity.Core" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Extensions.Identity.Stores" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Extensions.Localization.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Extensions.Localization" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.Abstractions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.AzureAppServices" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.Configuration" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.Console" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.Debug" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.EventLog" Source="$(DefaultNuGetFeed)" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.EventSource" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.Testing" Source="$(AspNetCoreMasterFeed)" Version="2.0.1-rtm-10011" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.TraceSource" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Options.ConfigurationExtensions" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Options" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.SecretManager.Tools" Source="$(DefaultNuGetFeed)" LZMATools="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.WebEncoders" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Net.Http.Headers" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Owin.Security.Interop" Source="$(DefaultNuGetFeed)" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.LanguageServices.Razor" Source="$(AspNetCoreMasterFeed)" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.BrowserLink" Source="$(DefaultNuGetFeed)" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Contracts" Source="$(DefaultNuGetFeed)" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Core" Source="$(DefaultNuGetFeed)" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Source="$(DefaultNuGetFeed)" LZMA="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore" Source="$(DefaultNuGetFeed)" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Templating" Source="$(DefaultNuGetFeed)" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Source="$(DefaultNuGetFeed)" LZMATools="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Utils" Source="$(DefaultNuGetFeed)" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration" Source="$(DefaultNuGetFeed)" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Source="$(DefaultNuGetFeed)" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.Web.Xdt.Extensions" Source="$(AspNetCoreMasterFeed)" Version="2.0.2" />
+    <ExternalDependency Include="RazorPageGenerator" Source="$(AspNetCoreMasterFeed)" Version="2.0.2-rtm-10011" />
+  </ItemGroup>
+
+  <!-- 2.0.0 -->
+  <ItemGroup>
+    <ExternalDependency Include="Microsoft.AspNetCore.JsonPatch" 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.ObjectPool" 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" />
+  </ItemGroup>
+
   <!-- 2.0.0 -->
   <ItemGroup>
     <ExternalDependency Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
diff --git a/build/repo.targets b/build/repo.targets
index 9af43196aa..8f02b10924 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -96,13 +96,14 @@
 
   <Target Name="ResolveRepoInfo" DependsOnTargets="_PrepareRepositories">
 
-    <Error Text="%(Repository.RootPath) does not exist. Did you forget to clone the submodules? Run `git submodules update`." Condition="!Exists(%(Repository.RootPath))" />
-    <Error Text="%(ShippedRepository.RootPath) does not exist. Did you forget to clone the submodules? Run `git submodules update`." Condition="!Exists(%(ShippedRepository.RootPath))" />
+    <Error Text="%(Repository.RootPath) does not exist. Did you forget to clone the submodules? Run `git submodule update --init`." Condition="'%(Repository.RootPath)' != '' AND !Exists(%(Repository.RootPath))" />
+    <Error Text="%(ShippedRepository.RootPath) does not exist. Did you forget to clone the submodules? Run `git submodule update --init`." Condition="'%(ShippedRepository.RootPath)' != '' AND !Exists(%(ShippedRepository.RootPath))" />
 
     <MSBuild Projects="$(MSBuildProjectFullPath)"
              Targets="GetArtifactInfo"
              Properties="RepositoryRoot=%(Repository.RootPath);Configuration=$(Configuration);BuildNumber=$(BuildNumber)"
-             ContinueOnError="WarnAndContinue">
+             ContinueOnError="WarnAndContinue"
+             Condition="'%(Repository.Identity)' != ''">
       <Output TaskParameter="TargetOutputs" ItemName="ArtifactInfo" />
     </MSBuild>
 
@@ -116,7 +117,8 @@
     <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>
@@ -128,13 +130,15 @@
     <MSBuild Projects="$(MSBuildProjectFullPath)"
              Targets="GetArtifactInfo"
              Properties="RepositoryRoot=%(ShippedRepository.RootPath);Configuration=$(Configuration);BuildNumber=$(BuildNumber);IsFinalBuild=true"
-             ContinueOnError="WarnAndContinue">
+             ContinueOnError="WarnAndContinue"
+             Condition="'%(ShippedRepository.Identity)' != ''">
       <Output TaskParameter="TargetOutputs" ItemName="ShippedArtifactInfo" />
     </MSBuild>
     <MSBuild Projects="$(MSBuildProjectFullPath)"
              Targets="ResolveSolutions"
              Properties="RepositoryRoot=%(ShippedRepository.RootPath);Configuration=$(Configuration);BuildNumber=$(BuildNumber)"
-             ContinueOnError="WarnAndContinue">
+             ContinueOnError="WarnAndContinue"
+             Condition="'%(ShippedRepository.Identity)' != ''">
       <Output TaskParameter="TargetOutputs" ItemName="_ShippedSolution" />
     </MSBuild>
 
diff --git a/build/submodules.props b/build/submodules.props
index ad60e882e4..cac8f3235e 100644
--- a/build/submodules.props
+++ b/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="Diagnostics" />
+    <ShippedRepository Include="DotNetTools" />
+    <ShippedRepository Include="EntityFrameworkCore" />
+    <ShippedRepository Include="EventNotification" />
+    <ShippedRepository Include="FileSystem" />
+    <ShippedRepository Include="Hosting" />
+    <ShippedRepository Include="HtmlAbstractions" />
+    <ShippedRepository Include="HttpAbstractions" />
+    <ShippedRepository Include="HttpSysServer" />
+    <ShippedRepository Include="Identity" />
+    <ShippedRepository Include="IISIntegration" />
+    <ShippedRepository Include="JavaScriptServices" />
     <ShippedRepository Include="JsonPatch" />
+    <ShippedRepository Include="KestrelHttpServer" />
+    <ShippedRepository Include="Localization" />
+    <ShippedRepository Include="Logging" />
+    <ShippedRepository Include="MetaPackages" />
+    <ShippedRepository Include="Microsoft.Data.Sqlite" />
+    <ShippedRepository Include="Mvc" />
+    <ShippedRepository Include="MvcPrecompilation" />
+    <ShippedRepository Include="Options" />
+    <ShippedRepository Include="Proxy" />
+    <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>
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 72a056667f..24286f69c1 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.0.5-rtm-10018
-commithash:bfff3b742331a70e257ac29391abdb36dc59dd06
+version:2.0.7-rtm-10021
+commithash:fd7692bd19ce7859829f4a1d28194a133d7a76a0
diff --git a/modules/Templating b/modules/Templating
index 9f49dce2f5..5dad28a2aa 160000
--- a/modules/Templating
+++ b/modules/Templating
@@ -1 +1 @@
-Subproject commit 9f49dce2f50458c0719f292e0a98a7cf5f140e50
+Subproject commit 5dad28a2aa4acefcbbd6a86097f09fcbf5179eba
diff --git a/version.props b/version.props
index 79f91aa50e..6293bceb0b 100644
--- a/version.props
+++ b/version.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.0.6</VersionPrefix>
+    <VersionPrefix>2.0.7</VersionPrefix>
     <VersionSuffix>rtm</VersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersionNoTimestamp Condition="'$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersionNoTimestamp>
@@ -9,7 +9,7 @@
     <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
 
     <!-- Chains in the previous runtime store installer and files. This must be updated with every patch. -->
-    <PreviousRuntimeStoreArchiveVersion>2.0.5-155</PreviousRuntimeStoreArchiveVersion>
-    <RuntimeStoreInstallerDependencyVersion>2.0.5</RuntimeStoreInstallerDependencyVersion>
+    <PreviousRuntimeStoreArchiveVersion>2.0.6-10011</PreviousRuntimeStoreArchiveVersion>
+    <RuntimeStoreInstallerDependencyVersion>2.0.6</RuntimeStoreInstallerDependencyVersion>
   </PropertyGroup>
 </Project>