From ce4e94c1ac1213f56489dc6f99eee537f9a159c4 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 25 Apr 2017 11:04:09 -0700
Subject: [PATCH] Use Bundled NETStandard.Library \ NETCoreApp versions instead
 of explicitly specifying one

---
 build/common.props                                         | 4 ++--
 build/dependencies.props                                   | 4 +---
 .../Microsoft.AspNetCore.Mvc.Performance.csproj            | 7 +------
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/build/common.props b/build/common.props
index 6bccf31042..189103e012 100644
--- a/build/common.props
+++ b/build/common.props
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
-    <PackageReference Include="NETStandard.Library" Version="$(NetStandardImplicitPackageVersion)" />
+    <PackageReference Include="NETStandard.Library" Version="$(BundledNETStandardPackageVersion)" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/dependencies.props b/build/dependencies.props
index 914e6010c3..f38f0aeed5 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -7,11 +7,9 @@
     <InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion>
     <JsonNetBsonVersion>1.0.1</JsonNetBsonVersion>
     <MoqVersion>4.7.1</MoqVersion>
-    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
     <RoslynVersion>2.0.0</RoslynVersion>
-    <RuntimeFrameworkVersion>2.0.0-*</RuntimeFrameworkVersion>
     <TestSdkVersion>15.0.0</TestSdkVersion>
     <WebApiClientVersion>5.2.2</WebApiClientVersion>
     <XunitVersion>2.2.0</XunitVersion>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj b/test/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj
index 87bd2aaacc..10687fb2ff 100644
--- a/test/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj
+++ b/test/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj
@@ -8,11 +8,6 @@
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPackable>false</IsPackable>
-    <!-- 
-        This is required right now for BenchmarkDotNet to restore the benchmarks. It is NOT ok to move this into
-        an imported .props file. See https://github.com/dotnet/BenchmarkDotNet/issues/406
-        -->
-    <RuntimeFrameworkVersion>2.0.0-*</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -23,4 +18,4 @@
     <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>