From eb63604bc9fd12939764d326f0341b013b34ed76 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 6 Sep 2021 09:38:08 +0300 Subject: [PATCH] Include VCToolsVersion and WindowsSDKVersion to versions.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's include these needed versions to versions.txt and set Visual studio versions as a last items in the versions list. Task-number: QTQAINFRA-4542 Change-Id: Ic4c4c9f092925b0e4dc05a1874fa2ee651b24b7d Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/update-msvc2019.ps1 | 3 +++ .../{05-msvc2015.ps1 => 99-msvc2015.ps1} | 0 .../{05-msvc2019.ps1 => 99-msvc2019.ps1} | 0 .../{05-msvc2015.ps1 => 99-msvc2015.ps1} | 0 .../{05-msvc2019.ps1 => 99-msvc2019.ps1} | 0 5 files changed, 3 insertions(+) rename coin/provisioning/qtci-windows-10-x86_64/{05-msvc2015.ps1 => 99-msvc2015.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{05-msvc2019.ps1 => 99-msvc2019.ps1} (100%) rename coin/provisioning/qtci-windows-10_21H1-x86_64/{05-msvc2015.ps1 => 99-msvc2015.ps1} (100%) rename coin/provisioning/qtci-windows-10_21H1-x86_64/{05-msvc2019.ps1 => 99-msvc2019.ps1} (100%) diff --git a/coin/provisioning/common/windows/update-msvc2019.ps1 b/coin/provisioning/common/windows/update-msvc2019.ps1 index b7db04d1..733b5ed7 100644 --- a/coin/provisioning/common/windows/update-msvc2019.ps1 +++ b/coin/provisioning/common/windows/update-msvc2019.ps1 @@ -70,3 +70,6 @@ $msvc2019Version = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Insta Write-Output "Visual Studio 2019 = $msvc2019Version" >> ~\versions.txt Write-Output "Visual Studio 2019 Build Tools = $version" >> ~\versions.txt + +# Add Windows SDK Version and VCTools Version to versions.txt +cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat" amd64 & set' |Select-String -Pattern '(WindowsSDKVersion)|(VCToolsVersion)' >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc2015.ps1 b/coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/05-msvc2015.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/99-msvc2015.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc2019.ps1 b/coin/provisioning/qtci-windows-10-x86_64/99-msvc2019.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/05-msvc2019.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/99-msvc2019.ps1 diff --git a/coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2015.ps1 b/coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2015.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2015.ps1 rename to coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2015.ps1 diff --git a/coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2019.ps1 b/coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2019.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10_21H1-x86_64/05-msvc2019.ps1 rename to coin/provisioning/qtci-windows-10_21H1-x86_64/99-msvc2019.ps1