From 82e094cf7c34a6535f6a60216ada860cdaad14c3 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 22 Apr 2025 11:33:07 -0700 Subject: [PATCH] Fix some ADO build failures (#609) --- .../pipelines/DirectXTex-GitHub-GDK-Dev17.yml | 14 +++--- .../pipelines/DirectXTex-GitHub-GDK.yml | 12 ++--- .../DirectXTex-GitHub-SDK-prerelease.yml | 50 ++++++++++++------- .../DirectXTex-GitHub-SDK-release.yml | 50 ++++++++++++------- 4 files changed, 76 insertions(+), 50 deletions(-) diff --git a/.azuredevops/pipelines/DirectXTex-GitHub-GDK-Dev17.yml b/.azuredevops/pipelines/DirectXTex-GitHub-GDK-Dev17.yml index 313dcc5..4d24fff 100644 --- a/.azuredevops/pipelines/DirectXTex-GitHub-GDK-Dev17.yml +++ b/.azuredevops/pipelines/DirectXTex-GitHub-GDK-Dev17.yml @@ -50,6 +50,8 @@ variables: value: true - name: URL_FEED value: $(ADOFeedURL) +- name: VC_PATH + value: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC' - name: skipNugetSecurityAnalysis value: true # We explicitly call this task so we don't need it to be auto-injected @@ -178,44 +180,40 @@ jobs: inputs: solution: DirectXTex_GXDK_PC_2022.sln vsVersion: 17.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) + msbuildArgs: /p:PreferredToolArchitecture=x64 /p:GDKEditionNumber=$(GDK_EDITION) - task: VSBuild@1 displayName: Build solution DirectXTex_GDK_PC_2022 rel continueOnError: True inputs: solution: DirectXTex_GXDK_PC_2022.sln vsVersion: 17.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) + msbuildArgs: /p:PreferredToolArchitecture=x64 /p:GDKEditionNumber=$(GDK_EDITION) - task: VSBuild@1 displayName: Build solution DirectXTex_GDK_PC_2022 scardbg continueOnError: True inputs: solution: DirectXTex_GXDK_PC_2022.sln vsVersion: 17.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug_Scarlett msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) + msbuildArgs: /p:PreferredToolArchitecture=x64 /p:GDKEditionNumber=$(GDK_EDITION) - task: VSBuild@1 displayName: Build solution DirectXTex_GDK_PC_2022 scarrel continueOnError: True inputs: solution: DirectXTex_GXDK_PC_2022.sln vsVersion: 17.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release_Scarlett msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) + msbuildArgs: /p:PreferredToolArchitecture=x64 /p:GDKEditionNumber=$(GDK_EDITION) - job: BUILD_GDK_CMAKE_SCAR displayName: 'Microsoft Game Development Kit (GDK) using CMake (Scarlett)' diff --git a/.azuredevops/pipelines/DirectXTex-GitHub-GDK.yml b/.azuredevops/pipelines/DirectXTex-GitHub-GDK.yml index f1abb4a..625a402 100644 --- a/.azuredevops/pipelines/DirectXTex-GitHub-GDK.yml +++ b/.azuredevops/pipelines/DirectXTex-GitHub-GDK.yml @@ -198,41 +198,37 @@ jobs: inputs: solution: DirectXTex_GXDK_PC_2019.sln vsVersion: 16.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) + msbuildArgs: /p:PreferredToolArchitecture=x64 /p:GDKEditionNumber=$(GDK_EDITION) - task: VSBuild@1 displayName: Build solution DirectXTex_GDK_PC_2019 rel continueOnError: True inputs: solution: DirectXTex_GXDK_PC_2019.sln vsVersion: 16.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) + msbuildArgs: /p:PreferredToolArchitecture=x64 /p:GDKEditionNumber=$(GDK_EDITION) - task: VSBuild@1 displayName: Build solution DirectXTex_GDK_PC_2019 scardbg continueOnError: True inputs: solution: DirectXTex_GXDK_PC_2019.sln vsVersion: 16.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug_Scarlett msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) + msbuildArgs: /p:PreferredToolArchitecture=x64 /p:GDKEditionNumber=$(GDK_EDITION) - task: VSBuild@1 displayName: Build solution DirectXTex_GDK_PC_2019 scarrel continueOnError: True inputs: solution: DirectXTex_GXDK_PC_2019.sln vsVersion: 16.0 - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release_Scarlett msbuildArchitecture: x64 - msbuildArgs: /p:GDKEditionNumber=$(GDK_EDITION) + msbuildArgs: /p:PreferredToolArchitecture=x64 /p:GDKEditionNumber=$(GDK_EDITION) diff --git a/.azuredevops/pipelines/DirectXTex-GitHub-SDK-prerelease.yml b/.azuredevops/pipelines/DirectXTex-GitHub-SDK-prerelease.yml index 9b96ec1..fc1e2c5 100644 --- a/.azuredevops/pipelines/DirectXTex-GitHub-SDK-prerelease.yml +++ b/.azuredevops/pipelines/DirectXTex-GitHub-SDK-prerelease.yml @@ -101,77 +101,87 @@ jobs: displayName: Build solution DirectXTex_Desktop_2019.sln 32dbg inputs: solution: DirectXTex_Desktop_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2019.sln 32rel inputs: solution: DirectXTex_Desktop_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2019.sln 64dbg inputs: solution: DirectXTex_Desktop_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2019.sln 64rel inputs: solution: DirectXTex_Desktop_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2019_Win10.sln 32dbg inputs: solution: DirectXTex_Desktop_2019_Win10.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2019_Win10.sln 32rel inputs: solution: DirectXTex_Desktop_2019_Win10.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2019_Win10.sln 64dbg inputs: solution: DirectXTex_Desktop_2019_Win10.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2019_Win10.sln 64rel inputs: solution: DirectXTex_Desktop_2019_Win10.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 # VS 2019 for Win32 on ARM64 is out of support. - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2022_Win10.sln arm64dbg inputs: solution: DirectXTex_Desktop_2022_Win10.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2022_Win10.sln arm64rel inputs: solution: DirectXTex_Desktop_2022_Win10.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - job: UWP_BUILD displayName: 'Universal Windows Platform (UWP)' - timeoutInMinutes: 120 + timeoutInMinutes: 240 cancelTimeoutInMinutes: 1 steps: - checkout: self @@ -228,42 +238,48 @@ jobs: displayName: Build solution DirectXTex_Windows10_2022.sln 32dbg inputs: solution: DirectXTex_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Windows10_2022.sln 32rel inputs: solution: DirectXTex_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Windows10_2022.sln 64dbg inputs: solution: DirectXTex_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Windows10_2022.sln 64rel inputs: solution: DirectXTex_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 # 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: solution: DirectXTex_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Windows10_2022.sln arm64rel inputs: solution: DirectXTex_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 diff --git a/.azuredevops/pipelines/DirectXTex-GitHub-SDK-release.yml b/.azuredevops/pipelines/DirectXTex-GitHub-SDK-release.yml index 6027ce2..de8de76 100644 --- a/.azuredevops/pipelines/DirectXTex-GitHub-SDK-release.yml +++ b/.azuredevops/pipelines/DirectXTex-GitHub-SDK-release.yml @@ -101,77 +101,87 @@ jobs: displayName: Build solution DirectXTex_Desktop_2019.sln 32dbg inputs: solution: DirectXTex_Desktop_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2019.sln 32rel inputs: solution: DirectXTex_Desktop_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2019.sln 64dbg inputs: solution: DirectXTex_Desktop_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2019.sln 64rel inputs: solution: DirectXTex_Desktop_2019.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2019_Win10.sln 32dbg inputs: solution: DirectXTex_Desktop_2019_Win10.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2019_Win10.sln 32rel inputs: solution: DirectXTex_Desktop_2019_Win10.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2019_Win10.sln 64dbg inputs: solution: DirectXTex_Desktop_2019_Win10.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2019_Win10.sln 64rel inputs: solution: DirectXTex_Desktop_2019_Win10.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 # VS 2019 for Win32 on ARM64 is out of support. - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2022_Win10.sln arm64dbg inputs: solution: DirectXTex_Desktop_2022_Win10.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Desktop_2022_Win10.sln arm64rel inputs: solution: DirectXTex_Desktop_2022_Win10.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - job: UWP_BUILD displayName: 'Universal Windows Platform (UWP)' - timeoutInMinutes: 120 + timeoutInMinutes: 240 cancelTimeoutInMinutes: 1 steps: - checkout: self @@ -228,42 +238,48 @@ jobs: displayName: Build solution DirectXTex_Windows10_2022.sln 32dbg inputs: solution: DirectXTex_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Windows10_2022.sln 32rel inputs: solution: DirectXTex_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x86 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Windows10_2022.sln 64dbg inputs: solution: DirectXTex_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Windows10_2022.sln 64rel inputs: solution: DirectXTex_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: x64 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 # 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: solution: DirectXTex_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Debug + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64 - task: VSBuild@1 displayName: Build solution DirectXTex_Windows10_2022.sln arm64rel inputs: solution: DirectXTex_Windows10_2022.sln - msbuildArgs: /p:PreferredToolArchitecture=x64 platform: ARM64 configuration: Release + msbuildArchitecture: x64 + msbuildArgs: /p:PreferredToolArchitecture=x64