Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	.gitmodules
	coin/provisioning/common/macos/docker_testserver.sh

Change-Id: Ifcf97d2ff12ca390e63e814c2a377f6f9135acab

1 files changed, 22 insertions, 0 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
new file mode 100644
index 00000000..e7f4c248
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-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
+}