From 5b976a9fa3541e6c26086b647ddad7321654b4cb 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                                        | 2 +-
 build/dependencies.props                                  | 4 +---
 ...Microsoft.AspNetCore.Server.Kestrel.Performance.csproj | 8 +-------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/build/common.props b/build/common.props
index 1021ec36b4..e2f5702c6b 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>
diff --git a/build/dependencies.props b/build/dependencies.props
index 1c27397040..f80df326e7 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -8,9 +8,7 @@
     <LibUvVersion>1.10.0-*</LibUvVersion>
     <JsonNetVersion>9.0.1</JsonNetVersion>
     <MoqVersion>4.7.1</MoqVersion>
-    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
-    <RuntimeFrameworkVersion>2.0.0-*</RuntimeFrameworkVersion>
     <TestSdkVersion>15.0.0</TestSdkVersion>
     <XunitVersion>2.2.0</XunitVersion>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj
index f75a837b72..54cd499106 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj
+++ b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\build\common.props" />
 
@@ -8,12 +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>