Update ADO pipeline to use GDK new layouts for 2510

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

@@ -21,7 +21,9 @@ pr:
   paths:
     include:
       - '.azuredevops/pipelines/DirectXTK12-GitHub-GDK-Dev17.yml'
-      - '.azuredevops/pipelines/DirectXTK12-build-gdk.yml'
+      - '.azuredevops/templates/DirectXTK12-build-gdk.yml'
+      - '.azuredevops/templates/DirectXTK12-build-gdkx.yml'
+      - '.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
       - CMakeList.txt
       - build/*.in
       - build/*.cmake
@@ -63,7 +65,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:
@@ -99,12 +101,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:
@@ -128,8 +135,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:
@@ -164,13 +171,74 @@ jobs:
         displayName: 'Secure Supply Chain Analysis'
       - task: NuGetAuthenticate@1
         displayName: 'NuGet Auth'
+      - template: '/.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
+        parameters:
+          windows: true
+          scarlett: true
+      - task: CopyFiles@2
+        displayName: Set up Directory.Build.props
+        inputs:
+          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/DirectXTK12-build-gdkx.yml'
+        parameters:
+          msVersion: '17.0'
+          vsYear: 2022
+          xboxone: false
+
+  - job: BUILD_GDKX_XBONE
+    displayName: 'Microsoft Game Development Kit (x64+Xbox One)'
+    timeoutInMinutes: 120
+    cancelTimeoutInMinutes: 1
+    steps:
+      - checkout: self
+        clean: true
+        fetchTags: false
+        fetchDepth: 1
+      - task: NuGetToolInstaller@1
+        displayName: 'Use NuGet'
       - task: PowerShell@2
-        displayName: 'NuGet Install GDK'
+        displayName: 'Create nuget.config with single source'
         inputs:
-          targetType: filePath
-          filePath: ./build/RestoreGDK.ps1
-          arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
-          failOnStderr: true
+          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/DirectXTK12-setup-gdk-auto.yml'
+        parameters:
+          windows: true
+          scarlett: false
       - task: CopyFiles@2
         displayName: Set up Directory.Build.props
         inputs:
@@ -193,9 +261,10 @@ jobs:
         parameters:
           msVersion: '17.0'
           vsYear: 2022
+          scarlett: false
 
   - job: BUILD_GDK_CMAKE_SCAR
-    displayName: 'Microsoft Game Development Kit (GDK) using CMake (Scarlett)'
+    displayName: 'Microsoft Game Development Kit (GDK) using CMake (Xbox Series X|S)'
     timeoutInMinutes: 120
     cancelTimeoutInMinutes: 1
     steps:
@@ -229,13 +298,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/DirectXTK12-setup-gdk-auto.yml'
+        parameters:
+          windows: false
+          scarlett: true
       - task: CmdLine@2
         displayName: Setup BWOI for GDK command-line
         inputs:
@@ -248,7 +314,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%
@@ -346,13 +415,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/DirectXTK12-setup-gdk-auto.yml'
+        parameters:
+          windows: false
+          scarlett: false
       - task: CmdLine@2
         displayName: Setup BWOI for GDK command-line
         inputs:
@@ -365,7 +431,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%
@@ -469,13 +538,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/DirectXTK12-setup-gdk-auto.yml'
+        parameters:
+          windows: false
+          scarlett: false
       - task: NuGetCommand@2
         displayName: NuGet restore
         inputs:
@@ -566,13 +632,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/DirectXTK12-setup-gdk-auto.yml'
+        parameters:
+          windows: false
+          scarlett: true
       - task: NuGetCommand@2
         displayName: NuGet restore
         inputs:

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

@@ -116,12 +116,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:
@@ -188,12 +193,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: NuGetCommand@2
         displayName: NuGet restore
         inputs:
@@ -211,7 +221,6 @@ jobs:
         displayName: Setup BWOI VCTargets
         inputs:
           solution: build/SetupBWOI.targets
-          msbuildVersion: 16.0
           msbuildArchitecture: x64
           msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
       - task: MSBuild@1
@@ -226,7 +235,6 @@ jobs:
         continueOnError: true
         inputs:
           solution: '**\*GDK_2019*.sln'
-          vsVersion: 16.0
           platform: Gaming.Xbox.XboxOne.x64
           configuration: Debug
           msbuildArchitecture: x64
@@ -236,7 +244,6 @@ jobs:
         continueOnError: true
         inputs:
           solution: '**\*GDK_2019*.sln'
-          vsVersion: 16.0
           platform: Gaming.Xbox.XboxOne.x64
           configuration: Release
           msbuildArchitecture: x64
@@ -285,12 +292,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: NuGetCommand@2
         displayName: NuGet restore
         inputs:
@@ -308,7 +320,6 @@ jobs:
         displayName: Setup BWOI VCTargets
         inputs:
           solution: build/SetupBWOI.targets
-          msbuildVersion: 16.0
           msbuildArchitecture: x64
           msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
       - task: MSBuild@1
@@ -323,7 +334,6 @@ jobs:
         continueOnError: true
         inputs:
           solution: '**\*GDK_2019*.sln'
-          vsVersion: 16.0
           platform: Gaming.Xbox.Scarlett.x64
           configuration: Debug
           msbuildArchitecture: x64
@@ -333,7 +343,6 @@ jobs:
         continueOnError: true
         inputs:
           solution: '**\*GDK_2019*.sln'
-          vsVersion: 16.0
           platform: Gaming.Xbox.Scarlett.x64
           configuration: Release
           msbuildArchitecture: x64

.azuredevops/templates/DirectXTK12-build-gdkx.yml

@@ -14,6 +14,12 @@ parameters:
     type: number
     values:
       - 2022
+  - name: scarlett
+    type: boolean
+    default: true
+  - name: xboxone
+    type: boolean
+    default: true
 
 steps:
   - task: VSBuild@1
@@ -38,6 +44,7 @@ steps:
       msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
   - task: VSBuild@1
     displayName: Build solution DirectXTK_GDKX_${{ parameters.vsYear }} xbdbg
+    condition: eq(${{ parameters.xboxone }}, true)
     continueOnError: true
     inputs:
       solution: DirectXTK_GDKX_${{ parameters.vsYear }}.sln
@@ -48,6 +55,7 @@ steps:
       msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
   - task: VSBuild@1
     displayName: Build solution DirectXTK_GDKX_${{ parameters.vsYear }} xbrel
+    condition: eq(${{ parameters.xboxone }}, true)
     continueOnError: true
     inputs:
       solution: DirectXTK_GDKX_${{ parameters.vsYear }}.sln
@@ -58,6 +66,7 @@ steps:
       msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
   - task: VSBuild@1
     displayName: Build solution DirectXTK_GDKX_${{ parameters.vsYear }} scardbg
+    condition: eq(${{ parameters.scarlett }}, true)
     continueOnError: true
     inputs:
       solution: DirectXTK_GDKX_${{ parameters.vsYear }}.sln
@@ -68,6 +77,7 @@ steps:
       msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
   - task: VSBuild@1
     displayName: Build solution DirectXTK_GDKX_${{ parameters.vsYear }} scarrel
+    condition: eq(${{ parameters.scarlett }}, true)
     continueOnError: true
     inputs:
       solution: DirectXTK_GDKX_${{ parameters.vsYear }}.sln