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

Backport: consolidate list of myget feeds to one place and remove the need to mirror packages

Nate McMaster 8 лет назад
Родитель
Сommit
7fffc939cf

+ 1 - 1
NuGet.config

@@ -2,6 +2,6 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
+    <!-- Restore sources should be defined in build/sources.props. -->
   </packageSources>
 </configuration>

+ 2 - 2
build/PackageArchive.targets

@@ -57,7 +57,7 @@
 
     <ItemGroup>
       <_FallbackArchiveRestoreSources Include="$(MetapackageRestoreSource)" Condition="Exists($(MetapackageRestoreSource))" />
-      <_FallbackArchiveRestoreSources Include="$(_DependencyMirrorDirectory)" Condition="Exists($(_DependencyMirrorDirectory))" />
+      <_FallbackArchiveRestoreSources Include="$(RestoreSources)" />
     </ItemGroup>
 
     <RepoTasks.GenerateRestoreSourcesPropsFile
@@ -71,7 +71,7 @@
     <MSBuild
       Projects="$(_WorkRoot)Archive.csproj"
       Targets="Restore"
-      Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp20PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);AspNetUniverseBuildOffline=true" />
+      Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp20PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true" />
 
     <!-- Create the archive -->
     <Exec Command="$(ArchiverPath) -a $(FallbackOutputPath) $(FallbackStagingDir)" />

+ 7 - 6
build/RuntimeStore.targets

@@ -3,7 +3,6 @@
 
   <PropertyGroup>
     <_DependencyBuildDirectory>$(RepositoryRoot).deps\build\</_DependencyBuildDirectory>
-    <_DependencyMirrorDirectory>$(RepositoryRoot).deps\mirror\</_DependencyMirrorDirectory>
     <_BuildScriptsDirectory>$(MSBuildThisFileDirectory)tools\scripts\</_BuildScriptsDirectory>
     <_WorkRoot>$(RepositoryRoot).w\</_WorkRoot>
     <_RuntimeStoreWorkDirectory>$(_WorkRoot).rw\</_RuntimeStoreWorkDirectory>
@@ -49,12 +48,12 @@
     <!-- Set _Target=Restore so the project will be re-evaluated to include Internal.AspNetCore.Sdk MSBuild properties on the next step. -->
     <MSBuild Projects="$(MetapackageWorkDirectory)Microsoft.AspNetCore.All.csproj"
       Targets="Restore"
-      Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath);AspNetUniverseBuildOffline=true;_Target=Restore" />
+      Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true;_Target=Restore" />
 
     <!-- Pack -->
     <MSBuild Projects="$(MetapackageWorkDirectory)Microsoft.AspNetCore.All.csproj"
       Targets="Pack"
-      Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath);AspNetUniverseBuildOffline=true" />
+      Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true" />
 
     <!-- Copy to output directory -->
     <ItemGroup>
@@ -86,12 +85,12 @@
     <!-- Set _Target=Restore so the project will be re-evaluated to include Internal.AspNetCore.Sdk MSBuild properties on the next step. -->
     <MSBuild Projects="$(RSReferencesWorkDirectory)RS.References.csproj"
       Targets="Restore"
-      Properties="Configuration=$(Configuration);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath);_Target=Restore" />
+      Properties="Configuration=$(Configuration);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath);DotNetBuildOffline=true;_Target=Restore" />
 
     <!-- Pack -->
     <MSBuild Projects="$(RSReferencesWorkDirectory)RS.References.csproj"
       Targets="Pack"
-      Properties="Configuration=$(Configuration);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath)" />
+      Properties="Configuration=$(Configuration);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath);DotNetBuildOffline=true" />
 
     <!-- Copy to output directory -->
     <ItemGroup>
@@ -103,8 +102,8 @@
 
   <Target Name="_PrepareRuntimeStoreBuildAssets">
     <ItemGroup>
+      <_RuntimeStoreRestoreSources Include="$(RestoreSources)" />
       <_RuntimeStoreRestoreSources Include="$(_DependencyBuildDirectory)" Condition="Exists($(_DependencyBuildDirectory))" />
-      <_RuntimeStoreRestoreSources Include="$(_DependencyMirrorDirectory)" Condition="Exists($(_DependencyMirrorDirectory))" />
       <_RuntimeStoreRestoreSources Include="$(BuildDir)" Condition="Exists($(BuildDir))" />
     </ItemGroup>
 
@@ -114,6 +113,7 @@
 
     <PropertyGroup>
       <_RsManifestProps>MicrosoftAspNetCoreAllPackageVersion=$(PackageVersion)</_RsManifestProps>
+      <_RsManifestProps>$(_RsManifestProps);DotNetBuildOffline=true</_RsManifestProps>
       <_RsManifestProps>$(_RsManifestProps);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath)</_RsManifestProps>
     </PropertyGroup>
   </Target>
@@ -153,6 +153,7 @@
       <HostingStartupWorkDir>$(_WorkRoot)HostingStartup\</HostingStartupWorkDir>
       <_HostingStartupProps>DepsOutputPath=$(_DepsOutputDirectory)</_HostingStartupProps>
       <_HostingStartupProps>$(_HostingStartupProps);DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcePropsPath)</_HostingStartupProps>
