From 497378076b756005febb20efc21a749bd1c35004 Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <walbourn@users.noreply.github.com>
Date: Mon, 16 Sep 2024 11:17:59 -0700
Subject: [PATCH] ADO pipeline for SDK builds (#478)

---
 build/DirectXTK-GitHub-GDK-Dev17.yml      |  6 +++---
 build/DirectXTK-GitHub-GDK.yml            |  4 ++--
 build/DirectXTK-GitHub-SDK-prerelease.yml | 12 ++++++------
 build/DirectXTK-GitHub-SDK-release.yml    | 12 ++++++------
 build/Directory.Build.props               | 20 ++++++++++----------
 build/SetupBWOI.targets                   | 22 +++++++++++++++++-----
 6 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/build/DirectXTK-GitHub-GDK-Dev17.yml b/build/DirectXTK-GitHub-GDK-Dev17.yml
index f2e71f03..b98b1626 100644
--- a/build/DirectXTK-GitHub-GDK-Dev17.yml
+++ b/build/DirectXTK-GitHub-GDK-Dev17.yml
@@ -88,7 +88,7 @@ jobs:
     displayName: NuGet install PGDK
     inputs:
       command: custom
-      arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
+      arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: CopyFiles@2
     displayName: Set up Directory.Build.props
     inputs:
@@ -159,7 +159,7 @@ jobs:
     displayName: NuGet install PGDK
     inputs:
       command: custom
-      arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
+      arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: CmdLine@2
     displayName: Setup BWOI for GDK command-line
     inputs:
@@ -171,7 +171,7 @@ jobs:
         echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
         echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
         echo ##vso[task.prependpath]%VCToolsInstallDir%bin\HostX64\x64
-        call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER)\GDK $(GDK_EDITION) PC
+        call $(Build.SourcesDirectory)\build\SetupBWOI.cmd $(EXTRACTED_FOLDER) $(GDK_EDITION) PC
         echo ##vso[task.setvariable variable=GameDKLatest;]%GameDKLatest%
         echo ##vso[task.setvariable variable=GRDKLatest;]%GRDKLatest%
         echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
diff --git a/build/DirectXTK-GitHub-GDK.yml b/build/DirectXTK-GitHub-GDK.yml
index d53ac888..dd7d3e4e 100644
--- a/build/DirectXTK-GitHub-GDK.yml
+++ b/build/DirectXTK-GitHub-GDK.yml
@@ -109,7 +109,7 @@ jobs:
     displayName: NuGet install PGDK
     inputs:
       command: custom
-      arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
+      arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: CopyFiles@2
     displayName: Set up Directory.Build.props
     inputs:
@@ -183,7 +183,7 @@ jobs:
     displayName: NuGet install PGDK
     inputs:
       command: custom
-      arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\GDK
+      arguments: install -prerelease Microsoft.GDK.PC.$(GDK_EDITION) -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: CopyFiles@2
     displayName: Set up Directory.Build.props
     inputs:
diff --git a/build/DirectXTK-GitHub-SDK-prerelease.yml b/build/DirectXTK-GitHub-SDK-prerelease.yml
index 18c298bb..95e6d759 100644
--- a/build/DirectXTK-GitHub-SDK-prerelease.yml
+++ b/build/DirectXTK-GitHub-SDK-prerelease.yml
@@ -74,17 +74,17 @@ jobs:
     displayName: NuGet Install WSDK x64
     inputs:
       command: custom
-      arguments: install -prerelease Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
+      arguments: install -prerelease Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: NuGetCommand@2
     displayName: NuGet Install WSDK x86
     inputs:
       command: custom
-      arguments: install -prerelease Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
+      arguments: install -prerelease Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: NuGetCommand@2
     displayName: NuGet Install WSDK arm64
     inputs:
       command: custom
-      arguments: install -prerelease Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
+      arguments: install -prerelease Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: CopyFiles@2
     displayName: Set up Directory.Build.props
     inputs:
@@ -254,12 +254,12 @@ jobs:
     displayName: NuGet Install WSDK x64
     inputs:
       command: custom
-      arguments: install -prerelease Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
+      arguments: install -prerelease Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: NuGetCommand@2
     displayName: NuGet Install WSDK x86
     inputs:
       command: custom
-      arguments: install -prerelease Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
+      arguments: install -prerelease Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: CopyFiles@2
     displayName: Set up Directory.Build.props
     inputs:
@@ -332,7 +332,7 @@ jobs:
     displayName: NuGet Install WSDK arm64
     inputs:
       command: custom
-      arguments: install -prerelease Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
+      arguments: install -prerelease Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: CopyFiles@2
     displayName: Set up Directory.Build.props
     inputs:
diff --git a/build/DirectXTK-GitHub-SDK-release.yml b/build/DirectXTK-GitHub-SDK-release.yml
index 7e615859..0cbfd9ee 100644
--- a/build/DirectXTK-GitHub-SDK-release.yml
+++ b/build/DirectXTK-GitHub-SDK-release.yml
@@ -74,17 +74,17 @@ jobs:
     displayName: NuGet Install WSDK x64
     inputs:
       command: custom
