diff --git a/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml b/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml
index a1beda2..a895d4c 100644
--- a/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml
+++ b/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml
@@ -57,8 +57,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:
@@ -82,6 +80,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:
diff --git a/build/DirectXTex-GitHub-CMake-Xbox.yml b/build/DirectXTex-GitHub-CMake-Xbox.yml
index c41f7b8..c42abf6 100644
--- a/build/DirectXTex-GitHub-CMake-Xbox.yml
+++ b/build/DirectXTex-GitHub-CMake-Xbox.yml
@@ -75,8 +75,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:
@@ -100,6 +98,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:
diff --git a/build/DirectXTex-GitHub-GDK-Dev17.yml b/build/DirectXTex-GitHub-GDK-Dev17.yml
index ffd57a8..86ea920 100644
--- a/build/DirectXTex-GitHub-GDK-Dev17.yml
+++ b/build/DirectXTex-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:
@@ -211,8 +211,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:
@@ -236,6 +234,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:
@@ -317,8 +317,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:
@@ -342,6 +340,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:
diff --git a/build/DirectXTex-GitHub-GDK.yml b/build/DirectXTex-GitHub-GDK.yml
index 2456d43..9accff7 100644
--- a/build/DirectXTex-GitHub-GDK.yml
+++ b/build/DirectXTex-GitHub-GDK.yml
@@ -79,8 +79,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:
@@ -104,6 +102,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:
diff --git a/build/DirectXTex-GitHub-SDK-prerelease.yml b/build/DirectXTex-GitHub-SDK-prerelease.yml
index 5322995..d01e503 100644
--- a/build/DirectXTex-GitHub-SDK-prerelease.yml
+++ b/build/DirectXTex-GitHub-SDK-prerelease.yml
@@ -45,8 +45,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:
@@ -70,6 +68,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:
@@ -172,8 +172,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 WSDK x64
inputs:
@@ -245,6 +245,7 @@ jobs:
msbuildArgs: /p:PreferredToolArchitecture=x64
platform: x64
configuration: Release
+ # Windows on ARM 32-bit is deprecated. https://learn.microsoft.com/windows/arm/arm32-to-arm64
- task: VSBuild@1
displayName: Build solution DirectXTex_Windows10_2022.sln arm64dbg
inputs:
diff --git a/build/DirectXTex-GitHub-SDK-release.yml b/build/DirectXTex-GitHub-SDK-release.yml
index 913b08b..46b4900 100644
--- a/build/DirectXTex-GitHub-SDK-release.yml
+++ b/build/DirectXTex-GitHub-SDK-release.yml
@@ -45,8 +45,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:
@@ -70,6 +68,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:
@@ -172,8 +172,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 WSDK x64
inputs:
@@ -245,6 +245,7 @@ jobs:
msbuildArgs: /p:PreferredToolArchitecture=x64
platform: x64
configuration: Release
+ # Windows on ARM 32-bit is deprecated. https://learn.microsoft.com/windows/arm/arm32-to-arm64
- task: VSBuild@1
displayName: Build solution DirectXTex_Windows10_2022.sln arm64dbg
inputs:
diff --git a/build/Directory.Build.props b/build/Directory.Build.props
index ab3bb53..f34ed2c 100644
--- a/build/Directory.Build.props
+++ b/build/Directory.Build.props
@@ -18,6 +18,21 @@
15.0
+
+ <_PCNuGetPackage>Microsoft.PGDK
+ <_XboxNuGetPackage>Microsoft.GDK
+
+
+
+ <_PCNuGetPackage>Microsoft.GDK.PC
+ <_XboxNuGetPackage>Microsoft.GDK.Xbox
+
+
+
+ <_PCNuGetPackage>$(_PCNuGetPackage).$(GDKEditionNumber)
+ <_XboxNuGetPackage>$(_XboxNuGetPackage).$(GDKEditionNumber)
+
+
@@ -32,11 +47,16 @@
Project="$(ExtractedFolder)SDK\Microsoft.Windows.SDK.cpp.arm64\build\native\Microsoft.Windows.SDK.cpp.arm64.props" />
-
+
-
+
+
+
+
+ $(MSBuildThisFileDirectory)build\placeholder.xvd
+