summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2019-12-19 15:28:53 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2020-04-04 17:13:43 +0300
commit8101b5471497ff9a617439971e7fdea0557fd39d (patch)
tree916a8227c8061bfc009eb3b6b16606a8ff7b7ad8
parentb3f626f83d1ea9c72659f7a0e34eda6a3d189eb4 (diff)
Provisioning: Update Windows 10 x86_64 to version 1909v5.15.0-beta3
These are also updated to tier1 image: msvc 2017: Not installed msvc 2019: version 16.4.4 msvc 2019 build tools: version 16.4.4 Task-number: QTQAINFRA-3623 Task-number: QTQAINFRA-3417 Change-Id: I006204ca090c4e2cf0d2ffc2309ab6b94f9b7d47 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rw-r--r--coin/platform_configs/default.yaml12
-rw-r--r--coin/platform_configs/flashing-wizard.yaml4
-rw-r--r--coin/platform_configs/qdb.yaml4
-rw-r--r--coin/platform_configs/qt5.yaml20
-rw-r--r--coin/platform_configs/qtbase.yaml2
-rw-r--r--coin/platform_configs/qtconnectivity.yaml2
-rw-r--r--coin/platform_configs/qtsaferenderer.yaml4
-rw-r--r--coin/platform_configs/tqtc-qt-config-gui.yaml4
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS60
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/disable-clean-manager.ps18
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps12
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps12
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps11
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps16
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps12
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps188
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps191
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt67
-rw-r--r--coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps167
-rw-r--r--coin/provisioning/common/windows/install-msys2.ps111
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps11
21 files changed, 165 insertions, 293 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index 6ef67f56..3fdefd84 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -1,7 +1,7 @@
Version: 2
Configurations:
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2015'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
@@ -11,32 +11,32 @@ Configurations:
Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target arch: 'x86'
Compiler: 'MSVC2019'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Target arch: 'x86'
Compiler: 'MSVC2015'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Target arch: 'armv7'
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2019'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml
index 78a33c5b..eff6e9f6 100644
--- a/coin/platform_configs/flashing-wizard.yaml
+++ b/coin/platform_configs/flashing-wizard.yaml
@@ -2,12 +2,12 @@ Version: 2
Module only: True
Configurations:
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2019'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2019'
Target arch: 'x86'
Features: ['Packaging']
diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml
index 69f4b77f..f18909fe 100644
--- a/coin/platform_configs/qdb.yaml
+++ b/coin/platform_configs/qdb.yaml
@@ -2,13 +2,13 @@ Version: 2
Module only: True
Configurations:
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2015'
Target arch: 'x86'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2015'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%'
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml
index 0dbb980c..56012f36 100644
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -1,13 +1,13 @@
Version: 2
Configurations:
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Target arch: 'x86'
Compiler: 'MSVC2019'
@@ -20,26 +20,26 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Target arch: 'armv7'
Compiler: 'MSVC2019'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-arm-msvc2019 -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Compiler: 'MSVC2019'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x64-msvc2019 -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'Mingw'
@@ -63,7 +63,7 @@ Configurations:
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'QNX_700'
Target arch: 'armv7'
Compiler: 'Mingw'
@@ -71,7 +71,7 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'QNX_700'
Target arch: 'armv8'
Compiler: 'Mingw'
@@ -79,7 +79,7 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'QNX_700'
Target arch: 'x86_64'
Compiler: 'Mingw'
@@ -101,7 +101,7 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WebAssembly'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml
index f1b6ca7b..a520e6ca 100644
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -13,7 +13,7 @@
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Target arch: 'x86_64'
Compiler: 'MSVC2015'
diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml
index 30ac284d..6c232f2a 100644
--- a/coin/platform_configs/qtconnectivity.yaml
+++ b/coin/platform_configs/qtconnectivity.yaml
@@ -1,5 +1,5 @@
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Target arch: 'x86_64'
Compiler: 'MSVC2015'
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml
index 322f1754..246925fb 100644
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -1,12 +1,12 @@
Version: 2
Configurations:
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests']
diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml
index 22eaaffa..ad35fc2c 100644
--- a/coin/platform_configs/tqtc-qt-config-gui.yaml
+++ b/coin/platform_configs/tqtc-qt-config-gui.yaml
@@ -2,12 +2,12 @@ Version: 2
Module only: True
Configurations:
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2019'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2019'
Target arch: 'x86'
Features: ['Packaging']
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS
index c2daf225..fd646cbf 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS
@@ -1,14 +1,50 @@
# List about manual pre-installations to Tier1 image:
-Vmware tools: installed
-Resolution: 1280 X 800
-Coin setup (installed boostrap agent, disabled fast boot, disabled firewall (both public and private), disabled UAC, enabled autologin)
-Remote Desktop Connection: enabled
-Timezone: set to UTC
-Administrator tools - services - Windows search: stop & disable
-Power settings screen & slee: never
-Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support"
-MSVC 2019 build tools (default installation, no additional selections).
- * Install after MSVC2019 is installed!
- * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
- * Version: 16.3.10
+Virtual Hardware:
+CPU: 4
+Memory: 8 GB
+Hard Disk: 550 GB
+CI_NW
+Video Card - total memory: 32MB
+
+VM Options:
+Boot options/Firmware: BIOS
+
+Language: English US
+Keyboard: finnish
+location: finnish
+Windows 10 Enterprise
+Region: Finland
+Keyboard layout: Finnish
+
+* VMware tools (complete) installed
+* Resolution set to 1280x800
+* Coin-setup:
+ - Installing Boostrap agent
+ - Disabling fast boot
+ - Disabling firewall
+ - Disabling UAC
+ - Enabling autologin
+ - Automatic login
+ - Disabling windows updates
+* Windows Defender Antivirus turned off: Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus'
+ - Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply'
+ - NOTE! Without this step windows defender can't be disabled!
+* Remote connections allowed:
+ - Enable Remote Desktop
+* Background defrag disabled: 'defragment and optimize drives' - 'change settings' - unchecked "run on a schedule"
+ - Run in terminal: 'schtasks /Delete /TN "Microsoft\Windows\Defrag\ScheduledDefrag"'
+* Time zone: Coordinated Universal Time
+* Windows search disabled: 'Control Panel\System and Security\Administrative Tools\Services' - 'Windows search' - stop & disable
+* Sysmain disabled: 'Control Panel\System and Security\Administrative Tools\Services' - 'SysMain' - stop & disable
+* Power saver disabled: Open 'Power & sleep' and set 'Screen' to 'never'
+* Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support
+* Google Chrome installed for RTA
+* Turn off Virus & threat protection (all sections) manually
+ - Real-tiem protection -> off
+ - Cloud-delivered protection -> off
+ - Automatic sample submission -> off
+ - Tamper protection -> off
+* Activate Windows
+* Modify 'Windows Software Development Kit - Windows 10.0.18362.1' from 'Add or remove programs'
+ - Add feature 'Debugging Tools for Windows'
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-clean-manager.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-clean-manager.ps1
new file mode 100644
index 00000000..45ce141f
--- /dev/null
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-clean-manager.ps1
@@ -0,0 +1,8 @@
+# This script will disable automatic disk cleanup
+
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
+
+Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy`" /V 04 /T REG_dWORD /D 0 /F"
+
+# Maintenance task used by the system to launch a silent auto disk cleanup when running low on free disk space.
+DisableSchedulerTask "DiskCleanup\SilentCleanup"
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1
index 757f0d18..22651763 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-ntp.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
# Disable the NTP from syncing
Run-Executable "w32tm.exe" "/config /syncfromflags:NO"
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1
index 351f10c6..1febd88c 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-schedule-tasks.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
# This script will remove unneeded Tasks from Task Scheduler
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1
index 5ae8fb0d..c7f23470 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1
@@ -8,7 +8,6 @@ icacls $path /grant Administrators:F /T
SCHTASKS /Change /TN "Microsoft\Windows\$name\Reboot" /DISABLE
del "$path\Schedule Scan"
del "$path\Schedule Scan Static Task"
-del "$path\Backup Scan"
del "$path\UpdateModelTask"
del "$path\USO_UxBroker"
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1
index 02ed54da..21938f7f 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1
@@ -35,10 +35,14 @@
#
# If disabled manually, windows will automatically enable it after
# some period of time. Disabling it speeds up the builds.
+# NOTE! Windows Defender Antivirus needs to be turned off!
+# Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus'
+# Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply'
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F"
+Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F"
# 'Windows Defender Cache Maintenance' - "Periodic maintenance task."
DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance"
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
index 00f8af72..69f3e27b 100644
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
@@ -33,7 +33,7 @@
# Visual Studio $version was installed manually using $installer.
$version = "2015 update 3"
-$version_number ="14.0.25431.01"
+$version_number ="14.0.25420.1"
$installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978"
# default plus following components were selected:
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
deleted file mode 100644
index c4b04df0..00000000
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1
+++ /dev/null
@@ -1,88 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2018 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# Visual Studio $version version $version_number was installed manually using $installer.
-
-$version = "2017"
-# Current version was manually upgraded from the installer
-$version_number = "15.9.17"
-$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__1312218103.1526017942.exe"
-
-# Following components were selected from installer:
-# Microsoft.Net.Component.4.5.TargetingPack (.NET Framework 4.5 targeting pack)
-# Microsoft.Net.Component.4.6.1.SDK (.NET Framework 4.6.1 SDK)
-# Microsoft.Component.NetFX.Native (.NET Native)
-# Microsoft.VisualStudio.Component.PortableLibrary (.NET Portable Library targeting pack)
-# Microsoft.VisualStudio.Component.SQL.CLR (CLR data types for SQL Server)
-# Microsoft.VisualStudio.Component.VisualStudioData (Data sources and service references)
-# Microsoft.Component.ClickOnce (ClickOnce Publishing)
-# Microsoft.VisualStudio.Component.AppInsights.Tools (Developer Analytics tools)
-# Microsoft.VisualStudio.Component.NuGet (NuGet package manager)
-# Microsoft.VisualStudio.Component.Static.Analysis.Tools (Static analysis tools)
-# Microsoft.VisualStudio.Component.TextTemplating (Text Template Transformation)
-# Microsoft.VisualStudio.Component.Roslyn.Compiler (C# and Visual Basic Roslyn compilers)
-# Microsoft.Component.MSBuild (MSBuild)
-# Microsoft.VisualStudio.Component.VC.Tools.x86.x64 (VC++ 2017 version 15.8 v14.15 latest v141 tools)
-# Microsoft.VisualStudio.Component.VC.Redist.14.Latest (Visual C++ 2017 Redistributable Update)
-# Microsoft.VisualStudio.Component.VC.Tools.ARM (Visual C++ compilers and libraries for ARM)
-# Microsoft.VisualStudio.Component.VC.Tools.ARM64 (Visual C++ compilers and libraries for ARM64)
-# Microsoft.VisualStudio.Component.VC.CMake.Project (Visual C++ tools for CMake)
-# Microsoft.VisualStudio.Component.DiagnosticTools (.NET profiling tools)
-# Microsoft.VisualStudio.Component.VC.DiagnosticTools (C++ profiling tools)
-# Microsoft.VisualStudio.Component.JavaScript.Diagnostics (JavaScript diagnostics)
-# Microsoft.VisualStudio.Component.Debugger.JustInTime (Just-In-Time debugger)
-# Microsoft.VisualStudio.Component.Roslyn.LanguageServices (C# and Visual Basic)
-# Microsoft.VisualStudio.Component.JavaScript.TypeScript (JavaScript and TypeScript language support)
-# Component.Microsoft.VisualStudio.RazorExtension (Razor Language Services)
-# Component.Linux.CMake (Visual C++ tools for CMake and Linux)
-# Microsoft.VisualStudio.Component.VC.CoreIde (Visual Studio C++ core features)
-# Microsoft.VisualStudio.Component.Graphics.Tools (Graphics debugger and GPU profiler for DirectX)
-# Microsoft.VisualStudio.Component.Graphics (Image and 3D model editors)
-# Microsoft.VisualStudio.Component.Graphics.Win81 (Graphics Tools Windows 8.1 SDK)
-# Microsoft.VisualStudio.Component.TypeScript.2.3 (TypeScript 2.3 SDK)
-# Microsoft.VisualStudio.Component.TypeScript.3.0 (TypeScript 3.0 SDK)
-# Microsoft.VisualStudio.Component.VC.ATL (Visual C++ ATL for x86 and x64)
-# Microsoft.VisualStudio.Component.Windows10SDK.10240 (Windows 10 SDK (10.0.10240.0))
-# Microsoft.VisualStudio.Component.Windows10SDK.10586 (Windows 10 SDK (10.0.10586.0))
-# Microsoft.VisualStudio.Component.Windows10SDK.14393 (Windows 10 SDK (10.0.14393.0))
-# Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop (Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64])
-# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP (Windows 10 SDK (10.0.15063.0) for UWP: C#, VB, JS)
-# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP.Native (Windows 10 SDK (10.0.15063.0) for UWP: C++)
-# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop (Windows 10 SDK (10.0.16299.0) for Desktop C++ [x86 and x64])
-# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP (Windows 10 SDK (10.0.16299.0) for UWP: C#, VB, JS)
-# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP.Native (Windows 10 SDK (10.0.16299.0) for UWP: C++)
-# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm (Windows 10 SDK (10.0.16299.0) for Desktop C++ [ARM and ARM64])
-# Microsoft.VisualStudio.Component.Windows10SDK.17134 (Windows 10 SDK (10.0.17134.0))
-# Microsoft.VisualStudio.Component.Windows10SDK.17763 (Windows 10 SDK (10.0.17763.0))
-
-echo "Visual Studio = $version version version_number" >> ~\versions.txt
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1
deleted file mode 100644
index 538d478c..00000000
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.ps1
+++ /dev/null
@@ -1,91 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2019 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# Visual Studio $version version $version_number was installed manually using $installer.
-
-$version = "2019"
-# Current version was manually upgraded from the installer
-$version_number = "16.3.10"
-$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe"
-
-.NET Framework 4.5 targeting pack
-.NET Framework 4.5.1 targeting pack
-.NET Framework 4.5.2 targeting pack
-.NET Framework 4.6.1 SDK
-.NET Framework 4.6.1 targeting pack
-.NET Framework 4.6.2 SDK
-.NET Framework 4.6.2 targeting pack
-.NET Framework 4.7.2 SDK
-.NET Framework 4.7.2 targeting pack
-.NET Native
-.NET Portable Library targeting pack
-CLR data typer for SQL Sever
-Connectivity and publishing tools
-Data sources for SQL Server support
-SQL ADAL runtime
-SQL Server Command Linne Utilities
-SQL Server Data Tools
-SQL Server Express 2016 LocalDB
-SQL Server ODBC Driver
-ClickOnce Publishing
-Developer Analytics tools
-NuGet package manager
-Text Template Transformation
-C# and Visual Basic Roslyn compilers
-C++ 2019 Redistributable Update
-C++ Cmake tools for Windows
-C++/CLI support for v142 build tools
-MSBuild
-MSVC v142 - VS 2019 C++ ARM build tools (v14.20)
-MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20)
-MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20)
-.NET profiling tools
-C++ profiling tools
-JavaScript diagnostics
-Just-In-Time debugger
-C# and Visual Basic
-C++ core features
-JavaSript and TypeScript language support
-Razor Language Services
-Graphics debugger and GPU profiler for DirectX
-Image and 3D model editors
-C++ ATL for v142 build tools (x86 & x64)
-TypeScript 3.3 SDK
-Windows 10 SDK (10.0.16299.0)
-Windows 10 SDK (10.0.17134.0)
-Windows 10 SDK (10.0.17763.0)
-Windows 10 SDK (10.0.18362.0)
-
-# NOTE! Work loads were added during installation!
-
-echo "Visual Studio = $version version version_number" >> ~\versions.txt
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt
new file mode 100644
index 00000000..28f63762
--- /dev/null
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt
@@ -0,0 +1,67 @@
+# Visual Studio $version version $version_number was installed manually using $installer.
+
+$version = "2019"
+# Current version was manually upgraded from the installer
+$version_number = "16.4.4"
+$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe"
+
+MSVC 2019 build tools (default installation, no additional selections).
+ * Install after MSVC2019 is installed!
+ * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
+ * Version: 16.4.4
+
+Installed MSVC-2019 Components:
+
+.NET Framework 4.5 targeting pack
+.NET Framework 4.5.1 targeting pack
+.NET Framework 4.5.2 targeting pack
+.NET Framework 4.6.1 SDK
+.NET Framework 4.6.1 targeting pack
+.NET Framework 4.6.2 SDK
+.NET Framework 4.6.2 targeting pack
+.NET Framework 4.7.2 SDK
+.NET Framework 4.7.2 targeting pack
+.NET Native
+.NET Portable Library targeting pack
+CLR data typer for SQL Sever
+Connectivity and publishing tools
+Data sources for SQL Server support
+SQL ADAL runtime
+SQL Server Command Linne Utilities
+SQL Server Data Tools
+SQL Server Express 2016 LocalDB
+SQL Server ODBC Driver
+ClickOnce Publishing
+Developer Analytics tools
+NuGet package manager
+Text Template Transformation
+C# and Visual Basic Roslyn compilers
+C++ 2019 Redistributable Update
+C++ Cmake tools for Windows
+C++/CLI support for v142 build tools /14.24)
+MSBuild
+MSVC v142 - VS 2019 C++ ARM build tools (v14.20)
+MSVC v142 - VS 2019 C++ ARM build tools (v14.24)
+MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20)
+MSVC v142 - VS 2019 C++ ARM64 build tools (v14.24)
+MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20)
+MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.24)
+.NET profiling tools
+C++ profiling tools
+JavaScript diagnostics
+Just-In-Time debugger
+C# and Visual Basic
+C++ core features
+JavaSript and TypeScript language support
+Razor Language Services
+Graphics debugger and GPU profiler for DirectX
+Image and 3D model editors
+C++ ATL for latest v142 build tools (x86 & x64)
+TypeScript 3.7 SDK
+Windows 10 SDK (10.0.16299.0)
+Windows 10 SDK (10.0.17134.0)
+Windows 10 SDK (10.0.17763.0)
+Windows 10 SDK (10.0.18362.0)
+
+# NOTE! Work loads were added during installation!
+
diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
deleted file mode 100644
index bfbb397a..00000000
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
+++ /dev/null
@@ -1,67 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-. "$PSScriptRoot\helpers.ps1"
-
-# Install Cumulative Servicing Release Visual Studio 2015 update 3
-# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
-
-$version = "2015 update3 (KB3165756)"
-$packagePath = "C:\Windows\Temp"
-$package = $packagePath + "\vs14-kb3165756.exe"
-$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/vs14-kb3165756.exe"
-$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878"
-$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02"
-$preparedPackage = "\\ci-files01-hki.intra.qt.io\provisioning\windows\vs14-kb3165756-update"
-
-if (Test-Path $preparedPackage) {
- # The prepared package contains updated packages so that not everything has to be downloaded
- Write-Host "Using prepared package"
- Copy-Item -Recurse $preparedPackage $packagePath
- # Remove the whole downloaded folder
- $toRemove = $packagePath + "\vs14-kb3165756-update"
- $executable = "$toRemove\vs14-kb3165756.exe"
-} else {
- Write-Host "Fetching patch for Visual Studio $version..."
- Download $url_official $url_cache $package
- $executable = $package
- # Remove the downloaded executable
- $toRemove = $executable
-}
-
-Verify-Checksum $executable $sha1
-Write-Host "Installing patch for Visual Studio $version..."
-Run-Executable $executable "/norestart /passive"
-
-Remove-Item -Force -Recurse -Path $toRemove
-
-Write-Output "Visual Studio = $version" >> ~\versions.txt
diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1
index 0c4a9680..b26df151 100644
--- a/coin/provisioning/common/windows/install-msys2.ps1
+++ b/coin/provisioning/common/windows/install-msys2.ps1
@@ -1,6 +1,6 @@
############################################################################
##
-## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -61,8 +61,13 @@ Extract-tar_gz $PackagePath $TargetLocation
$msys = "$TargetLocation\$folder\msys2_shell.cmd"
# install perl
-Run-Executable "$msys" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
-Run-Executable "$msys" "`"-l`" `"-c`" `"cpan -i Text::Template Test::More`""
+# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
+cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
+Start-Sleep -s 30
+cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`""
+
+if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent }
+if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
Write-Host "Cleaning $PackagePath.."
Remove-Item -Recurse -Force -Path "$PackagePath"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1
deleted file mode 100644
index 1dc08d21..00000000
--- a/coin/provisioning/qtci-windows-10-x86_64/00-disable-clean-manager.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\disable-clean-manager.ps1"