GHA and ADO pipeline updates (#623)

2026-02-04 04:16:12 +01:00 · 2025-07-22 16:22:37 -07:00
parent 32b2a8ef35
commit 9a84cfdc5e
17 changed files with 585 additions and 310 deletions
--- a/.azuredevops/pipelines/DirectXTex-GitHub-CMake-Xbox-Dev17.yml
+++ b/.azuredevops/pipelines/DirectXTex-GitHub-CMake-Xbox-Dev17.yml
@@ -32,7 +32,6 @@ resources:
    - repository: self
      type: git
      ref: refs/heads/main
-      trigger: none
    - repository: testRepo
      name: walbourn/directxtextest
      type: github
@@ -51,12 +50,14 @@ variables:
    value: '10.0.19041.0'
  - name: EXTRACTED_FOLDER
    value: '$(ExtractedFolder)'
+  - name: GDK_EDITION
+    value: $(GDKEditionNumber)
  - name: URL_FEED
    value: $(ADOFeedURL)
  - name: VC_PATH
    value: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
  - name: GameDKLatest
-    value: '$(ExtractedFolder)\Microsoft.gdk.xbox.$(GDK_EDITION)\native\$(GDK_EDITION)\'
+    value: '$(ExtractedFolder)\Microsoft.gdk.xbox\native\$(GDK_EDITION)\'
  - name: skipNugetSecurityAnalysis
    value: true # We explicitly call this task so we don't need it to be auto-injected

@@ -97,16 +98,13 @@ jobs:
        displayName: 'Secure Supply Chain Analysis'
      - task: NuGetAuthenticate@1
        displayName: 'NuGet Auth'
-      - task: NuGetCommand@2
-        displayName: NuGet install PGDK
+      - task: PowerShell@2
+        displayName: 'NuGet Install GDK'
        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
-      - task: NuGetCommand@2
-        displayName: NuGet install GDKX
-        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+          targetType: filePath
+          filePath: ./build/RestoreGDK.ps1
+          arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
+          failOnStderr: true
      - task: CMake@1
        displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S)'
        inputs:
@@ -251,16 +249,13 @@ jobs:
        displayName: 'Secure Supply Chain Analysis'
      - task: NuGetAuthenticate@1
        displayName: 'NuGet Auth'
-      - task: NuGetCommand@2
-        displayName: NuGet install PGDK
+      - task: PowerShell@2
+        displayName: 'NuGet Install GDK'
        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
-      - task: NuGetCommand@2
-        displayName: NuGet install GDKX
-        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+          targetType: filePath
+          filePath: ./build/RestoreGDK.ps1
+          arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
+          failOnStderr: true
      - task: CmdLine@2
        displayName: Setup BWOI for GDK command-line
        inputs:
@@ -345,16 +340,13 @@ jobs:
        displayName: 'Secure Supply Chain Analysis'
      - task: NuGetAuthenticate@1
        displayName: 'NuGet Auth'
-      - task: NuGetCommand@2
-        displayName: NuGet install PGDK
+      - task: PowerShell@2
+        displayName: 'NuGet Install GDK'
        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
-      - task: NuGetCommand@2
-        displayName: NuGet install GDKX
-        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+          targetType: filePath
+          filePath: ./build/RestoreGDK.ps1
+          arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
+          failOnStderr: true
      - task: CmdLine@2
        displayName: Setup BWOI for GDK command-line
        inputs:
--- a/.azuredevops/pipelines/DirectXTex-GitHub-CMake-Xbox.yml
+++ b/.azuredevops/pipelines/DirectXTex-GitHub-CMake-Xbox.yml
@@ -58,20 +58,22 @@ variables:
  - name: Codeql.Enabled
    value: false
  - name: VS_GENERATOR
-    value: 'Visual Studio 16 2019'
+    value: 'Visual Studio 17 2022'
  - name: WIN10_SDK
    value: '10.0.19041.0'
  - name: EXTRACTED_FOLDER
    value: '$(ExtractedFolder)'
+  - name: GDK_EDITION
+    value: $(GDKEditionNumber)
  - name: URL_FEED
    value: $(ADOFeedURL)
  - name: GameDKLatest