-      arguments: install Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
+      arguments: install Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: NuGetCommand@2
     displayName: NuGet Install WSDK x86
     inputs:
       command: custom
-      arguments: install Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
+      arguments: install Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: NuGetCommand@2
     displayName: NuGet Install WSDK arm64
     inputs:
       command: custom
-      arguments: install Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
+      arguments: install Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: CopyFiles@2
     displayName: Set up Directory.Build.props
     inputs:
@@ -254,12 +254,12 @@ jobs:
     displayName: NuGet Install WSDK x64
     inputs:
       command: custom
-      arguments: install Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
+      arguments: install Microsoft.Windows.SDK.CPP.x64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: NuGetCommand@2
     displayName: NuGet Install WSDK x86
     inputs:
       command: custom
-      arguments: install Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
+      arguments: install Microsoft.Windows.SDK.CPP.x86 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: CopyFiles@2
     displayName: Set up Directory.Build.props
     inputs:
@@ -332,7 +332,7 @@ jobs:
     displayName: NuGet Install WSDK arm64
     inputs:
       command: custom
-      arguments: install Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)\SDK
+      arguments: install Microsoft.Windows.SDK.CPP.arm64 -ExcludeVersion -OutputDirectory $(EXTRACTED_FOLDER)
   - task: CopyFiles@2
     displayName: Set up Directory.Build.props
     inputs:
diff --git a/build/Directory.Build.props b/build/Directory.Build.props
index 70cd3ee1..f356ccf1 100644
--- a/build/Directory.Build.props
+++ b/build/Directory.Build.props
@@ -18,34 +18,34 @@
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(GDKEditionNumber)' &lt; '220300'">
+  <PropertyGroup Condition="'$(GDKEditionNumber)' != '' AND '$(GDKEditionNumber)' &lt; '220300'">
     <_PCNuGetPackage>Microsoft.PGDK</_PCNuGetPackage>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(GDKEditionNumber)' &gt;= '220300'">
+  <PropertyGroup Condition="'$(GDKEditionNumber)' != '' AND '$(GDKEditionNumber)' &gt;= '220300'">
     <_PCNuGetPackage>Microsoft.GDK.PC</_PCNuGetPackage>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(GDKEditionNumber)' &lt; '241000'">
+  <PropertyGroup Condition="'$(GDKEditionNumber)' != '' AND '$(GDKEditionNumber)' &lt; '241000'">
     <_PCNuGetPackage>$(_PCNuGetPackage).$(GDKEditionNumber)</_PCNuGetPackage>
   </PropertyGroup>
 
-  <!-- Windows 10 SDK NuGet -->
+  <!-- Windows SDK NuGet -->
   <Import Condition="'$(WSDKEnableBWOI)' == 'true'"
-          Project="$(ExtractedFolder)SDK\Microsoft.Windows.SDK.cpp\build\Microsoft.Windows.SDK.cpp.props" />
+          Project="$(ExtractedFolder)Microsoft.Windows.SDK.cpp\build\Microsoft.Windows.SDK.cpp.props" />
 
   <Import Condition="'$(WSDKEnableBWOI)' == 'true' and $(Platform.Contains('x64'))"
-          Project="$(ExtractedFolder)SDK\Microsoft.Windows.SDK.cpp.x64\build\native\Microsoft.Windows.SDK.cpp.x64.props" />
+          Project="$(ExtractedFolder)Microsoft.Windows.SDK.cpp.x64\build\native\Microsoft.Windows.SDK.cpp.x64.props" />
 
   <Import Condition="'$(WSDKEnableBWOI)' == 'true' and '$(Platform)' == 'Win32'"
-          Project="$(ExtractedFolder)SDK\Microsoft.Windows.SDK.cpp.x86\build\native\Microsoft.Windows.SDK.cpp.x86.props" />
+          Project="$(ExtractedFolder)Microsoft.Windows.SDK.cpp.x86\build\native\Microsoft.Windows.SDK.cpp.x86.props" />
 
   <Import Condition="'$(WSDKEnableBWOI)' == 'true' and '$(Platform)' == 'ARM64'"
-          Project="$(ExtractedFolder)SDK\Microsoft.Windows.SDK.cpp.arm64\build\native\Microsoft.Windows.SDK.cpp.arm64.props" />
+          Project="$(ExtractedFolder)Microsoft.Windows.SDK.cpp.arm64\build\native\Microsoft.Windows.SDK.cpp.arm64.props" />
 
   <!-- Microsoft GDK NuGet -->
-  <Import Condition="'$(GDKEnableBWOI)' == 'true' and $(Platform.Contains('x64')) and Exists('$(ExtractedFolder)GDK\$(_PCNuGetPackage)\build\$(_PCNuGetPackage).props')"
-          Project="$(ExtractedFolder)GDK\$(_PCNuGetPackage)\build\$(_PCNuGetPackage).props" />
+  <Import Condition="'$(GDKEnableBWOI)' == 'true' and $(Platform.Contains('x64')) and Exists('$(ExtractedFolder)$(_PCNuGetPackage)\build\$(_PCNuGetPackage).props')"
+          Project="$(ExtractedFolder)$(_PCNuGetPackage)\build\$(_PCNuGetPackage).props" />
 
   <!--
   ****************************************************************************************************
