Skip to content

Commit 63960e5

Browse files
walbournwalbourn
authored
ADO pipeline for SDK builds (#511)
1 parent 118ca16 commit 63960e5

8 files changed

+65
-50
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ variables:
4242
EXTRACTED_FOLDER: $(ExtractedFolder)
4343
GDK_EDITION: $(GDKEditionNumber)
4444
URL_FEED: $(ADOFeedURL)
45-
GameDKLatest: '$(ExtractedFolder)\GDK\Microsoft.gdk.xbox.$(GDKEditionNumber)\native\$(GDKEditionNumber)\'
45+
GameDKLatest: '$(ExtractedFolder)\Microsoft.gdk.xbox.$(GDKEditionNumber)\native\$(GDKEditionNumber)\'
4646
skipNugetSecurityAnalysis: true # We explicitly call this task so we don't need it to be auto-injected
4747

4848
pool:
@@ -86,12 +86,12 @@ jobs:
8686
displayName: NuGet install PGDK
8787
inputs:
8888
command: custom
89-
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
89+
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
9090
- task: NuGetCommand@2
9191
displayName: NuGet install GDKX
9292
inputs:
9393
command: custom
94-
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
94+
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
9595
- task: CMake@1
9696
displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S)'
9797
inputs:

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ variables:
6060
EXTRACTED_FOLDER: $(ExtractedFolder)
6161
GDK_EDITION: $(GDKEditionNumber)
6262
URL_FEED: $(ADOFeedURL)
63-
GameDKLatest: '$(ExtractedFolder)\GDK\Microsoft.gdk.xbox.$(GDKEditionNumber)\native\$(GDKEditionNumber)\'
63+
GameDKLatest: '$(ExtractedFolder)\Microsoft.gdk.xbox.$(GDKEditionNumber)\native\$(GDKEditionNumber)\'
6464
skipNugetSecurityAnalysis: true # We explicitly call this task so we don't need it to be auto-injected
6565

6666
pool:
@@ -104,12 +104,12 @@ jobs:
104104
displayName: NuGet install PGDK
105105
inputs:
106106
command: custom
107-
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
107+
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
108108
- task: NuGetCommand@2
109109
displayName: NuGet install GDKX
110110
inputs:
111111
command: custom
112-
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
112+
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
113113
- task: CMake@1
114114
displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S)'
115115
inputs:

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ jobs:
8888
displayName: NuGet install PGDK
8989
inputs:
9090
command: custom
91-
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
91+
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
9292
- task: NuGetCommand@2
9393
displayName: NuGet install GDKX
9494
inputs:
9595
command: custom
96-
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
96+
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
9797
- task: CopyFiles@2
9898
displayName: Set up Directory.Build.props
9999
inputs:
@@ -240,12 +240,12 @@ jobs:
240240
displayName: NuGet install PGDK
241241
inputs:
242242
command: custom
243-
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
243+
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
244244
- task: NuGetCommand@2
245245
displayName: NuGet install GDKX
246246
inputs:
247247
command: custom
248-
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
248+
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
249249
- task: CmdLine@2
250250
displayName: Setup BWOI for GDK command-line
251251
inputs:
@@ -257,7 +257,7 @@ jobs:
257257
echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
258258
echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
259259
echo ##vso[task.prependpath]%VCToolsInstallDir%bin\HostX64\x64
260-
call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER)\GDK $(GDK_EDITION) Scarlett
260+
call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER) $(GDK_EDITION) Scarlett
261261
echo ##vso[task.setvariable variable=GameDKLatest;]%GameDKLatest%
262262
echo ##vso[task.setvariable variable=GRDKLatest;]%GRDKLatest%
263263
echo ##vso[task.setvariable variable=GXDKLatest;]%GXDKLatest%
@@ -346,12 +346,12 @@ jobs:
346346
displayName: NuGet install PGDK
347347
inputs:
348348
command: custom
349-
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
349+
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
350350
- task: NuGetCommand@2
351351
displayName: NuGet install GDKX
352352
inputs:
353353
command: custom
354-
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
354+
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
355355
- task: CmdLine@2
356356
displayName: Setup BWOI for GDK command-line
357357
inputs:
@@ -363,7 +363,7 @@ jobs:
363363
echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
364364
echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
365365
echo ##vso[task.prependpath]%VCToolsInstallDir%bin\HostX64\x64
366-
call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER)\GDK $(GDK_EDITION) XboxOne
366+
call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER) $(GDK_EDITION) XboxOne
367367
echo ##vso[task.setvariable variable=GameDKLatest;]%GameDKLatest%
368368
echo ##vso[task.setvariable variable=GRDKLatest;]%GRDKLatest%
369369
echo ##vso[task.setvariable variable=GXDKLatest;]%GXDKLatest%