+      <_HostingStartupProps>$(_HostingStartupProps);DotNetBuildOffline=true</_HostingStartupProps>
       <_HostingStartupProps>$(_HostingStartupProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp20PackageVersion)</_HostingStartupProps>
       <_HostingStartupProps>$(_HostingStartupProps);HostingStartupPackageName=$(HostingStartupPackageName)</_HostingStartupProps>
       <_HostingStartupProps>$(_HostingStartupProps);HostingStartupPackageVersion=$(HostingStartupPackageVersion)</_HostingStartupProps>

+ 336 - 366
build/dependencies.props

@@ -4,14 +4,10 @@
     <ExternalDependency>
       <!-- The NuGet package version. Floating versions not allowed. -->
       <Version></Version>
-      <!-- Where does this pacakge come from -->
-      <Source></Source>
       <!-- A list of warnings to suppress. -->
       <NoWarn></NoWarn>
       <!-- This dependency is 'Private', aka. it should not end up as a public-facing external dependency. This is validated by checking the nuspec on generated packages. -->
       <Private>false</Private>
-      <!-- When true, this dependency should be mirrored to aspnetcore's nightly build feeds. -->
-      <Mirror>false</Mirror>
       <!-- When true, this dependency will be included in the metapackage. -->
       <Metapackage>false</Metapackage>
       <!-- When true, this dependency will be included in the runtime store. -->
@@ -33,281 +29,258 @@
   </PropertyGroup>
 
   <!-- .NET Core feed -->
-  <PropertyGroup>
-    <DotNetCoreFeed>https://dotnet.myget.org/F/dotnet-core/api/v3/index.json</DotNetCoreFeed>
-  </PropertyGroup>
-
   <ItemGroup>
-    <ExternalDependency Include="System.Memory" Version="4.4.0-preview3-25519-03" Source="$(DotNetCoreFeed)" Mirror="false" Private="true" />
+    <ExternalDependency Include="System.Memory" Version="4.4.0-preview3-25519-03" Private="true" />
   </ItemGroup>
 
-  <!-- .NET Core patch feed -->
-  <PropertyGroup>
-    <DotNetCorePatchFeed Condition="'$(DotNetCorePatchFeed)' == ''">https://api.nuget.org/v3/index.json</DotNetCorePatchFeed>
-    <DotNetCorePatchFeed>$(DotNetCorePatchFeed);$(DotNetCoreFeed)</DotNetCorePatchFeed>
-  </PropertyGroup>
-
   <ItemGroup>
-    <ExternalDependency Include="System.Data.SqlClient" Version="4.4.3" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true">
+    <ExternalDependency Include="System.Data.SqlClient" Version="4.4.3" />
+    <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)">
       <NoWarn>KRB2004</NoWarn>
       <VariableName>RuntimeFrameworkVersion</VariableName>
       <TargetFramework>netcoreapp2.0</TargetFramework>
     </ExternalDependency>
-    <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)">
+    <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)">
       <NoWarn>KRB2004</NoWarn>
       <VariableName>MicrosoftNETCoreApp20PackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
-    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreApp20PackageVersion)" Source="$(DotNetCorePatchFeed)" Mirror="true" />
+    <ExternalDependency Include="Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.rhel.6-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
+    <ExternalDependency Include="runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreApp20PackageVersion)" />
   </ItemGroup>
 
   <!-- ASP.NET Core Tools feed -->
   <PropertyGroup>
-    <RoslynFeed>https://dotnet.myget.org/F/roslyn/api/v3/index.json</RoslynFeed>
     <RoslynDevPackageVersion>2.6.0-beta1-61924-08</RoslynDevPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <ExternalDependency Include="Microsoft.CodeAnalysis" Version="$(RoslynDevPackageVersion)" Source="$(RoslynFeed)" Private="true" Mirror="true">
+    <ExternalDependency Include="Microsoft.CodeAnalysis" Version="$(RoslynDevPackageVersion)" Private="true">
       <!-- This version is required for Razor to build the VSIX for VS. -->
       <NoWarn>KRB2004</NoWarn>
       <VariableName>MicrosoftCodeAnalysisToolingPackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="Microsoft.CodeAnalysis.Common" Version="$(RoslynDevPackageVersion)" Source="$(RoslynFeed)" Private="true" Mirror="true">
+    <ExternalDependency Include="Microsoft.CodeAnalysis.Common" Version="$(RoslynDevPackageVersion)" Private="true">
       <!-- This version is required for Razor to build the VSIX for VS. -->
       <NoWarn>KRB2004</NoWarn>
       <VariableName>MicrosoftCodeAnalysisCommonToolingPackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynDevPackageVersion)" Source="$(RoslynFeed)" Private="true" Mirror="true">
+    <ExternalDependency Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynDevPackageVersion)" Private="true">
       <!-- This version is required for Razor to build the VSIX for VS. -->
       <NoWarn>KRB2004</NoWarn>
       <VariableName>MicrosoftCodeAnalysisCSharpToolingPackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynDevPackageVersion)" Source="$(RoslynFeed)" Private="true" Mirror="true">
+    <ExternalDependency Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynDevPackageVersion)" Private="true">
       <!-- This version is required for Razor to build the VSIX for VS. -->
       <NoWarn>KRB2004</NoWarn>
       <VariableName>MicrosoftCodeAnalysisCSharpWorkspacesToolingPackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(RoslynDevPackageVersion)" Source="$(RoslynFeed)" Private="true" Mirror="true">
