diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2018-09-07 09:17:02 +0300 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-04-05 05:04:34 +0000 |
commit | c654e63c87d83577116431e165115e0c6ceb723d (patch) | |
tree | 35110638755100c49b98920cc469aab40f418894 /coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 | |
parent | 8630f18d1e2f072338da3d6196f90de690be95b3 (diff) |
Update Windows 10, MSVC 2015 and MSVC 2017
Windows 10 updated to build 1809
msvc2015 update 3 14.0.25431.01
msvc2015 update 3 (KB3165756)
msvc2017 5.18.2 4.7.03056
ms-zune is no longer available in the latest
Windows 10 version
dotnet and msvc 2015 update patch installation
moved to pre-provisioning. Msvc 2015 update patch installation
seems to be flaky with this windows version.
Task-number: QTBUG-68190
Task-number: QTQAINFRA-2255
Task-number: QTBUG-71125
Change-Id: I87defffa488cb75f7de0909020073b35476bea80
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 deleted file mode 100644 index e7f4c248..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 +++ /dev/null @@ -1,22 +0,0 @@ -# The DirectX SDK installer requires .Net framework 3.5 which isn't installed -# by default - -$netFeature = "NetFx3" -try { - $netFeatureState = (Get-WindowsOptionalFeature -Online -FeatureName "$netFeature").State - if ($netFeatureState -eq "Enabled") { - Write-Host ".Net Framework is already installed" - exit 0 - } -} catch { - Write-Host "Could not find .Net Framework Windows feature." - exit 1 -} - -Write-Host "Installing .Net Framework client" -try { - Enable-WindowsOptionalFeature -Online -FeatureName "$netFeature" -All -NoRestart -} catch { - Write-Host "Could not install .Net framework" - exit 1 -} |