windows-2019 image being retired for ADO

This commit is contained in:
Chuck Walbourn 2025-07-17 17:19:31 -07:00
parent f297031066
commit 50a22ee39b
8 changed files with 46 additions and 187 deletions

View File

@ -32,7 +32,6 @@ resources:
- repository: self - repository: self
type: git type: git
ref: refs/heads/main ref: refs/heads/main
trigger: none
- repository: testRepo - repository: testRepo
name: walbourn/directxtextest name: walbourn/directxtextest
type: github type: github

View File

@ -58,7 +58,7 @@ variables:
- name: Codeql.Enabled - name: Codeql.Enabled
value: false value: false
- name: VS_GENERATOR - name: VS_GENERATOR
value: 'Visual Studio 16 2019' value: 'Visual Studio 17 2022'
- name: WIN10_SDK - name: WIN10_SDK
value: '10.0.19041.0' value: '10.0.19041.0'
- name: EXTRACTED_FOLDER - name: EXTRACTED_FOLDER
@ -73,7 +73,7 @@ variables:
value: true # We explicitly call this task so we don't need it to be auto-injected value: true # We explicitly call this task so we don't need it to be auto-injected
pool: pool:
vmImage: windows-2019 vmImage: windows-2022
jobs: jobs:
- job: CMAKE_BUILD - job: CMAKE_BUILD
@ -121,7 +121,7 @@ jobs:
inputs: inputs:
cwd: '' cwd: ''
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out -G "$(VS_GENERATOR)" -T v142 -A x64 -B out
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
- task: CMake@1 - task: CMake@1
@ -134,66 +134,30 @@ jobs:
inputs: inputs:
cwd: '' cwd: ''
cmakeArgs: --build out -v --config RelWithDebInfo cmakeArgs: --build out -v --config RelWithDebInfo
- task: CMake@1
displayName: 'CMake (ClangCl): Config x64 (Xbox Series X|S)'
inputs:
cwd: ''
cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
- task: CMake@1
displayName: 'CMake (ClangCl): Build x64 Debug (Xbox Series X|S)'
inputs:
cwd: ''
cmakeArgs: --build out2 -v --config Debug
- task: CMake@1
displayName: 'CMake (ClangCl): Build x64 Release (Xbox Series X|S)'
inputs:
cwd: ''
cmakeArgs: --build out2 -v --config RelWithDebInfo
- task: CMake@1 - task: CMake@1
displayName: 'CMake (MSVC): Config x64 (Xbox One)' displayName: 'CMake (MSVC): Config x64 (Xbox One)'
inputs: inputs:
cwd: '' cwd: ''
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out3 -G "$(VS_GENERATOR)" -T v142 -A x64 -B out2
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
- task: CMake@1 - task: CMake@1
displayName: 'CMake (MSVC): Build x64 Debug (Xbox One)' displayName: 'CMake (MSVC): Build x64 Debug (Xbox One)'
inputs: inputs:
cwd: '' cwd: ''
cmakeArgs: --build out3 -v --config Debug cmakeArgs: --build out2 -v --config Debug
- task: CMake@1 - task: CMake@1
displayName: 'CMake (MSVC): Build x64 Release (Xbox One)' displayName: 'CMake (MSVC): Build x64 Release (Xbox One)'
inputs: inputs:
cwd: '' cwd: ''
cmakeArgs: --build out3 -v --config RelWithDebInfo cmakeArgs: --build out2 -v --config RelWithDebInfo
- task: CMake@1
displayName: 'CMake (ClangCl): Config x64 (Xbox One)'
inputs:
cwd: ''
cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
- task: CMake@1
displayName: 'CMake (ClangCl): Build x64 Debug (Xbox One)'
inputs:
cwd: ''
cmakeArgs: --build out4 -v --config Debug
- task: CMake@1
displayName: 'CMake (ClangCl): Build x64 Release (Xbox One)'
inputs:
cwd: ''
cmakeArgs: --build out4 -v --config RelWithDebInfo
- task: CMake@1 - task: CMake@1
displayName: 'CMake (DLL): Config x64 (Xbox Series X|S)' displayName: 'CMake (DLL): Config x64 (Xbox Series X|S)'
inputs: inputs:
cwd: '' cwd: ''
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out5 -G "$(VS_GENERATOR)" -T v142 -A x64 -B out3
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
-DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON
@ -201,18 +165,18 @@ jobs:
displayName: 'CMake (DLL): Build x64 Debug (Xbox Series X|S)' displayName: 'CMake (DLL): Build x64 Debug (Xbox Series X|S)'
inputs: inputs:
cwd: '' cwd: ''
cmakeArgs: --build out5 -v --config Debug cmakeArgs: --build out3 -v --config Debug
- task: CMake@1 - task: CMake@1
displayName: 'CMake (DLL): Build x64 Release (Xbox Series X|S)' displayName: 'CMake (DLL): Build x64 Release (Xbox Series X|S)'
inputs: inputs:
cwd: '' cwd: ''
cmakeArgs: --build out5 -v --config RelWithDebInfo cmakeArgs: --build out3 -v --config RelWithDebInfo
- task: CMake@1 - task: CMake@1
displayName: 'CMake (DLL): Config x64 (Xbox One)' displayName: 'CMake (DLL): Config x64 (Xbox One)'
inputs: inputs:
cwd: '' cwd: ''
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out6 -G "$(VS_GENERATOR)" -T v142 -A x64 -B out4
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
-DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON
@ -220,9 +184,9 @@ jobs:
displayName: 'CMake (DLL): Build x64 Debug (Xbox One)' displayName: 'CMake (DLL): Build x64 Debug (Xbox One)'
inputs: inputs:
cwd: '' cwd: ''
cmakeArgs: --build out6 -v --config Debug cmakeArgs: --build out4 -v --config Debug
- task: CMake@1 - task: CMake@1
displayName: 'CMake (DLL): Build x64 Release (Xbox One)' displayName: 'CMake (DLL): Build x64 Release (Xbox One)'
inputs: inputs:
cwd: '' cwd: ''
cmakeArgs: --build out6 -v --config RelWithDebInfo cmakeArgs: --build out4 -v --config RelWithDebInfo

