Update how PackageReference versions are set

Changes:
 - Remove floating versions
 - Disable myget feeds during a Universe build
 - Use package-specific MSBuild variables. Pattern = `packageId.Pascalize() + "PackageVersion"`, with a few exceptions.

21 files changed, 83 insertions, 217 deletions

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 7bf9e763a6..246f7ac20c 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,6 +1,4 @@
-<Project>
+<Project>
   <Import Project="build\sources.props" />
   <Import Project="build\dependencies.props" />
-  <Import Project="build\dependencies.targets" />
-  <Import Project="build\dependencies.g.targets" Condition="Exists('build\dependencies.g.targets') AND '$(DesignTimeBuild)' != 'true'" />
 </Project>
diff --git a/build/common.props b/build/common.props
index 08494d7ee6..c967a47ed8 100644
--- a/build/common.props
+++ b/build/common.props
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
+    <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/build/dependencies.props b/build/dependencies.props
index b0809a9f34..bf3460a31a 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,17 +1,24 @@
 <Project>
   <PropertyGroup>
-    <AspNetCoreVersion>2.0.0</AspNetCoreVersion>
-    <CoreFxVersion>4.4.0</CoreFxVersion>
-    <InternalAspNetCoreSdkVersion>2.0.1-rtm-15400</InternalAspNetCoreSdkVersion>
-    <MoqVersion>4.7.49</MoqVersion>
-    <NETStandardImplicitPackageVersion>2.0.0</NETStandardImplicitPackageVersion>
-    <NETStandardLibraryNETFrameworkVersion>2.0.0</NETStandardLibraryNETFrameworkVersion>
-    <RedisVersion>1.2.4</RedisVersion>
-    <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0</RuntimeFrameworkVersion>
-    <TestSdkVersion>15.3.0</TestSdkVersion>
-    <XunitVersion>2.3.0-beta2-build3683</XunitVersion>
-    <XunitRunnerVisualStudioVersion>2.3.0-beta2-build1317</XunitRunnerVisualStudioVersion>
-    <WindowsAzureStorageVersion>8.1.4</WindowsAzureStorageVersion>
+    <InternalAspNetCoreSdkPackageVersion>2.0.2-beta-15522</InternalAspNetCoreSdkPackageVersion>
+    <MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
+    <MicrosoftAspNetCoreHostingPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreHostingPackageVersion>
+    <MicrosoftAspNetCoreTestingPackageVersion>2.0.0</MicrosoftAspNetCoreTestingPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>2.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>2.0.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.0.0</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
+    <MicrosoftExtensionsLoggingConsolePackageVersion>2.0.0</MicrosoftExtensionsLoggingConsolePackageVersion>
+    <MicrosoftExtensionsLoggingPackageVersion>2.0.0</MicrosoftExtensionsLoggingPackageVersion>
+    <MicrosoftExtensionsOptionsPackageVersion>2.0.0</MicrosoftExtensionsOptionsPackageVersion>
+    <MicrosoftExtensionsWebEncodersSourcesPackageVersion>2.0.0</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
+    <MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
+    <MicrosoftWin32RegistryPackageVersion>4.4.0</MicrosoftWin32RegistryPackageVersion>
+    <MoqPackageVersion>4.7.49</MoqPackageVersion>
+    <StackExchangeRedisStrongNamePackageVersion>1.2.4</StackExchangeRedisStrongNamePackageVersion>
+    <SystemSecurityCryptographyXmlPackageVersion>4.4.0</SystemSecurityCryptographyXmlPackageVersion>
+    <WindowsAzureStoragePackageVersion>8.1.4</WindowsAzureStoragePackageVersion>
+    <XunitPackageVersion>2.3.0-beta2-build3683</XunitPackageVersion>
+    <XunitRunnerVisualStudioPackageVersion>2.3.0-beta2-build1317</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
 
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
diff --git a/build/dependencies.targets b/build/dependencies.targets
deleted file mode 100644
index d7f6b7b254..0000000000
--- a/build/dependencies.targets
+++ /dev/null
@@ -1,142 +0,0 @@
-<Project>
-  <PropertyGroup />
-  <ItemGroup>
-    <PackageReference Update="Microsoft.AspNet.Identity.AspNetCoreCompat" Version="0.3.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.All" Version="2.0.2-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Antiforgery" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.ApplicationInsights.HostingStartup" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.Core" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.Facebook" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.Google" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.OAuth" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.Twitter" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Authorization" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Authorization.Policy" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Buffering" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Certificates.Configuration.Sources" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.CookiePolicy" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Cors" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Diagnostics" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Diagnostics.Elm" Version="0.3.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Diagnostics.Identity.Service" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Hosting" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Hosting.Server.Abstractions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Hosting.WindowsServices" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Http" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Http.Extensions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Http.Features" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.HttpOverrides" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.Service" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.Service.Abstractions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.Service.AzureKeyVault" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.Service.Core" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.Service.EntityFrameworkCore" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.Service.IntegratedWebClient" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.Service.Mvc" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.Service.Specification.Tests" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Identity.Specification.Tests" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Localization" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Localization.Routing" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.MiddlewareAnalysis" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.ApiExplorer" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.Core" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.Cors" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.Formatters.Xml" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.Localization" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.Razor" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.RazorPages" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.TagHelpers" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.Testing" Version="2.0.1-alpha1-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.NodeServices" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.NodeServices.Sockets" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Owin" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Proxy" Version="0.3.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.RangeHelper.Sources" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Razor" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Razor.Language" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Razor.Runtime" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.ResponseCaching" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.ResponseCaching.Abstractions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.ResponseCompression" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Rewrite" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Routing" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Routing.Abstractions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Server.HttpSys" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Server.IISIntegration" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Server.IntegrationTesting" Version="0.4.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.Session" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.SpaServices" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.StaticFiles" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.WebSockets" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.AspNetCore.WebUtilities" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.CodeAnalysis.Razor" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.CodeAnalysis.Razor.Workspaces" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.CodeAnalysis.Remote.Razor" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Design.Specification.Tests" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Specification.Tests" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Tools" Version="2.0.1-rtm-*" />
-    <DotNetCliToolReference Update="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.Extensions.Hosting.Abstractions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.Extensions.Identity.Core" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.Extensions.Identity.Stores" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.Extensions.Localization" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.Extensions.Localization.Abstractions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.Net.Http.Headers" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.Owin.Security.Interop" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.VisualStudio.LanguageServices.Razor" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.VisualStudio.Web.BrowserLink" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Contracts" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Core" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Templating" Version="2.0.1-rtm-*" />
-    <DotNetCliToolReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGeneration.Utils" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" Version="2.0.1-rtm-*" />
-    <PackageReference Update="Microsoft.Web.Xdt.Extensions" Version="2.0.1-rtm-*" />
-    <PackageReference Update="RazorPageGenerator" Version="2.0.1-rtm-*" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/build/sources.props b/build/sources.props
index ff68f685fa..804940f029 100644
--- a/build/sources.props
+++ b/build/sources.props
@@ -3,11 +3,14 @@
 
   <PropertyGroup>
     <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
