Add ${__CommonMSBuildArgs} to pass buildtype and arch

diff --git a/build.cmd b/build.cmd
index 8828901..945d128 100644 (file)
--- a/build.cmd
+++ b/build.cmd
@@ -390,7 +390,7 @@ if %__RestoreOptData% EQU 1 (
 )
 
 REM Parse the optdata package versions out of msbuild so that we can pass them on to CMake
-call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpPgoDataPackageVersion /nologo
+call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpPgoDataPackageVersion /nologo %__CommonMSBuildArgs%
 
 if not exist "%__IntermediatesDir%\optdataversion.txt" (
     echo "Failed to get PGO data package version."
@@ -399,7 +399,7 @@ if not exist "%__IntermediatesDir%\optdataversion.txt" (
 
 set /p __PgoOptDataVersion<"%__IntermediatesDir%\optdataversion.txt"
 
-call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpIbcDataPackageVersion /nologo
+call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpIbcDataPackageVersion /nologo %__CommonMSBuildArgs%
 
 if not exist "%__IntermediatesDir%\ibcoptdataversion.txt" (
     echo "Failed to get PGO data package version."

diff --git a/build.sh b/build.sh
index 826ce97..6738cf5 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -152,7 +152,7 @@ restore_optdata()
         # Parse the optdata package versions out of msbuild so that we can pass them on to CMake
 
         # Writes into ${__IntermediatesDir}/optdataversion.txt
-        ${__ProjectDir}/dotnet.sh msbuild $OptDataProjectFilePath /t:DumpPgoDataPackageVersion /nologo 2>&1 >/dev/null
+        ${__ProjectDir}/dotnet.sh msbuild $OptDataProjectFilePath /t:DumpPgoDataPackageVersion ${__CommonMSBuildArgs} /nologo 2>&1 >/dev/null
         if [ ! -f "${__IntermediatesDir}/optdataversion.txt" ]; then
             echo "Failed to get PGO data package version."
             exit $?
@@ -161,7 +161,7 @@ restore_optdata()
         __PgoOptDataVersion=$(<"${__IntermediatesDir}/optdataversion.txt")
 
         # Writes into ${__IntermediatesDir}/ibcoptdataversion.txt
-        ${__ProjectDir}/dotnet.sh msbuild $OptDataProjectFilePath /t:DumpIbcDataPackageVersion /nologo 2>&1 >/dev/null
+        ${__ProjectDir}/dotnet.sh msbuild $OptDataProjectFilePath /t:DumpIbcDataPackageVersion ${__CommonMSBuildArgs} /nologo 2>&1 >/dev/null
         if [ ! -f "${__IntermediatesDir}/ibcoptdataversion.txt" ]; then
             echo "Failed to get IBC data package version."
             exit $?