Move 14.1 to 15.0 now that MSBuild is version 15.0.

2016-08-09 10:13:49 -05:00 · 2016-08-09 10:13:49 -05:00 · 2bea6bac83
commit 2bea6bac83
parent 38d18eab4d
6 changed files with 5 additions and 1 deletions
--- a/build/Microsoft.DotNet.Cli.Compile.targets
+++ b/build/Microsoft.DotNet.Cli.Compile.targets
@ -210,6 +210,10 @@
      <Copy SourceFiles="@(MSBuildTargetsToCopy)"
            DestinationFiles="@(MSBuildTargetsToCopy->'$(SdkOutputDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />

+    <!-- Temporary workaround for MSBuild placing their .props files in the old 14.1 directory -->
+    <Move SourceFiles="$(SdkOutputDirectory)/14.1/Microsoft.Common.props"
+          DestinationFolder="$(SdkOutputDirectory)/15.0" />
+    
      <ItemGroup>
        <FilesToClean Include="$(StageDirectory)/sdk/**/vbc.exe" />
      </ItemGroup>
--- a/src/dotnet/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
+++ b/src/dotnet/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
--- a/src/dotnet/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
+++ b/src/dotnet/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
--- a/src/dotnet/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
+++ b/src/dotnet/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
--- a/src/dotnet/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
+++ b/src/dotnet/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
--- a/src/dotnet/project.json
+++ b/src/dotnet/project.json
@ -27,7 +27,7 @@
  },
  "publishOptions": {
    "include": [
-      "14.1/**",
+      "15.0/**",
      "*.props",
      "*.targets"
    ]