diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index f2b9ffc7..0332dcae 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -140,7 +140,7 @@ Configurations: ] - Id: 'windows-10_22h2-msvc2022' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2022' Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' @@ -236,7 +236,7 @@ Configurations: ] - Id: 'windows-10_22h2-mingw13' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'Mingw' Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 32a50fda..d1a145fd 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -17,7 +17,7 @@ Configurations: ] - Id: 'android-armv7-on-windows' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Target os: 'Android_ANY' Target arch: 'armv7' Compiler: 'Mingw' diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index a780d234..7cdba074 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -14,7 +14,7 @@ Configurations: ] - Id: 'webassembly-windows' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Target os: 'WebAssembly' Compiler: 'Mingw' Target compiler: 'Clang' diff --git a/coin/platform_configs/nightly_qnx710_host_windows.yaml b/coin/platform_configs/nightly_qnx710_host_windows.yaml index a4e1bed2..40a53fd3 100644 --- a/coin/platform_configs/nightly_qnx710_host_windows.yaml +++ b/coin/platform_configs/nightly_qnx710_host_windows.yaml @@ -7,7 +7,7 @@ Include: [ Configurations: - Id: 'qnx-710-arm64-on-windows' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Target os: 'QNX_710' Target arch: 'arm64' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qmake2cmake.yaml b/coin/platform_configs/qmake2cmake.yaml index 9ffcbaee..deabdf00 100644 --- a/coin/platform_configs/qmake2cmake.yaml +++ b/coin/platform_configs/qmake2cmake.yaml @@ -2,7 +2,7 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2019' Features: ['DisableTests'] - diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index c30819a5..94096a6f 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -2,7 +2,7 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Sccache', 'DebugAndRelease'] Configure arguments: '' @@ -28,7 +28,7 @@ Configurations: Environment variables: [] # without tests - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Sccache', 'DebugAndRelease', 'DisableTests'] Configure arguments: '' @@ -36,7 +36,7 @@ Configurations: Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] # oldest Qt version - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Sccache', 'DebugAndRelease', 'OldestQt'] Configure arguments: '' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 14fde359..d0da81c1 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -48,7 +48,7 @@ Configurations: ] - Id: 'Windows-MSVC2022_Static' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql' diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 7230a749..d63d2c6b 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH'] Features: ['Packaging', UseLegacyInstructions'] diff --git a/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt b/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt index 09764b39..1953083e 100644 --- a/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt +++ b/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt @@ -56,6 +56,10 @@ Windows 10 SDK (10.0.22000.0) Windows 10 SDK (10.0.22621.0) Windows Universal C Runtime +Windows SDK (10.0.26100.1742) was later downloaded and installed from: +https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/ +# COIN-1206 + # NOTE! Work loads were added during installation! ############################################################