-    value: '$(ExtractedFolder)\Microsoft.gdk.xbox.$(GDK_EDITION)\native\$(GDK_EDITION)\'
+    value: '$(ExtractedFolder)\Microsoft.gdk.xbox\native\$(GDK_EDITION)\'
  - name: skipNugetSecurityAnalysis
    value: true # We explicitly call this task so we don't need it to be auto-injected

 pool:
-  vmImage: windows-2019
+  vmImage: windows-2022

 jobs:
  - job: CMAKE_BUILD
@@ -107,22 +109,19 @@ jobs:
        displayName: 'Secure Supply Chain Analysis'
      - task: NuGetAuthenticate@1
        displayName: 'NuGet Auth'
-      - task: NuGetCommand@2
-        displayName: NuGet install PGDK
+      - task: PowerShell@2
+        displayName: 'NuGet Install GDK'
        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
-      - task: NuGetCommand@2
-        displayName: NuGet install GDKX
-        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+          targetType: filePath
+          filePath: ./build/RestoreGDK.ps1
+          arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
+          failOnStderr: true
      - task: CMake@1
        displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S)'
        inputs:
          cwd: ''
          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out
            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
            -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
      - task: CMake@1
@@ -135,66 +134,30 @@ jobs:
        inputs:
          cwd: ''
          cmakeArgs: --build out -v --config RelWithDebInfo
-      - task: CMake@1
-        displayName: 'CMake (ClangCl): Config x64 (Xbox Series X|S)'
-        inputs:
-          cwd: ''
-          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2
-            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-            -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
-      - task: CMake@1
-        displayName: 'CMake (ClangCl): Build x64 Debug (Xbox Series X|S)'
-        inputs:
-          cwd: ''
-          cmakeArgs: --build out2 -v --config Debug
-      - task: CMake@1
-        displayName: 'CMake (ClangCl): Build x64 Release (Xbox Series X|S)'
-        inputs:
-          cwd: ''
-          cmakeArgs: --build out2 -v --config RelWithDebInfo
      - task: CMake@1
        displayName: 'CMake (MSVC): Config x64 (Xbox One)'
        inputs:
          cwd: ''
          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out3
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out2
            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
            -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
      - task: CMake@1
        displayName: 'CMake (MSVC): Build x64 Debug (Xbox One)'
        inputs:
          cwd: ''
-          cmakeArgs: --build out3 -v --config Debug
+          cmakeArgs: --build out2 -v --config Debug
      - task: CMake@1
        displayName: 'CMake (MSVC): Build x64 Release (Xbox One)'
        inputs:
          cwd: ''
-          cmakeArgs: --build out3 -v --config RelWithDebInfo
-      - task: CMake@1
-        displayName: 'CMake (ClangCl): Config x64 (Xbox One)'
-        inputs:
-          cwd: ''
-          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4
-            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-            -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
-      - task: CMake@1
-        displayName: 'CMake (ClangCl): Build x64 Debug (Xbox One)'
-        inputs:
-          cwd: ''
-          cmakeArgs: --build out4 -v --config Debug
-      - task: CMake@1
-        displayName: 'CMake (ClangCl): Build x64 Release (Xbox One)'
-        inputs:
-          cwd: ''
-          cmakeArgs: --build out4 -v --config RelWithDebInfo
+          cmakeArgs: --build out2 -v --config RelWithDebInfo
      - task: CMake@1
        displayName: 'CMake (DLL): Config x64 (Xbox Series X|S)'
        inputs:
          cwd: ''
          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out5
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out3
            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
            -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
            -DBUILD_SHARED_LIBS=ON
@@ -202,18 +165,18 @@ jobs:
        displayName: 'CMake (DLL): Build x64 Debug (Xbox Series X|S)'
        inputs:
          cwd: ''
-          cmakeArgs: --build out5 -v --config Debug
+          cmakeArgs: --build out3 -v --config Debug
      - task: CMake@1
        displayName: 'CMake (DLL): Build x64 Release (Xbox Series X|S)'
        inputs:
          cwd: ''
