diff options
author | Liang Qi <liang.qi@qt.io> | 2018-07-02 13:12:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-07-02 13:12:35 +0200 |
commit | c6d9e433dfa899890b4279c773779659f8cb2626 (patch) | |
tree | 1335a5742b5c6eed239f26e616fdad30e1af6271 /coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 | |
parent | 7784f89036afca51292ab0cc3aadff59b3004f5f (diff) | |
parent | 3e044c71b92617eb8eb794edd30d94f57d9524ac (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
Change-Id: I00d0ccd138eb8d89e30e7e57632c6fc8f83e0001
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 new file mode 100644 index 00000000..e7f4c248 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 @@ -0,0 +1,22 @@ +# 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 +} |