‎build/DirectXTex-GitHub-GDK.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ jobs:
108108
displayName: NuGet install PGDK
109109
inputs:
110110
command: custom
111-
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
111+
arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
112112
- task: NuGetCommand@2
113113
displayName: NuGet install GDKX
114114
inputs:
115115
command: custom
116-
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
116+
arguments: install -prerelease Microsoft.GDK.Xbox.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
117117
- task: CopyFiles@2
118118
displayName: Set up Directory.Build.props
119119
inputs:

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ jobs:
7474
displayName: NuGet Install WSDK x64
7575
inputs:
7676
command: custom
77-
arguments: install -prerelease Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
77+
arguments: install -prerelease Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
7878
- task: NuGetCommand@2
7979
displayName: NuGet Install WSDK x86
8080
inputs:
8181
command: custom
82-
arguments: install -prerelease Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
82+
arguments: install -prerelease Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
8383
- task: NuGetCommand@2
8484
displayName: NuGet Install WSDK arm64
8585
inputs:
8686
command: custom
87-
arguments: install -prerelease Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
87+
arguments: install -prerelease Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
8888
- task: CopyFiles@2
8989
displayName: Set up Directory.Build.props
9090
inputs:
@@ -200,17 +200,17 @@ jobs:
200200
displayName: NuGet Install WSDK x64
201201
inputs:
202202
command: custom
203-
arguments: install -prerelease Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
203+
arguments: install -prerelease Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
204204
- task: NuGetCommand@2
205205
displayName: NuGet Install WSDK x86
206206
inputs:
207207
command: custom
208-
arguments: install -prerelease Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
208+
arguments: install -prerelease Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
209209
- task: NuGetCommand@2
210210
displayName: NuGet Install WSDK arm64
211211
inputs:
212212
command: custom
213-
arguments: install -prerelease Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
213+
arguments: install -prerelease Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
214214
- task: CopyFiles@2
215215
displayName: Set up Directory.Build.props
216216
inputs:

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ jobs:
7474
displayName: NuGet Install WSDK x64
7575
inputs:
7676
command: custom
77-
arguments: install Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
77+
arguments: install Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
7878
- task: NuGetCommand@2
7979
displayName: NuGet Install WSDK x86
8080
inputs:
8181
command: custom
82-
arguments: install Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
82+
arguments: install Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
8383
- task: NuGetCommand@2
8484
displayName: NuGet Install WSDK arm64
8585
inputs:
8686
command: custom
87-
arguments: install Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
87+
arguments: install Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
8888
- task: CopyFiles@2
8989
displayName: Set up Directory.Build.props
9090
inputs:
@@ -200,17 +200,17 @@ jobs:
200200
displayName: NuGet Install WSDK x64
201201
inputs:
202202
command: custom
203-
arguments: install Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
203+
arguments: install Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
204204
- task: NuGetCommand@2
205205
displayName: NuGet Install WSDK x86
206206
inputs:
207207
command: custom
208-
arguments: install Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
208+
arguments: install Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
209209
- task: NuGetCommand@2
210210
displayName: NuGet Install WSDK arm64
211211
inputs:
212212
command: custom
213-
arguments: install Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
213+
arguments: install Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
214214
- task: CopyFiles@2
215215
displayName: Set up Directory.Build.props
216216
inputs:

