From fd3486df0f5f28ecd19d5a644a135e72797da3d4 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 15 Mar 2017 12:58:08 -0700
Subject: [PATCH] Unify dependency versions to one file and remove workarounds

---
 build/dependencies.props                          |  6 +++++-
 .../SampleDestination/SampleDestination.csproj    | 11 +++++++----
 .../SampleDestination/runtimeconfig.template.json |  5 -----
 samples/SampleOrigin/SampleOrigin.csproj          |  8 ++++----
 samples/SampleOrigin/runtimeconfig.template.json  |  5 -----
 .../Microsoft.AspNetCore.Cors.csproj              | 10 +++++-----
 .../Microsoft.AspNetCore.Cors.Test.csproj         | 15 +++++++++------
 .../CorsMiddlewareWebSite.csproj                  |  9 +++++----
 8 files changed, 35 insertions(+), 34 deletions(-)
 delete mode 100644 samples/SampleDestination/runtimeconfig.template.json
 delete mode 100644 samples/SampleOrigin/runtimeconfig.template.json

diff --git a/build/dependencies.props b/build/dependencies.props
index e704edaec0..c153f0e3f9 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -1,6 +1,10 @@
 <Project>
   <PropertyGroup>
-    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
+    <AspNetCoreVersion>1.2.0-*</AspNetCoreVersion>
     <CoreFxVersion>4.3.0</CoreFxVersion>
+    <MoqVersion>4.7.1</MoqVersion>
+    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
+    <TestSdkVersion>15.0.0</TestSdkVersion>
+    <XunitVersion>2.2.0</XunitVersion>
   </PropertyGroup>
 </Project>
diff --git a/samples/SampleDestination/SampleDestination.csproj b/samples/SampleDestination/SampleDestination.csproj
index 4163aa41cb..873b414bb0 100644
--- a/samples/SampleDestination/SampleDestination.csproj
+++ b/samples/SampleDestination/SampleDestination.csproj
@@ -1,15 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
+  <Import Project="..\..\build\dependencies.props" />
+
   <PropertyGroup>
     <TargetFramework>netcoreapp1.1</TargetFramework>
-    <PreserveCompilationContext>true</PreserveCompilationContext>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Cors\Microsoft.AspNetCore.Cors.csproj" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.2.0-*" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/SampleDestination/runtimeconfig.template.json b/samples/SampleDestination/runtimeconfig.template.json
deleted file mode 100644
index 7305508a37..0000000000
--- a/samples/SampleDestination/runtimeconfig.template.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "configProperties": {
-    "System.GC.Server": true
-  }
-}
\ No newline at end of file
diff --git a/samples/SampleOrigin/SampleOrigin.csproj b/samples/SampleOrigin/SampleOrigin.csproj
index 6873ae9cb6..26e32c75de 100644
--- a/samples/SampleOrigin/SampleOrigin.csproj
+++ b/samples/SampleOrigin/SampleOrigin.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
+  <Import Project="..\..\build\dependencies.props" />
+
   <PropertyGroup>
     <TargetFramework>netcoreapp1.1</TargetFramework>
-    <PreserveCompilationContext>true</PreserveCompilationContext>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.2.0-*" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/SampleOrigin/runtimeconfig.template.json b/samples/SampleOrigin/runtimeconfig.template.json
deleted file mode 100644
index 7305508a37..0000000000
--- a/samples/SampleOrigin/runtimeconfig.template.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "configProperties": {
-    "System.GC.Server": true
-  }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Cors/Microsoft.AspNetCore.Cors.csproj b/src/Microsoft.AspNetCore.Cors/Microsoft.AspNetCore.Cors.csproj
index 825be01e49..458ef9776a 100644
--- a/src/Microsoft.AspNetCore.Cors/Microsoft.AspNetCore.Cors.csproj
+++ b/src/Microsoft.AspNetCore.Cors/Microsoft.AspNetCore.Cors.csproj
@@ -14,11 +14,11 @@ Microsoft.AspNetCore.Cors.EnableCorsAttribute</Description>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="1.2.0-*" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="1.2.0-*" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.2.0-*" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.2.0-*" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="1.2.0-*" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.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)" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Microsoft.AspNetCore.Cors.Test/Microsoft.AspNetCore.Cors.Test.csproj b/test/Microsoft.AspNetCore.Cors.Test/Microsoft.AspNetCore.Cors.Test.csproj
index 46daf629db..98a5f12099 100644
--- a/test/Microsoft.AspNetCore.Cors.Test/Microsoft.AspNetCore.Cors.Test.csproj
+++ b/test/Microsoft.AspNetCore.Cors.Test/Microsoft.AspNetCore.Cors.Test.csproj
@@ -10,12 +10,15 @@
   <ItemGroup>
     <ProjectReference Include="..\WebSites\CorsMiddlewareWebSite\CorsMiddlewareWebSite.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Cors\Microsoft.AspNetCore.Cors.csproj" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.2.0-*" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="1.2.0-*" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
-    <PackageReference Include="Moq" Version="4.6.36-*" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
-    <PackageReference Include="xunit" Version="2.2.0-*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
+    <PackageReference Include="xunit" Version="$(XunitVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/WebSites/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj b/test/WebSites/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj
index 6cb158f487..90058afc19 100644
--- a/test/WebSites/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj
+++ b/test/WebSites/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj
@@ -5,14 +5,15 @@
   <PropertyGroup>
     <TargetFrameworks>net452;netcoreapp1.1</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
-    <RuntimeIdentifier Condition=" '$(TargetFramework)' != 'netcoreapp1.1' ">win7-x64</RuntimeIdentifier>
-    <OutputType>Exe</OutputType>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.Cors\Microsoft.AspNetCore.Cors.csproj" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.2.0-*" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.2.0-*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
   </ItemGroup>
 
 </Project>