View File

@ -69,14 +69,14 @@ variables:
- name: VCPKG_MANIFEST_DIR - name: VCPKG_MANIFEST_DIR
value: '$(Build.SourcesDirectory)/build' value: '$(Build.SourcesDirectory)/build'
- name: VS_GENERATOR - name: VS_GENERATOR
value: 'Visual Studio 16 2019' value: 'Visual Studio 17 2022'
- name: WIN10_SDK - name: WIN10_SDK
value: '10.0.19041.0' value: '10.0.19041.0'
- name: WIN11_SDK - name: WIN11_SDK
value: '10.0.22000.0' value: '10.0.22000.0'
pool: pool:
vmImage: windows-2019 vmImage: windows-2022
jobs: jobs:
- job: CMAKE_BUILD - job: CMAKE_BUILD
@ -90,7 +90,7 @@ jobs:
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out -G "$(VS_GENERATOR)" -T v142 -A x64 -B out
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DBUILD_DX12=OFF -DBUILD_DX12=OFF
- task: CMake@1 - task: CMake@1
@ -108,7 +108,7 @@ jobs:
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A Win32 -B out2 -G "$(VS_GENERATOR)" -T v142 -A Win32 -B out2
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DBUILD_DX12=OFF -DBUILD_DX12=OFF
- task: CMake@1 - task: CMake@1
@ -126,49 +126,32 @@ jobs:
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out3 -G "$(VS_GENERATOR)" -T v142 -A x64 -B out3
-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
- task: CMake@1 - task: CMake@1
displayName: 'CMake (UWP): Build x64' displayName: 'CMake (UWP): Build x64'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out3 -v cmakeArgs: --build out3 -v
- task: CMake@1
displayName: 'CMake (ClangCl): Config x64'
inputs:
cwd: $(Build.SourcesDirectory)
cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
- task: CMake@1
displayName: 'CMake (ClangCl): Build x64 Debug'
inputs:
cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out4 -v --config Debug
- task: CMake@1
displayName: 'CMake (ClangCl): Build x64 Release'
inputs:
cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out4 -v --config RelWithDebInfo
- task: CMake@1 - task: CMake@1
displayName: 'CMake (Win10): Config' displayName: 'CMake (Win10): Config'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out5 -G "$(VS_GENERATOR)" -T v142 -A x64 -B out4
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DBUILD_DX12=ON -DBUILD_DX12=ON
- task: CMake@1 - task: CMake@1
displayName: 'CMake (Win10): Build' displayName: 'CMake (Win10): Build'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out5 -v --config Debug cmakeArgs: --build out4 -v --config Debug
- task: CMake@1 - task: CMake@1
displayName: 'CMake (MSVC Spectre): Config x64' displayName: 'CMake (MSVC Spectre): Config x64'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out6 -G "$(VS_GENERATOR)" -T v142 -A x64 -B out5
-DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DBUILD_DX12=OFF -DBUILD_DX12=OFF
@ -176,18 +159,18 @@ jobs:
displayName: 'CMake (MSVC Spectre): Build x64 Debug' displayName: 'CMake (MSVC Spectre): Build x64 Debug'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out6 -v --config Debug cmakeArgs: --build out5 -v --config Debug
- task: CMake@1 - task: CMake@1
displayName: 'CMake (MSVC Spectre): Build x64 Release' displayName: 'CMake (MSVC Spectre): Build x64 Release'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out6 -v --config RelWithDebInfo cmakeArgs: --build out5 -v --config RelWithDebInfo
- task: CMake@1 - task: CMake@1
displayName: 'CMake (Win10 Spectre): Config' displayName: 'CMake (Win10 Spectre): Config'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out7 -G "$(VS_GENERATOR)" -T v142 -A x64 -B out6
-DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
-DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DBUILD_DX12=ON -DBUILD_DX12=ON
@ -195,13 +178,13 @@ jobs:
displayName: 'CMake (Win10 Spectre): Build' displayName: 'CMake (Win10 Spectre): Build'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out7 -v --config Debug cmakeArgs: --build out6 -v --config Debug
- task: CMake@1 - task: CMake@1
displayName: 'CMake (NO_WCHAR_T): Config' displayName: 'CMake (NO_WCHAR_T): Config'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out8 -G "$(VS_GENERATOR)" -T v142 -A x64 -B out7
-DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
-DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
-DBUILD_DX12=ON -DBUILD_DX12=ON
@ -209,13 +192,13 @@ jobs:
displayName: 'CMake (NO_WCHAR_T): Build' displayName: 'CMake (NO_WCHAR_T): Build'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out8 -v --config Debug cmakeArgs: --build out7 -v --config Debug
- task: CMake@1 - task: CMake@1
displayName: 'CMake (DLL): Config x64' displayName: 'CMake (DLL): Config x64'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out9 -G "$(VS_GENERATOR)" -T v142 -A x64 -B out8
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DBUILD_DX12=ON -DBUILD_DX12=ON
-DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON
@ -223,25 +206,25 @@ jobs:
displayName: 'CMake (DLL): Build x64 Debug' displayName: 'CMake (DLL): Build x64 Debug'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out9 -v --config Debug cmakeArgs: --build out8 -v --config Debug
- task: CMake@1 - task: CMake@1
displayName: 'CMake (DLL): Build x64 Release' displayName: 'CMake (DLL): Build x64 Release'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out9 -v --config RelWithDebInfo cmakeArgs: --build out8 -v --config RelWithDebInfo
- task: CMake@1 - task: CMake@1
displayName: 'CMake (UWP DLL): Config x64' displayName: 'CMake (UWP DLL): Config x64'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out10 -G "$(VS_GENERATOR)" -T v142 -A x64 -B out9
-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
-DBUILD_SHARED_LIBS=ON -DBUILD_SHARED_LIBS=ON
- task: CMake@1 - task: CMake@1
displayName: 'CMake (UWP DLL): Build x64' displayName: 'CMake (UWP DLL): Build x64'
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: --build out10 -v cmakeArgs: --build out9 -v
- job: CMAKE_BUILD_VCPKG - job: CMAKE_BUILD_VCPKG
displayName: CMake using VCPKG displayName: CMake using VCPKG
@ -272,7 +255,7 @@ jobs:
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -G "$(VS_GENERATOR)" -T v142 -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
-DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
- task: CMake@1 - task: CMake@1
@ -285,7 +268,7 @@ jobs:
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out2 -DENABLE_OPENEXR_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -G "$(VS_GENERATOR)" -T v142 -A x64 -B out2 -DENABLE_OPENEXR_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
-DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
- task: CMake@1 - task: CMake@1
@ -298,7 +281,7 @@ jobs:
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out3 -DENABLE_LIBJPEG_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -G "$(VS_GENERATOR)" -T v142 -A x64 -B out3 -DENABLE_LIBJPEG_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
-DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
- task: CMake@1 - task: CMake@1
@ -311,7 +294,7 @@ jobs:
inputs: inputs:
cwd: $(Build.SourcesDirectory) cwd: $(Build.SourcesDirectory)
cmakeArgs: > cmakeArgs: >
-G "$(VS_GENERATOR)" -A x64 -B out4 -DENABLE_LIBPNG_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -G "$(VS_GENERATOR)" -T v142 -A x64 -B out4 -DENABLE_LIBPNG_SUPPORT=ON -DBUILD_TESTING=OFF -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
-DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)" -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_CMAKE_DIR)"
-DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows -DVCPKG_MANIFEST_DIR="$(VCPKG_MANIFEST_DIR)" -DVCPKG_TARGET_TRIPLET=x64-windows
- task: CMake@1 - task: CMake@1

