Update ADO pipeline to use GDK new layouts for 2510 (#649)

2026-02-13 16:06:12 +01:00 · 2025-11-14 15:53:19 -08:00
parent 2f50e14ec2
commit 00f3eb20d0
13 changed files with 532 additions and 222 deletions
--- a/.azuredevops/pipelines/DirectXTex-GitHub-GDK-Dev17.yml
+++ b/.azuredevops/pipelines/DirectXTex-GitHub-GDK-Dev17.yml
@@ -22,6 +22,8 @@ pr:
    include:
      - '.azuredevops/pipelines/DirectXTex-GitHub-GDK-Dev17.yml'
      - '.azuredevops/templates/DirectXTex-build-gdk.yml'
+      - '.azuredevops/templates/DirectXTex-build-gdkx.yml'
+      - '.azuredevops/templates/DirectXTex-setup-gdk-auto.yml'
      - CMakeList.txt
      - build/*.in
      - build/*.cmake
@@ -59,7 +61,7 @@ variables:

 jobs:
  - job: BUILD_GDK
-    displayName: 'Microsoft Game Development Kit (GDK Gaming.Desktop.x64)'
+    displayName: 'Microsoft Game Development Kit (Gaming.*.x64)'
    timeoutInMinutes: 120
    cancelTimeoutInMinutes: 1
    steps:
@@ -94,12 +96,17 @@ jobs:
      - task: NuGetAuthenticate@1
        displayName: 'NuGet Auth'
      - task: PowerShell@2
-        displayName: 'NuGet Install GDK'
+        displayName: 'NuGet Install PC GDK'
        inputs:
          targetType: filePath
          filePath: ./build/RestoreGDK.ps1
          arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
          failOnStderr: true
+      - task: NuGetCommand@2
+        displayName: 'NuGet install Xbox GDK'
+        inputs:
+          command: custom
+          arguments: 'install -directdownload Microsoft.GDK.Xbox -ExcludeVersion -Version $(GDKNuGetPackageVersion) -OutputDirectory $(EXTRACTED_FOLDER)'
      - task: CopyFiles@2
        displayName: Set up Directory.Build.props
        inputs:
@@ -123,8 +130,8 @@ jobs:
          msVersion: '17.0'
          vsYear: 2022

-  - job: BUILD_GDKX
-    displayName: 'Microsoft Game Development Kit (GDK x64)'
+  - job: BUILD_GDKX_SCAR
+    displayName: 'Microsoft Game Development Kit (x64+Xbox Series X|S)'
    timeoutInMinutes: 120
    cancelTimeoutInMinutes: 1
    steps:
@@ -158,13 +165,10 @@ jobs:
        displayName: 'Secure Supply Chain Analysis'
      - task: NuGetAuthenticate@1
        displayName: 'NuGet Auth'
-      - task: PowerShell@2
-        displayName: 'NuGet Install GDK'
-        inputs:
-          targetType: filePath
-          filePath: ./build/RestoreGDK.ps1
-          arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
-          failOnStderr: true
+      - template: '/.azuredevops/templates/DirectXTex-setup-gdk-auto.yml'
+        parameters:
+          windows: true
+          scarlett: true
      - task: CopyFiles@2
        displayName: Set up Directory.Build.props
        inputs:
@@ -187,9 +191,10 @@ jobs:
        parameters:
          msVersion: '17.0'
          vsYear: 2022
+          xboxone: false

-  - job: BUILD_GDK_CMAKE_SCAR
-    displayName: 'Microsoft Game Development Kit (GDK) using CMake (Scarlett)'
+  - job: BUILD_GDKX_XBONE
+    displayName: 'Microsoft Game Development Kit (x64+Xbox One)'
    timeoutInMinutes: 120
    cancelTimeoutInMinutes: 1
    steps:
@@ -223,13 +228,73 @@ jobs:
        displayName: 'Secure Supply Chain Analysis'
      - task: NuGetAuthenticate@1
        displayName: 'NuGet Auth'
-      - task: PowerShell@2
-        displayName: 'NuGet Install GDK'
+      - template: '/.azuredevops/templates/DirectXTex-setup-gdk-auto.yml'
+        parameters:
+          windows: true
+          scarlett: false
+      - task: CopyFiles@2
+        displayName: Set up Directory.Build.props
        inputs:
-          targetType: filePath
-          filePath: ./build/RestoreGDK.ps1
-          arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
-          failOnStderr: true
+          SourceFolder: build
+          Contents: 'Directory.Build.props'
+          TargetFolder: $(Build.SourcesDirectory)
+      - task: MSBuild@1
+        displayName: Setup BWOI VCTargets
+        inputs:
+          solution: build/SetupBWOI.targets
+          msbuildArchitecture: x64
+          msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
+      - task: MSBuild@1
+        displayName: Log Information
+        inputs:
+          solution: build/LogInfo.targets
+          msbuildArchitecture: x64
+          msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
+      - template: '/.azuredevops/templates/DirectXTex-build-gdkx.yml'
+        parameters:
+          msVersion: '17.0'
+          vsYear: 2022
+          scarlett: false
+
+  - job: BUILD_GDK_CMAKE_SCAR
+    displayName: 'Microsoft Game Development Kit (GDK) using CMake (Xbox Series X|S)'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
+      - task: PowerShell@2
+        displayName: 'Create nuget.config with single source'
+        inputs:
+          targetType: inline
+          script: |
+            $xml = @'
+            <?xml version="1.0" encoding="utf-8"?>
+            <configuration>
+              <packageSources>
+                <clear />
+              </packageSources>
+            </configuration>
+            '@
+            $xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
+
+      - task: NuGetCommand@2
+        # We have to use a nuget.config to provide the feed for the 'nuget install' option.
+        displayName: 'NuGet set package source to ADO feed'
+        inputs:
+          command: custom
+          arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
+      - task: nuget-security-analysis@0
+        displayName: 'Secure Supply Chain Analysis'
+      - task: NuGetAuthenticate@1
+        displayName: 'NuGet Auth'
+      - template: '/.azuredevops/templates/DirectXTex-setup-gdk-auto.yml'
+        parameters:
+          windows: false
+          scarlett: true
      - task: CmdLine@2
        displayName: Setup BWOI for GDK command-line
        inputs:
@@ -242,7 +307,10 @@ jobs:
            echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
            echo ##vso[task.prependpath]%VCToolsInstallDir%bin\HostX64\x64
            call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER) $(GDK_EDITION) Scarlett
+            echo ##vso[task.setvariable variable=GameDK;]%GameDK%
            echo ##vso[task.setvariable variable=GameDKLatest;]%GameDKLatest%
+            echo ##vso[task.setvariable variable=GameDKCoreLatest;]%GameDKCoreLatest%
+            echo ##vso[task.setvariable variable=GameDKXboxLatest;]%GameDKXboxLatest%
            echo ##vso[task.setvariable variable=GRDKLatest;]%GRDKLatest%
            echo ##vso[task.setvariable variable=GXDKLatest;]%GXDKLatest%
            echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
@@ -339,13 +407,10 @@ jobs:
        displayName: 'Secure Supply Chain Analysis'
      - task: NuGetAuthenticate@1
        displayName: 'NuGet Auth'
-      - task: PowerShell@2
-        displayName: 'NuGet Install GDK'
-        inputs:
-          targetType: filePath
-          filePath: ./build/RestoreGDK.ps1
-          arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
-          failOnStderr: true
+      - template: '/.azuredevops/templates/DirectXTex-setup-gdk-auto.yml'
+        parameters:
+          windows: false
+          scarlett: false
      - task: CmdLine@2
        displayName: Setup BWOI for GDK command-line
        inputs:
@@ -358,7 +423,10 @@ jobs:
            echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
            echo ##vso[task.prependpath]%VCToolsInstallDir%bin\HostX64\x64
            call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER) $(GDK_EDITION) XboxOne
+            echo ##vso[task.setvariable variable=GameDK;]%GameDK%
            echo ##vso[task.setvariable variable=GameDKLatest;]%GameDKLatest%
+            echo ##vso[task.setvariable variable=GameDKCoreLatest;]%GameDKCoreLatest%
+            echo ##vso[task.setvariable variable=GameDKXboxLatest;]%GameDKXboxLatest%
            echo ##vso[task.setvariable variable=GRDKLatest;]%GRDKLatest%
            echo ##vso[task.setvariable variable=GXDKLatest;]%GXDKLatest%
            echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%