diff --git a/build/SetupBWOI.targets b/build/SetupBWOI.targets
index 893026be..34c9ae10 100644
--- a/build/SetupBWOI.targets
+++ b/build/SetupBWOI.targets
@@ -11,6 +11,18 @@
     <ExtractedFolder Condition="!HasTrailingSlash('$(ExtractedFolder)')">$(ExtractedFolder)\</ExtractedFolder>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(GDKEditionNumber)' &lt; '220300'">
+    <_PCNuGetPackage>Microsoft.PGDK</_PCNuGetPackage>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(GDKEditionNumber)' &gt;= '220300'">
+    <_PCNuGetPackage>Microsoft.GDK.PC</_PCNuGetPackage>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(GDKEditionNumber)' &lt; '241000'">
+    <_PCNuGetPackage>$(_PCNuGetPackage).$(GDKEditionNumber)</_PCNuGetPackage>
+  </PropertyGroup>
+
   <!--
       A list of VCTargets folders that we expect to exist after copying the BWOI VS files
       If any of these folders is not present then we assume that the VCTargets has not been setup
@@ -78,8 +90,8 @@ SixtyFourBit = (IntPtr.Size == 8) ? true : false;
           Condition="'@(_MissingBWOIVCFolders)' != ''">
     <Error Condition="'$(GDKEditionNumber)'==''"
         Text="GDKEditionNumber property is required" />
-    <Error Condition="!Exists('$(ExtractedFolder)GDK\Microsoft.GDK.PC.$(GDKEditionNumber)')"
-        Text="NuGet package Microsoft.GDK.PC.$(GDKEditionNumber) not found in $(ExtractedFolder)GDK" />
+    <Error Condition="!Exists('$(ExtractedFolder)$(_PCNuGetPackage)')"
+        Text="NuGet package $(_PCNuGetPackage) not found in $(ExtractedFolder)" />
 
     <PropertyGroup>
       <_VSFolder Condition="'$(VisualStudioVersion)' == '17.0'">VS2022</_VSFolder>
@@ -95,7 +107,7 @@ SixtyFourBit = (IntPtr.Size == 8) ? true : false;
     </ItemGroup>
 
     <ItemGroup Condition="'$(GDKEditionNumber)' &lt; '241000'">
-      <GDKVCTargetsFilesV150 Include="$(ExtractedFolder)GDK\Microsoft.GDK.PC.$(GDKEditionNumber)\native\$(GDKEditionNumber)\GRDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v150\**" />
+      <GDKVCTargetsFilesV150 Include="$(ExtractedFolder)$(_PCNuGetPackage)\native\$(GDKEditionNumber)\GRDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v150\**" />
     </ItemGroup>
 
     <Copy Condition="'$(GDKEditionNumber)' &lt; '241000'" SkipUnchangedFiles="true" SourceFiles="@(SourceVCTargetsFilesV150)" DestinationFolder="$(ExtractedFolder)VCTargets150\%(RecursiveDir)/" />
@@ -107,7 +119,7 @@ SixtyFourBit = (IntPtr.Size == 8) ? true : false;
     </ItemGroup>
 
     <ItemGroup>
-      <GDKVCTargetsFilesV160 Include="$(ExtractedFolder)GDK\Microsoft.GDK.PC.$(GDKEditionNumber)\native\$(GDKEditionNumber)\GRDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v160\**" />
+      <GDKVCTargetsFilesV160 Include="$(ExtractedFolder)$(_PCNuGetPackage)\native\$(GDKEditionNumber)\GRDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v160\**" />
     </ItemGroup>
 
     <Copy SkipUnchangedFiles="true" SourceFiles="@(SourceVCTargetsFilesV160)" DestinationFolder="$(ExtractedFolder)VCTargets160\%(RecursiveDir)/" />
@@ -119,7 +131,7 @@ SixtyFourBit = (IntPtr.Size == 8) ? true : false;
     </ItemGroup>
 
     <ItemGroup Condition="'$(VisualStudioVersion)' == '17.0'">
-      <GDKVCTargetsFilesV170 Include="$(ExtractedFolder)GDK\Microsoft.GDK.PC.$(GDKEditionNumber)\native\$(GDKEditionNumber)\GRDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v170\**" />
+      <GDKVCTargetsFilesV170 Include="$(ExtractedFolder)$(_PCNuGetPackage)\native\$(GDKEditionNumber)\GRDK\$(_VSFolder)\flatDeployment\MSBuild\Microsoft\VC\v170\**" />
     </ItemGroup>
 
     <Copy SkipUnchangedFiles="true" SourceFiles="@(SourceVCTargetsFilesV170)" DestinationFolder="$(ExtractedFolder)VCTargets170\%(RecursiveDir)/" />