+    <ExternalDependency Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(RoslynDevPackageVersion)" Private="true">
       <!-- This version is required for Razor to build the VSIX for VS. -->
       <NoWarn>KRB2004</NoWarn>
       <VariableName>MicrosoftCodeAnalysisVisualBasicToolingPackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(RoslynDevPackageVersion)" Source="$(RoslynFeed)" Private="true" Mirror="true">
+    <ExternalDependency Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(RoslynDevPackageVersion)" Private="true">
       <!-- This version is required for Razor to build the VSIX for VS. -->
       <NoWarn>KRB2004</NoWarn>
       <VariableName>MicrosoftCodeAnalysisVisualBasicWorkspacesToolingPackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynDevPackageVersion)" Source="$(RoslynFeed)" Private="true" Mirror="true">
+    <ExternalDependency Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynDevPackageVersion)" Private="true">
       <!-- This version is required for Razor to build the VSIX for VS. -->
       <NoWarn>KRB2004</NoWarn>
       <VariableName>MicrosoftCodeAnalysisWorkspacesCommonToolingPackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(RoslynDevPackageVersion)" Source="$(RoslynFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.CodeAnalysis.Remote.Razor.ServiceHub" Version="$(RoslynDevPackageVersion)" Source="$(RoslynFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.CodeAnalysis.Remote.Workspaces" Version="$(RoslynDevPackageVersion)" Source="$(RoslynFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient" Version="$(RoslynDevPackageVersion)" Source="$(RoslynFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.VisualStudio.LanguageServices" Version="$(RoslynDevPackageVersion)" Source="$(RoslynFeed)" Private="true" Mirror="true" />
+    <ExternalDependency Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(RoslynDevPackageVersion)" Private="true" />
+    <ExternalDependency Include="Microsoft.CodeAnalysis.Remote.Razor.ServiceHub" Version="$(RoslynDevPackageVersion)" Private="true" />
+    <ExternalDependency Include="Microsoft.CodeAnalysis.Remote.Workspaces" Version="$(RoslynDevPackageVersion)" Private="true" />
+    <ExternalDependency Include="Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient" Version="$(RoslynDevPackageVersion)" Private="true" />
+    <ExternalDependency Include="Microsoft.VisualStudio.LanguageServices" Version="$(RoslynDevPackageVersion)" Private="true" />
   </ItemGroup>
 
-  <!-- ASP.NET Core Tools feed -->
   <PropertyGroup>
-    <AspNetCoreToolsFeed>https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json</AspNetCoreToolsFeed>
     <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
     <MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>$(KoreBuildVersion)</MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <ExternalDependency Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkPackageVersion)" Source="$(AspNetCoreToolsFeed)" Private="true" />
-    <ExternalDependency Include="Microsoft.AspNetCore.BuildTools.ApiCheck" Version="$(MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion)" Source="$(AspNetCoreToolsFeed)" Private="true" />
+    <ExternalDependency Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkPackageVersion)" Private="true" />
+    <ExternalDependency Include="Microsoft.AspNetCore.BuildTools.ApiCheck" Version="$(MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion)" Private="true" />
   </ItemGroup>
 
-  <!-- ASP.NET Core (non-Universe builds) -->
-  <PropertyGroup>
-    <AspNetCoreModuleFeed>https://dotnet.myget.org/F/aspnetcoremodule/api/v3/index.json</AspNetCoreModuleFeed>
-  </PropertyGroup>
-
   <ItemGroup>
-    <ExternalDependency Include="Microsoft.AspNetCore.AspNetCoreModule" Version="1.0.0-pre-10057" Source="$(AspNetCoreModuleFeed)" Private="true" Mirror="true" />
+    <ExternalDependency Include="Microsoft.AspNetCore.AspNetCoreModule" Version="1.0.0-pre-10057" Private="true" />
   </ItemGroup>
 
-  <!-- nuget.org -->
-  <PropertyGroup>
-    <DefaultNuGetFeed>https://api.nuget.org/v3/index.json</DefaultNuGetFeed>
-  </PropertyGroup>
-
   <ItemGroup>
-    <ExternalDependency Include="Microsoft.NETCore.Platforms" Version="2.0.1" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.DotNet.PlatformAbstractions" Version="2.0.3" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.Extensions.DependencyModel" Version="2.0.3" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp10PackageVersion)" Source="$(DefaultNuGetFeed)">
+    <ExternalDependency Include="Microsoft.NETCore.Platforms" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.DotNet.PlatformAbstractions" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.Extensions.DependencyModel" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp10PackageVersion)">
       <NoWarn>KRB2004</NoWarn>
       <VariableName>RuntimeFrameworkVersion</VariableName>
       <TargetFramework>netcoreapp1.0</TargetFramework>
     </ExternalDependency>
-    <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp10PackageVersion)" Source="$(DefaultNuGetFeed)">
+    <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp10PackageVersion)">
       <NoWarn>KRB2004</NoWarn>
       <VariableName>MicrosoftNETCoreApp10PackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp11PackageVersion)" Source="$(DefaultNuGetFeed)">
+    <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp11PackageVersion)">
       <NoWarn>KRB2004</NoWarn>
       <VariableName>RuntimeFrameworkVersion</VariableName>
       <TargetFramework>netcoreapp1.1</TargetFramework>
     </ExternalDependency>
-    <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp11PackageVersion)" Source="$(DefaultNuGetFeed)">
+    <ExternalDependency Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreApp11PackageVersion)">
       <NoWarn>KRB2004</NoWarn>
       <VariableName>MicrosoftNETCoreApp11PackageVersion</VariableName>
     </ExternalDependency>
     <!-- This should remain hard-coded to 2.0.0. DotNetCliTool packages should use the 2.0.0 package so ensure maximum compatibility with most CLI installations. -->
