Skip to content

Commit 8613b90

Browse files
committed
Was missing Microsoft.GDK.Windows
1 parent fffcd0b commit 8613b90

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ jobs:
173173
displayName: 'NuGet Auth'
174174
- template: '/.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
175175
parameters:
176+
windows: true
176177
scarlett: true
177178
- task: CopyFiles@2
178179
displayName: Set up Directory.Build.props
@@ -236,6 +237,7 @@ jobs:
236237
displayName: 'NuGet Auth'
237238
- template: '/.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
238239
parameters:
240+
windows: true
239241
scarlett: false
240242
- task: CopyFiles@2
241243
displayName: Set up Directory.Build.props
@@ -298,6 +300,7 @@ jobs:
298300
displayName: 'NuGet Auth'
299301
- template: '/.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
300302
parameters:
303+
windows: false
301304
scarlett: true
302305
- task: CmdLine@2
303306
displayName: Setup BWOI for GDK command-line
@@ -411,6 +414,7 @@ jobs:
411414
displayName: 'NuGet Auth'
412415
- template: '/.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
413416
parameters:
417+
windows: false
414418
scarlett: false
415419
- task: CmdLine@2
416420
displayName: Setup BWOI for GDK command-line
@@ -530,6 +534,7 @@ jobs:
530534
displayName: 'NuGet Auth'
531535
- template: '/.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
532536
parameters:
537+
windows: false
533538
scarlett: false
534539
- task: NuGetCommand@2
535540
displayName: NuGet restore
@@ -623,6 +628,7 @@ jobs:
623628
displayName: 'NuGet Auth'
624629
- template: '/.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml'
625630
parameters:
631+
windows: false
626632
scarlett: true
627633
- task: NuGetCommand@2
628634
displayName: NuGet restore

.azuredevops/templates/DirectXTK12-setup-gdk-auto.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
# Template used by GitHub-GDK-* pipelines
77

88
parameters:
9+
- name: windows
10+
type: boolean
11+
default: true
912
- name: scarlett
1013
type: boolean
1114
default: true
@@ -19,19 +22,25 @@ steps:
1922
arguments: -GDKEditionNumber $(GDK_EDITION) -OutputDirectory $(EXTRACTED_FOLDER) -AutoLayout
2023
failOnStderr: true
2124
- task: NuGetCommand@2
22-
displayName: 'NuGet install Xbox Series X|S GDK'
25+
displayName: 'NuGet install GDK (Windows)'
26+
condition: and(ge(variables.GDKEditionNumber, '251000'), eq(${{ parameters.windows }}, true))
27+
inputs:
28+
command: custom
29+
arguments: 'install -directdownload Microsoft.GDK.Windows -ExcludeVersion -Version $(GDKNuGetPackageVersion) -OutputDirectory $(EXTRACTED_FOLDER)'
30+
- task: NuGetCommand@2
31+
displayName: 'NuGet install GDK (Xbox Series X|S)'
2332
condition: and(ge(variables.GDKEditionNumber, '251000'), eq(${{ parameters.scarlett }}, true))
2433
inputs:
2534
command: custom
2635
arguments: 'install -directdownload Microsoft.GDK.Xbox.XboxSeriesX_S -ExcludeVersion -Version $(GDKNuGetPackageVersion) -OutputDirectory $(EXTRACTED_FOLDER)'
2736
- task: NuGetCommand@2
28-
displayName: 'NuGet install Xbox One GDK'
37+
displayName: 'NuGet install GDK (Xbox One)'
2938
condition: and(ge(variables.GDKEditionNumber, '251000'), eq(${{ parameters.scarlett }}, false))
3039
inputs:
3140
command: custom
3241
arguments: 'install -directdownload Microsoft.GDK.Xbox.XboxOne -ExcludeVersion -Version $(GDKNuGetPackageVersion) -OutputDirectory $(EXTRACTED_FOLDER)'
3342
- task: NuGetCommand@2
34-
displayName: 'NuGet install Xbox GDK'
43+
displayName: 'NuGet install GDK (Xbox)'
3544
condition: lt(variables.GDKEditionNumber, '251000')
3645
inputs:
3746
command: custom

0 commit comments

Comments
 (0)