‎build/Directory.Build.props

+12-12
Original file line numberDiff line numberDiff line change
@@ -18,40 +18,40 @@
1818
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
1919
</PropertyGroup>
2020

21-
<PropertyGroup Condition="'$(GDKEditionNumber)' &lt; '220300'">
21+
<PropertyGroup Condition="'$(GDKEditionNumber)' != '' AND '$(GDKEditionNumber)' &lt; '220300'">
2222
<_PCNuGetPackage>Microsoft.PGDK</_PCNuGetPackage>
2323
<_XboxNuGetPackage>Microsoft.GDK</_XboxNuGetPackage>
2424
</PropertyGroup>
2525

26-
<PropertyGroup Condition="'$(GDKEditionNumber)' &gt;= '220300'">
26+
<PropertyGroup Condition="'$(GDKEditionNumber)' != '' AND '$(GDKEditionNumber)' &gt;= '220300'">
2727
<_PCNuGetPackage>Microsoft.GDK.PC</_PCNuGetPackage>
2828
<_XboxNuGetPackage>Microsoft.GDK.Xbox</_XboxNuGetPackage>
2929
</PropertyGroup>
3030

31-
<PropertyGroup Condition="'$(GDKEditionNumber)' &lt; '241000'">
31+
<PropertyGroup Condition="'$(GDKEditionNumber)' != '' AND '$(GDKEditionNumber)' &lt; '241000'">
3232
<_PCNuGetPackage>$(_PCNuGetPackage).$(GDKEditionNumber)</_PCNuGetPackage>
3333
<_XboxNuGetPackage>$(_XboxNuGetPackage).$(GDKEditionNumber)</_XboxNuGetPackage>
3434
</PropertyGroup>
3535

36-
<!-- Windows 10 SDK NuGet -->
36+
<!-- Windows SDK NuGet -->
3737
<Import Condition="'$(WSDKEnableBWOI)' == 'true'"
38-
Project="$(ExtractedFolder)SDK\Microsoft.Windows.SDK.cpp\build\Microsoft.Windows.SDK.cpp.props" />
38+
Project="$(ExtractedFolder)Microsoft.Windows.SDK.cpp\build\Microsoft.Windows.SDK.cpp.props" />
3939

4040
<Import Condition="'$(WSDKEnableBWOI)' == 'true' and $(Platform.Contains('x64'))"
41-
Project="$(ExtractedFolder)SDK\Microsoft.Windows.SDK.cpp.x64\build\native\Microsoft.Windows.SDK.cpp.x64.props" />
41+
Project="$(ExtractedFolder)Microsoft.Windows.SDK.cpp.x64\build\native\Microsoft.Windows.SDK.cpp.x64.props" />
4242

4343
<Import Condition="'$(WSDKEnableBWOI)' == 'true' and '$(Platform)' == 'Win32'"
44-
Project="$(ExtractedFolder)SDK\Microsoft.Windows.SDK.cpp.x86\build\native\Microsoft.Windows.SDK.cpp.x86.props" />
44+
Project="$(ExtractedFolder)Microsoft.Windows.SDK.cpp.x86\build\native\Microsoft.Windows.SDK.cpp.x86.props" />
4545

4646
<Import Condition="'$(WSDKEnableBWOI)' == 'true' and '$(Platform)' == 'ARM64'"
47-
Project="$(ExtractedFolder)SDK\Microsoft.Windows.SDK.cpp.arm64\build\native\Microsoft.Windows.SDK.cpp.arm64.props" />
47+
Project="$(ExtractedFolder)Microsoft.Windows.SDK.cpp.arm64\build\native\Microsoft.Windows.SDK.cpp.arm64.props" />
4848

