diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2023-06-27 05:35:24 +0000 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-07-09 02:03:22 +0200 |
commit | a4c0d0104b7cdef4c25f44dea06c33af821a6022 (patch) | |
tree | 088699a5c43fffe798236be0f51f418ff97c462b | |
parent | 349d3e1a2f65400a73fe912678e73865c643821b (diff) |
Upgrade MSVC 2022 and 2019 for Windows 10 22H2
Change upgrades also build tools for both visual studios
MSVC 2022: 17.6.4
MSVC 2019: 16.11.27
Task-number: COIN-1059
Change-Id: Id212d396a58827d5794158a4b314ec65ad5a3f47
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
(cherry picked from commit 6341108c6fad1fcf032a946ea994d794f6bb1867)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 14 | ||||
-rw-r--r-- | coin/platform_configs/cmake_platforms_static_tests.yaml | 2 | ||||
-rw-r--r-- | coin/platform_configs/cmake_platforms_target_android.yaml | 2 | ||||
-rw-r--r-- | coin/platform_configs/cmake_platforms_wasm.yaml | 2 | ||||
-rw-r--r-- | coin/platform_configs/flashing-wizard.yaml | 4 | ||||
-rw-r--r-- | coin/platform_configs/nightly_qnx710_host_windows.yaml | 2 | ||||
-rw-r--r-- | coin/platform_configs/qmake2cmake.yaml | 2 | ||||
-rw-r--r-- | coin/platform_configs/qt-creator.yaml | 2 | ||||
-rw-r--r-- | coin/platform_configs/qtsaferenderer.yaml | 2 | ||||
-rw-r--r-- | coin/platform_configs/qtwebkit.yaml | 2 | ||||
-rw-r--r-- | coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2019.txt | 4 | ||||
-rw-r--r-- | coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt | 4 |
12 files changed, 21 insertions, 21 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index e034e703..47f87bda 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -61,7 +61,7 @@ Configurations: ] - Id: 'windows-10_22h2-msvc2019' - Template: 'qtci-windows-10_22H2-x86_64-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'MSVC2019' Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' @@ -87,7 +87,7 @@ Configurations: ] - Id: 'windows-10_22h2-msvc2022' - Template: 'qtci-windows-10_22H2-x86_64-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'MSVC2022' Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' @@ -113,7 +113,7 @@ Configurations: ] - Id: 'windows-10_22h2-msvc2019-developer-build' - Template: 'qtci-windows-10_22H2-x86_64-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'MSVC2019' Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib' @@ -125,7 +125,7 @@ Configurations: ] - Id: 'windows-10_22h2-msvc2019-arm64' - Template: 'qtci-windows-10_22H2-x86_64-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'MSVC2019' Target arch: 'arm64' Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure'] @@ -198,7 +198,7 @@ Configurations: ] - Id: 'windows-10_22h2-mingw11' - Template: 'qtci-windows-10_22H2-x86_64-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Mingw' Features: ['Packaging', 'Sccache', 'UseConfigure'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' @@ -212,7 +212,7 @@ Configurations: ] - Id: 'windows-10_22h2-llvm' - Template: 'qtci-windows-10_22H2-x86_64-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Clang' Features: ['Sccache', 'UseConfigure'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' @@ -240,7 +240,7 @@ Configurations: ] - Id: 'windows-10_22h2-mingw11-developer-build' - Template: 'qtci-windows-10_22H2-x86_64-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg' diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index ab34c2b2..53b63398 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -11,7 +11,7 @@ Configurations: ] - Id: 'windows-10_22h2-minimal-static' - Template: 'qtci-windows-10_22H2-x86_64-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'MSVC2019' Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 7da56dd6..6f3bb8e5 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-50' + Template: 'qtci-windows-10_22H2-x86_64-51' 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 ce7212af..fc872881 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-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Target os: 'WebAssembly' Compiler: 'Mingw' Target compiler: 'Clang' diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 009aeb05..ab9807a9 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -7,7 +7,7 @@ Configurations: Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - - Template: 'qtci-windows-10_22H2-x86_64-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'MSVC2019' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' @@ -18,7 +18,7 @@ Configurations: Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu' - - Template: 'qtci-windows-10_22H2-x86_64-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/nightly_qnx710_host_windows.yaml b/coin/platform_configs/nightly_qnx710_host_windows.yaml index 614a982f..3bd6a3f9 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-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Target os: 'QNX_710' Target arch: 'arm64' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qmake2cmake.yaml b/coin/platform_configs/qmake2cmake.yaml index 876d07e8..f44aef73 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-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'MSVC2019' Features: ['DisableTests'] - diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index 4f9204c0..5f8077d2 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-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'MSVC2019' Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Configure arguments: '' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 1b636047..f0589916 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -46,7 +46,7 @@ Configurations: ] - Id: 'Windows-MSVC2019_Static' - Template: 'qtci-windows-10_22H2-x86_64-50' + Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'MSVC2019' 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 -plugin-sql-sqlite -plugin-sql-odbc' diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 2c9f5efd..97910193 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-50' + Template: 'qtci-windows-10_22H2-x86_64-51' 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/msvc2019.txt b/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2019.txt index 28278630..013c01b4 100644 --- a/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2019.txt +++ b/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2019.txt @@ -1,5 +1,5 @@ ### Visual Studio 2019 ### -Visual Studio 2019 version 16.11.20 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__505064367.1547034421.exe +Visual Studio 2019 version 16.11.27 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__505064367.1547034421.exe Installed MSVC-2019 Components: @@ -66,7 +66,7 @@ Windows 11 SDK (10.0.22000.0) ############################################################ ### Visual Studio 2019 build tools ### -Visual studio 2019 build tools version 16.11.20 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe" +Visual studio 2019 build tools version 16.11.27 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe" * Only default installation, no additional selections ############################################################ 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 e9c7b519..09764b39 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 @@ -1,5 +1,5 @@ ### Visual Studio 2022 Official release ### -Visual Studio 2022 version 17.3.6 was installed manually using installer: http://ci-files01-hki.intra.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe +Visual Studio 2022 version 17.6.4 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe Installed MSVC-2022 Components: @@ -61,7 +61,7 @@ Windows Universal C Runtime ############################################################ ### Visual Studio 2022 build tools ### - Visual studio 2022 build tools version 17.3.6 was installed manually using installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_BuildTools_msvc2022.exe" + Visual studio 2022 build tools version 17.6.4 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_BuildTools_msvc2022.exe" * Only default installation, no additional selections ############################################################ |