GHA and ADO pipeline updates

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

@@ -55,12 +55,12 @@ 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'
   WIN11_SDK: '10.0.22000.0'
 
 pool:
-  vmImage: windows-2019
+  vmImage: windows-2022
 
 jobs:
   - job: CMAKE_BUILD
@@ -74,7 +74,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_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON
       - task: CMake@1
@@ -92,7 +92,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_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON
       - task: CMake@1
@@ -110,93 +110,56 @@ 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)
-            -DBUILD_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON
-      - 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_XAUDIO_WIN10=ON -DBUILD_TOOLS=OFF
       - task: CMake@1
         displayName: 'CMake (Win10): Build'
         inputs:
           cwd: '$(Build.SourcesDirectory)'
-          cmakeArgs: --build out5 -v
-      - 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_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON
-      - 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
+          cmakeArgs: --build out4 -v
       - task: CMake@1
         displayName: 'CMake (NO_WCHAR_T): Config'
         inputs:
           cwd: '$(Build.SourcesDirectory)'
           cmakeArgs: >
-            -G "$(VS_GENERATOR)" -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)'
       - task: CMake@1
         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)" -A x64 -B out8
+            -G "$(VS_GENERATOR)" -T v142 -A x64 -B out6
             -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
             -DBUILD_XAUDIO_WIN8=ON -DBUILD_TOOLS=ON
             -DBUILD_SHARED_LIBS=ON
       - task: CMake@1
         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

.azuredevops/pipelines/DirectXTK-GitHub-GDK-Dev17.yml

@@ -44,6 +44,8 @@ variables:
     value: false
   - name: EXTRACTED_FOLDER
     value: '$(ExtractedFolder)'
+  - name: GDK_EDITION
+    value: $(GDKEditionNumber)
   - name: GDKEnableBWOI
     value: true
   - name: URL_FEED
@@ -56,6 +58,8 @@ variables:
 jobs:
   - job: BUILD_GDK
     displayName: 'Microsoft Game Development Kit (GDK)'
+    workspace:
+      clean: all
     timeoutInMinutes: 120
     cancelTimeoutInMinutes: 1
     steps:
@@ -90,11 +94,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)
+          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:
@@ -105,15 +111,13 @@ jobs:
         displayName: Setup BWOI VCTargets
         inputs:
           solution: build/SetupBWOI.targets
-          msbuildVersion: 17.0
           msbuildArchitecture: x64
           msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
       - task: VSBuild@1
         displayName: Build solution DirectXTK_GDK_2022 pcdbg
         continueOnError: true
         inputs:
           solution: DirectXTK_GDK_2022.sln
-          vsVersion: 17.0
           platform: Gaming.Desktop.x64
           configuration: Debug
           msbuildArchitecture: x64
@@ -123,14 +127,15 @@ jobs:
         continueOnError: true
         inputs:
           solution: DirectXTK_GDK_2022.sln
-          vsVersion: 17.0
           platform: Gaming.Desktop.x64
           configuration: Release
           msbuildArchitecture: x64
           msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
 
   - job: BUILD_GDK_CMAKE
     displayName: 'Microsoft Game Development Kit (GDK) using CMake'
+    workspace:
+      clean: all
     timeoutInMinutes: 120
     cancelTimeoutInMinutes: 1
     steps:
@@ -164,11 +169,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)
+          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:

.azuredevops/pipelines/DirectXTK-GitHub-GDK.yml

@@ -63,14 +63,16 @@ resources:
 name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
 
 pool:
-  vmImage: windows-2019
+  vmImage: windows-2022
 
 variables:
   - group: dxtk-shared-variables
   - name: Codeql.Enabled
     value: false
   - name: EXTRACTED_FOLDER
     value: '$(ExtractedFolder)'
+  - name: GDK_EDITION
+    value: $(GDKEditionNumber)
   - name: GDKEnableBWOI
     value: true
   - name: URL_FEED