-          cmakeArgs: --build out5 -v --config RelWithDebInfo
+          cmakeArgs: --build out3 -v --config RelWithDebInfo
      - task: CMake@1
        displayName: 'CMake (DLL): Config x64 (Xbox One)'
        inputs:
          cwd: ''
          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out6
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out4
            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
            -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
            -DBUILD_SHARED_LIBS=ON
@@ -221,9 +184,9 @@ jobs:
        displayName: 'CMake (DLL): Build x64 Debug (Xbox One)'
        inputs:
          cwd: ''
-          cmakeArgs: --build out6 -v --config Debug
+          cmakeArgs: --build out4 -v --config Debug
      - task: CMake@1
        displayName: 'CMake (DLL): Build x64 Release (Xbox One)'
        inputs:
          cwd: ''
-          cmakeArgs: --build out6 -v --config RelWithDebInfo
+          cmakeArgs: --build out4 -v --config RelWithDebInfo
--- a/.azuredevops/pipelines/DirectXTex-GitHub-CMake.yml
+++ b/.azuredevops/pipelines/DirectXTex-GitHub-CMake.yml
@@ -69,14 +69,14 @@ variables:
  - name: VCPKG_MANIFEST_DIR
    value: '$(Build.SourcesDirectory)/build'
  - name: VS_GENERATOR
-    value: 'Visual Studio 16 2019'
+    value: 'Visual Studio 17 2022'
  - name: WIN10_SDK
    value: '10.0.19041.0'
  - name: WIN11_SDK
    value: '10.0.22000.0'

 pool:
-  vmImage: windows-2019
+  vmImage: windows-2022

 jobs:
  - job: CMAKE_BUILD
@@ -90,7 +90,7 @@ jobs:
        inputs:
          cwd: $(Build.SourcesDirectory)
          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out
            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
            -DBUILD_DX12=OFF
      - task: CMake@1
@@ -108,7 +108,7 @@ jobs:
        inputs:
          cwd: $(Build.SourcesDirectory)
          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A Win32 -B out2
+            -G "$(VS_GENERATOR)" -T v142 -A Win32 -B out2
            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
            -DBUILD_DX12=OFF
      - task: CMake@1
@@ -126,82 +126,32 @@ jobs:
        inputs:
          cwd: $(Build.SourcesDirectory)
          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out3
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out3
            -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
      - task: CMake@1
        displayName: 'CMake (UWP): Build x64'
        inputs:
          cwd: $(Build.SourcesDirectory)
          cmakeArgs: --build out3 -v
-      - task: CMake@1
-        displayName: 'CMake (ClangCl): Config x64'
-        inputs:
-          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4
-            -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-      - task: CMake@1
-        displayName: 'CMake (ClangCl): Build x64 Debug'
-        inputs:
-          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: --build out4 -v --config Debug
-      - task: CMake@1
-        displayName: 'CMake (ClangCl): Build x64 Release'
-        inputs:
-          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: --build out4 -v --config RelWithDebInfo
      - task: CMake@1
        displayName: 'CMake (Win10): Config'
        inputs:
          cwd: $(Build.SourcesDirectory)
          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out5
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out4
            -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
            -DBUILD_DX12=ON
      - task: CMake@1
        displayName: 'CMake (Win10): Build'
        inputs:
          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: --build out5 -v --config Debug
-      - task: CMake@1
-        displayName: 'CMake (MSVC Spectre): Config x64'
-        inputs:
-          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out6
-            -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 out6 -v --config Debug
-      - task: CMake@1
-        displayName: 'CMake (MSVC Spectre): Build x64 Release'
-        inputs:
-          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: --build out6 -v --config RelWithDebInfo
-      - task: CMake@1
-        displayName: 'CMake (Win10 Spectre): Config'
-        inputs:
-          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out7
-            -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 out7 -v --config Debug
+          cmakeArgs: --build out4 -v --config Debug
      - task: CMake@1
        displayName: 'CMake (NO_WCHAR_T): Config'
        inputs:
          cwd: $(Build.SourcesDirectory)
          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out8
