diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2021-10-29 11:53:33 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2021-11-26 15:42:27 +0200 |
| commit | 8f46d3ede3c090448d5554f3444bc3908225c4fc (patch) | |
| tree | a098928c18d64f68a58c4e23f35086abce833a7d /coin/provisioning/common/windows/squishInstall.ps1 | |
| parent | a9eed4e5353e507917d0d05d8f13a5b458c9cdb6 (diff) | |
Add Windows 11 targets and provisioning scripts
Tier 1 image includes all configurations from
pre-provisioning folder.
E.g. these are pre-provisioned:
Visual Studio 2015 version 14.0.25431.1 Update 3
Visual Studio 2019 + build tools version 16.11.5
Visual Studio 2022 + build tools version 17.0.0 preview 7.0
Visual Studio 2022 + build tools version 17.0.1
Task-number: QTQAINFRA-4512
Change-Id: Ieceff236a9c12f34dc772c89cb93ad99d38d7fe5
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin/provisioning/common/windows/squishInstall.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/squishInstall.ps1 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 8f04e702..aaebb25c 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -57,7 +57,8 @@ if (Is64BitWinHost) { $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName -if ($OSVersion -eq "Windows 10 Enterprise") { +if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 10 Pro")) { + # In Windows 11 case $OSVersion is 'Windows 10 Pro' $winVersion = "win10" if (Is64BitWinHost) { $sha1 = "0ce4f94ebff488fedef29e9ed62b400a8b5014fb" |