-    <ExternalDependency Include="Microsoft.NETCore.App" Version="2.0.0" Source="$(DefaultNuGetFeed)">
+    <ExternalDependency Include="Microsoft.NETCore.App" Version="2.0.0">
       <NoWarn>KRB2004</NoWarn>
       <VariableName>DotNetCliTool_MicrosoftNETCoreApp20PackageVersion</VariableName>
       <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="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)" />
-    <ExternalDependency Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.1" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.AspNet.WebApi.Client" Version="5.2.2" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.Azure.KeyVault" Version="2.3.2" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Microsoft.Build.Runtime" Version="15.3.409" Source="$(DefaultNuGetFeed)" />
-    <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="Libuv" Version="1.10.0" />
+    <ExternalDependency Include="BenchmarkDotNet" Version="0.10.3" Private="true" />
+    <ExternalDependency Include="EntityFramework" Version="6.1.3" Private="true" />
+    <ExternalDependency Include="FSharp.Core" Version="4.2.1" Private="true" />
+    <ExternalDependency Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
+    <ExternalDependency Include="Microsoft.AspNet.Identity.EntityFramework" Version="2.2.1" />
+    <ExternalDependency Include="Microsoft.AspNet.WebApi.Client" Version="5.2.2" />
+    <ExternalDependency Include="Microsoft.Azure.KeyVault" Version="2.3.2" />
+    <ExternalDependency Include="Microsoft.Build.Runtime" Version="15.3.409" />
+    <ExternalDependency Include="Microsoft.Build.Tasks.Core" Version="15.3.409" />
+    <ExternalDependency Include="Microsoft.Build.Utilities.Core" Version="15.3.409" />
+    <ExternalDependency Include="Microsoft.Build" Version="15.3.409" />
+    <ExternalDependency Include="Microsoft.CodeAnalysis.Common" Version="2.3.1">
       <!-- 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.Workspaces" Version="2.3.1" Source="$(DefaultNuGetFeed)">
+    <ExternalDependency Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.3.1">
       <!-- 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">
       <!-- 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">
       <!-- 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.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.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.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" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Shell.Interop.10.0" Version="10.0.30319" Source="$(DefaultNuGetFeed)" Private="true" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="11.0.61030" Source="$(DefaultNuGetFeed)" Private="true" />
-    <ExternalDependency Include="Microsoft.VisualStudio.Shell.Interop.12.0" Version="12.0.30110" Source="$(DefaultNuGetFeed)" Private="true" />
-    <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.Win32.Registry" Version="4.4.0" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Moq" Version="4.7.49" Source="$(DefaultNuGetFeed)" Private="true" />
-    <ExternalDependency Include="NETStandard.Library" Version="2.0.1" Source="$(DefaultNuGetFeed)">
+    <ExternalDependency Include="Microsoft.CSharp" Version="4.4.0" />
+    <ExternalDependency Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-rc3-003121" Private="true" />
+    <ExternalDependency Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.14.1" />
+    <ExternalDependency Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="2.1.4" />
+    <ExternalDependency Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="5.2.0" />
+    <ExternalDependency Include="Microsoft.NET.Test.Sdk" Version="15.6.1" Private="true" />
+    <ExternalDependency Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
+    <ExternalDependency Include="Microsoft.Owin.Security.Cookies" Version="3.0.1" />
+    <ExternalDependency Include="Microsoft.Owin.Security" Version="3.0.1" />
+    <ExternalDependency Include="Microsoft.Owin.Testing" Version="3.0.1" Private="true" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Editor" Version="15.0.26606" Private="true" />
+    <ExternalDependency Include="Microsoft.VisualStudio.OLE.Interop" Version="7.10.6070" Private="true" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Shell.15.0" Version="15.0.26606" Private="true" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Shell.Interop.10.0" Version="10.0.30319" Private="true" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="11.0.61030" Private="true" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Shell.Interop.12.0" Version="12.0.30110" Private="true" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Shell.Interop.8.0" Version="8.0.50727" Private="true" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Shell.Interop.9.0" Version="9.0.30729" Private="true" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Shell.Interop" Version="7.10.6071" Private="true" />
+    <ExternalDependency Include="Microsoft.Web.Xdt" Version="1.4.0" />
+    <ExternalDependency Include="Microsoft.Win32.Registry" Version="4.4.0" />
+    <ExternalDependency Include="Moq" Version="4.7.49" Private="true" />
+    <ExternalDependency Include="NETStandard.Library" Version="2.0.1">
       <VariableName>NETStandardLibrary20PackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="Newtonsoft.Json.Bson" Version="1.0.1" Source="$(DefaultNuGetFeed)" />
-    <ExternalDependency Include="Newtonsoft.Json" Version="9.0.1" Source="$(DefaultNuGetFeed)" Private="true">
+    <ExternalDependency Include="Newtonsoft.Json.Bson" Version="1.0.1" />
+    <ExternalDependency Include="Newtonsoft.Json" Version="9.0.1" Private="true">
       <!-- This version is used by tooling packages to match what is in VS and MSBuild. -->
       <NoWarn>KRB2004</NoWarn>
       <VariableName>NewtonsoftJsonToolingPackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="Newtonsoft.Json" Version="10.0.1" Source="$(DefaultNuGetFeed)">