+            -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
@@ -209,13 +159,13 @@ jobs:
        displayName: 'CMake (NO_WCHAR_T): Build'
        inputs:
          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: --build out8 -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)" -A x64 -B out9
+            -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
@@ -223,25 +173,25 @@ jobs:
        displayName: 'CMake (DLL): Build x64 Debug'
        inputs:
          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: --build out9 -v --config Debug
+          cmakeArgs: --build out6 -v --config Debug
      - task: CMake@1
        displayName: 'CMake (DLL): Build x64 Release'
        inputs:
          cwd: $(Build.SourcesDirectory)
-          cmakeArgs: --build out9 -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)" -A x64 -B out10
+            -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 out10 -v
+          cmakeArgs: --build out7 -v

  - job: CMAKE_BUILD_VCPKG
    displayName: CMake using VCPKG
@@ -272,7 +222,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)
            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
      - task: CMake@1
@@ -285,7 +235,7 @@ jobs:
        inputs:
          cwd: $(Build.SourcesDirectory)
          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out2 -DENABLE_OPENEXR_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out2 -DENABLE_OPENEXR_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
      - task: CMake@1
@@ -298,7 +248,7 @@ jobs:
        inputs:
          cwd: $(Build.SourcesDirectory)
          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out3 -DENABLE_LIBJPEG_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out3 -DENABLE_LIBJPEG_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
      - task: CMake@1
@@ -311,7 +261,7 @@ jobs:
        inputs:
          cwd: $(Build.SourcesDirectory)
          cmakeArgs: >
-            -G "$(VS_GENERATOR)" -A x64 -B out4 -DENABLE_LIBPNG_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out4 -DENABLE_LIBPNG_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
            -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
            -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
      - task: CMake@1
--- a/.azuredevops/pipelines/DirectXTex-GitHub-GDK-Dev17.yml
+++ b/.azuredevops/pipelines/DirectXTex-GitHub-GDK-Dev17.yml
@@ -34,7 +34,6 @@ resources:
    - repository: self
      type: git
      ref: refs/heads/main
-      trigger: none

 name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)

@@ -47,6 +46,8 @@ variables:
    value: false
  - name: EXTRACTED_FOLDER
    value: '$(ExtractedFolder)'
+  - name: GDK_EDITION
+    value: $(GDKEditionNumber)
  - name: GDKEnableBWOI
    value: true
  - name: URL_FEED
@@ -92,16 +93,13 @@ jobs:
        displayName: 'Secure Supply Chain Analysis'
      - task: NuGetAuthenticate@1
        displayName: 'NuGet Auth'
-      - task: NuGetCommand@2
-        displayName: NuGet install PGDK
+      - task: PowerShell@2
+        displayName: 'NuGet Install GDK'
        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
-      - task: NuGetCommand@2
-        displayName: NuGet install GDKX
-        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+          targetType: filePath
+          filePath: ./build/RestoreGDK.ps1
+          arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
+          failOnStderr: true
      - task: CopyFiles@2
        displayName: Set up Directory.Build.props
        inputs:
@@ -112,7 +110,6 @@ jobs:
        displayName: Setup BWOI VCTargets
        inputs:
          solution: build/SetupBWOI.targets
-          msbuildVersion: 17.0
          msbuildArchitecture: x64
          msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
      - template: '/.azuredevops/templates/DirectXTex-build-gdk.yml'
@@ -155,16 +152,13 @@ jobs:
        displayName: 'Secure Supply Chain Analysis'
      - task: NuGetAuthenticate@1
        displayName: 'NuGet Auth'
-      - task: NuGetCommand@2
-        displayName: NuGet install PGDK
+      - task: PowerShell@2
+        displayName: 'NuGet Install GDK'
        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
-      - task: NuGetCommand@2
-        displayName: NuGet install GDKX
-        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+          targetType: filePath
+          filePath: ./build/RestoreGDK.ps1
+          arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
+          failOnStderr: true
      - task: CmdLine@2
        displayName: Setup BWOI for GDK command-line
        inputs:
@@ -274,16 +268,13 @@ jobs:
        displayName: 'Secure Supply Chain Analysis'
      - task: NuGetAuthenticate@1
        displayName: 'NuGet Auth'
