Skip to content

{Packaging} FIX: windows pool upgraded from 2019 to 2022 #33175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
msarfraz wants to merge 4 commits into from
+2 −2
Closed

{Packaging} FIX: windows pool upgraded from 2019 to 2022 #33175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5bd356
windows pool upgraded to 2022
Mar 31, 2026
92067ae
updated msbuild path
Apr 1, 2026
1082a7b
updated visual studio 2022 path to use env var
Apr 1, 2026
f250fff
Merge remote-tracking branch 'origin/dev' into msarfraz/upgrade-windo…
Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/templates/variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
ubuntu_pool: 'pool-ubuntu-2204'
ubuntu_multi_core_pool: 'pool-ubuntu-latest-multi-core'
windows_pool: 'pool-windows-2019'
windows_pool: 'pool-windows-2022'
ubuntu_arm64_pool: 'pool-ubuntu-latest-arm64'
macos_pool: 'macOS-14'
macos_intel_pool: 'macOS-15'
Expand Down
2 changes: 1 addition & 1 deletion build_scripts/windows/scripts/build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ REM See https://stackoverflow.com/a/12407934/2199657
echo build a msi installer using local cli sources and python executables. You need to have curl.exe, unzip.exe and msbuild.exe available under PATH
echo.

set "PATH=%PATH%;%ProgramFiles%\Git\bin;%ProgramFiles%\Git\usr\bin;C:\Program Files (x86)\Git\bin;C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin"
set "PATH=%PATH%;%ProgramFiles%\Git\bin;%ProgramFiles%\Git\usr\bin;C:\Program Files (x86)\Git\bin;%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin"
Copy link

Copilot AI Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using %ProgramFiles% for the VS2022 MSBuild path can resolve to the 32-bit "Program Files (x86)" when the script is run from a 32-bit process, which would break MSBuild discovery (VS2022 installs under the 64-bit Program Files). Prefer using %ProgramW6432% (or vswhere to locate MSBuild) to make the PATH update reliable across environments.

Suggested change
set "PATH=%PATH%;%ProgramFiles%\Git\bin;%ProgramFiles%\Git\usr\bin;C:\Program Files (x86)\Git\bin;%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin"
set "VS2022_PROGRAM_FILES=%ProgramW6432%"
if "!VS2022_PROGRAM_FILES!"=="" (
set "VS2022_PROGRAM_FILES=%ProgramFiles%"
)
set "PATH=%PATH%;%ProgramFiles%\Git\bin;%ProgramFiles%\Git\usr\bin;C:\Program Files (x86)\Git\bin;!VS2022_PROGRAM_FILES!\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin"

Copilot uses AI. Check for mistakes.

if "%CLI_VERSION%"=="" (
echo Please set the CLI_VERSION environment variable, e.g. 2.0.13
Expand Down
Loading