+    <ExternalDependency Include="Newtonsoft.Json" Version="10.0.1">
       <!-- This version is used by runtime packages. -->
       <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="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.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="System.Buffers" Version="4.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.IdentityModel.Tokens.Jwt" Version="5.2.0" 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.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.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.3.1" Source="$(DefaultNuGetFeed)" Private="true">
+    <ExternalDependency Include="NuGet.Frameworks" Version="4.0.0" />
+    <ExternalDependency Include="Remotion.Linq" Version="2.1.1" />
+    <ExternalDependency Include="Serilog.Extensions.Logging" Version="1.4.0" />
+    <ExternalDependency Include="Serilog.Sinks.File" Version="3.2.0" />
+    <ExternalDependency Include="SQLitePCLRaw.bundle_green" Version="1.1.7" />
+    <ExternalDependency Include="SQLitePCLRaw.core" Version="1.1.7" />
+    <ExternalDependency Include="StackExchange.Redis.StrongName" Version="1.2.4" />
+    <ExternalDependency Include="StreamJsonRpc" Version="1.1.92" Private="true" />
+    <ExternalDependency Include="StyleCop.Analyzers" Version="1.0.0" Private="true" />
+    <ExternalDependency Include="System.Buffers" Version="4.4.0" />
+    <ExternalDependency Include="System.Collections.Immutable" Version="1.4.0" />
+    <ExternalDependency Include="System.ComponentModel.Annotations" Version="4.4.0" />
+    <ExternalDependency Include="System.Diagnostics.DiagnosticSource" Version="4.4.1" />
+    <ExternalDependency Include="System.IdentityModel.Tokens.Jwt" Version="5.2.0" />
+    <ExternalDependency Include="System.Interactive.Async" Version="3.1.1" />
+    <ExternalDependency Include="System.Net.Http.WinHttpHandler" Version="4.4.0" />
+    <ExternalDependency Include="System.Numerics.Vectors" Version="4.4.0" />
+    <ExternalDependency Include="System.Reflection.Metadata" Version="1.5.0" />
+    <ExternalDependency Include="System.Runtime.CompilerServices.Unsafe" Version="4.4.0" />
+    <ExternalDependency Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
+    <ExternalDependency Include="System.Security.Cryptography.Xml" Version="4.4.0" />
+    <ExternalDependency Include="System.Security.Principal.Windows" Version="4.4.0" />
+    <ExternalDependency Include="System.Text.Encodings.Web" Version="4.4.0" />
+    <ExternalDependency Include="System.Threading.Tasks.Dataflow" Version="4.8.0" />
+    <ExternalDependency Include="System.Threading.Tasks.Extensions" Version="4.4.0" />
+    <ExternalDependency Include="System.ValueTuple" Version="4.4.0" />
+    <ExternalDependency Include="WindowsAzure.Storage" Version="8.1.4" />
+    <ExternalDependency Include="xunit.abstractions" Version="2.0.1" Private="true" />
+    <ExternalDependency Include="xunit.assert" Version="2.3.1" 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.1" Source="$(DefaultNuGetFeed)" Private="true">
+    <ExternalDependency Include="xunit.assert" Version="2.3.1" 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.1" Source="$(DefaultNuGetFeed)" Private="true">
+    <ExternalDependency Include="xunit.extensibility.core" Version="2.2.0" />
+    <ExternalDependency Include="xunit.runner.visualstudio" Version="2.3.1" Private="true">
       <VariableName>XunitRunnerVisualStudioPackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="xunit" Version="2.2.0" Source="$(DefaultNuGetFeed)">
+    <ExternalDependency Include="xunit" Version="2.2.0">
       <!-- It is okay to have multiple versions of test-only dependencies. -->
       <NoWarn>KRB2004</NoWarn>
       <VariableName>XunitStablePackageVersion</VariableName>
     </ExternalDependency>
-    <ExternalDependency Include="xunit" Version="2.3.1" Source="$(DefaultNuGetFeed)" Private="true">
+    <ExternalDependency Include="xunit" Version="2.3.1" Private="true">
       <!-- It is okay to have multiple versions of test-only dependencies. -->
       <NoWarn>KRB2004</NoWarn>
     </ExternalDependency>
@@ -321,218 +294,215 @@ not building again in this patch.
 -->
 
   <!-- Shipped dependencies from previous builds -->
