diff options
author | Liang Qi <liang.qi@qt.io> | 2017-05-07 22:11:10 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-05-08 08:35:30 +0200 |
commit | 41379a50c7b99987842cb6467c37bcc63cf0f0c8 (patch) | |
tree | be195057400aef094d01cf77758b287c32822fb9 /coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 | |
parent | f5754fd722c981ca157e7c650ecd271c9077b7cc (diff) | |
parent | a4a7f71f37843d6f0809855ba443541faa3cdc87 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9.0
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
Diffstat (limited to 'coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1')
-rw-r--r-- | coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 index 46675c23..01442324 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 @@ -43,7 +43,7 @@ $msvcPackage = "C:\Windows\Temp\$version.exe" Download $url_cache $url_cache $msvcPackage Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --norestart --quiet --wait" +cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM" echo "Cleaning $msvcPackage.." Remove-Item -Recurse -Force "$msvcPackage" echo "Visual Studio = $version" >> ~\versions.txt |