-    <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
+    <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>
   </PropertyGroup>
diff --git a/samples/AzureBlob/AzureBlob.csproj b/samples/AzureBlob/AzureBlob.csproj
index 95fb9ca46c..a9388ad953 100644
--- a/samples/AzureBlob/AzureBlob.csproj
+++ b/samples/AzureBlob/AzureBlob.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
@@ -11,9 +11,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/CustomEncryptorSample/CustomEncryptorSample.csproj b/samples/CustomEncryptorSample/CustomEncryptorSample.csproj
index e86fc74819..d6978a8494 100644
--- a/samples/CustomEncryptorSample/CustomEncryptorSample.csproj
+++ b/samples/CustomEncryptorSample/CustomEncryptorSample.csproj
@@ -11,8 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Redis/Redis.csproj b/samples/Redis/Redis.csproj
index 2eb832ea10..cbaea96c41 100644
--- a/samples/Redis/Redis.csproj
+++ b/samples/Redis/Redis.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
@@ -10,9 +10,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.DataProtection.Abstractions/Microsoft.AspNetCore.DataProtection.Abstractions.csproj b/src/Microsoft.AspNetCore.DataProtection.Abstractions/Microsoft.AspNetCore.DataProtection.Abstractions.csproj
index 936785fab3..fdb470ef61 100644
--- a/src/Microsoft.AspNetCore.DataProtection.Abstractions/Microsoft.AspNetCore.DataProtection.Abstractions.csproj
+++ b/src/Microsoft.AspNetCore.DataProtection.Abstractions/Microsoft.AspNetCore.DataProtection.Abstractions.csproj
@@ -17,7 +17,7 @@ Microsoft.AspNetCore.DataProtection.IDataProtector</Description>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.WebEncoders.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.Extensions.WebEncoders.Sources" Version="$(MicrosoftExtensionsWebEncodersSourcesPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.DataProtection.AzureStorage/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj b/src/Microsoft.AspNetCore.DataProtection.AzureStorage/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
index 57a9cbc921..caf1938dcf 100644
--- a/src/Microsoft.AspNetCore.DataProtection.AzureStorage/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
+++ b/src/Microsoft.AspNetCore.DataProtection.AzureStorage/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStorageVersion)" />
+    <PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStoragePackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.DataProtection.Extensions/Microsoft.AspNetCore.DataProtection.Extensions.csproj b/src/Microsoft.AspNetCore.DataProtection.Extensions/Microsoft.AspNetCore.DataProtection.Extensions.csproj
index c5e139b89b..08dd794110 100644
--- a/src/Microsoft.AspNetCore.DataProtection.Extensions/Microsoft.AspNetCore.DataProtection.Extensions.csproj
+++ b/src/Microsoft.AspNetCore.DataProtection.Extensions/Microsoft.AspNetCore.DataProtection.Extensions.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.DataProtection.Redis/Microsoft.AspNetCore.DataProtection.Redis.csproj b/src/Microsoft.AspNetCore.DataProtection.Redis/Microsoft.AspNetCore.DataProtection.Redis.csproj
index 4cb00eaf80..110ea57024 100644
--- a/src/Microsoft.AspNetCore.DataProtection.Redis/Microsoft.AspNetCore.DataProtection.Redis.csproj
+++ b/src/Microsoft.AspNetCore.DataProtection.Redis/Microsoft.AspNetCore.DataProtection.Redis.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis.StrongName" Version="$(RedisVersion)" />
+    <PackageReference Include="StackExchange.Redis.StrongName" Version="$(StackExchangeRedisStrongNamePackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.AspNetCore.DataProtection.SystemWeb/Microsoft.AspNetCore.DataProtection.SystemWeb.csproj b/src/Microsoft.AspNetCore.DataProtection.SystemWeb/Microsoft.AspNetCore.DataProtection.SystemWeb.csproj
index 76f71bd615..064fe2a7e9 100644
--- a/src/Microsoft.AspNetCore.DataProtection.SystemWeb/Microsoft.AspNetCore.DataProtection.SystemWeb.csproj
+++ b/src/Microsoft.AspNetCore.DataProtection.SystemWeb/Microsoft.AspNetCore.DataProtection.SystemWeb.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web" />
   </ItemGroup>
