diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2021-12-16 11:22:03 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-24 09:34:57 +0000 |
| commit | 79a5ee62d62e99de236da03673b2e5237b6e9bb0 (patch) | |
| tree | 5bce2a846dc9c56b2d4e56e2fcb6a511d2d74c42 | |
| parent | 04cc50669cd1c1603c510cfc4a88ad588458a843 (diff) | |
provisioning: Check successful installation of MSVC 2019 update
Using vswhere we can make sure if the MSVC 2019 update finished with the
right version. For further safety we check, if the installation is
complete and launchable.
Change-Id: I90e84bf4922647b4ff30ba93a207b9d5e1a96120
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit bc4797a7e879ce84bb0267077fb5e32d1d90984f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | coin/provisioning/common/windows/update-msvc2019.ps1 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/update-msvc2019.ps1 b/coin/provisioning/common/windows/update-msvc2019.ps1 index da68cf75..7a482f01 100644 --- a/coin/provisioning/common/windows/update-msvc2019.ps1 +++ b/coin/provisioning/common/windows/update-msvc2019.ps1 @@ -78,6 +78,16 @@ Install $urlOfficial_vsInstaller $urlCache_vsInstaller $sha1_vsInstaller $msvc2019Version = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" ` -version [16.0,17.0`) -latest -property catalog_productDisplayVersion 2`>`&1) +$msvc2019Complete = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" ` + -version [16.0,17.0`) -latest -property isComplete 2`>`&1) +$msvc2019Launchable = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" ` + -version [16.0,17.0`) -latest -property isLaunchable 2`>`&1) + +if($msvc2019Version -ne $version -or [int]$msvc2019Complete -ne 1 ` + -or [int]$msvc2019Launchable -ne 1) { + throw "MSVC 2019 update failed. msvc2019Version: $($msvc2019Version) ` + msvc2019Complete: $($msvc2019Complete) msvc2019Launchable: $($msvc2019Launchable)" +} Write-Output "Visual Studio 2019 = $msvc2019Version" >> ~\versions.txt Write-Output "Visual Studio 2019 Build Tools = $version" >> ~\versions.txt |