View File

@ -34,7 +34,6 @@ resources:
- repository: self - repository: self
type: git type: git
ref: refs/heads/main ref: refs/heads/main
trigger: none
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
@ -111,7 +110,6 @@ jobs:
displayName: Setup BWOI VCTargets displayName: Setup BWOI VCTargets
inputs: inputs:
solution: build/SetupBWOI.targets solution: build/SetupBWOI.targets
msbuildVersion: 17.0
msbuildArchitecture: x64 msbuildArchitecture: x64
msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION) msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
- template: '/.azuredevops/templates/DirectXTex-build-gdk.yml' - template: '/.azuredevops/templates/DirectXTex-build-gdk.yml'

View File

@ -58,7 +58,7 @@ resources:
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
pool: pool:
vmImage: windows-2019 vmImage: windows-2022
variables: variables:
- group: dxtex-shared-variables - group: dxtex-shared-variables
@ -128,10 +128,9 @@ jobs:
displayName: Setup BWOI VCTargets displayName: Setup BWOI VCTargets
inputs: inputs:
solution: build/SetupBWOI.targets solution: build/SetupBWOI.targets
msbuildVersion: 16.0
msbuildArchitecture: x64 msbuildArchitecture: x64
msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION) msbuildArguments: /p:GDKEditionNumber=$(GDK_EDITION)
- template: '/.azuredevops/templates/DirectXTex-build-gdk.yml' - template: '/.azuredevops/templates/DirectXTex-build-gdk.yml'
parameters: parameters:
msVersion: '16.0' msVersion: '17.0'
vsYear: 2019 vsYear: 2019

