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