gitlab-ci: Update Windows packaging builds to MSVC 14.34 toolset

Problems with `cmake-gui` when compiled with the MSVC 14.33 toolset,
that did not occur with the MSVC 14.32 toolset, no longer occur with the
MSVC 14.34 toolset.  Revert commit cb8b27a901 (gitlab-ci: Use separate
MSVC toolset specification for packaging jobs, 2022-08-18, v3.24.2~24^2~1)
and update the remaining toolset version references.

Fixes: #23859

2 files changed, 20 insertions, 41 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4baba5486..712ebd1e26 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1093,7 +1093,7 @@ b:windows-x86_64-package:
         - .windows_x86_64_package
         - .cmake_build_windows
         - .cmake_build_package_artifacts
-        - .windows_tags_x86_64_package
+        - .windows_tags_nonconcurrent_vs2022
         - .run_only_for_package
     dependencies:
         - p:doc-package
@@ -1107,7 +1107,7 @@ k:windows-x86_64-package:
         - .windows_x86_64_package
         - .cmake_package_windows
         - .cmake_release_artifacts
-        - .windows_tags_x86_64_package
+        - .windows_tags_nonconcurrent_vs2022
         - .run_only_for_package
     dependencies:
         - b:windows-x86_64-package
@@ -1130,7 +1130,7 @@ b:windows-i386-package:
         - .windows_i386_package
         - .cmake_build_windows
         - .cmake_build_package_artifacts
-        - .windows_tags_x86_64_package
+        - .windows_tags_nonconcurrent_vs2022
         - .run_only_for_package
     dependencies:
         - p:doc-package
@@ -1144,7 +1144,7 @@ k:windows-i386-package:
         - .windows_i386_package
         - .cmake_package_windows
         - .cmake_release_artifacts
-        - .windows_tags_x86_64_package
+        - .windows_tags_nonconcurrent_vs2022
         - .run_only_for_package
     dependencies:
         - b:windows-i386-package
@@ -1167,7 +1167,7 @@ b:windows-arm64-package:
         - .windows_arm64_package
         - .cmake_build_windows
         - .cmake_build_package_artifacts
-        - .windows_tags_arm64_package
+        - .windows_tags_nonconcurrent_vs2022_arm64
         - .run_only_for_package
     dependencies:
         - p:doc-package
@@ -1181,7 +1181,7 @@ k:windows-arm64-package:
         - .windows_arm64_package
         - .cmake_package_windows
         - .cmake_release_artifacts
-        - .windows_tags_arm64_package
+        - .windows_tags_nonconcurrent_vs2022_arm64
         - .run_only_for_package
     dependencies:
         - b:windows-arm64-package
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index 5fd1dc7643..eeed6405a8 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -43,23 +43,11 @@
         VCVARSPLATFORM: "x86"
         VCVARSVERSION: "14.34.31933"
 
-.windows_vcvarsall_vs2022_x64_package:
-    variables:
-        VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
-        VCVARSPLATFORM: "x64"
-        VCVARSVERSION: "14.32.31326"
-
-.windows_vcvarsall_vs2022_x86_package:
-    variables:
-        VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
-        VCVARSPLATFORM: "x86"
-        VCVARSVERSION: "14.32.31326"
-
-.windows_vcvarsall_vs2022_x64_arm64_package:
+.windows_vcvarsall_vs2022_x64_arm64:
     variables:
         VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "x64_arm64"
-        VCVARSVERSION: "14.32.31326"
+        VCVARSVERSION: "14.34.31933"
 
 .windows_vs2022_x64_ninja:
     extends:
@@ -80,7 +68,7 @@
 .windows_x86_64_package:
     extends:
         - .windows_package
-        - .windows_vcvarsall_vs2022_x64_package
+        - .windows_vcvarsall_vs2022_x64
 
     variables:
         CMAKE_CONFIGURATION: windows_x86_64_package
@@ -88,7 +76,7 @@
 .windows_i386_package:
     extends:
         - .windows_package
-        - .windows_vcvarsall_vs2022_x86_package
+        - .windows_vcvarsall_vs2022_x86
 
     variables:
         CMAKE_CONFIGURATION: windows_i386_package
@@ -96,7 +84,7 @@
 .windows_arm64_package:
     extends:
         - .windows_package
-        - .windows_vcvarsall_vs2022_x64_arm64_package
+        - .windows_vcvarsall_vs2022_x64_arm64
 
     variables:
         CMAKE_CONFIGURATION: windows_arm64_package
@@ -247,6 +235,15 @@
         - msvc-19.34
         - nonconcurrent
 
+.windows_tags_nonconcurrent_vs2022_arm64:
+    tags:
+        - cmake # Since this is a bare runner, pin to a project.
+        - windows
+        - shell
+        - vs2022
+        - msvc-19.34-arm64
+        - nonconcurrent
+
 .windows_tags_concurrent_vs2022:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
@@ -272,24 +269,6 @@
         - shell
         - concurrent
 
-.windows_tags_x86_64_package:
-    tags:
-        - cmake # Since this is a bare runner, pin to a project.
-        - windows
-        - shell
-        - vs2022
-        - msvc-19.32
-        - nonconcurrent
-
-.windows_tags_arm64_package:
-    tags:
-        - cmake # Since this is a bare runner, pin to a project.
-        - windows
-        - shell
-        - vs2022
-        - msvc-19.32-arm64
-        - nonconcurrent
-
 ## Windows-specific scripts
 
 .before_script_windows: &before_script_windows