From 86093dd6184a1b549b8c9143b13b631a3a94d528 Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <chuckw@microsoft.com>
Date: Thu, 17 Jul 2025 17:33:36 -0700
Subject: [PATCH] windows-2022 image is missing v142 spectre-mitigated
 libraries

---
 .../pipelines/DirectXTex-GitHub-CMake.yml     | 47 +++----------------
 .azuredevops/pipelines/DirectXTex-GitHub.yml  | 17 +------
 2 files changed, 8 insertions(+), 56 deletions(-)

diff --git a/.azuredevops/pipelines/DirectXTex-GitHub-CMake.yml b/.azuredevops/pipelines/DirectXTex-GitHub-CMake.yml
index 25f1d3a..c80cd1f 100644
--- a/.azuredevops/pipelines/DirectXTex-GitHub-CMake.yml
+++ b/.azuredevops/pipelines/DirectXTex-GitHub-CMake.yml
@@ -146,45 +146,12 @@ jobs:
         inputs:
           cwd: $(Build.SourcesDirectory)
           cmakeArgs: --build out4 -v --config Debug
-      - task: CMake@1
-        displayName: 'CMake (MSVC Spectre): Config x64'
-        inputs:
-          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out5
-            -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
-            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-            -DBUILD_DX12=OFF
-      - task: CMake@1
-        displayName: 'CMake (MSVC Spectre): Build x64 Debug'
-        inputs:
-          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: --build out5 -v --config Debug
-      - task: CMake@1
-        displayName: 'CMake (MSVC Spectre): Build x64 Release'
-        inputs:
-          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: --build out5 -v --config RelWithDebInfo
-      - task: CMake@1
-        displayName: 'CMake (Win10 Spectre): Config'
-        inputs:
-          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out6
-            -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
-            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-            -DBUILD_DX12=ON
-      - task: CMake@1
-        displayName: 'CMake (Win10 Spectre): Build'
-        inputs:
-          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: --build out6 -v --config Debug
       - task: CMake@1
         displayName: 'CMake (NO_WCHAR_T): Config'
         inputs:
           cwd: $(Build.SourcesDirectory)
           cmakeArgs: >
-            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out7
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out5
             -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
             -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
             -DBUILD_DX12=ON
@@ -192,13 +159,13 @@ jobs:
         displayName: 'CMake (NO_WCHAR_T): Build'
         inputs:
           cwd: $(Build.SourcesDirectory)
-          cmakeArgs: --build out7 -v --config Debug
+          cmakeArgs: --build out5 -v --config Debug
       - task: CMake@1
         displayName: 'CMake (DLL): Config x64'
         inputs:
           cwd: $(Build.SourcesDirectory)
           cmakeArgs: >
-            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out8
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out6
             -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
             -DBUILD_DX12=ON
             -DBUILD_SHARED_LIBS=ON
@@ -206,25 +173,25 @@ jobs:
         displayName: 'CMake (DLL): Build x64 Debug'
         inputs:
           cwd: $(Build.SourcesDirectory)
-          cmakeArgs: --build out8 -v --config Debug
+          cmakeArgs: --build out6 -v --config Debug
       - task: CMake@1
         displayName: 'CMake (DLL): Build x64 Release'
         inputs:
           cwd: $(Build.SourcesDirectory)
-          cmakeArgs: --build out8 -v --config RelWithDebInfo
+          cmakeArgs: --build out6 -v --config RelWithDebInfo
       - task: CMake@1
         displayName: 'CMake (UWP DLL): Config x64'
         inputs:
           cwd: $(Build.SourcesDirectory)
           cmakeArgs: >
-            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out9
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out7
             -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
             -DBUILD_SHARED_LIBS=ON
       - task: CMake@1
         displayName: 'CMake (UWP DLL): Build x64'
         inputs:
           cwd: $(Build.SourcesDirectory)
-          cmakeArgs: --build out9 -v
+          cmakeArgs: --build out7 -v
 
   - job: CMAKE_BUILD_VCPKG
     displayName: CMake using VCPKG
diff --git a/.azuredevops/pipelines/DirectXTex-GitHub.yml b/.azuredevops/pipelines/DirectXTex-GitHub.yml
index 9a4be84..ab5f674 100644
--- a/.azuredevops/pipelines/DirectXTex-GitHub.yml
+++ b/.azuredevops/pipelines/DirectXTex-GitHub.yml
@@ -61,22 +61,7 @@ jobs:
           BuildPlatform: x86
           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: x86
-          BuildConfiguration: Release
-          SpectreMitigation: 'Spectre'
-        Debug_x86_SpectreMitigated:
-          BuildPlatform: x86
-          BuildConfiguration: Debug
-          SpectreMitigation: 'Spectre'
+        # windows-2022 image is missing v142 spectre-mitigated libraries
     steps:
       - checkout: self
         clean: true