From 79648f9ccb11f2238d528333aefd63f43bad2efc Mon Sep 17 00:00:00 2001
From: Piotr Puszkiewicz <piotrp@microsoft.com>
Date: Sun, 7 Aug 2016 01:51:47 -0700
Subject: [PATCH 1/3] Update stage0 msbuild

---
 src/Microsoft.DotNet.Core.Build.Tasks/project.json |  6 +++---
 src/dotnet/project.json                            | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Microsoft.DotNet.Core.Build.Tasks/project.json b/src/Microsoft.DotNet.Core.Build.Tasks/project.json
index 985721190..58b48191e 100644
--- a/src/Microsoft.DotNet.Core.Build.Tasks/project.json
+++ b/src/Microsoft.DotNet.Core.Build.Tasks/project.json
@@ -26,9 +26,9 @@
         "portable-net45+wp80+win8+wpa81+dnxcore50"
       ],
       "dependencies": {
-        "Microsoft.Build.Framework": "0.1.0-preview-00024-160610",
-        "Microsoft.Build.Tasks.Core": "0.1.0-preview-00024-160610",
-        "Microsoft.Build.Utilities.Core": "0.1.0-preview-00024-160610"
+        "Microsoft.Build.Framework": "0.1.0-preview-00029-160805",
+        "Microsoft.Build.Tasks.Core": "0.1.0-preview-00029-160805",
+        "Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805"
       }
     }
   }
diff --git a/src/dotnet/project.json b/src/dotnet/project.json
index a4df97b88..f7cc39482 100644
--- a/src/dotnet/project.json
+++ b/src/dotnet/project.json
@@ -71,12 +71,12 @@
       "exclude": "compile"
     },
 
-    "MSBuild": "0.1.0-preview-00024-160610",
-    "Microsoft.Build.Framework": "0.1.0-preview-00024-160610",
-    "Microsoft.Build.Tasks.Core": "0.1.0-preview-00024-160610",
-    "Microsoft.Build.Utilities.Core": "0.1.0-preview-00024-160610",
-    "Microsoft.Build.Targets": "0.1.0-preview-00024-160610",
-    "Microsoft.Build": "0.1.0-preview-00024-160610",
+    "MSBuild": "0.1.0-preview-00029-160805",
+    "Microsoft.Build.Framework": "0.1.0-preview-00029-160805",
+    "Microsoft.Build.Tasks.Core": "0.1.0-preview-00029-160805",
+    "Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805",
+    "Microsoft.Build.Targets": "0.1.0-preview-00029-160805",
+    "Microsoft.Build": "0.1.0-preview-00029-160805",
     "Microsoft.Net.Compilers.netcore": "1.3.0",
     "Microsoft.Net.Compilers.Targets.NetCore": "0.1.5-dev",
     "Microsoft.Cci": "4.0.0-rc3-24128-00",

From f277103831acaaf8f60d4950bcbaecbda22cc554 Mon Sep 17 00:00:00 2001
From: PiotrP <piotrp@microsoft.com>
Date: Mon, 8 Aug 2016 13:44:44 -0700
Subject: [PATCH 2/3] Make GivenThatICopyLibraryAssets repeatable

---
 .../GivenThatICopyLibraryAssets.cs                         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/GivenThatICopyLibraryAssets.cs b/test/Microsoft.DotNet.Compiler.Common.Tests/GivenThatICopyLibraryAssets.cs
index b8421c27b..373d7a95e 100644
--- a/test/Microsoft.DotNet.Compiler.Common.Tests/GivenThatICopyLibraryAssets.cs
+++ b/test/Microsoft.DotNet.Compiler.Common.Tests/GivenThatICopyLibraryAssets.cs
@@ -60,6 +60,13 @@ namespace Microsoft.DotNet.Cli.Compiler.Common.Tests
             var mockedLibraryAssetFileName = $"{mockedLibraryAssetName}.dll";
 
             var fakeFile = Path.Combine(AppContext.BaseDirectory, mockedLibraryAssetFileName);
+
+            if (File.Exists(fakeFile))
+            {
+                File.SetAttributes(fakeFile, FileAttributes.Normal);
+                File.Delete(fakeFile);
+            }
+
             File.WriteAllText(fakeFile, mockedLibraryAssetName);
 
             return new LibraryAsset(mockedLibraryAssetName, mockedLibraryAssetFileName, fakeFile);

From 359f274626633f8636f2287e848b3f13bccca187 Mon Sep 17 00:00:00 2001
From: PiotrP <piotrp@microsoft.com>
Date: Mon, 8 Aug 2016 14:35:09 -0700
Subject: [PATCH 3/3] Workaround for msbuild #872

---
 build/Microsoft.DotNet.Cli.Compile.targets |  7 ++
 resources/MSBuild.exe.config               | 75 ++++++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 resources/MSBuild.exe.config

diff --git a/build/Microsoft.DotNet.Cli.Compile.targets b/build/Microsoft.DotNet.Cli.Compile.targets
index 3d444f65f..b1f329b1c 100644
--- a/build/Microsoft.DotNet.Cli.Compile.targets
+++ b/build/Microsoft.DotNet.Cli.Compile.targets
@@ -225,5 +225,12 @@
           DestinationFiles="@(FilesToCopy->'$(StageSymbolsDirectory)\%(RecursiveDir)%(Filename)%(Extension)')" />
 
       <Delete Files="@(PdbsToClean)" />