View File

@ -39,9 +39,13 @@ pool:
vmImage: windows-2022 vmImage: windows-2022
variables: variables:
Codeql.Enabled: false - group: dxtex-shared-variables
VC_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC' - name: Codeql.Enabled
GUID_FEED: $(ADOFeedGUID) value: false
- name: VC_PATH
value: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC'
- name: GUID_FEED
value: $(ADOFeedGUID)
jobs: jobs:
- job: DESKTOP_BUILD - job: DESKTOP_BUILD
@ -93,7 +97,6 @@ jobs:
displayName: Build solution DirectXTex_Tests_Desktop_2022.sln displayName: Build solution DirectXTex_Tests_Desktop_2022.sln
inputs: inputs:
solution: Tests/DirectXTex_Tests_Desktop_2022.sln solution: Tests/DirectXTex_Tests_Desktop_2022.sln
vsVersion: 17.0
msbuildArgs: /p:PreferredToolArchitecture=x64 msbuildArgs: /p:PreferredToolArchitecture=x64
platform: '$(BuildPlatform)' platform: '$(BuildPlatform)'
configuration: '$(BuildConfiguration)' configuration: '$(BuildConfiguration)'
@ -103,7 +106,6 @@ jobs:
displayName: Build solution DirectXTex_Tests_Desktop_2022_Win10.sln displayName: Build solution DirectXTex_Tests_Desktop_2022_Win10.sln
inputs: inputs:
solution: Tests/DirectXTex_Tests_Desktop_2022_Win10.sln solution: Tests/DirectXTex_Tests_Desktop_2022_Win10.sln
vsVersion: 17.0
msbuildArgs: /p:PreferredToolArchitecture=x64 msbuildArgs: /p:PreferredToolArchitecture=x64
platform: '$(BuildPlatform)' platform: '$(BuildPlatform)'
configuration: '$(BuildConfiguration)' configuration: '$(BuildConfiguration)'

View File

