Change how build.sh/build.cmd parse the PGO and IBC versions

This will reduce fragility in our build pipeline, by explicitely controlling the output of dotnet msbuild. It also unblocks the source-build effort, as source-build will write extra console output breaking our old parsing.

1 files changed, 15 insertions, 4 deletions

diff --git a/build.cmd b/build.cmd
index 1e2030c124..8828901160 100644
--- a/build.cmd
+++ b/build.cmd
@@ -390,13 +390,24 @@ if %__RestoreOptData% EQU 1 (
 )
 
 REM Parse the optdata package versions out of msbuild so that we can pass them on to CMake
-for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpPgoDataPackageVersion /nologo') do (
-    set __PgoOptDataVersion=%%s
+call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpPgoDataPackageVersion /nologo
+
+if not exist "%__IntermediatesDir%\optdataversion.txt" (
+    echo "Failed to get PGO data package version."
+    exit /b !errorlevel!
 )
-for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpIbcDataPackageVersion /nologo') do (
-    set __IbcOptDataVersion=%%s
+
+set /p __PgoOptDataVersion<"%__IntermediatesDir%\optdataversion.txt"
+
+call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpIbcDataPackageVersion /nologo
+
+if not exist "%__IntermediatesDir%\ibcoptdataversion.txt" (
+    echo "Failed to get PGO data package version."
+    exit /b !errorlevel!
 )
 
+set /p __IbcOptDataVersion=<"%__IntermediatesDir%\ibcoptdataversion.txt"
+
 REM =========================================================================================
 REM ===
 REM === Generate source files for eventing