+
+      <!-- workaround for https://github.com/Microsoft/msbuild/issues/872 -->
+      <Copy SourceFiles="$(RepoRoot)/resources/MSBuild.exe.config"
+            DestinationFiles="$(SdkOutputDirectory)/MSBuild.exe.config" />
+
+      <Copy SourceFiles="$(RepoRoot)/resources/MSBuild.exe.config"
+            DestinationFiles="$(MSBuildTargetsDirectory)/MSBuild.exe.config" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/resources/MSBuild.exe.config b/resources/MSBuild.exe.config
new file mode 100644
index 000000000..76d340ed2
--- /dev/null
+++ b/resources/MSBuild.exe.config
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <configSections>
+    <section name="msbuildToolsets" type="Microsoft.Build.Evaluation.ToolsetConfigurationSection, Microsoft.Build, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  </configSections>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+  </startup>
+  <runtime>
+    <DisableFXClosureWalk enabled="true" />
+    <generatePublisherEvidence enabled="false" />
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Build.Framework" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
+        <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Build" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
+        <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Build.Conversion.Core" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
+        <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Build.Tasks.Core" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
+        <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Build.Utilities.Core" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
+        <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <!-- To define one or more new toolsets, add an 'msbuildToolsets' element in this file. -->
+  <msbuildToolsets default="15.0">
+    <toolset toolsVersion="15.0">
+      <property name="MSBuildRootWorkaround704" value="$([MSBuild]::GetCurrentExecutableDirectory())" />
+      <!-- See https://github.com/Microsoft/msbuild/issues/704 -->
+      <property name="MSBuildToolsPath" value="$(MSBuildRootWorkaround704)" />
+      <property name="MSBuildToolsPath32" value="$(MSBuildToolsPath)" />
+      <property name="MSBuildToolsPath64" value="$(MSBuildToolsPath)\amd64" />
+      <property name="FrameworkSDKRoot" value="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\NETFXSDK\4.6.1@InstallationFolder)" />
+      <property name="MSBuildRuntimeVersion" value="4.0.30319" />
+      <property name="MSBuildFrameworkToolsPath" value="$(SystemRoot)\Microsoft.NET\Framework\v$(MSBuildRuntimeVersion)\" />
+      <property name="MSBuildFrameworkToolsPath32" value="$(SystemRoot)\Microsoft.NET\Framework\v$(MSBuildRuntimeVersion)\" />
+      <property name="MSBuildFrameworkToolsPath64" value="$(SystemRoot)\Microsoft.NET\Framework64\v$(MSBuildRuntimeVersion)\" />
+      <property name="MSBuildFrameworkToolsRoot" value="$(SystemRoot)\Microsoft.NET\Framework\" />
+      <property name="SDK35ToolsPath" value="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx35Tools-x86@InstallationFolder)" />
+      <property name="SDK40ToolsPath" value="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\NETFXSDK\4.6.1\WinSDK-NetFx40Tools-x86@InstallationFolder)" />
+      <property name="WindowsSDK80Path" value="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.1@InstallationFolder)" />
+      <property name="VsInstallRoot" value="$([MSBuild]::GetVsInstallRoot())" />
+      <property name="MSBuildToolsRoot" value="$(VsInstallRoot)\MSBuild" />
+      <property name="MSBuildExtensionsPath" value="$(VsInstallRoot)\MSBuild" />
+      <property name="MSBuildExtensionsPath32" value="$(VsInstallRoot)\MSBuild" />
+
+      <!-- VC Specific Paths -->
+      <property name="VCTargetsPath" value="$(VsInstallRoot)\Common7\IDE\VC\VCTargets\" />
+      <property name="VCTargetsPath14" value="$([MSBuild]::ValueOrDefault('$(VCTargetsPath14)','$(MSBuildProgramFiles32)\MSBuild\Microsoft.Cpp\v4.0\V140\'))" />
+      <property name="VCTargetsPath12" value="$([MSBuild]::ValueOrDefault('$(VCTargetsPath12)','$(MSBuildProgramFiles32)\MSBuild\Microsoft.Cpp\v4.0\V120\'))" />
+      <property name="VCTargetsPath11" value="$([MSBuild]::ValueOrDefault('$(VCTargetsPath11)','$(MSBuildProgramFiles32)\MSBuild\Microsoft.Cpp\v4.0\V110\'))" />
+      <property name="VCTargetsPath10" value="$([MSBuild]::ValueOrDefault('$(VCTargetsPath10)','$(MSBuildProgramFiles32)\MSBuild\Microsoft.Cpp\v4.0\'))" />
+      <property name="AndroidTargetsPath" value="$(MSBuildExtensionsPath32)\Microsoft\MDD\Android\V150\" />
+      <property name="iOSTargetsPath" value="$(MSBuildExtensionsPath32)\Microsoft\MDD\iOS\V150\" />
+      <projectImportSearchPaths>
+        <searchPaths os="windows">
+          <property name="MSBuildExtensionsPath" value="$(MSBuildProgramFiles32)\MSBuild"/>
+          <property name="MSBuildExtensionsPath32" value="$(MSBuildProgramFiles32)\MSBuild"/>
+          <property name="MSBuildExtensionsPath64" value="$(MSBuildProgramFiles32)\MSBuild"/>
+          <property name="VSToolsPath" value="$(MSBuildProgramFiles32)\MSBuild\Microsoft\VisualStudio\v$(VisualStudioVersion)"/>
+        </searchPaths>
+      </projectImportSearchPaths>
+    </toolset>
+  </msbuildToolsets>
+</configuration>
\ No newline at end of file