diff --git a/src/Microsoft.AspNetCore.DataProtection/Microsoft.AspNetCore.DataProtection.csproj b/src/Microsoft.AspNetCore.DataProtection/Microsoft.AspNetCore.DataProtection.csproj
index 6495b57699..5c0f2dbc81 100644
--- a/src/Microsoft.AspNetCore.DataProtection/Microsoft.AspNetCore.DataProtection.csproj
+++ b/src/Microsoft.AspNetCore.DataProtection/Microsoft.AspNetCore.DataProtection.csproj
@@ -21,12 +21,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.Security.Cryptography.Xml" Version="$(CoreFxVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(MicrosoftAspNetCoreHostingAbstractionsPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryPackageVersion)" />
+    <PackageReference Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Microsoft.AspNetCore.Cryptography.Internal.Test.csproj b/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Microsoft.AspNetCore.Cryptography.Internal.Test.csproj
index 4ae08cfafd..753ac49287 100644
--- a/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Microsoft.AspNetCore.Cryptography.Internal.Test.csproj
+++ b/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Microsoft.AspNetCore.Cryptography.Internal.Test.csproj
@@ -17,10 +17,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test.csproj b/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test.csproj
index f3a89ed8ac..a357798ed0 100644
--- a/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test.csproj
+++ b/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test.csproj
@@ -18,10 +18,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/Microsoft.AspNetCore.DataProtection.Abstractions.Test.csproj b/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/Microsoft.AspNetCore.DataProtection.Abstractions.Test.csproj
index f0ba469499..d127a9b5d4 100644
--- a/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/Microsoft.AspNetCore.DataProtection.Abstractions.Test.csproj
+++ b/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/Microsoft.AspNetCore.DataProtection.Abstractions.Test.csproj
@@ -17,11 +17,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test.csproj b/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test.csproj
index 1af35a2f05..dcec21499f 100644
--- a/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test.csproj
+++ b/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test.csproj
@@ -14,12 +14,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/Microsoft.AspNetCore.DataProtection.Extensions.Test.csproj b/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/Microsoft.AspNetCore.DataProtection.Extensions.Test.csproj
index 6072bb32f8..2a157b2faa 100644
--- a/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/Microsoft.AspNetCore.DataProtection.Extensions.Test.csproj
+++ b/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/Microsoft.AspNetCore.DataProtection.Extensions.Test.csproj
@@ -17,11 +17,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Microsoft.AspNetCore.DataProtection.Redis.Test/Microsoft.AspNetCore.DataProtection.Redis.Test.csproj b/test/Microsoft.AspNetCore.DataProtection.Redis.Test/Microsoft.AspNetCore.DataProtection.Redis.Test.csproj
index 2b7f018dad..4c3a39ff83 100644
--- a/test/Microsoft.AspNetCore.DataProtection.Redis.Test/Microsoft.AspNetCore.DataProtection.Redis.Test.csproj
+++ b/test/Microsoft.AspNetCore.DataProtection.Redis.Test/Microsoft.AspNetCore.DataProtection.Redis.Test.csproj
@@ -17,12 +17,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Microsoft.AspNetCore.DataProtection.Test/Microsoft.AspNetCore.DataProtection.Test.csproj b/test/Microsoft.AspNetCore.DataProtection.Test/Microsoft.AspNetCore.DataProtection.Test.csproj
index 735a3b89fe..c86f2c473a 100644
--- a/test/Microsoft.AspNetCore.DataProtection.Test/Microsoft.AspNetCore.DataProtection.Test.csproj
+++ b/test/Microsoft.AspNetCore.DataProtection.Test/Microsoft.AspNetCore.DataProtection.Test.csproj
@@ -17,13 +17,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="Moq" Version="$(MoqVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualStudioPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
   </ItemGroup>
 
 </Project>