Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into ci-msvc-14.28-16.9

.gitlab/os-windows.yml

@@ -38,7 +38,7 @@
         CMAKE_CONFIGURATION: windows_vs2019_x64_ninja
         VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
         VCVARSPLATFORM: "x64"
-        VCVARSVERSION: "14.28.29333"
+        VCVARSVERSION: "14.28.29910"
 
 ### External testing
 
@@ -49,7 +49,7 @@
         CMAKE_CONFIGURATION: windows_vs2019_x64
         CMAKE_GENERATOR: "Visual Studio 16 2019"
         CMAKE_GENERATOR_PLATFORM: "x64"
-        CMAKE_GENERATOR_TOOLSET: "v142,version=14.28.29333"
+        CMAKE_GENERATOR_TOOLSET: "v142,version=14.28.29910"
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
 ## Tags
@@ -60,7 +60,7 @@
         - windows
         - shell
         - vs2019
-        - msvc-19.28
+        - msvc-19.28-16.9
         - nonconcurrent
 
 .windows_builder_ext_tags:
@@ -69,7 +69,7 @@
         - windows
         - shell
         - vs2019
-        - msvc-19.28
+        - msvc-19.28-16.9
         - concurrent
 
 ## Windows-specific scripts