4949
<!-- Microsoft GDK NuGet -->
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" />
50+
<Import Condition="'$(GDKEnableBWOI)' == 'true' and $(Platform.Contains('x64')) and Exists('$(ExtractedFolder)$(_PCNuGetPackage)\build\$(_PCNuGetPackage).props')"
51+
Project="$(ExtractedFolder)$(_PCNuGetPackage)\build\$(_PCNuGetPackage).props" />
5252

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" />
53+
<Import Condition="'$(GDKEnableBWOI)' == 'true' and $(Platform.Contains('x64')) and Exists('$(ExtractedFolder)$(_XboxNuGetPackage)\build\$(_XboxNuGetPackage).props')"
54+
Project="$(ExtractedFolder)$(_XboxNuGetPackage)\build\$(_XboxNuGetPackage).props" />
5555

5656
<!-- Remove copy of real gameos.xvd since this is a build validation only pipeline -->
5757
<PropertyGroup Condition="'$(Platform)' == 'Gaming.Xbox.XboxOne.x64' or '$(Platform)' == 'Gaming.Xbox.Scarlett.x64'">

‎build/SetupBWOI.targets

+25-10
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,21 @@
1111
<ExtractedFolder Condition="!HasTrailingSlash('$(ExtractedFolder)')">$(ExtractedFolder)\</ExtractedFolder>
1212
</PropertyGroup>
1313

14+
<PropertyGroup Condition="'$(GDKEditionNumber)' &lt; '220300'">
15+
<_PCNuGetPackage>Microsoft.PGDK</_PCNuGetPackage>
16+
<_XboxNuGetPackage>Microsoft.GDK</_XboxNuGetPackage>
17+
</PropertyGroup>
18+
19+
<PropertyGroup Condition="'$(GDKEditionNumber)' &gt;= '220300'">
20+
<_PCNuGetPackage>Microsoft.GDK.PC</_PCNuGetPackage>
21+
<_XboxNuGetPackage>Microsoft.GDK.Xbox</_XboxNuGetPackage>
22+
</PropertyGroup>
23+
24+
<PropertyGroup Condition="'$(GDKEditionNumber)' &lt; '241000'">
25+
<_PCNuGetPackage>$(_PCNuGetPackage).$(GDKEditionNumber)</_PCNuGetPackage>
26+
<_XboxNuGetPackage>$(_XboxNuGetPackage).$(GDKEditionNumber)</_XboxNuGetPackage>
27+
</PropertyGroup>
28+
1429
<!--
1530
A list of VCTargets folders that we expect to exist after copying the BWOI VS files
1631
If any of these folders is not present then we assume that the VCTargets has not been setup
@@ -80,10 +95,10 @@ SixtyFourBit = (IntPtr.Size == 8) ? true : false;
8095
Condition="'@(_MissingBWOIVCFolders)' != ''">
8196
<Error Condition="'$(GDKEditionNumber)'==''"
8297
Text="GDKEditionNumber property is required" />
83-
<Error Condition="!Exists('$(ExtractedFolder)GDK\Microsoft.GDK.PC.$(GDKEditionNumber)')"
84-
Text="NuGet package Microsoft.GDK.PC.$(GDKEditionNumber) not found in $(ExtractedFolder)GDK" />
85-
<Error Condition="!Exists('$(ExtractedFolder)GDK\Microsoft.GDK.Xbox.$(GDKEditionNumber)')"
86-
Text="NuGet package Microsoft.GDK.Xbox.$(GDKEditionNumber) not found in $(ExtractedFolder)GDK" />
98+
<Error Condition="!Exists('$(ExtractedFolder)$(_PCNuGetPackage)')"
99+
Text="NuGet package $(_PCNuGetPackage) not found in $(ExtractedFolder)" />
100+
<Error Condition="!Exists('$(ExtractedFolder)$(_XboxNuGetPackage)')"
101+
Text="NuGet package $(_XboxNuGetPackage) not found in $(ExtractedFolder)" />
87102

88103
<PropertyGroup>
89104
<_VSFolder Condition="'$(VisualStudioVersion)' == '17.0'">VS2022</_VSFolder>
@@ -99,8 +114,8 @@ SixtyFourBit = (IntPtr.Size == 8) ? true : false;
99114
</ItemGroup>
100115

