From 0a0bdaecdf490c904c43024d9c9a2a778fed184a Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 8 Dec 2025 20:31:25 -0500
Subject: [PATCH] ci: Update Windows packaging jobs to VS 20206

Restore commit ffa010e32d (ci: Update Windows jobs to VS 2026,
2025-11-21, v4.2.1~28^2) now that we require Windows 10 anyway.

Issue: #27450
---
 .gitlab-ci.yml         |  4 ++--
 .gitlab/os-windows.yml | 19 ++-----------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 222ee9392d..86b08e994b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1636,7 +1636,7 @@ b:windows-x86_64-package:
         - .windows_x86_64_package
         - .cmake_build_windows
         - .cmake_build_package_artifacts
-        - .windows_x86_64_tags_nonconcurrent_vs2022_msvc14.44
+        - .windows_x86_64_tags_nonconcurrent_vs2026
         - .run_only_for_package
     needs:
         - p:doc-package
@@ -1667,7 +1667,7 @@ b:windows-i386-package:
         - .windows_i386_package
         - .cmake_build_windows
         - .cmake_build_package_artifacts
-        - .windows_x86_64_tags_nonconcurrent_vs2022_msvc14.44
+        - .windows_x86_64_tags_nonconcurrent_vs2026
         - .run_only_for_package
     needs:
         - p:doc-package
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index 8719f0ee70..3b19d4c741 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -43,12 +43,6 @@
         VCVARSPLATFORM: "x64"
         VCVARSVERSION: "14.44.35207"
 
-.windows_vcvarsall_vs2022_x86_msvc14.44:
-    variables:
-        VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
-        VCVARSPLATFORM: "x86"
-        VCVARSVERSION: "14.44.35207"
-
 .windows_vcvarsall_vs2026_x64:
     variables:
         VCVARSALL: "${VS180COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
@@ -107,7 +101,7 @@
 .windows_x86_64_package:
     extends:
         - .windows_package
-        - .windows_vcvarsall_vs2022_x64_msvc14.44
+        - .windows_vcvarsall_vs2026_x64
 
     variables:
         CMAKE_CONFIGURATION: windows_x86_64_package
@@ -115,7 +109,7 @@
 .windows_i386_package:
     extends:
         - .windows_package
-        - .windows_vcvarsall_vs2022_x86_msvc14.44
+        - .windows_vcvarsall_vs2026_x86
 
     variables:
         CMAKE_CONFIGURATION: windows_i386_package
@@ -409,15 +403,6 @@
         - msvc-14.50
         - concurrent
 
-.windows_x86_64_tags_nonconcurrent_vs2022_msvc14.44:
-    tags:
-        - cmake # Since this is a bare runner, pin to a project.
-        - windows-x86_64
-        - shell
-        - vs2022
-        - msvc-14.44
-        - nonconcurrent
-
 .windows_x86_64_tags_concurrent_vs2022_msvc14.44:
     tags:
         - cmake # Since this is a bare runner, pin to a project.