@ -36,14 +36,12 @@ resources:
name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r) name: $(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
pool: pool:
vmImage: windows-2019 vmImage: windows-2022
variables: variables:
- group: dxtex-shared-variables - group: dxtex-shared-variables
- name: Codeql.Enabled - name: Codeql.Enabled
value: false value: false
- name: VC_PATH
value: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC'
- name: GUID_FEED - name: GUID_FEED
value: $(ADOFeedGUID) value: $(ADOFeedGUID)
@ -91,7 +89,6 @@ jobs:
displayName: Build solution DirectXTex_Tests_Desktop_2019.sln displayName: Build solution DirectXTex_Tests_Desktop_2019.sln
inputs: inputs:
solution: Tests/DirectXTex_Tests_Desktop_2019.sln solution: Tests/DirectXTex_Tests_Desktop_2019.sln
vsVersion: 16.0
msbuildArgs: /p:PreferredToolArchitecture=x64 msbuildArgs: /p:PreferredToolArchitecture=x64
platform: '$(BuildPlatform)' platform: '$(BuildPlatform)'
configuration: '$(BuildConfiguration)' configuration: '$(BuildConfiguration)'
@ -99,89 +96,6 @@ jobs:
displayName: Build solution DirectXTex_Tests_Desktop_2019_Win10.sln displayName: Build solution DirectXTex_Tests_Desktop_2019_Win10.sln
inputs: inputs:
solution: Tests/DirectXTex_Tests_Desktop_2019_Win10.sln solution: Tests/DirectXTex_Tests_Desktop_2019_Win10.sln
vsVersion: 16.0
msbuildArgs: /p:PreferredToolArchitecture=x64 msbuildArgs: /p:PreferredToolArchitecture=x64
platform: '$(BuildPlatform)' platform: '$(BuildPlatform)'
configuration: '$(BuildConfiguration)' configuration: '$(BuildConfiguration)'
- job: CMAKE_BUILD_X64
displayName: 'CMake for X64 BUILD_TESTING=ON'
timeoutInMinutes: 120
workspace:
clean: all
steps:
- checkout: self
clean: true
fetchTags: false
fetchDepth: 1
path: 's'
- checkout: testRepo
displayName: Fetch Tests
clean: true
fetchTags: false
fetchDepth: 1
path: 's/Tests'
- task: CmdLine@2
displayName: Setup environment for CMake to use VS
inputs:
script: |
call "$(VC_PATH)\Auxiliary\Build\vcvars64.bat"
echo ##vso[task.setvariable variable=WindowsSdkVerBinPath;]%WindowsSdkVerBinPath%
echo ##vso[task.prependpath]%VSINSTALLDIR%Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
echo ##vso[task.prependpath]%VCINSTALLDIR%Tools\Llvm\x64\bin
echo ##vso[task.prependpath]%WindowsSdkBinPath%x64
echo ##vso[task.prependpath]%WindowsSdkVerBinPath%x64
echo ##vso[task.prependpath]%VCToolsInstallDir%bin\Hostx64\x64
echo ##vso[task.setvariable variable=EXTERNAL_INCLUDE;]%EXTERNAL_INCLUDE%
echo ##vso[task.setvariable variable=INCLUDE;]%INCLUDE%
echo ##vso[task.setvariable variable=LIB;]%LIB%
- task: CMake@1
displayName: CMake (MSVC; x64-Debug) Config
inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --preset=x64-Debug
- task: CMake@1
displayName: CMake (MSVC; x64-Debug) Build
inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --build out/build/x64-Debug -v
- task: DeleteFiles@1
inputs:
Contents: 'out'
- task: CMake@1
displayName: CMake (MSVC; x64-Release) Config
inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --preset=x64-Release
- task: CMake@1
displayName: CMake (MSVC; x64-Release) Build
inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --build out/build/x64-Release -v
- task: DeleteFiles@1
inputs:
Contents: 'out'
- task: CMake@1
displayName: CMake (clang/LLVM; x64-Debug) Config
inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --preset=x64-Debug-Clang
- task: CMake@1
displayName: CMake (clang/LLVM; x64-Debug) Build
inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --build out/build/x64-Debug-Clang -v
- task: DeleteFiles@1
inputs:
Contents: 'out'
- task: CMake@1
displayName: CMake (clang/LLVM; x64-Release) Config
inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --preset=x64-Release-Clang
- task: CMake@1
displayName: CMake (clang/LLVM; x64-Release) Build
inputs:
cwd: '$(Build.SourcesDirectory)'
cmakeArgs: --build out/build/x64-Release-Clang -v

View File

@ -35,7 +35,7 @@ variables:
Codeql.Enabled: false Codeql.Enabled: false
pool: pool:
vmImage: windows-2019 vmImage: windows-2022
jobs: jobs:
- job: DESKTOP_BUILD - job: DESKTOP_BUILD