From 06fb909429041b5e169e81bfc5c930fea7adf8fd Mon Sep 17 00:00:00 2001
From: Heikki Halmet <heikki.halmet@qt.io>
Date: Sat, 23 Feb 2019 08:20:08 +0200
Subject: Provisioning: Change installation order for dotnet-framework
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Windows updates can't be disabled before dotnet-framework is enabled

Task-number: QTQAINFRA-2824
Change-Id: I26c6b9d9aacfd8031a0b05ce48e003822aec3bdc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
---
 .../01-disable-windows-updates.ps1                 |  1 -
 .../01-enable-dotnet-framework.ps1                 | 22 ++++++++++++++++++++++
 .../02-disable-windows-updates.ps1                 |  1 +
 .../02-enable-dotnet-framework.ps1                 | 22 ----------------------
 4 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1
 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1
 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1
 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1

(limited to 'coin/provisioning/qtci-windows-10-x86_64')

diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1
deleted file mode 100644
index 57428310..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-updates.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"
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
+}
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1
new file mode 100644
index 00000000..57428310
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\disable-windows-updates.ps1"
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
deleted file mode 100644
index e7f4c248..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/02-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
-}
-- 
cgit v1.2.3