From 1edbbd9287bdfa7cae7bd3ca05a3e571db374d94 Mon Sep 17 00:00:00 2001 From: Lance Collins Date: Fri, 20 Sep 2024 12:58:48 -0700 Subject: [PATCH] Get appropriate vc tools version --- repos/.build/arcadebuild.cmd | 2 +- repos/github/microsoft/buildxl/build.cmd | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/repos/.build/arcadebuild.cmd b/repos/.build/arcadebuild.cmd index b4fd431..9fc9aa8 100644 --- a/repos/.build/arcadebuild.cmd +++ b/repos/.build/arcadebuild.cmd @@ -1,4 +1,4 @@ REM Build using arcade build logic powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -nodeReuse:$false %*" -call "%CodexBuildConfigRoot%\arcade.copybinlogs.cmd"a \ No newline at end of file +call "%CodexBuildConfigRoot%\arcade.copybinlogs.cmd" \ No newline at end of file diff --git a/repos/github/microsoft/buildxl/build.cmd b/repos/github/microsoft/buildxl/build.cmd index 419c72d..9aec467 100644 --- a/repos/github/microsoft/buildxl/build.cmd +++ b/repos/github/microsoft/buildxl/build.cmd @@ -1,10 +1,15 @@ +pushd "C:\Program Files (x86)\Microsoft Visual Studio\Installer\" +for /f "delims=" %%x in ('.\vswhere.exe -latest -property InstallationPath') do set VSPATH=%%x +popd +call "%VSPATH%\VC\Auxiliary\Build\vcvarsall.bat" x64 + @echo on -set BUILDXL_LOG_DIR=%CodexDebugDir%/bxllogs +echo VCToolsVersion=%VCToolsVersion% -mkdir "%ProgramFiles%/Microsoft Visual Studio/2022/Preview/VC/Tools/MSVC/14.39.33519" -dir "%ProgramFiles%/Microsoft Visual Studio/2022/Preview/VC" -dir "%ProgramFiles%/Microsoft Visual Studio/2022/Preview/VC/Tools" +set MSVC_VERSION=%VCToolsVersion% + +set BUILDXL_LOG_DIR=%CodexDebugDir%/bxllogs echo ----- Writing cache config -----