Skip to content

Commit 00d2747

Browse files
walbournwalbourn
authored
Update ADO pipeline to use GDK new layouts for 2510 (#364)
1 parent 7da9593 commit 00d2747

File tree

11 files changed

+416
-178
lines changed

11 files changed

+416
-178
lines changed

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

Lines changed: 102 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ pr:
2121
paths:
2222
include:
2323
- '.azuredevops/pipelines/DirectXTK12-GitHub-GDK-Dev17.yml'
24-
- '.azuredevops/pipelines/DirectXTK12-build-gdk.yml'
24+
- '.azuredevops/templates/DirectXTK12-build-gdk.yml'
25+
- '.azuredevops/templates/DirectXTK12-build-gdkx.yml'
26+
- '.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
2527
- CMakeList.txt
2628
- build/*.in
2729
- build/*.cmake
@@ -63,7 +65,7 @@ variables:
6365

6466
jobs:
6567
- job: BUILD_GDK
66-
displayName: 'Microsoft Game Development Kit (GDK Gaming.Desktop.x64)'
68+
displayName: 'Microsoft Game Development Kit (Gaming.*.x64)'
6769
timeoutInMinutes: 120
6870
cancelTimeoutInMinutes: 1
6971
steps:
@@ -99,12 +101,17 @@ jobs:
99101
- task: NuGetAuthenticate@1
100102
displayName: 'NuGet Auth'
101103
- task: PowerShell@2
102-
displayName: 'NuGet Install GDK'
104+
displayName: 'NuGet Install PC GDK'
103105
inputs:
104106
targetType: filePath
105107
filePath: ./build/RestoreGDK.ps1
106108
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
107109
failOnStderr: true
110+
- task: NuGetCommand@2
111+
displayName: 'NuGet install Xbox GDK'
112+
inputs:
113+
command: custom
114+
arguments: 'install -directdownload Microsoft.GDK.Xbox -ExcludeVersion -Version $(GDKNuGetPackageVersion) -OutputDirectory $(EXTRACTED_FOLDER)'
108115
- task: CopyFiles@2
109116
displayName: Set up Directory.Build.props
110117
inputs:
@@ -128,8 +135,8 @@ jobs:
128135
msVersion: '17.0'
129136
vsYear: 2022
130137

131-
- job: BUILD_GDKX
132-
displayName: 'Microsoft Game Development Kit (GDK x64)'
138+
- job: BUILD_GDKX_SCAR
139+
displayName: 'Microsoft Game Development Kit (x64+Xbox Series X|S)'
133140
timeoutInMinutes: 120
134141
cancelTimeoutInMinutes: 1
135142
steps:
@@ -164,13 +171,74 @@ jobs:
164171
displayName: 'Secure Supply Chain Analysis'
165172
- task: NuGetAuthenticate@1
166173
displayName: 'NuGet Auth'
174+
- template: '/.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
175+
parameters:
176+
windows: true
177+
scarlett: true
178+
- task: CopyFiles@2
179+
displayName: Set up Directory.Build.props
180+
inputs:
181+
SourceFolder: build
182+
Contents: 'Directory.Build.props'
183+
TargetFolder: $(Build.SourcesDirectory)
184+
- task: MSBuild@1
185+
displayName: Setup BWOI VCTargets
186+
inputs:
187+
solution: build/SetupBWOI.targets
188+
msbuildArchitecture: x64
189+
msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
190+
- task: MSBuild@1
191+
displayName: Log Information
192+
inputs:
193+
solution: build/LogInfo.targets
194+
msbuildArchitecture: x64
195+
msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
196+
- template: '/.azuredevops/templates/DirectXTK12-build-gdkx.yml'
197+
parameters:
198+
msVersion: '17.0'
199+
vsYear: 2022
200+
xboxone: false
201+
202+
- job: BUILD_GDKX_XBONE
203+
displayName: 'Microsoft Game Development Kit (x64+Xbox One)'
204+
timeoutInMinutes: 120
205+
cancelTimeoutInMinutes: 1
206+
steps:
207+
- checkout: self
208+
clean: true
209+
fetchTags: false
210+
fetchDepth: 1
211+
- task: NuGetToolInstaller@1
212+
displayName: 'Use NuGet'
167213
- task: PowerShell@2
168-
displayName: 'NuGet Install GDK'
214+
displayName: 'Create nuget.config with single source'
169215
inputs:
170-
targetType: filePath
171-
filePath: ./build/RestoreGDK.ps1
172-
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
173-
failOnStderr: true
216+
targetType: inline
217+
script: |
218+
$xml = @'
219+
<?xml version="1.0" encoding="utf-8"?>
220+
<configuration>
221+
<packageSources>
222+
<clear />
223+
</packageSources>
224+
</configuration>
225+
'@
226+
$xml | Set-Content -Path "$(Build.SourcesDirectory)\NuGet.config"
227+
228+
- task: NuGetCommand@2
229+
# We have to use a nuget.config to provide the feed for the 'nuget install' option.
230+
displayName: 'NuGet set package source to ADO feed'
231+
inputs:
232+
command: custom
233+
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
234+
- task: nuget-security-analysis@0
235+
displayName: 'Secure Supply Chain Analysis'
236+
- task: NuGetAuthenticate@1
237+
displayName: 'NuGet Auth'
238+
- template: '/.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
239+
parameters:
240+
windows: true
241+
scarlett: false
174242
- task: CopyFiles@2
175243
displayName: Set up Directory.Build.props
176244
inputs:
@@ -193,9 +261,10 @@ jobs:
193261
parameters:
194262
msVersion: '17.0'
195263
vsYear: 2022
264+
scarlett: false
196265

197266
- job: BUILD_GDK_CMAKE_SCAR
198-
displayName: 'Microsoft Game Development Kit (GDK) using CMake (Scarlett)'
267+
displayName: 'Microsoft Game Development Kit (GDK) using CMake (Xbox Series X|S)'
199268
timeoutInMinutes: 120
200269
cancelTimeoutInMinutes: 1
201270
steps:
@@ -229,13 +298,10 @@ jobs:
229298
displayName: 'Secure Supply Chain Analysis'
230299
- task: NuGetAuthenticate@1
231300
displayName: 'NuGet Auth'
232-
- task: PowerShell@2
233-
displayName: 'NuGet Install GDK'
234-
inputs:
235-
targetType: filePath
236-
filePath: ./build/RestoreGDK.ps1
237-
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
238-
failOnStderr: true
301+
- template: '/.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
302+
parameters:
303+
windows: false
304+
scarlett: true
239305
- task: CmdLine@2
240306
displayName: Setup BWOI for GDK command-line
241307
inputs:
@@ -248,7 +314,10 @@ jobs:
248314
echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
249315
echo ##vso[task.prependpath]%VCToolsInstallDir%bin\HostX64\x64
250316
call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER) $(GDK_EDITION) Scarlett
317+
echo ##vso[task.setvariable variable=GameDK;]%GameDK%
251318
echo ##vso[task.setvariable variable=GameDKLatest;]%GameDKLatest%
319+
echo ##vso[task.setvariable variable=GameDKCoreLatest;]%GameDKCoreLatest%
320+
echo ##vso[task.setvariable variable=GameDKXboxLatest;]%GameDKXboxLatest%
252321
echo ##vso[task.setvariable variable=GRDKLatest;]%GRDKLatest%
253322
echo ##vso[task.setvariable variable=GXDKLatest;]%GXDKLatest%
254323
echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
@@ -346,13 +415,10 @@ jobs:
346415
displayName: 'Secure Supply Chain Analysis'
347416
- task: NuGetAuthenticate@1
348417
displayName: 'NuGet Auth'
349-
- task: PowerShell@2
350-
displayName: 'NuGet Install GDK'
351-
inputs:
352-
targetType: filePath
353-
filePath: ./build/RestoreGDK.ps1
354-
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
355-
failOnStderr: true
418+
- template: '/.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
419+
parameters:
420+
windows: false
421+
scarlett: false
356422
- task: CmdLine@2
357423
displayName: Setup BWOI for GDK command-line
358424
inputs:
@@ -365,7 +431,10 @@ jobs:
365431
echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
366432
echo ##vso[task.prependpath]%VCToolsInstallDir%bin\HostX64\x64
367433
call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER) $(GDK_EDITION) XboxOne
434+
echo ##vso[task.setvariable variable=GameDK;]%GameDK%
368435
echo ##vso[task.setvariable variable=GameDKLatest;]%GameDKLatest%
436+
echo ##vso[task.setvariable variable=GameDKCoreLatest;]%GameDKCoreLatest%
437+
echo ##vso[task.setvariable variable=GameDKXboxLatest;]%GameDKXboxLatest%
369438
echo ##vso[task.setvariable variable=GRDKLatest;]%GRDKLatest%
370439
echo ##vso[task.setvariable variable=GXDKLatest;]%GXDKLatest%
371440
echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
@@ -469,13 +538,10 @@ jobs:
469538
displayName: 'Secure Supply Chain Analysis'
470539
- task: NuGetAuthenticate@1
471540
displayName: 'NuGet Auth'
472-
- task: PowerShell@2
473-
displayName: 'NuGet Install GDK'
474-
inputs:
475-
targetType: filePath
476-
filePath: ./build/RestoreGDK.ps1
477-
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
478-
failOnStderr: true
541+
- template: '/.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
542+
parameters:
543+
windows: false
544+
scarlett: false
479545
- task: NuGetCommand@2
480546
displayName: NuGet restore
481547
inputs:
@@ -566,13 +632,10 @@ jobs:
566632
displayName: 'Secure Supply Chain Analysis'
567633
- task: NuGetAuthenticate@1
568634
displayName: 'NuGet Auth'
569-
- task: PowerShell@2
570-
displayName: 'NuGet Install GDK'
571-
inputs:
572-
targetType: filePath
573-
filePath: ./build/RestoreGDK.ps1
574-
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
575-
failOnStderr: true
635+
- template: '/.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
636+
parameters:
637+
windows: false
638+
scarlett: true
576639
- task: NuGetCommand@2
577640
displayName: NuGet restore
578641
inputs:

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

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,17 @@ jobs:
116116
- task: NuGetAuthenticate@1
117117
displayName: 'NuGet Auth'
118118
- task: PowerShell@2
119-
displayName: 'NuGet Install GDK'
119+
displayName: 'NuGet Install PC GDK'
120120
inputs:
121121
targetType: filePath
122122
filePath: ./build/RestoreGDK.ps1
123123
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
124124
failOnStderr: true
125+
- task: NuGetCommand@2
126+
displayName: 'NuGet install Xbox GDK'
127+
inputs:
128+
command: custom
129+
arguments: 'install -directdownload Microsoft.GDK.Xbox -ExcludeVersion -Version $(GDKNuGetPackageVersion) -OutputDirectory $(EXTRACTED_FOLDER)'
125130
- task: CopyFiles@2
126131
displayName: Set up Directory.Build.props
127132
inputs:
@@ -188,12 +193,17 @@ jobs:
188193
- task: NuGetAuthenticate@1
189194
displayName: 'NuGet Auth'
190195
- task: PowerShell@2
191-
displayName: 'NuGet Install GDK'
196+
displayName: 'NuGet Install PC GDK'
192197
inputs:
193198
targetType: filePath
194199
filePath: ./build/RestoreGDK.ps1
195200
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
196201
failOnStderr: true
202+
- task: NuGetCommand@2
203+
displayName: 'NuGet install Xbox GDK'
204+
inputs:
205+
command: custom
206+
arguments: 'install -directdownload Microsoft.GDK.Xbox -ExcludeVersion -Version $(GDKNuGetPackageVersion) -OutputDirectory $(EXTRACTED_FOLDER)'
197207
- task: NuGetCommand@2
198208
displayName: NuGet restore
199209
inputs:
@@ -211,7 +221,6 @@ jobs:
211221
displayName: Setup BWOI VCTargets
212222
inputs:
213223
solution: build/SetupBWOI.targets
214-
msbuildVersion: 16.0
215224
msbuildArchitecture: x64
216225
msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
217226
- task: MSBuild@1
@@ -226,7 +235,6 @@ jobs:
226235
continueOnError: true
227236
inputs:
228237
solution: '**\*GDK_2019*.sln'
229-
vsVersion: 16.0
230238
platform: Gaming.Xbox.XboxOne.x64
231239
configuration: Debug
232240
msbuildArchitecture: x64
@@ -236,7 +244,6 @@ jobs:
236244
continueOnError: true
237245
inputs:
238246
solution: '**\*GDK_2019*.sln'
239-
vsVersion: 16.0
240247
platform: Gaming.Xbox.XboxOne.x64
241248
configuration: Release
242249
msbuildArchitecture: x64
@@ -285,12 +292,17 @@ jobs:
285292
- task: NuGetAuthenticate@1
286293
displayName: 'NuGet Auth'
287294
- task: PowerShell@2
288-
displayName: 'NuGet Install GDK'
295+
displayName: 'NuGet Install PC GDK'
289296
inputs:
290297
targetType: filePath
291298
filePath: ./build/RestoreGDK.ps1
292299
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER)
293300
failOnStderr: true
301+
- task: NuGetCommand@2
302+
displayName: 'NuGet install Xbox GDK'
303+
inputs:
304+
command: custom
305+
arguments: 'install -directdownload Microsoft.GDK.Xbox -ExcludeVersion -Version $(GDKNuGetPackageVersion) -OutputDirectory $(EXTRACTED_FOLDER)'
294306
- task: NuGetCommand@2
295307
displayName: NuGet restore
296308
inputs:
@@ -308,7 +320,6 @@ jobs:
308320
displayName: Setup BWOI VCTargets
309321
inputs:
310322
solution: build/SetupBWOI.targets
311-
msbuildVersion: 16.0
312323
msbuildArchitecture: x64
313324
msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
314325
- task: MSBuild@1
@@ -323,7 +334,6 @@ jobs:
323334
continueOnError: true
324335
inputs:
325336
solution: '**\*GDK_2019*.sln'
326-
vsVersion: 16.0
327337
platform: Gaming.Xbox.Scarlett.x64
328338
configuration: Debug
329339
msbuildArchitecture: x64
@@ -333,7 +343,6 @@ jobs:
333343
continueOnError: true
334344
inputs:
335345
solution: '**\*GDK_2019*.sln'
336-
vsVersion: 16.0
337346
platform: Gaming.Xbox.Scarlett.x64
338347
configuration: Release
339348
msbuildArchitecture: x64

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ parameters:
1414
type: number
1515
values:
1616
- 2022
17+
- name: scarlett
18+
type: boolean
19+
default: true
20+
- name: xboxone
21+
type: boolean
22+
default: true
1723

1824
steps:
1925
- task: VSBuild@1
@@ -38,6 +44,7 @@ steps:
3844
msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
3945
- task: VSBuild@1
4046
displayName: Build solution DirectXTK_GDKX_${{ parameters.vsYear }} xbdbg
47+
condition: eq(${{ parameters.xboxone }}, true)
4148
continueOnError: true
4249
inputs:
4350
solution: DirectXTK_GDKX_${{ parameters.vsYear }}.sln
@@ -48,6 +55,7 @@ steps:
4855
msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
4956
- task: VSBuild@1
5057
displayName: Build solution DirectXTK_GDKX_${{ parameters.vsYear }} xbrel
58+
condition: eq(${{ parameters.xboxone }}, true)
5159
continueOnError: true
5260
inputs:
5361
solution: DirectXTK_GDKX_${{ parameters.vsYear }}.sln
@@ -58,6 +66,7 @@ steps:
5866
msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
5967
- task: VSBuild@1
6068
displayName: Build solution DirectXTK_GDKX_${{ parameters.vsYear }} scardbg
69+
condition: eq(${{ parameters.scarlett }}, true)
6170
continueOnError: true
6271
inputs:
6372
solution: DirectXTK_GDKX_${{ parameters.vsYear }}.sln
@@ -68,6 +77,7 @@ steps:
6877
msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION)
6978
- task: VSBuild@1
7079
displayName: Build solution DirectXTK_GDKX_${{ parameters.vsYear }} scarrel
80+
condition: eq(${{ parameters.scarlett }}, true)
7181
continueOnError: true
7282
inputs:
7383
solution: DirectXTK_GDKX_${{ parameters.vsYear }}.sln

0 commit comments

Comments
 (0)