Centralize Microsoft.Net.SDK Version (#4890)

* Centralize Microsoft.Net.Sdk package version Note: Templates were omitted as their version needs to be static. * Unifying additional missmatched versions * prefercliruntime whitespace threw off ReplaceAll * Additional missed globs * Revert SDK version for performance tests * PR Feedback * Roll back VSTestXunitDesktopAndNetCore.csproj SDK version
2016-12-02 09:34:03 -08:00 · 2016-12-02 09:34:03 -08:00 · da82bdb05d
commit da82bdb05d
parent f18967e39a
116 changed files with 340 additions and 67532 deletions
--- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/SingleTargetApp.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/SingleTargetApp.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFramework>netcoreapp1.0</TargetFramework>
    <OutputType>Exe</OutputType>
@ -12,7 +14,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
    <PackageReference Include="Microsoft.NETCore.App">
--- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/SingleTargetP0.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/SingleTargetP0.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFramework>netcoreapp1.0</TargetFramework>
    <OutputType>Exe</OutputType>
@ -15,7 +17,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
    <PackageReference Include="Microsoft.NETCore.App">
--- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/SingleTargetP1.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/SingleTargetP1.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>
@ -14,7 +16,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
    <PackageReference Include="Microsoft.NETCore.App">
--- a/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/SingleTargetP2.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/SingleTargetP2.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFramework>netcoreapp1.0</TargetFramework>
  </PropertyGroup>
@ -11,7 +13,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
    <PackageReference Include="Microsoft.NETCore.App">
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/TwoTargetApp.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/TwoTargetApp.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFrameworks>netcoreapp1.0;netstandard1.6</TargetFrameworks>
    <OutputType>Exe</OutputType>
@ -12,7 +14,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
  </ItemGroup>
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/TwoTargetP0.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/TwoTargetP0.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFrameworks>netcoreapp1.0;netstandard1.6</TargetFrameworks>
    <OutputType>Exe</OutputType>
@ -15,7 +17,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
  </ItemGroup>
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/TwoTargetP1.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/TwoTargetP1.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
  </PropertyGroup>
@ -14,7 +16,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
  </ItemGroup>
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/TwoTargetP2.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/TwoTargetP2.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
  </PropertyGroup>
@ -11,7 +13,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
  </ItemGroup>
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/TwoTargetLargeP0.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/TwoTargetLargeP0.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFrameworks>netcoreapp1.0;netstandard1.6</TargetFrameworks>
    <OutputType>Exe</OutputType>
@ -15,7 +17,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
  </ItemGroup>
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/TwoTargetLargeP1.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/TwoTargetLargeP1.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
  </PropertyGroup>
@ -15,7 +17,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
  </ItemGroup>
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/TwoTargetLargeP2.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/TwoTargetLargeP2.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
  </PropertyGroup>
@ -15,7 +17,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
  </ItemGroup>
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/TwoTargetLargeP3.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/TwoTargetLargeP3.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
  </PropertyGroup>
@ -14,7 +16,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
  </ItemGroup>
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/TwoTargetLargeP4.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/TwoTargetLargeP4.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
  </PropertyGroup>
@ -15,7 +17,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
  </ItemGroup>
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/TwoTargetLargeP5.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/TwoTargetLargeP5.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
  </PropertyGroup>
@ -11,7 +13,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
  </ItemGroup>
--- a/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/TwoTargetLargeP6.csproj
+++ b/TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/TwoTargetLargeP6.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
  <PropertyGroup>
    <TargetFrameworks>netcoreapp1.0;netstandard1.5</TargetFrameworks>
  </PropertyGroup>
@ -11,7 +13,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Sdk">
-      <Version>1.0.0-alpha-20161019-1</Version>
+      <Version>$(CLI_NETSDK_Version)</Version>
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
  </ItemGroup>
--- a/TestAssets/TestProjects/PerformanceTestProjects/dir.props
+++ b/TestAssets/TestProjects/PerformanceTestProjects/dir.props
@ -0,0 +1,8 @@
+<Project ToolsVersion="15.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+
+  <!-- This file should not be necessary, but overrides CLI_NETSDK_Version because https://github.com/dotnet/cli/issues/4893 -->
+  <PropertyGroup>
+    <CLI_NETSDK_Version>1.0.0-alpha-20161019-1</CLI_NETSDK_Version>
+  </PropertyGroup>
+</Project>