101116
<ItemGroup Condition="'$(GDKEditionNumber)' &lt; '241000'">
102-
<GDKVCTargetsFilesV150 Include="$(ExtractedFolder)GDK\Microsoft.GDK.PC.$(GDKEditionNumber)\native\$(GDKEditionNumber)\GRDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v150\**" />
103-
<GDKVCTargetsFilesV150 Include="$(ExtractedFolder)GDK\Microsoft.GDK.Xbox.$(GDKEditionNumber)\native\$(GDKEditionNumber)\GXDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v150\**" />
117+
<GDKVCTargetsFilesV150 Include="$(ExtractedFolder)$(_PCNuGetPackage)\native\$(GDKEditionNumber)\GRDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v150\**" />
118+
<GDKVCTargetsFilesV150 Include="$(ExtractedFolder)$(_XboxNuGetPackage)\native\$(GDKEditionNumber)\GXDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v150\**" />
104119
</ItemGroup>
105120

106121
<Copy Condition="'$(GDKEditionNumber)' &lt; '241000'" SkipUnchangedFiles="true" SourceFiles="@(SourceVCTargetsFilesV150)" DestinationFolder="$(ExtractedFolder)VCTargets150\%(RecursiveDir)/" />
@@ -112,8 +127,8 @@ SixtyFourBit = (IntPtr.Size == 8) ? true : false;
112127
</ItemGroup>
113128

114129
<ItemGroup>
115-
<GDKVCTargetsFilesV160 Include="$(ExtractedFolder)GDK\Microsoft.GDK.PC.$(GDKEditionNumber)\native\$(GDKEditionNumber)\GRDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v160\**" />
116-
<GDKVCTargetsFilesV160 Include="$(ExtractedFolder)GDK\Microsoft.GDK.Xbox.$(GDKEditionNumber)\native\$(GDKEditionNumber)\GXDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v160\**" />
130+
<GDKVCTargetsFilesV160 Include="$(ExtractedFolder)$(_PCNuGetPackage)\native\$(GDKEditionNumber)\GRDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v160\**" />
131+
<GDKVCTargetsFilesV160 Include="$(ExtractedFolder)$(_XboxNuGetPackage)\native\$(GDKEditionNumber)\GXDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v160\**" />
117132
</ItemGroup>
118133

119134
<Copy SkipUnchangedFiles="true" SourceFiles="@(SourceVCTargetsFilesV160)" DestinationFolder="$(ExtractedFolder)VCTargets160\%(RecursiveDir)/" />
@@ -125,8 +140,8 @@ SixtyFourBit = (IntPtr.Size == 8) ? true : false;
125140
</ItemGroup>
126141

127142
<ItemGroup Condition="'$(VisualStudioVersion)' == '17.0'">
128-
<GDKVCTargetsFilesV170 Include="$(ExtractedFolder)GDK\Microsoft.GDK.PC.$(GDKEditionNumber)\native\$(GDKEditionNumber)\GRDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v170\**" />
129-
<GDKVCTargetsFilesV170 Include="$(ExtractedFolder)GDK\Microsoft.GDK.Xbox.$(GDKEditionNumber)\native\$(GDKEditionNumber)\GXDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v170\**" />
143+
<GDKVCTargetsFilesV170 Include="$(ExtractedFolder)$(_PCNuGetPackage)\native\$(GDKEditionNumber)\GRDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v170\**" />
144+
<GDKVCTargetsFilesV170 Include="$(ExtractedFolder)$(_XboxNuGetPackage)\native\$(GDKEditionNumber)\GXDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v170\**" />
130145
</ItemGroup>
131146

132147
<Copy SkipUnchangedFiles="true" SourceFiles="@(SourceVCTargetsFilesV170)" DestinationFolder="$(ExtractedFolder)VCTargets170\%(RecursiveDir)/" />

0 commit comments

Comments
 (0)