-  <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" />
+    <ExternalDependency Include="Microsoft.AspNet.Identity.AspNetCoreCompat" Version="0.3.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Antiforgery" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Metapackage="true" RuntimeStore="true" HostingStartup="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Cookies" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Core" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Facebook" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Google" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.JwtBearer" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.OAuth" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.WsFederation" Metapackage="false" RuntimeStore="false" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication.Twitter" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authentication" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authorization.Policy" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Authorization" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Metapackage="true" RuntimeStore="true" HostingStartup="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Buffering" Version="2.0.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.CertificateGeneration.Task" Version="2.0.1-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Certificates.Configuration.Sources" Version="2.0.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Version="2.0.3-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.CookiePolicy" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Cors" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Cryptography.Internal" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.AzureStorage" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Extensions" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.Redis" Version="0.3.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection.SystemWeb" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.DataProtection" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Diagnostics.Elm" Version="0.3.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Diagnostics" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.Server.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Hosting" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Html.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Http.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Http.Extensions" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Http.Features" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Http" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.HttpOverrides" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Identity.Specification.Tests" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Identity" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Localization.Routing" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Localization" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.MiddlewareAnalysis" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.ApiExplorer" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Core" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Cors" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Formatters.Xml" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Localization" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Razor" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.RazorPages" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.TagHelpers" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.0.3-alpha1-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Mvc" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.NodeServices.Sockets" Version="2.0.3-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.NodeServices" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Owin" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Proxy" Version="0.3.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.RangeHelper.Sources" Version="2.0.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Razor.Language" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Razor.Runtime" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Version="2.0.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Razor" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCaching.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCaching" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.ResponseCompression" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Rewrite" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Routing.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Version="2.0.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Routing" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.HttpSys" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.IISIntegration" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.IntegrationTesting" Version="0.4.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel.Core" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel.Https" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.0.2-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Server.Kestrel" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Session" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.SpaServices" Metapackage="true" RuntimeStore="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.AspNetCore.StaticFiles" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.TestHost" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.Testing" Version="2.0.1-rtm-10011" />
+    <ExternalDependency Include="Microsoft.AspNetCore.WebSockets" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore.WebUtilities" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.AspNetCore" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.CodeAnalysis.Razor.Workspaces" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.CodeAnalysis.Razor" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.CodeAnalysis.Remote.Razor" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Data.Sqlite.Core" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Data.Sqlite" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.DotNet.Watcher.Tools" LZMATools="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Design" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.InMemory" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Relational" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Specification.Tests" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Sqlite" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.SqlServer" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Tools.DotNet" LZMATools="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore.Tools" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.EntityFrameworkCore" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Extensions.Caching.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Caching.Memory" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Caching.Redis" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Caching.SqlConfig.Tools" LZMATools="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Caching.SqlServer" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.AzureKeyVault" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Binder" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.CommandLine" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.DockerSecrets" Version="2.0.1-rtm-10011" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.FileExtensions" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Ini" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Json" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.UserSecrets" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration.Xml" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Configuration" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.DiagnosticAdapter" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Composite" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Embedded" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.FileProviders.Physical" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.FileSystemGlobbing" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Hosting.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Extensions.Identity.Core" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Extensions.Identity.Stores" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Extensions.Localization.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Extensions.Localization" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.Abstractions" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.AzureAppServices" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.Configuration" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.Console" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.Debug" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.EventLog" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.EventSource" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.Testing" Version="2.0.1-rtm-10011" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging.TraceSource" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Logging" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Options.ConfigurationExtensions" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.Options" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.SecretManager.Tools" LZMATools="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Extensions.WebEncoders" Metapackage="true" RuntimeStore="true" Version="2.0.1" />
+    <ExternalDependency Include="Microsoft.Net.Http.Headers" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.Owin.Security.Interop" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.LanguageServices.Razor" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.BrowserLink" Metapackage="true" RuntimeStore="true" Version="2.0.2" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Contracts" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Core" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" LZMA="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Templating" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" LZMATools="true" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration.Utils" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGeneration" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Version="2.0.3" />
+    <ExternalDependency Include="Microsoft.Web.Xdt.Extensions" Version="2.0.2" />
+    <ExternalDependency Include="RazorPageGenerator" 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" />
+    <ExternalDependency Include="Microsoft.AspNetCore.JsonPatch" Version="2.0.0" Metapackage="true" RuntimeStore="true" />
+    <ExternalDependency Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" Metapackage="true" RuntimeStore="true" />
+    <ExternalDependency Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" Metapackage="true" RuntimeStore="true" />
+    <ExternalDependency Include="Microsoft.Extensions.ObjectPool" Version="2.0.0" Metapackage="true" RuntimeStore="true" />
+    <ExternalDependency Include="Microsoft.Extensions.Primitives" Version="2.0.0" 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" />
-    <ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.Extensions.ObjectMethodExecutor.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.Extensions.Process.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.Extensions.PropertyActivator.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.Extensions.PropertyHelper.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.Extensions.RazorViews.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.Extensions.SecurityHelper.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.Extensions.StackTrace.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
-    <ExternalDependency Include="Microsoft.Extensions.WebEncoders.Sources" Version="2.0.0" Source="$(AspNetCoreMasterFeed)" Private="true" Mirror="true" />
+    <ExternalDependency Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="2.0.0" Private="true" />
+    <ExternalDependency Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="2.0.0" Private="true" />
+    <ExternalDependency Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.0.0" Private="true" />
+    <ExternalDependency Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="2.0.0" Private="true" />
+    <ExternalDependency Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="2.0.0" Private="true" />
+    <ExternalDependency Include="Microsoft.Extensions.ObjectMethodExecutor.Sources" Version="2.0.0" Private="true" />
+    <ExternalDependency Include="Microsoft.Extensions.ParameterDefaultValue.Sources" Version="2.0.0" Private="true" />
+    <ExternalDependency Include="Microsoft.Extensions.Process.Sources" Version="2.0.0" Private="true" />
+    <ExternalDependency Include="Microsoft.Extensions.PropertyActivator.Sources" Version="2.0.0" Private="true" />
+    <ExternalDependency Include="Microsoft.Extensions.PropertyHelper.Sources" Version="2.0.0" Private="true" />
+    <ExternalDependency Include="Microsoft.Extensions.RazorViews.Sources" Version="2.0.0" Private="true" />
+    <ExternalDependency Include="Microsoft.Extensions.SecurityHelper.Sources" Version="2.0.0" Private="true" />
+    <ExternalDependency Include="Microsoft.Extensions.StackTrace.Sources" Version="2.0.0" Private="true" />
+    <ExternalDependency Include="Microsoft.Extensions.TypeNameHelper.Sources" Version="2.0.0" Private="true" />
+    <ExternalDependency Include="Microsoft.Extensions.WebEncoders.Sources" Version="2.0.0" Private="true" />
   </ItemGroup>
 </Project>

