Get appropriate vc tools version

Ref12 · Sep 20, 2024 · 1edbbd9 · 1edbbd9
1 parent 078a390
commit 1edbbd9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git 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
+call "%CodexBuildConfigRoot%\arcade.copybinlogs.cmd"
diff --git 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 -----