-      - task: NuGetCommand@2
-        displayName: NuGet install PGDK
+      - task: PowerShell@2
+        displayName: 'NuGet Install GDK'
        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
-      - task: NuGetCommand@2
-        displayName: NuGet install GDKX
-        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+          targetType: filePath
+          filePath: ./build/RestoreGDK.ps1
+          arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
+          failOnStderr: true
      - task: CmdLine@2
        displayName: Setup BWOI for GDK command-line
        inputs:
--- a/.azuredevops/pipelines/DirectXTex-GitHub-GDK.yml
+++ b/.azuredevops/pipelines/DirectXTex-GitHub-GDK.yml
@@ -58,7 +58,7 @@ resources:
 name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)

 pool:
-  vmImage: windows-2019
+  vmImage: windows-2022

 variables:
  - group: dxtex-shared-variables
@@ -66,6 +66,8 @@ variables:
    value: false
  - name: EXTRACTED_FOLDER
    value: '$(ExtractedFolder)'
+  - name: GDK_EDITION
+    value: $(GDKEditionNumber)
  - name: GDKEnableBWOI
    value: true
  - name: URL_FEED
@@ -109,16 +111,13 @@ jobs:
        displayName: 'Secure Supply Chain Analysis'
      - task: NuGetAuthenticate@1
        displayName: 'NuGet Auth'
-      - task: NuGetCommand@2
-        displayName: NuGet install PGDK
+      - task: PowerShell@2
+        displayName: 'NuGet Install GDK'
        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
-      - task: NuGetCommand@2
-        displayName: NuGet install GDKX
-        inputs:
-          command: custom
-          arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
+          targetType: filePath
+          filePath: ./build/RestoreGDK.ps1
+          arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
+          failOnStderr: true
      - task: CopyFiles@2
        displayName: Set up Directory.Build.props
        inputs:
@@ -129,10 +128,9 @@ jobs:
        displayName: Setup BWOI VCTargets
        inputs:
          solution: build/SetupBWOI.targets
-          msbuildVersion: 16.0
          msbuildArchitecture: x64
          msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
      - template: '/.azuredevops/templates/DirectXTex-build-gdk.yml'
        parameters:
-          msVersion: '16.0'
+          msVersion: '17.0'
          vsYear: 2019
--- a/.azuredevops/pipelines/DirectXTex-GitHub-Test-Dev17.yml
+++ b/.azuredevops/pipelines/DirectXTex-GitHub-Test-Dev17.yml
@@ -39,9 +39,13 @@ pool:
  vmImage: windows-2022

 variables:
-  Codeql.Enabled: false
-  VC_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
-  GUID_FEED: $(ADOFeedGUID)
+  - group: dxtex-shared-variables
+  - name: Codeql.Enabled
+    value: false
+  - name: VC_PATH
+    value: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
+  - name: GUID_FEED
+    value: $(ADOFeedGUID)

 jobs:
  - job: DESKTOP_BUILD
@@ -93,7 +97,6 @@ jobs:
        displayName: Build solution DirectXTex_Tests_Desktop_2022.sln
        inputs:
          solution: Tests/DirectXTex_Tests_Desktop_2022.sln
-          vsVersion: 17.0
          msbuildArgs: /p:PreferredToolArchitecture=x64
          platform: '$(BuildPlatform)'
          configuration: '$(BuildConfiguration)'
@@ -103,7 +106,6 @@ jobs:
        displayName: Build solution DirectXTex_Tests_Desktop_2022_Win10.sln
        inputs:
          solution: Tests/DirectXTex_Tests_Desktop_2022_Win10.sln
-          vsVersion: 17.0
          msbuildArgs: /p:PreferredToolArchitecture=x64
          platform: '$(BuildPlatform)'
          configuration: '$(BuildConfiguration)'
--- a/.azuredevops/pipelines/DirectXTex-GitHub-Test.yml
+++ b/.azuredevops/pipelines/DirectXTex-GitHub-Test.yml
@@ -36,14 +36,12 @@ resources:
 name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)

 pool:
