From 9d29090169c27c487faf260037a75fc4f86d943e Mon Sep 17 00:00:00 2001
From: "Kevin Ransom (msft)" <codecutter@hotmail.com>
Date: Mon, 29 Aug 2022 12:27:04 -0700
Subject: [PATCH] Revert tools.sh edit (#13796)

* Revert tools.sh edit

* Add binlog to build.sh for proto stuff
---
 eng/build.sh        | 17 ++++++++++-------
 eng/common/tools.sh |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/eng/build.sh b/eng/build.sh
index de5352612..fff8414b3 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -255,21 +255,24 @@ function BuildSolution {
       rm -fr $bootstrap_dir
     fi
     if [ ! -f "$bootstrap_dir/fslex.dll" ]; then
+      local bltools=""
+      if [[ "$bl" != "" ]]; then
+        bltools=$bl+".lex.binlog"
+      fi
       BuildMessage="Error building tools"
-      MSBuild "$repo_root/buildtools/buildtools.proj" \
-        /restore \
-        /p:Configuration=$bootstrap_config
+      MSBuild "$repo_root/buildtools/buildtools.proj" /restore "$bltools" /p:Configuration=$bootstrap_config
 
       mkdir -p "$bootstrap_dir"
       cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/net7.0 $bootstrap_dir/fslex
       cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/net7.0 $bootstrap_dir/fsyacc
     fi
     if [ ! -f "$bootstrap_dir/fsc.exe" ]; then
+      local bltools=""
+      if [[ "$bl" != "" ]]; then
+        bltools=$bl+".bootstrap.binlog"
+      fi
       BuildMessage="Error building bootstrap"
-      MSBuild "$repo_root/Proto.sln" \
-        /restore \
-        /p:Configuration=$bootstrap_config
-
+      MSBuild "$repo_root/Proto.sln" /restore "$bltools" /p:Configuration=$bootstrap_config
       cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/net7.0 $bootstrap_dir/fsc
     fi
   fi
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index a5fed41b6..c110d0ed4 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -490,7 +490,7 @@ function MSBuild-Core {
     }
   }
 
-  RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci /bl "$@"
+  RunBuildTool "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@"
 }
 
 ResolvePath "${BASH_SOURCE[0]}"
-- 
GitLab