Merge topic 'ci-vs-16.8-in-16.9' into release-3.20

7662344faa gitlab-ci: Fix using VS 16.8 toolset under VS 16.9

Acked-by: Kitware Robot <[email protected]>
Merge-request: !5910

.gitlab/ci/cmake.ps1

@@ -1,7 +1,7 @@
 $erroractionpreference = "stop"
 
-$version = "3.19.3"
-$sha256sum = "3838E11A0DB08F97D687F061882A1E52807010A313F3AC716015B3587CA3F20E"
+$version = "3.19.7"
+$sha256sum = "E6788D6E23B3026C37FCFA7658075D6B5F9113F26FAE17FE372AD4A7EE62D5FD"
 $filename = "cmake-$version-win64-x64"
 $tarball = "$filename.zip"
 

.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"
+        VCVARSVERSION: "14.28.29333"
 
 ### 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"
+        CMAKE_GENERATOR_TOOLSET: "v142,version=14.28.29333"
         CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
 
 ## Tags