From d1b6a9c968b612302bf6cf631a4c18958c1dca35 Mon Sep 17 00:00:00 2001 From: Oliver Smith-Denny Date: Fri, 19 Jun 2026 07:24:15 -0700 Subject: [PATCH] .azurepipelines: Move to VS2026 This upgrades the Azure Pipelines CI to use VS2026 instead of VS2022. The Windows VM image is updated to windows-2025-vs2026 which has been updated to use VS2026. Note, 2025 references the Windows Server release, not the VS version. Azure pipelines has not migrated its windows-2025 VM image to use VS2026 yet, it will do so after that feature is GA'd, at which point edk2 will have time to update to that VM image. Signed-off-by: Oliver Smith-Denny --- .azurepipelines/ReadMe.md | 2 +- .azurepipelines/Windows-VS.yml | 2 +- .azurepipelines/templates/defaults.yml | 2 +- .azurepipelines/templates/pr-gate-build-job.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.azurepipelines/ReadMe.md b/.azurepipelines/ReadMe.md index c0d751e916..41d16ddd94 100644 --- a/.azurepipelines/ReadMe.md +++ b/.azurepipelines/ReadMe.md @@ -22,7 +22,7 @@ Focused on building a single target platform and confirming functionality on tha * Top level CI files should be named `-.yml` * The pipeline YAML file name is referenced in Azure Pipelines. To allow flexibility for toolchain updates in the YAML file without necessitating changes in Azure Pipelines, the toolchain version is not included in the filename. - For example, `Windows-VS.yml` is used instead of `Windows-VS2022.yml`. + For example, `Windows-VS.yml` is used instead of `Windows-VS2026.yml`. ## Links diff --git a/.azurepipelines/Windows-VS.yml b/.azurepipelines/Windows-VS.yml index 86d4bff5f9..9020249a2a 100644 --- a/.azurepipelines/Windows-VS.yml +++ b/.azurepipelines/Windows-VS.yml @@ -25,7 +25,7 @@ variables: jobs: - template: templates/pr-gate-build-job.yml parameters: - tool_chain_tag: 'VS2022' + tool_chain_tag: 'VS2026' vm_image: ${{ variables.default_windows_vm }} arch_list: "IA32,X64" usePythonVersion: ${{ variables.default_python_version }} diff --git a/.azurepipelines/templates/defaults.yml b/.azurepipelines/templates/defaults.yml index 6bb55c7e81..fa738ed20c 100644 --- a/.azurepipelines/templates/defaults.yml +++ b/.azurepipelines/templates/defaults.yml @@ -11,4 +11,4 @@ variables: default_python_version: "3.12" default_linux_container: "ghcr.io/tianocore/containers/fedora-43-test:b562821" default_linux_vm: "ubuntu-24.04" - default_windows_vm: "windows-2022" + default_windows_vm: "windows-2025-vs2026" diff --git a/.azurepipelines/templates/pr-gate-build-job.yml b/.azurepipelines/templates/pr-gate-build-job.yml index 2029ac52a5..f0e90dca96 100644 --- a/.azurepipelines/templates/pr-gate-build-job.yml +++ b/.azurepipelines/templates/pr-gate-build-job.yml @@ -117,7 +117,7 @@ jobs: container: ${{ parameters.container }} steps: - # Strip test targets for CI toolchains other than GCC and VS2022, as these + # Strip test targets for CI toolchains other than GCC and VS2026, as these # cannot run them and would be duplicating work during CI if they could. # Note: Within PR gate CI, NOOPT is only used for building tests. - bash: | @@ -147,7 +147,7 @@ jobs: clean: all pool: - vmImage: 'windows-2022' + vmImage: 'windows-2025-vs2026' steps: - checkout: self