From 7662344faa00c6817072ef1ea53a8132bac20313 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 15 Mar 2021 10:08:19 -0400
Subject: gitlab-ci: Fix using VS 16.8 toolset under VS 16.9

The 16.8 and 16.9 toolset numbers vary only in their third component.
Use CMake 3.19.7 for three-component toolset version specification
support.
---
 .gitlab/ci/cmake.ps1   | 4 ++--
 .gitlab/os-windows.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab/ci/cmake.ps1 b/.gitlab/ci/cmake.ps1
index c5bf958..3d6fb81 100755
--- a/.gitlab/ci/cmake.ps1
+++ b/.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"
 
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index 3e9634d..0b0a948 100644
--- a/.gitlab/os-windows.yml
+++ b/.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
-- 
cgit v0.12