From 2bea6bac83e7d0dfa083ef242ba7f3d5c7c2e74d Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Tue, 9 Aug 2016 10:13:49 -0500
Subject: [PATCH] Move 14.1 to 15.0 now that MSBuild is version 15.0.

---
 build/Microsoft.DotNet.Cli.Compile.targets                    | 4 ++++
 .../ImportBefore/Microsoft.NETCore.ImportBefore.props         | 0
 .../ImportBefore/Microsoft.NuGet.ImportBefore.props           | 0
 .../ImportAfter/Microsoft.NETCore.ImportAfter.targets         | 0
 .../ImportAfter/Microsoft.NuGet.ImportAfter.targets           | 0
 src/dotnet/project.json                                       | 2 +-
 6 files changed, 5 insertions(+), 1 deletion(-)
 rename src/dotnet/{14.1 => 15.0}/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props (100%)
 rename src/dotnet/{14.1 => 15.0}/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props (100%)
 rename src/dotnet/{14.1 => 15.0}/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets (100%)
 rename src/dotnet/{14.1 => 15.0}/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets (100%)

diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets
index 24e9613f4..023585664 100644
--- 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>
diff --git a/src/dotnet/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props b/src/dotnet/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
similarity index 100%
rename from src/dotnet/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
rename to src/dotnet/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NETCore.ImportBefore.props
diff --git a/src/dotnet/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props b/src/dotnet/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
similarity index 100%
rename from src/dotnet/14.1/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
rename to src/dotnet/15.0/Imports/Microsoft.Common.props/ImportBefore/Microsoft.NuGet.ImportBefore.props
diff --git a/src/dotnet/14.1/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets b/src/dotnet/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
similarity index 100%
rename from src/dotnet/14.1/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
rename to src/dotnet/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NETCore.ImportAfter.targets
diff --git a/src/dotnet/14.1/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets b/src/dotnet/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
similarity index 100%
rename from src/dotnet/14.1/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
rename to src/dotnet/15.0/Microsoft.Common.targets/ImportAfter/Microsoft.NuGet.ImportAfter.targets
diff --git a/src/dotnet/project.json b/src/dotnet/project.json
index f7cc39482..5257e2d0d 100644
--- a/src/dotnet/project.json
+++ b/src/dotnet/project.json
@@ -27,7 +27,7 @@
   },
   "publishOptions": {
     "include": [
-      "14.1/**",
+      "15.0/**",
       "*.props",
       "*.targets"
     ]