lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-18 02:06:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

provisioning: Make sure that MSVC 2019 version is added to versions.txt

Browse Source 
If MSVC 2022 is installed in CI machines, vswhere -latest without any
additional version information will return the latest version of 2022.
By limiting the version range (>=16, <17) we make sure that only the
latest version of MSVC 2019 is returned.

Change-Id: I8f92099f030660c1914ffb728efc9a55eadf4808
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 37f4d821b8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Oliver Wolff
2021-12-16 11:06:08 +01:00
committed by Qt Cherry-pick Bot
parent 171c611b69
commit 04cc50669c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coin/provisioning/common/windows/update-msvc2019.ps1
View File

@@ -76,7 +76,8 @@ function Install {
Install $urlOfficial_vsInstaller $urlCache_vsInstaller $sha1_vsInstaller
# Install $urlOfficial_buildToolsInstaller $urlCache_buildToolsInstaller $sha1_buildToolsInstaller
$msvc2019Version = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property catalog_productDisplayVersion 2`>`&1)
$msvc2019Version = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" `
-version [16.0,17.0`) -latest -property catalog_productDisplayVersion 2`>`&1)
Write-Output "Visual Studio 2019 = $msvc2019Version" >> ~\versions.txt
Write-Output "Visual Studio 2019 Build Tools = $version" >> ~\versions.txt