+ 0 - 1
build/push.targets

@@ -3,7 +3,6 @@
 
   <ItemGroup>
     <PackagesToPush Include="$(BuildDir)*.nupkg" />
-    <PackagesToPush Include="$(ArtifactsDir)mirror\*.nupkg" />
   </ItemGroup>
 
   <Target Name="_PushNuGet" Condition="@(PackagesToPush->Count()) != 0">

+ 1 - 0
build/repo.props

@@ -13,6 +13,7 @@
       FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
   </ItemGroup>
 
+  <Import Project="artifacts.props" />
   <Import Project="artifacts.props" />
   <Import Project="submodules.props" />
 </Project>

+ 3 - 19
build/repo.targets

@@ -13,17 +13,13 @@
 
     <_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'=='' AND '$(CompileOnly)'=='true'">/t:Package /t:VerifyPackages</_RepositoryBuildTargets>
     <_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'==''">/t:Verify</_RepositoryBuildTargets>
-    <!-- For external packages that come from feeds will mirrored to aspnetcore feeds. -->
-    <IntermediateMirrorPackageDir>$(IntermediateDir)mirror\</IntermediateMirrorPackageDir>
-    <!-- For external packages that come from feeds we don't mirror. -->
-    <IntermediateExternalPackageDir>$(IntermediateDir)ext\</IntermediateExternalPackageDir>
     <GeneratedPackageVersionPropsPath>$(IntermediateDir)dependencies.g.props</GeneratedPackageVersionPropsPath>
     <GeneratedRestoreSourcePropsPath>$(IntermediateDir)sources.g.props</GeneratedRestoreSourcePropsPath>
     <GeneratedBrandingPropsPath>$(IntermediateDir)branding.g.props</GeneratedBrandingPropsPath>
 
     <PrepareDependsOn>$(PrepareDependsOn);VerifyPackageArtifactConfig;PrepareOutputPath</PrepareDependsOn>
     <CleanDependsOn>$(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts</CleanDependsOn>
-    <RestoreDependsOn>$(RestoreDependsOn);InstallDotNet;RestoreExternalDependencies</RestoreDependsOn>
+    <RestoreDependsOn>$(RestoreDependsOn);InstallDotNet</RestoreDependsOn>
     <CompileDependsOn>$(CompileDependsOn);BuildRepositories</CompileDependsOn>
     <PackageDependsOn>$(PackageDependsOn);BuildTemplates;SplitPackages</PackageDependsOn>
     <VerifyDependsOn>$(VerifyDependsOn);VerifyCoherentVersions</VerifyDependsOn>
@@ -33,16 +29,6 @@
     <MakeDir Directories="$(ArtifactsDir);$(BuildDir)" />
   </Target>
 
-  <Target Name="RestoreExternalDependencies">
-    <DownloadNuGetPackages
-      Packages="@(ExternalDependency->WithMetadataValue('Mirror', 'false'))"
-      DestinationFolder="$(IntermediateExternalPackageDir)" />
-
-    <DownloadNuGetPackages
-      Packages="@(ExternalDependency->WithMetadataValue('Mirror', 'true'))"
-      DestinationFolder="$(IntermediateMirrorPackageDir)" />
-  </Target>
-
   <Target Name="GeneratePropsFiles" DependsOnTargets="ResolveRepoInfo">
     <ItemGroup>
       <_LineupPackages Include="@(ExternalDependency)" />
@@ -52,7 +38,7 @@
       <_LineupSources Include="$(_DependencyPackagesDirectory)" Condition="'$(_DependencyPackagesDirectory)' != '' AND Exists('$(_DependencyPackagesDirectory)')" />
       <_LineupSources Include="$(BuildDir)" />
       <_LineupSources Include="$(IntermediateExternalPackageDir)" />
-      <_LineupSources Include="$(IntermediateMirrorPackageDir)" />
+      <_LineupSources Include="$(RestoreSources)" />
     </ItemGroup>
 
     <RepoTasks.GeneratePackageVersionPropsFile
@@ -203,13 +189,11 @@
   <Target Name="SplitPackages">
     <ItemGroup>
       <PackageArtifactFile Include="$(BuildDir)*.nupkg" />
-      <ExternalDependencyPackage Include="@(ExternalDependency->WithMetadataValue('Mirror', 'true'))" Category="mirror" />
-      <_MirroredPackageFiles Include="$(IntermediateMirrorPackageDir)*.nupkg" />
     </ItemGroup>
 
     <RepoTasks.CopyPackagesToSplitFolders
       Packages="@(PackageArtifact);@(ExternalDependencyPackage)"
-      Files="@(PackageArtifactFile);@(_MirroredPackageFiles)"
+      Files="@(PackageArtifactFile)"
       DestinationFolder="$(ArtifactsDir)"
       Overwrite="true" />
   </Target>

+ 24 - 0
build/sources.props

@@ -0,0 +1,24 @@
+<Project>
+
+  <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
+
+  <PropertyGroup>
+    <RestoreSources>
+      $(DotNetAdditionalRestoreSources);
+      $(DotNetRestoreSources);
+      $(DotNetCorePatchFeed);
+    </RestoreSources>
+    <RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' ">
+      $(RestoreSources);
+      https://api.nuget.org/v3/index.json;
+    </RestoreSources>
+    <RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' AND '$(DisableMyGetRestoreSources)' != 'true' ">
+      $(RestoreSources);
+      https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
+      https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
+      https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json;
+      https://dotnet.myget.org/F/roslyn/api/v3/index.json;
+      https://dotnet.myget.org/F/aspnetcoremodule/api/v3/index.jsonl
+    </RestoreSources>
+  </PropertyGroup>
+</Project>

+ 0 - 3
build/tasks/CopyPackagesToSplitFolders.cs

@@ -76,9 +76,6 @@ namespace RepoTasks
                     case PackageCategory.ShipOob:
                         destDir = Path.Combine(DestinationFolder, "shipoob");
                         break;
-                    case PackageCategory.Mirror:
-                        destDir = Path.Combine(DestinationFolder, "mirror");
-                        break;
                     case PackageCategory.Symbols:
                         destDir = Path.Combine(DestinationFolder, "symbols");
                         break;

+ 1 - 0
build/tasks/RepoTasks.csproj

@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <Import Project="$(RepoTasksSdkPath)\Sdk.props" Condition="'$(RepoTasksSdkPath)' != '' "/>
+   <Import Project="..\sources.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>

+ 0 - 1
build/tasks/Utilities/PackageCategory.cs

@@ -10,7 +10,6 @@ namespace RepoTasks.Utilities
         Shipping,
         NoShip,
         ShipOob,
-        Mirror,
         Symbols,
     }
 }

