Install WebView2 on other windows nodesHEADdev

We are going to run test suite twice with qtwebview, with
different backends on windows. Therefore install
webview2 to build plugin also on other nodes.

Task-number: QTBUG-128447
Task-number: QTBUG-75747
Pick-to: 6.10
Change-Id: I88da09eb9bf9e58f630ed65071d33bd4a89ac094
Reviewed-by: Toni Saario <[email protected]>

4 files changed, 16 insertions, 23 deletions

diff --git a/coin/provisioning/common/windows/winappsdk.ps1 b/coin/provisioning/common/windows/winappsdk.ps1
index 9f02ef42b..3c84e5aa0 100644
--- a/coin/provisioning/common/windows/winappsdk.ps1
+++ b/coin/provisioning/common/windows/winappsdk.ps1
@@ -2,13 +2,13 @@
 
 # This script installs Windows App SDK
 
-$nugetPackage = "nuget.exe"
-$packageRoot = "C:\Utils\WindowsAppSdk\"
+$script:nugetPackage = "nuget.exe"
+$script:packageRoot = "C:\Utils\WindowsAppSdk\"
 
-$cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\nuget\$nugetPackage"
-$officialUrl = "https://dist.nuget.org/win-x86-commandline/v6.11.0/nuget.exe"
-$sdkChecksumSha1 = "5443887cfb5283da5021388d146ebb5febdc82e9"
-$package_path = "$packageRoot\\$nugetPackage"
+$script:cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\nuget\$nugetPackage"
+$script:officialUrl = "https://dist.nuget.org/win-x86-commandline/v6.11.0/nuget.exe"
+$script:sdkChecksumSha1 = "5443887cfb5283da5021388d146ebb5febdc82e9"
+$script:package_path = "$packageRoot\\$nugetPackage"
 
 New-Item -ItemType Directory -Path "$packageRoot"
 Download $officialUrl $cachedUrl $package_path
@@ -16,11 +16,8 @@ Verify-Checksum $package_path $sdkChecksumSha1 sha1
 Write-Host "Installing Nuget"
 Run-Executable "$package_path" "install Microsoft.WindowsAppSDK -OutputDirectory $packageRoot"
 
-if ([System.Environment]::Is64BitProcess) {
-    $cppWinRt_path = "C:\Program Files*\Windows Kits\*\bin\*\x64\cppwinrt.exe"
-} else {
-    $cppWinRt_path = "C:\Program Files*\Windows Kits\*\bin\*\x86\cppwinrt.exe"
-}
+$script:cpuarch = Get-CpuArchitecture
+$script:cppWinRt_path = "C:\Program Files*\Windows Kits\*\bin\*\$cpuarch\cppwinrt.exe"
 
 if (Resolve-Path -Path $cppWinRt_path) {
     $cppWinRt_path = $(Resolve-Path -Path $cppWinRt_path).Path
@@ -30,20 +27,13 @@ else {
     $cppWinRt_path = $(Resolve-Path -Path "$packageRoot\\Microsoft.Windows.CppWinRT.*\\bin\\cppwinrt.exe").Path
 }
 
-$winAppSDK_path = $(Resolve-Path -Path "$packageRoot\Microsoft.WindowsAppSDK.*").Path
-$webview2_path = $(Resolve-Path -Path "$packageRoot\Microsoft.Web.WebView*").Path
+$script:winAppSDK_path = $(Resolve-Path -Path "$packageRoot\Microsoft.WindowsAppSDK.*").Path
+$script:webview2_path = $(Resolve-Path -Path "$packageRoot\Microsoft.Web.WebView*").Path
 
 Write-Output "CppWinRT Path = $cppWinRt_path"
 Write-Output "WindowsAppSdk Path = $winAppSDK_path"
 Write-Output "WebView2 Path = $webview2_path"
 
-if ([System.Environment]::Is64BitProcess) {
-    Set-EnvironmentVariable "WIN_APP_SDK_ROOT_x64" "$winAppSDK_path"
-    Set-EnvironmentVariable "WEBVIEW2_SDK_ROOT_x64" "$webview2_path"
-    Set-EnvironmentVariable "CPP_WIN_RT_PATH_x64" "$cppWinRt_path"
-} else {
-    Set-EnvironmentVariable "WIN_APP_SDK_ROOT_x86" "$winAppSDK_path"
-    Set-EnvironmentVariable "WEBVIEW2_SDK_ROOT_x86" "$webview2_path"
-    Set-EnvironmentVariable "CPP_WIN_RT_PATH_x86" "$cppWinRt_path"
-}
-
+Set-EnvironmentVariable "WIN_APP_SDK_ROOT_PATH" "$winAppSDK_path"
+Set-EnvironmentVariable "WEBVIEW2_SDK_ROOT_PATH" "$webview2_path"
+Set-EnvironmentVariable "CPP_WIN_RT_PATH_$cpuarch" "$cppWinRt_path"
diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/100-winappsdk.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/100-winappsdk.ps1
new file mode 100644
index 000000000..0d20b1eed
--- /dev/null
+++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/100-winappsdk.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\winappsdk.ps1"
diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/100-winappsdk.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/100-winappsdk.ps1
new file mode 100644
index 000000000..0d20b1eed
--- /dev/null
+++ b/coin/provisioning/qtci-windows-11_23H2-x86_64/100-winappsdk.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\winappsdk.ps1"
diff --git a/coin/provisioning/qtci-windows-11_24H2-x86_64/100-winappsdk.ps1 b/coin/provisioning/qtci-windows-11_24H2-x86_64/100-winappsdk.ps1
new file mode 100644
index 000000000..0d20b1eed
--- /dev/null
+++ b/coin/provisioning/qtci-windows-11_24H2-x86_64/100-winappsdk.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\winappsdk.ps1"