windows-2019 image retired for ADO

.azuredevops/pipelines/FX11-GitHub-CMake.yml

@@ -35,11 +35,11 @@ name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
 
 variables:
   Codeql.Enabled: false
-  VS_GENERATOR: 'Visual Studio 16 2019'
+  VS_GENERATOR: 'Visual Studio 17 2022'
   WIN10_SDK: '10.0.19041.0'
 
 pool:
-  vmImage: windows-2019
+  vmImage: windows-2022
 
 jobs:
   - job: CMAKE_BUILD
@@ -53,7 +53,7 @@ jobs:
         inputs:
           cwd: '$(Build.SourcesDirectory)'
           cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
       - task: CMake@1
         displayName: 'CMake (MSVC): Build x64 Debug'
         inputs:
@@ -69,7 +69,7 @@ jobs:
         inputs:
           cwd: '$(Build.SourcesDirectory)'
           cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A Win32 -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -G "$(VS_GENERATOR)" -T v142 -A Win32 -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
       - task: CMake@1
         displayName: 'CMake (MSVC): Build x86 Debug'
         inputs:
@@ -85,7 +85,7 @@ jobs:
         inputs:
           cwd: '$(Build.SourcesDirectory)'
           cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A ARM64 -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -G "$(VS_GENERATOR)" -T v142 -A ARM64 -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
       - task: CMake@1
         displayName: 'CMake (MSVC): Build ARM64 Debug'
         inputs:
@@ -101,41 +101,9 @@ jobs:
         inputs:
           cwd: '$(Build.SourcesDirectory)'
           cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out4 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out4 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0
       - task: CMake@1
         displayName: 'CMake (UWP): Build x64'
         inputs:
           cwd: '$(Build.SourcesDirectory)'
           cmakeArgs: --build out4 -v
-      - task: CMake@1
-        displayName: 'CMake (ClangCl): Config x64'
-        inputs:
-          cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out6 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-      - task: CMake@1
-        displayName: 'CMake (ClangCl): Build x64 Debug'
-        inputs:
-          cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: --build out6 -v --config Debug
-      - task: CMake@1
-        displayName: 'CMake (ClangCl): Build x64 Release'
-        inputs:
-          cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: --build out6 -v --config RelWithDebInfo
-      - task: CMake@1
-        displayName: 'CMake (MSVC Spectre): Config x64'
-        inputs:
-          cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out7 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-      - task: CMake@1
-        displayName: 'CMake (MSVC Spectre): Build x64 Debug'
-        inputs:
-          cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: --build out7 -v --config Debug
-      - task: CMake@1
-        displayName: 'CMake (MSVC Spectre): Build x64 Release'
-        inputs:
-          cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: --build out7 -v --config RelWithDebInfo

.azuredevops/pipelines/FX11-GitHub.yml

@@ -34,7 +34,7 @@ variables:
   Codeql.Enabled: false
 
 pool:
-  vmImage: windows-2019
+  vmImage: windows-2022
 
 jobs:
   - job: DESKTOP_BUILD
@@ -59,22 +59,7 @@ jobs:
           BuildPlatform: Win32
           BuildConfiguration: Debug
           SpectreMitigation: false
-        Release_x64_SpectreMitigated:
-          BuildPlatform: x64
-          BuildConfiguration: Release
-          SpectreMitigation: 'Spectre'
-        Debug_x64_SpectreMitigated:
-          BuildPlatform: x64
-          BuildConfiguration: Debug
-          SpectreMitigation: 'Spectre'
-        Release_x86_SpectreMitigated:
-          BuildPlatform: Win32
-          BuildConfiguration: Release
-          SpectreMitigation: 'Spectre'
-        Debug_x86_SpectreMitigated:
-          BuildPlatform: Win32
-          BuildConfiguration: Debug
-          SpectreMitigation: 'Spectre'
+        # windows-2022 image is missing v142 spectre-mitigated libraries
     steps:
       - checkout: self
         clean: true