-  vmImage: windows-2019
+  vmImage: windows-2022

 variables:
  - group: dxtex-shared-variables
  - name: Codeql.Enabled
    value: false
-  - name: VC_PATH
-    value: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC'
  - name: GUID_FEED
    value: $(ADOFeedGUID)

@@ -91,7 +89,6 @@ jobs:
        displayName: Build solution DirectXTex_Tests_Desktop_2019.sln
        inputs:
          solution: Tests/DirectXTex_Tests_Desktop_2019.sln
-          vsVersion: 16.0
          msbuildArgs: /p:PreferredToolArchitecture=x64
          platform: '$(BuildPlatform)'
          configuration: '$(BuildConfiguration)'
@@ -99,89 +96,6 @@ jobs:
        displayName: Build solution DirectXTex_Tests_Desktop_2019_Win10.sln
        inputs:
          solution: Tests/DirectXTex_Tests_Desktop_2019_Win10.sln
-          vsVersion: 16.0
          msbuildArgs: /p:PreferredToolArchitecture=x64
          platform: '$(BuildPlatform)'
          configuration: '$(BuildConfiguration)'
-
-  - job: CMAKE_BUILD_X64
-    displayName: 'CMake for X64 BUILD_TESTING=ON'
-    timeoutInMinutes: 120
-    workspace:
-      clean: all
-    steps:
-      - checkout: self
-        clean: true
-        fetchTags: false
-        fetchDepth: 1
-        path: 's'
-      - checkout: testRepo
-        displayName: Fetch Tests
-        clean: true
-        fetchTags: false
-        fetchDepth: 1
-        path: 's/Tests'
-      - task: CmdLine@2
-        displayName: Setup environment for CMake to use VS
-        inputs:
-          script: |
-            call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat"
-            echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
-            echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
-            echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
-            echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
-            echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
-            echo ##vso[task.prependpath]%VCToolsInstallDir%bin\Hostx64\x64
-            echo ##vso[task.setvariable variable=EXTERNAL_INCLUDE;]%EXTERNAL_INCLUDE%
-            echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
-            echo ##vso[task.setvariable variable=LIB;]%LIB%
-
-      - task: CMake@1
-        displayName: CMake (MSVC; x64-Debug) Config
-        inputs:
-          cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: --preset=x64-Debug
-      - task: CMake@1
-        displayName: CMake (MSVC; x64-Debug) Build
-        inputs:
-          cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: --build out/build/x64-Debug -v
-      - task: DeleteFiles@1
-        inputs:
-          Contents: 'out'
-      - task: CMake@1
-        displayName: CMake (MSVC; x64-Release) Config
-        inputs:
-          cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: --preset=x64-Release
-      - task: CMake@1
-        displayName: CMake (MSVC; x64-Release) Build
-        inputs:
-          cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: --build out/build/x64-Release -v
-      - task: DeleteFiles@1
-        inputs:
-          Contents: 'out'
-      - task: CMake@1
-        displayName: CMake (clang/LLVM; x64-Debug) Config
-        inputs:
-          cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: --preset=x64-Debug-Clang
-      - task: CMake@1
-        displayName: CMake (clang/LLVM; x64-Debug) Build
-        inputs:
-          cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: --build out/build/x64-Debug-Clang -v
-      - task: DeleteFiles@1
-        inputs:
-          Contents: 'out'
-      - task: CMake@1
-        displayName: CMake (clang/LLVM; x64-Release) Config
-        inputs:
-          cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: --preset=x64-Release-Clang
-      - task: CMake@1
-        displayName: CMake (clang/LLVM; x64-Release) Build
-        inputs:
-          cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: --build out/build/x64-Release-Clang -v
--- a/.azuredevops/pipelines/DirectXTex-GitHub.yml
+++ b/.azuredevops/pipelines/DirectXTex-GitHub.yml
@@ -35,7 +35,7 @@ variables:
  Codeql.Enabled: false

 pool:
-  vmImage: windows-2019
+  vmImage: windows-2022

 jobs:
  - job: DESKTOP_BUILD
@@ -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