From f032c3156db05db20ca070594ba1716c9823f143 Mon Sep 17 00:00:00 2001 From: Oleksii Zbykovskyi Date: Wed, 17 Dec 2025 15:35:18 +0100 Subject: [PATCH] Install NuGet in a separate file Made an installation of NuGet in a separate script to be able to share the packages by an environment variable between multiple scripts. NuGet is needed for both the Windows App SDK and a virtual camera. Also added a label on top of the scripts about copyright and license. Change-Id: I11f035d8eb107d2d2c9e2a93f17a935129bb707e Reviewed-by: Tero Heikkinen Reviewed-by: Elias Toivola --- .../common/windows/install-nuget.ps1 | 20 +++++++++++++++++++ .../provisioning/common/windows/winappsdk.ps1 | 14 ++++--------- .../09-install-nuget.ps1 | 1 + .../09-install-nuget.ps1 | 1 + .../09-install-nuget.ps1 | 1 + .../09-install-nuget.ps1 | 1 + .../09-install-nuget.ps1 | 1 + 7 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 coin/provisioning/common/windows/install-nuget.ps1 create mode 100644 coin/provisioning/qtci-windows-10_22H2-x86_64/09-install-nuget.ps1 create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/09-install-nuget.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-nuget.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-x86_64/09-install-nuget.ps1 create mode 100644 coin/provisioning/qtci-windows-11_24H2-x86_64/09-install-nuget.ps1 diff --git a/coin/provisioning/common/windows/install-nuget.ps1 b/coin/provisioning/common/windows/install-nuget.ps1 new file mode 100644 index 00000000..1a5f52e7 --- /dev/null +++ b/coin/provisioning/common/windows/install-nuget.ps1 @@ -0,0 +1,20 @@ +# Copyright (C) 2025 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +. "$PSScriptRoot\helpers.ps1" + +$script:nugetVersion = "v6.11.0" +$script:nugetPackage = "nuget_$nugetVersion.exe" +$script:packageRoot = "C:\Utils\NuGet\" + +$script:cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\nuget\$nugetPackage" +$script:officialUrl = "https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe" +$script:sdkChecksumSha1 = "5443887cfb5283da5021388d146ebb5febdc82e9" +$script:package_path = "$packageRoot\\$nugetPackage" + +New-Item -ItemType Directory -Path "$packageRoot" +Download $officialUrl $cachedUrl $package_path +Verify-Checksum $package_path $sdkChecksumSha1 sha1 +Write-Host "Installing Nuget" + +Set-EnvironmentVariable "NUGET_EXE_PATH" "$package_path" diff --git a/coin/provisioning/common/windows/winappsdk.ps1 b/coin/provisioning/common/windows/winappsdk.ps1 index 8b9ba3b2..67a2f5e8 100644 --- a/coin/provisioning/common/windows/winappsdk.ps1 +++ b/coin/provisioning/common/windows/winappsdk.ps1 @@ -1,20 +1,14 @@ +# Copyright (C) 2025 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + . "$PSScriptRoot\helpers.ps1" # This script installs Windows App SDK -$script:nugetVersion = "v6.11.0" -$script:nugetPackage = "nuget_$nugetVersion.exe" $script:packageRoot = "C:\Utils\WindowsAppSdk\" -$script:cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\nuget\$nugetPackage" -$script:officialUrl = "https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe" -$script:sdkChecksumSha1 = "5443887cfb5283da5021388d146ebb5febdc82e9" -$script:package_path = "$packageRoot\\$nugetPackage" +$script:package_path = [System.Environment]::GetEnvironmentVariable('NUGET_EXE_PATH', [System.EnvironmentVariableTarget]::Machine) -New-Item -ItemType Directory -Path "$packageRoot" -Download $officialUrl $cachedUrl $package_path -Verify-Checksum $package_path $sdkChecksumSha1 sha1 -Write-Host "Installing Nuget" Run-Executable "$package_path" "install Microsoft.WindowsAppSDK -OutputDirectory $packageRoot" $script:cpuarch = Get-CpuArchitecture diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/09-install-nuget.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/09-install-nuget.ps1 new file mode 100644 index 00000000..f1ccd8fb --- /dev/null +++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/09-install-nuget.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-nuget.ps1" diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/09-install-nuget.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/09-install-nuget.ps1 new file mode 100644 index 00000000..f1ccd8fb --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/09-install-nuget.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-nuget.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-nuget.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-nuget.ps1 new file mode 100644 index 00000000..f1ccd8fb --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-nuget.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-nuget.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/09-install-nuget.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/09-install-nuget.ps1 new file mode 100644 index 00000000..f1ccd8fb --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-x86_64/09-install-nuget.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-nuget.ps1" diff --git a/coin/provisioning/qtci-windows-11_24H2-x86_64/09-install-nuget.ps1 b/coin/provisioning/qtci-windows-11_24H2-x86_64/09-install-nuget.ps1 new file mode 100644 index 00000000..f1ccd8fb --- /dev/null +++ b/coin/provisioning/qtci-windows-11_24H2-x86_64/09-install-nuget.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-nuget.ps1"