Install WebView2 on other windows nodes

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
Change-Id: I88da09eb9bf9e58f630ed65071d33bd4a89ac094
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 539dc64e8e)
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>

coin/platform_configs/cmake_platforms.yaml

@@ -132,7 +132,7 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_x64}}',
+        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
     ]
 -
     Id: 'windows-11_24H2-msvc2022'
@@ -145,6 +145,7 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
     ]
 -
     Id: 'windows-11_22h2-arm64-msvc2022'
@@ -156,6 +157,7 @@ Configurations:
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
         'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
     ]
 -
     Id: 'windows-11_24H2-msvc2022-arm64'
@@ -173,6 +175,7 @@ Configurations:
         'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
         'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
     ]
 -
     Id: 'windows-11-x86_64-arm64-tests'

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"

coin/provisioning/qtci-windows-11_22H2-aarch64/100-winappsdk.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\winappsdk.ps1"

coin/provisioning/qtci-windows-11_24H2-x86_64/100-winappsdk.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\winappsdk.ps1"