From 596e35a74f4d0741c017b251d6185a3138184956 Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Wed, 2 May 2018 22:25:33 +0000
Subject: [PATCH 1/4] Update to latest msbuild vs15.7_source-build branch

---
 ...ls-verison-to-msbuild-specific-versi.patch | 26 -------------------
 src/msbuild                                   |  2 +-
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 patches/msbuild/0001-Update-RoslynTools-verison-to-msbuild-specific-versi.patch

diff --git a/patches/msbuild/0001-Update-RoslynTools-verison-to-msbuild-specific-versi.patch b/patches/msbuild/0001-Update-RoslynTools-verison-to-msbuild-specific-versi.patch
deleted file mode 100644
index 74fb13f214..0000000000
--- a/patches/msbuild/0001-Update-RoslynTools-verison-to-msbuild-specific-versi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8767e665cf966e63cc67df2fe931cf5290d96526 Mon Sep 17 00:00:00 2001
-From: dseefeld <dseefeld@microsoft.com>
-Date: Wed, 25 Apr 2018 21:54:15 +0000
-Subject: [PATCH] Update RoslynTools verison to msbuild specific version until
- the msbuild repo is updated to the current version.
-
----
- build/Versions.props | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/Versions.props b/build/Versions.props
-index 53de55a..7f10d05 100644
---- a/build/Versions.props
-+++ b/build/Versions.props
-@@ -40,7 +40,7 @@
-     <DotNetCliVersion>2.1.300-preview2-008530</DotNetCliVersion>
-     <!-- We are pretty much always on a preview SDK. No need to warn about it. -->
-     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
--    <RoslynToolsRepoToolsetVersion>1.0.0-beta-62705-01</RoslynToolsRepoToolsetVersion>
-+    <RoslynToolsRepoToolsetVersion>1.0.0-msbuild-62811-02</RoslynToolsRepoToolsetVersion>
-     <VSWhereVersion>2.2.7</VSWhereVersion>
- 
-     <GenApiVersion>2.1.0-prerelease-02404-02</GenApiVersion>
--- 
-1.8.3.1
-
diff --git a/src/msbuild b/src/msbuild
index 1a410f549e..e5cfa78385 160000
--- a/src/msbuild
+++ b/src/msbuild
@@ -1 +1 @@
-Subproject commit 1a410f549ea34d2c780b4f8144d928e14ceb31ec
+Subproject commit e5cfa78385d0676d770d5242d0a27144919518dd

From 08faefb8e3082c4595d13f374c07522a27e65acb Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Thu, 3 May 2018 19:03:05 +0000
Subject: [PATCH 2/4] Add repotoolset params to msbuild.proj

---
 repos/msbuild.proj | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/repos/msbuild.proj b/repos/msbuild.proj
index 3d5e48cf6f..eaf573171c 100644
--- a/repos/msbuild.proj
+++ b/repos/msbuild.proj
@@ -10,6 +10,8 @@
     <BuildCommand>$(ProjectDirectory)build/build$(ShellExtension) build -DotNetBuildFromSource -DotNetCoreSdkDir $(DotNetCliToolDir) -bootstraponly -skiptests -pack -configuration $(Configuration) /p:GitHeadSha=$(GitCommitHash) $(OutputVersionArgs)</BuildCommand>
     <SourceOverrideRepoApiImplemented>true</SourceOverrideRepoApiImplemented>
     <RepoApiImplemented>false</RepoApiImplemented>
+    <UsesRepoToolset>true</UsesRepoToolset>
+    <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
     <!--
       MSBuild is part of ProdCon, but that branch doesn't build from source yet.
     <OrchestratedManifestBuildName>Microsoft/msbuild</OrchestratedManifestBuildName>
@@ -17,5 +19,9 @@
     <OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
   </PropertyGroup>
 
+  <ItemGroup>
+    <RepositoryReference Include="roslyn-tools" />
+  </ItemGroup>
+
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))/dir.targets" />
 </Project>

From edaa175dd1f2158b94ab90f38c9ee8d2d8fe617f Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Thu, 3 May 2018 14:21:12 -0500
Subject: [PATCH 3/4] Remove global.json: MSBuild's has no SDK version

---
 repos/msbuild.proj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/repos/msbuild.proj b/repos/msbuild.proj
index eaf573171c..52731f183b 100644
--- a/repos/msbuild.proj
+++ b/repos/msbuild.proj
@@ -11,7 +11,6 @@
     <SourceOverrideRepoApiImplemented>true</SourceOverrideRepoApiImplemented>
     <RepoApiImplemented>false</RepoApiImplemented>
     <UsesRepoToolset>true</UsesRepoToolset>
