From 24c40cafc4d6e92e167fbf14e6189fdb47027290 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Wed, 8 Jun 2022 14:20:15 +0800 Subject: [PATCH] ci/msvc: Upgrade to vs2022 build tools Signed-off-by: Yonggang Luo Reviewed-by: Jesse Natalie Part-of: --- .gitlab-ci/windows/mesa_deps_msvc.ps1 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci/windows/mesa_deps_msvc.ps1 b/.gitlab-ci/windows/mesa_deps_msvc.ps1 index b7f4b5212d7..649847f7e0e 100644 --- a/.gitlab-ci/windows/mesa_deps_msvc.ps1 +++ b/.gitlab-ci/windows/mesa_deps_msvc.ps1 @@ -1,20 +1,20 @@ # we want more secure TLS 1.2 for most things [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; -# VS16.x is 2019 -$msvc_url = 'https://aka.ms/vs/16/release/vs_buildtools.exe' +# VS17.x is 2022 +$msvc_url = 'https://aka.ms/vs/17/release/vs_buildtools.exe' -Write-Host "Downloading Visual Studio 2019 build tools at:" +Write-Host "Downloading Visual Studio 2022 build tools at:" Get-Date Invoke-WebRequest -Uri $msvc_url -OutFile C:\vs_buildtools.exe -Write-Host "Installing Visual Studio 2019 at:" +Write-Host "Installing Visual Studio 2022 at:" Get-Date # Command line -# https://docs.microsoft.com/en-us/visualstudio/install/command-line-parameter-examples?view=vs-2019 +# https://docs.microsoft.com/en-us/visualstudio/install/command-line-parameter-examples?view=vs-2022 # Component ids -# https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2019 -# https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-community?view=vs-2019 +# https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2022 +# https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-community?view=vs-2022 Start-Process -NoNewWindow -Wait -FilePath C:\vs_buildtools.exe ` -ArgumentList ` "--wait", ` @@ -37,7 +37,7 @@ if (!$?) { } Remove-Item C:\vs_buildtools.exe -Force -Write-Host "Installing Visual Studio 2019 finished at:" +Write-Host "Installing Visual Studio 2022 finished at:" Get-Date Exit 0