Build pipeline updates (#252)

2024-09-12 12:35:09 -07:00 · 2024-09-12 12:35:09 -07:00 · 0b5f1b7ff0
--- a/build/DirectXTK12-GitHub-GDK-Dev17.yml
+++ b/build/DirectXTK12-GitHub-GDK-Dev17.yml
@ -59,8 +59,6 @@ jobs:
    fetchTags: false
  - task: NuGetToolInstaller@1
    displayName: 'Use NuGet'
-    inputs:
-      versionSpec: '6.5.x'
  - task: PowerShell@2
    displayName: 'Create nuget.config with single source'
    inputs:
@ -84,6 +82,8 @@ jobs:
      arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
  - task: nuget-security-analysis@0
    displayName: 'Secure Supply Chain Analysis'
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet Auth'
  - task: NuGetCommand@2
    displayName: NuGet install PGDK
    inputs:
@ -171,8 +171,6 @@ jobs:
    fetchTags: false
  - task: NuGetToolInstaller@1
    displayName: 'Use NuGet'
-    inputs:
-      versionSpec: '6.5.x'
  - task: PowerShell@2
    displayName: 'Create nuget.config with single source'
    inputs:
@ -196,6 +194,8 @@ jobs:
      arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
  - task: nuget-security-analysis@0
    displayName: 'Secure Supply Chain Analysis'
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet Auth'
  - task: NuGetCommand@2
    displayName: NuGet install PGDK
    inputs:
@ -277,8 +277,6 @@ jobs:
    fetchTags: false
  - task: NuGetToolInstaller@1
    displayName: 'Use NuGet'
-    inputs:
-      versionSpec: '6.5.x'
  - task: PowerShell@2
    displayName: 'Create nuget.config with single source'
    inputs:
@ -302,6 +300,8 @@ jobs:
      arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
  - task: nuget-security-analysis@0
    displayName: 'Secure Supply Chain Analysis'
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet Auth'
  - task: NuGetCommand@2
    displayName: NuGet install PGDK
    inputs:
--- a/build/DirectXTK12-GitHub-GDK.yml
+++ b/build/DirectXTK12-GitHub-GDK.yml
@ -78,8 +78,6 @@ jobs:
    fetchTags: false
  - task: NuGetToolInstaller@1
    displayName: 'Use NuGet'
-    inputs:
-      versionSpec: '6.5.x'
  - task: PowerShell@2
    displayName: 'Create nuget.config with single source'
    inputs:
@ -103,6 +101,8 @@ jobs:
      arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
  - task: nuget-security-analysis@0
    displayName: 'Secure Supply Chain Analysis'
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet Auth'
  - task: NuGetCommand@2
    displayName: NuGet install PGDK
    inputs:
@ -196,8 +196,6 @@ jobs:
      failOnStderr: true
  - task: NuGetToolInstaller@1
    displayName: 'Use NuGet'
-    inputs:
-      versionSpec: '6.5.x'
  - task: PowerShell@2
    displayName: 'Create nuget.config with single source'
    inputs:
@ -220,6 +218,8 @@ jobs:
      arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
  - task: nuget-security-analysis@0
    displayName: 'Secure Supply Chain Analysis'
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet Auth'
  - task: NuGetCommand@2
    displayName: NuGet install PGDK
    inputs:
@ -284,8 +284,6 @@ jobs:
      failOnStderr: true
  - task: NuGetToolInstaller@1
    displayName: 'Use NuGet'
-    inputs:
-      versionSpec: '6.5.x'
  - task: PowerShell@2
    displayName: 'Create nuget.config with single source'
    inputs:
@ -308,6 +306,8 @@ jobs:
      arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
  - task: nuget-security-analysis@0
    displayName: 'Secure Supply Chain Analysis'
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet Auth'
  - task: NuGetCommand@2
    displayName: NuGet install PGDK
    inputs:
--- a/build/DirectXTK12-GitHub-SDK-prerelease.yml
+++ b/build/DirectXTK12-GitHub-SDK-prerelease.yml
@ -46,8 +46,6 @@ jobs:
    fetchTags: false
  - task: NuGetToolInstaller@1
    displayName: 'Use NuGet'
-    inputs:
-      versionSpec: '6.5.x'
  - task: PowerShell@2
    displayName: 'Create nuget.config with single source'
    inputs:
@ -71,6 +69,8 @@ jobs:
      arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
  - task: nuget-security-analysis@0
    displayName: 'Secure Supply Chain Analysis'
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet Auth'
  - task: NuGetCommand@2
    displayName: NuGet Install WSDK x64
    inputs:
@ -145,8 +145,6 @@ jobs:
    fetchTags: false
  - task: NuGetToolInstaller@1
    displayName: 'Use NuGet'
-    inputs:
-      versionSpec: '6.5.x'
  - task: PowerShell@2
    displayName: 'Create nuget.config with single source'
    inputs:
@ -169,6 +167,8 @@ jobs:
      arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
  - task: nuget-security-analysis@0
    displayName: 'Secure Supply Chain Analysis'
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet Auth'
  - task: NuGetCommand@2
    displayName: NuGet Install WSDK x64
    inputs:
@ -214,16 +214,15 @@ jobs:
      platform: x64
      configuration: Release

- job: UWP_BUILD_ARM_ARM64
-  displayName: 'Universal Windows Platform (UWP) for ARM/ARM64'
+- job: UWP_BUILD_ARM64
+  displayName: 'Universal Windows Platform (UWP) for ARM64'
+  # Windows on ARM 32-bit is deprecated. https://learn.microsoft.com/windows/arm/arm32-to-arm64
  steps:
  - checkout: self
    clean: true
    fetchTags: false
  - task: NuGetToolInstaller@1
    displayName: 'Use NuGet'
-    inputs:
-      versionSpec: '6.5.x'
  - task: PowerShell@2
    displayName: 'Create nuget.config with single source'
    inputs:
@ -246,6 +245,8 @@ jobs:
      arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
  - task: nuget-security-analysis@0
    displayName: 'Secure Supply Chain Analysis'
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet Auth'
  - task: NuGetCommand@2
    displayName: NuGet Install WSDK arm64
    inputs:
--- a/build/DirectXTK12-GitHub-SDK-release.yml
+++ b/build/DirectXTK12-GitHub-SDK-release.yml
@ -46,8 +46,6 @@ jobs:
    fetchTags: false
  - task: NuGetToolInstaller@1
    displayName: 'Use NuGet'
-    inputs:
-      versionSpec: '6.5.x'
  - task: PowerShell@2
    displayName: 'Create nuget.config with single source'
    inputs:
@ -71,6 +69,8 @@ jobs:
      arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
  - task: nuget-security-analysis@0
    displayName: 'Secure Supply Chain Analysis'
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet Auth'
  - task: NuGetCommand@2
    displayName: NuGet Install WSDK x64
    inputs:
@ -145,8 +145,6 @@ jobs:
    fetchTags: false
  - task: NuGetToolInstaller@1
    displayName: 'Use NuGet'
-    inputs:
-      versionSpec: '6.5.x'
  - task: PowerShell@2
    displayName: 'Create nuget.config with single source'
    inputs:
@ -169,6 +167,8 @@ jobs:
      arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
  - task: nuget-security-analysis@0
    displayName: 'Secure Supply Chain Analysis'
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet Auth'
  - task: NuGetCommand@2
    displayName: NuGet Install WSDK x64
    inputs:
@ -214,16 +214,15 @@ jobs:
      platform: x64
      configuration: Release

- job: UWP_BUILD_ARM_ARM64
-  displayName: 'Universal Windows Platform (UWP) for ARM/ARM64'
+- job: UWP_BUILD_ARM64
+  displayName: 'Universal Windows Platform (UWP) for ARM64'
+  # Windows on ARM 32-bit is deprecated. https://learn.microsoft.com/windows/arm/arm32-to-arm64
  steps:
  - checkout: self
    clean: true
    fetchTags: false
  - task: NuGetToolInstaller@1
    displayName: 'Use NuGet'
-    inputs:
-      versionSpec: '6.5.x'
  - task: PowerShell@2
    displayName: 'Create nuget.config with single source'
    inputs:
@ -246,6 +245,8 @@ jobs:
      arguments: sources add -Name xboxgdk -Source $(URL_FEED) -ConfigFile $(Build.SourcesDirectory)\NuGet.config
  - task: nuget-security-analysis@0
    displayName: 'Secure Supply Chain Analysis'
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet Auth'
  - task: NuGetCommand@2
    displayName: NuGet Install WSDK arm64
    inputs:
--- a/build/DirectXTK12-GitHub-Test-Dev17.yml
+++ b/build/DirectXTK12-GitHub-Test-Dev17.yml
@ -66,6 +66,8 @@ jobs:
      failOnStderr: true
  - task: NuGetToolInstaller@1
    displayName: 'Use NuGet'
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet Auth'
  - task: NuGetCommand@2
    displayName: NuGet restore tests
    inputs:
@ -168,6 +170,8 @@ jobs:
      failOnStderr: true
  - task: NuGetToolInstaller@1
    displayName: 'Use NuGet'
+  - task: NuGetAuthenticate@1
+    displayName: 'NuGet Auth'
  - task: NuGetCommand@2
    displayName: NuGet restore tests
    inputs:
--- a/build/Directory.Build.props
+++ b/build/Directory.Build.props
@ -18,6 +18,21 @@
    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
  </PropertyGroup>

+  <PropertyGroup Condition="'$(GDKEditionNumber)' &lt; '220300'">
+    <_PCNuGetPackage>Microsoft.PGDK</_PCNuGetPackage>
+    <_XboxNuGetPackage>Microsoft.GDK</_XboxNuGetPackage>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(GDKEditionNumber)' &gt;= '220300'">
+    <_PCNuGetPackage>Microsoft.GDK.PC</_PCNuGetPackage>
+    <_XboxNuGetPackage>Microsoft.GDK.Xbox</_XboxNuGetPackage>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(GDKEditionNumber)' &lt; '241000'">
+    <_PCNuGetPackage>$(_PCNuGetPackage).$(GDKEditionNumber)</_PCNuGetPackage>
+    <_XboxNuGetPackage>$(_XboxNuGetPackage).$(GDKEditionNumber)</_XboxNuGetPackage>
+  </PropertyGroup>
+
  <!-- Windows 10 SDK NuGet -->
  <Import Condition="'$(WSDKEnableBWOI)' == 'true'"
          Project="$(ExtractedFolder)SDK\Microsoft.Windows.SDK.cpp\build\Microsoft.Windows.SDK.cpp.props" />
@ -32,11 +47,11 @@
          Project="$(ExtractedFolder)SDK\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\Microsoft.GDK.PC.$(GDKEditionNumber)\build\Microsoft.GDK.PC.$(GDKEditionNumber).props')"
-          Project="$(ExtractedFolder)GDK\Microsoft.GDK.PC.$(GDKEditionNumber)\build\Microsoft.GDK.PC.$(GDKEditionNumber).props" />
+  <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'))"
-          Project="$(ExtractedFolder)GDK\Microsoft.GDK.Xbox.$(GDKEditionNumber)\build\Microsoft.GDK.Xbox.$(GDKEditionNumber).props" />
+  <Import Condition="'$(GDKEnableBWOI)' == 'true' and $(Platform.Contains('x64')) and Exists('$(ExtractedFolder)GDK\$(_XboxNuGetPackage)\build\$(_XboxNuGetPackage).props')"
+          Project="$(ExtractedFolder)GDK\$(_XboxNuGetPackage)\build\$(_XboxNuGetPackage).props" />

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