-    <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
     <!--
       MSBuild is part of ProdCon, but that branch doesn't build from source yet.
     <OrchestratedManifestBuildName>Microsoft/msbuild</OrchestratedManifestBuildName>

From 16adae090c80600a787b62423f8ce715561db262 Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Thu, 3 May 2018 22:33:20 +0000
Subject: [PATCH 4/4] Update build.sh to uptake source-built repotoolset

---
 ...h-to-uptake-source-built-repotoolset.patch | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 patches/msbuild/0001-Update-build-sh-to-uptake-source-built-repotoolset.patch

diff --git a/patches/msbuild/0001-Update-build-sh-to-uptake-source-built-repotoolset.patch b/patches/msbuild/0001-Update-build-sh-to-uptake-source-built-repotoolset.patch
new file mode 100644
index 0000000000..40770d654a
--- /dev/null
+++ b/patches/msbuild/0001-Update-build-sh-to-uptake-source-built-repotoolset.patch
@@ -0,0 +1,67 @@
+From c46510737402f30f28c23b06a0b309354f98e29a Mon Sep 17 00:00:00 2001
+From: dseefeld <dseefeld@microsoft.com>
+Date: Thu, 3 May 2018 22:30:30 +0000
+Subject: [PATCH] Update build.sh to uptake source-built repotoolset
+
+---
+ build/build.sh | 30 ++++++++++++++++++++++++------
+ 1 file changed, 24 insertions(+), 6 deletions(-)
+
+diff --git a/build/build.sh b/build/build.sh
+index 141f779..310cf85 100755
+--- a/build/build.sh
++++ b/build/build.sh
+@@ -278,19 +278,36 @@ function InstallDotNetCli {
+ }
+ 
+ function InstallRepoToolset {
++  CreateDirectory "$RepoToolsetDir"
+   ReadJson "$RepoRoot/global.json" "RoslynTools.RepoToolset"
+   RepoToolsetVersion=$readjsonvalue
+-  RepoToolsetDir="$NuGetPackageRoot/roslyntools.repotoolset/$RepoToolsetVersion/tools"
+-  RepoToolsetBuildProj="$RepoToolsetDir/Build.proj"
++  RepoToolsetLocationFile="$RepoToolsetDir/$RepoToolsetVersion.txt"
++
++  if [[ -a "$RepoToolsetLocationFile" ]]; then
++    local path=`cat $RepoToolsetLocationFile`
++    if [[ -a "$path" ]]; then
++      RepoToolsetBuildProj=$path
++      return
++    fi
++  fi
++  if [[ "$restore" != true ]]; then
++    ExitIfError 2 "Toolset version $RepoToolsetVersion has not been restored."
++  fi
+ 
+   echo "Using repo tools version: $readjsonvalue"
++  local proj="$RepoToolsetDir/restore.proj"
++  echo '<Project Sdk="RoslynTools.RepoToolset"/>' > $proj
+ 
+   local logCmd=$(GetLogCmd Toolset)
++  CallMSBuild $(QQ $proj) /t:__WriteToolsetLocation /m /nologo /clp:None /warnaserror $logCmd /p:__ToolsetLocationOutputFile=$RepoToolsetLocationFile
++  local lastexitcode=$?
+ 
+-  if [ ! -d "$RepoToolsetBuildProj" ]
+-  then
+-    local ToolsetProj="$ScriptRoot/Toolset.csproj"
+-    CallMSBuild $(QQ $ToolsetProj) /t:build /m /clp:Summary /warnaserror /v:$verbosity $logCmd $properties
++  ExitIfError $lastexitcode "Failed to restore toolset (exit code '$lastexitcode')."
++
++  RepoToolsetBuildProj=`cat $RepoToolsetLocationFile`
++
++  if [[ ! -a "$RepoToolsetBuildProj" ]]; then
++    ExitIfError 3 "Invalid toolset path: $RepoToolsetBuildProj"
+   fi
+ }
+ 
+@@ -392,6 +409,7 @@ ArtifactsConfigurationDir="$ArtifactsDir/$configuration"
+ PackagesDir="$ArtifactsConfigurationDir/packages"
+ LogDir="$ArtifactsConfigurationDir/log"
+ VersionsProps="$ScriptRoot/Versions.props"
++RepoToolsetDir="$ArtifactsDir/toolset"
+ 
+ #https://github.com/dotnet/source-build
+ if $dotnetBuildFromSource
+-- 
+1.8.3.1
+