@@ -81,6 +83,8 @@ variables:
 jobs:
   - job: BUILD_GDK
     displayName: 'Microsoft Game Development Kit (GDK)'
+    workspace:
+      clean: all
     timeoutInMinutes: 120
     cancelTimeoutInMinutes: 1
     steps:
@@ -115,11 +119,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)
+          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:
@@ -130,15 +136,13 @@ jobs:
         displayName: Setup BWOI VCTargets
         inputs:
           solution: build/SetupBWOI.targets
-          msbuildVersion: 16.0
           msbuildArchitecture: x64
           msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
       - task: VSBuild@1
         displayName: Build solution DirectXTK_GDK_2019 pcdbg
         continueOnError: true
         inputs:
           solution: DirectXTK_GDK_2019.sln
-          vsVersion: 16.0
           platform: Gaming.Desktop.x64
           configuration: Debug
           msbuildArchitecture: x64
@@ -148,14 +152,15 @@ jobs:
         continueOnError: true
         inputs:
           solution: DirectXTK_GDK_2019.sln
-          vsVersion: 16.0
           platform: Gaming.Desktop.x64
           configuration: Release
           msbuildArchitecture: x64
           msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
 
   - job: BUILD_TESTS_GDK
     displayName: 'Test Suite for Microsoft Game Development Kit (GDK)'
+    workspace:
+      clean: all
     timeoutInMinutes: 120
     cancelTimeoutInMinutes: 1
     steps:
@@ -196,11 +201,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)
+          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:
@@ -211,14 +218,12 @@ jobs:
         displayName: Setup BWOI VCTargets
         inputs:
           solution: build/SetupBWOI.targets
-          msbuildVersion: 16.0
           msbuildArchitecture: x64
           msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
       - task: VSBuild@1
         displayName: Build Tests pcdbg
         inputs:
           solution: '**\*GDK_2019*.sln'
-          vsVersion: 16.0
           platform: Gaming.Desktop.x64
           configuration: Debug
           msbuildArchitecture: x64
@@ -227,7 +232,6 @@ jobs:
         displayName: Build Tests pcrel
         inputs:
           solution: '**\*GDK_2019*.sln'
-          vsVersion: 16.0
           platform: Gaming.Desktop.x64
           configuration: Release
           msbuildArchitecture: x64

.azuredevops/pipelines/DirectXTK-GitHub-Test-Dev17.yml

@@ -27,7 +27,6 @@ resources:
     - repository: self
       type: git
       ref: refs/heads/main
-      trigger: none
     - repository: testRepo
       name: walbourn/directxtktest
       type: github
@@ -92,7 +91,6 @@ jobs:
         displayName: Build solution DirectXTK_Tests_Desktop_2022.sln
         inputs:
           solution: Tests/DirectXTK_Tests_Desktop_2022.sln
-          vsVersion: 17.0
           msbuildArgs: /p:PreferredToolArchitecture=x64
           platform: '$(BuildPlatform)'
           configuration: '$(BuildConfiguration)'
@@ -102,7 +100,6 @@ jobs:
         displayName: Build solution DirectXTK_Tests_Desktop_2022_Win10.sln
         inputs:
           solution: Tests/DirectXTK_Tests_Desktop_2022_Win10.sln
-          vsVersion: 17.0
           msbuildArgs: /p:PreferredToolArchitecture=x64
           platform: '$(BuildPlatform)'
           configuration: '$(BuildConfiguration)'
@@ -149,7 +146,6 @@ jobs:
         displayName: Build solution DirectXTK_Tests_Windows10.sln
         inputs:
           solution: Tests/DirectXTK_Tests_Windows10.sln
-          vsVersion: 17.0
           msbuildArgs: /p:PreferredToolArchitecture=x64 /p:AppxBundle=Never
           platform: '$(BuildPlatform)'
           configuration: '$(BuildConfiguration)'