+ 0 - 3
build/tasks/Utilities/PackageCollection.cs

@@ -47,9 +47,6 @@ namespace RepoTasks.Utilities
                     case "shipoob":
                         category = PackageCategory.ShipOob;
                         break;
-                    case "mirror":
-                        category = PackageCategory.Mirror;
-                        break;
                     default:
                         category = PackageCategory.Unknown;
                         break;

+ 2 - 1
build/tools/dotnet-deb-tool-consumer/dotnet-deb-tool-consumer.csproj

@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <Import Project="..\..\sources.props" />
+
   <PropertyGroup>
     <TargetFramework>netcoreapp1.0</TargetFramework>
-    <RestoreSources>$(RestoreSources);https://dotnet.myget.org/F/cli-deps/api/v3/index.json</RestoreSources>
   </PropertyGroup>
 
   <ItemGroup>

+ 1 - 12
build/tools/templates/Archive/Archive.csproj

@@ -8,18 +8,7 @@
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
-    <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
-    <RestoreSources>$(RestoreSources);https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;</RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
-      $(RestoreSources);
-      https://dotnet.myget.org/F/aspnet-2-0-2-october2017-patch/api/v3/index.json;
-      https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json;
-      https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
-    </RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
-      $(RestoreSources);
-      https://api.nuget.org/v3/index.json;
-    </RestoreSources>
+    <RestoreSources>$(RestoreSources);$(DotNetRestoreSources);</RestoreSources>
   </PropertyGroup>
 
   <ItemGroup>

+ 1 - 9
build/tools/templates/HostingStartup/HostingStartup.csproj

@@ -5,15 +5,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
-      $(RestoreSources);
-      https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
-    </RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
-      $(RestoreSources);
-      https://api.nuget.org/v3/index.json;
-    </RestoreSources>
+    <RestoreSources>$(RestoreSources);$(DotNetRestoreSources);</RestoreSources>
   </PropertyGroup>
 
   <ItemGroup>

+ 1 - 11
build/tools/templates/RS.Manifest/RS.Manifest.csproj

@@ -4,17 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
-      $(RestoreSources);
-      https://dotnet.myget.org/F/aspnet-2-0-2-october2017-patch/api/v3/index.json;
-      https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json;
-      https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
-    </RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
-      $(RestoreSources);
-      https://api.nuget.org/v3/index.json;
-    </RestoreSources>
+    <RestoreSources>$(RestoreSources);$(DotNetRestoreSources);</RestoreSources>
   </PropertyGroup>
 
   <ItemGroup>

+ 1 - 9
build/tools/templates/RS.References/RS.References.csproj

@@ -3,15 +3,7 @@
   <Import Project="$(DotNetRestoreSourcePropsPath)" Condition="'$(DotNetRestoreSourcePropsPath)' != ''"/>
 
   <PropertyGroup>
-    <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
-      $(RestoreSources);
-      https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
-    </RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
-      $(RestoreSources);
-      https://api.nuget.org/v3/index.json;
-    </RestoreSources>
+    <RestoreSources>$(RestoreSources);$(DotNetRestoreSources);</RestoreSources>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>

+ 1 - 0
src/Directory.Build.props

@@ -1,4 +1,5 @@
 <Project>
   <Import Project="..\version.props" />
   <Import Project="..\build\common.props" />
+  <Import Project="..\build\sources.props" />
 </Project>

+ 0 - 9
src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj

@@ -4,15 +4,6 @@
 
   <PropertyGroup>
     <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
-      $(RestoreSources);
-      https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
-    </RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
-      $(RestoreSources);
-      https://api.nuget.org/v3/index.json;
-    </RestoreSources>
-
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
     <TargetFramework>netcoreapp2.0</TargetFramework>