Skip to content

Commit 118ca16

Browse files
walbournwalbourn
authored
Build pipeline updates (#510)
1 parent 061355c commit 118ca16

8 files changed

+47
-24
lines changed

‎build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ jobs:
5757
fetchTags: false
5858
- task: NuGetToolInstaller@1
5959
displayName: 'Use NuGet'
60-
inputs:
61-
versionSpec: '6.5.x'
6260
- task: PowerShell@2
6361
displayName: 'Create nuget.config with single source'
6462
inputs:
@@ -82,6 +80,8 @@ jobs:
8280
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
8381
- task: nuget-security-analysis@0
8482
displayName: 'Secure Supply Chain Analysis'
83+
- task: NuGetAuthenticate@1
84+
displayName: 'NuGet Auth'
8585
- task: NuGetCommand@2
8686
displayName: NuGet install PGDK
8787
inputs:

‎build/DirectXTex-GitHub-CMake-Xbox.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ jobs:
7575
fetchTags: false
7676
- task: NuGetToolInstaller@1
7777
displayName: 'Use NuGet'
78-
inputs:
79-
versionSpec: '6.5.x'
8078
- task: PowerShell@2
8179
displayName: 'Create nuget.config with single source'
8280
inputs:
@@ -100,6 +98,8 @@ jobs:
10098
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
10199
- task: nuget-security-analysis@0
102100
displayName: 'Secure Supply Chain Analysis'
101+
- task: NuGetAuthenticate@1
102+
displayName: 'NuGet Auth'
103103
- task: NuGetCommand@2
104104
displayName: NuGet install PGDK
105105
inputs:

‎build/DirectXTex-GitHub-GDK-Dev17.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ jobs:
5959
fetchTags: false
6060
- task: NuGetToolInstaller@1
6161
displayName: 'Use NuGet'
62-
inputs:
63-
versionSpec: '6.5.x'
6462
- task: PowerShell@2
6563
displayName: 'Create nuget.config with single source'
6664
inputs:
@@ -84,6 +82,8 @@ jobs:
8482
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
8583
- task: nuget-security-analysis@0
8684
displayName: 'Secure Supply Chain Analysis'
85+
- task: NuGetAuthenticate@1
86+
displayName: 'NuGet Auth'
8787
- task: NuGetCommand@2
8888
displayName: NuGet install PGDK
8989
inputs:
@@ -211,8 +211,6 @@ jobs:
211211
fetchTags: false
212212
- task: NuGetToolInstaller@1
213213
displayName: 'Use NuGet'
214-
inputs:
215-
versionSpec: '6.5.x'
216214
- task: PowerShell@2
217215
displayName: 'Create nuget.config with single source'
218216
inputs:
@@ -236,6 +234,8 @@ jobs:
236234
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
237235
- task: nuget-security-analysis@0
238236
displayName: 'Secure Supply Chain Analysis'
237+
- task: NuGetAuthenticate@1
238+
displayName: 'NuGet Auth'
239239
- task: NuGetCommand@2
240240
displayName: NuGet install PGDK
241241
inputs:
@@ -317,8 +317,6 @@ jobs:
317317
fetchTags: false
318318
- task: NuGetToolInstaller@1
319319
displayName: 'Use NuGet'
320-
inputs:
321-
versionSpec: '6.5.x'
322320
- task: PowerShell@2
323321
displayName: 'Create nuget.config with single source'
324322
inputs:
@@ -342,6 +340,8 @@ jobs:
342340
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
343341
- task: nuget-security-analysis@0
344342
displayName: 'Secure Supply Chain Analysis'
343+
- task: NuGetAuthenticate@1
344+
displayName: 'NuGet Auth'
345345
- task: NuGetCommand@2
346346
displayName: NuGet install PGDK
347347
inputs:

‎build/DirectXTex-GitHub-GDK.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ jobs:
7979
fetchTags: false
8080
- task: NuGetToolInstaller@1
8181
displayName: 'Use NuGet'
82-
inputs:
83-
versionSpec: '6.5.x'
8482
- task: PowerShell@2
8583
displayName: 'Create nuget.config with single source'
8684
inputs:
@@ -104,6 +102,8 @@ jobs:
104102
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
105103
- task: nuget-security-analysis@0
106104
displayName: 'Secure Supply Chain Analysis'
105+
- task: NuGetAuthenticate@1
106+
displayName: 'NuGet Auth'
107107
- task: NuGetCommand@2
108108
displayName: NuGet install PGDK
109109
inputs:

‎build/DirectXTex-GitHub-SDK-prerelease.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ jobs:
4545
fetchTags: false
4646
- task: NuGetToolInstaller@1
4747
displayName: 'Use NuGet'
48-
inputs:
49-
versionSpec: '6.5.x'
5048
- task: PowerShell@2
5149
displayName: 'Create nuget.config with single source'
5250
inputs:
@@ -70,6 +68,8 @@ jobs:
7068
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
7169
- task: nuget-security-analysis@0
7270
displayName: 'Secure Supply Chain Analysis'
71+
- task: NuGetAuthenticate@1
72+
displayName: 'NuGet Auth'
7373
- task: NuGetCommand@2
7474
displayName: NuGet Install WSDK x64
7575
inputs:
@@ -172,8 +172,6 @@ jobs:
172172
fetchTags: false
173173
- task: NuGetToolInstaller@1
174174
displayName: 'Use NuGet'
175-
inputs:
176-
versionSpec: '6.5.x'
177175
- task: PowerShell@2
178176
displayName: 'Create nuget.config with single source'
179177
inputs:
@@ -196,6 +194,8 @@ jobs:
196194
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
197195
- task: nuget-security-analysis@0
198196
displayName: 'Secure Supply Chain Analysis'
197+
- task: NuGetAuthenticate@1
198+
displayName: 'NuGet Auth'
199199
- task: NuGetCommand@2
200200
displayName: NuGet Install WSDK x64
201201
inputs:
@@ -245,6 +245,7 @@ jobs:
245245
msbuildArgs: /p:PreferredToolArchitecture=x64
246246
platform: x64
247247
configuration: Release
248+
# Windows on ARM 32-bit is deprecated. https://learn.microsoft.com/windows/arm/arm32-to-arm64
248249
- task: VSBuild@1
249250
displayName: Build solution DirectXTex_Windows10_2022.sln arm64dbg
250251
inputs:

‎build/DirectXTex-GitHub-SDK-release.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ jobs:
4545
fetchTags: false
4646
- task: NuGetToolInstaller@1
4747
displayName: 'Use NuGet'
48-
inputs:
49-
versionSpec: '6.5.x'
5048
- task: PowerShell@2
5149
displayName: 'Create nuget.config with single source'
5250
inputs:
@@ -70,6 +68,8 @@ jobs:
7068
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
7169
- task: nuget-security-analysis@0
7270
displayName: 'Secure Supply Chain Analysis'
71+
- task: NuGetAuthenticate@1
72+
displayName: 'NuGet Auth'
7373
- task: NuGetCommand@2
7474
displayName: NuGet Install WSDK x64
7575
inputs:
@@ -172,8 +172,6 @@ jobs:
172172
fetchTags: false
173173
- task: NuGetToolInstaller@1
174174
displayName: 'Use NuGet'
175-
inputs:
176-
versionSpec: '6.5.x'
177175
- task: PowerShell@2
178176
displayName: 'Create nuget.config with single source'
179177
inputs:
@@ -196,6 +194,8 @@ jobs:
196194
arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
197195
- task: nuget-security-analysis@0
198196
displayName: 'Secure Supply Chain Analysis'
197+
- task: NuGetAuthenticate@1
198+
displayName: 'NuGet Auth'
199199
- task: NuGetCommand@2
200200
displayName: NuGet Install WSDK x64
201201
inputs:
@@ -245,6 +245,7 @@ jobs:
245245
msbuildArgs: /p:PreferredToolArchitecture=x64
246246
platform: x64
247247
configuration: Release
248+
# Windows on ARM 32-bit is deprecated. https://learn.microsoft.com/windows/arm/arm32-to-arm64
248249
- task: VSBuild@1
249250
displayName: Build solution DirectXTex_Windows10_2022.sln arm64dbg
250251
inputs:

‎build/Directory.Build.props

+24-4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,21 @@
1818
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
1919
</PropertyGroup>
2020

21+
<PropertyGroup Condition="'$(GDKEditionNumber)' &lt; '220300'">
22+
<_PCNuGetPackage>Microsoft.PGDK</_PCNuGetPackage>
23+
<_XboxNuGetPackage>Microsoft.GDK</_XboxNuGetPackage>
24+
</PropertyGroup>
25+
26+
<PropertyGroup Condition="'$(GDKEditionNumber)' &gt;= '220300'">
27+
<_PCNuGetPackage>Microsoft.GDK.PC</_PCNuGetPackage>
28+
<_XboxNuGetPackage>Microsoft.GDK.Xbox</_XboxNuGetPackage>
29+
</PropertyGroup>
30+
31+
<PropertyGroup Condition="'$(GDKEditionNumber)' &lt; '241000'">
32+
<_PCNuGetPackage>$(_PCNuGetPackage).$(GDKEditionNumber)</_PCNuGetPackage>
33+
<_XboxNuGetPackage>$(_XboxNuGetPackage).$(GDKEditionNumber)</_XboxNuGetPackage>
34+
</PropertyGroup>
35+
2136
<!-- Windows 10 SDK NuGet -->
2237
<Import Condition="'$(WSDKEnableBWOI)' == 'true'"
2338
Project="$(ExtractedFolder)SDK\Microsoft.Windows.SDK.cpp\build\Microsoft.Windows.SDK.cpp.props" />
@@ -32,11 +47,16 @@
3247
Project="$(ExtractedFolder)SDK\Microsoft.Windows.SDK.cpp.arm64\build\native\Microsoft.Windows.SDK.cpp.arm64.props" />
3348

3449
<!-- Microsoft GDK NuGet -->
35-
<Import Condition="'$(GDKEnableBWOI)' == 'true' and $(Platform.Contains('x64')) and Exists('$(ExtractedFolder)GDK\Microsoft.GDK.PC.$(GDKEditionNumber)\build\Microsoft.GDK.PC.$(GDKEditionNumber).props')"
36-
Project="$(ExtractedFolder)GDK\Microsoft.GDK.PC.$(GDKEditionNumber)\build\Microsoft.GDK.PC.$(GDKEditionNumber).props" />
50+
<Import Condition="'$(GDKEnableBWOI)' == 'true' and $(Platform.Contains('x64')) and Exists('$(ExtractedFolder)GDK\$(_PCNuGetPackage)\build\$(_PCNuGetPackage).props')"
51+
Project="$(ExtractedFolder)GDK\$(_PCNuGetPackage)\build\$(_PCNuGetPackage).props" />
3752

38-
<Import Condition="'$(GDKEnableBWOI)' == 'true' and $(Platform.Contains('x64'))"
39-
Project="$(ExtractedFolder)GDK\Microsoft.GDK.Xbox.$(GDKEditionNumber)\build\Microsoft.GDK.Xbox.$(GDKEditionNumber).props" />
53+
<Import Condition="'$(GDKEnableBWOI)' == 'true' and $(Platform.Contains('x64')) and Exists('$(ExtractedFolder)GDK\$(_XboxNuGetPackage)\build\$(_XboxNuGetPackage).props')"
54+
Project="$(ExtractedFolder)GDK\$(_XboxNuGetPackage)\build\$(_XboxNuGetPackage).props" />
55+
56+
<!-- Remove copy of real gameos.xvd since this is a build validation only pipeline -->
57+
<PropertyGroup Condition="'$(Platform)' == 'Gaming.Xbox.XboxOne.x64' or '$(Platform)' == 'Gaming.Xbox.Scarlett.x64'">
58+
<GameOSFilePath>$(MSBuildThisFileDirectory)build\placeholder.xvd</GameOSFilePath>
59+
</PropertyGroup>
4060

4161
<!--
4262
****************************************************************************************************

‎build/placeholder.xvd

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This file is a placeholder for gameos.xvd to speed up ADO pipeline builds.

0 commit comments

Comments
 (0)