Merge pull request llvm#192 from steveisok/bump-vs-image

Bump windows images to VS2022
mmitche · Apr 15, 2022 · 05ec0c7 · 05ec0c7
2 parents eda35d1 + da0a362
commit 05ec0c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -198,10 +198,11 @@ stages:
               LLVMTableGenArg: /p:LLVMTableGenPath=$(Build.SourcesDirectory)\artifacts\obj\BuildRoot-x64\bin\llvm-tblgen.exe
         pool:
           ${{ if eq(variables['System.TeamProject'], 'public') }}:
-            vmImage: windows-2019
+            name: NetCore1ESPool-Public
+            demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open
           ${{ if eq(variables['System.TeamProject'], 'internal') }}:
             name: NetCore1ESPool-Internal
-            demands: ImageOverride -equals Build.Server.Amd64.VS2019
+            demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
         steps:
         - script: |
             git clean -ffdx

diff --git a/llvm.proj b/llvm.proj
@@ -15,7 +15,7 @@
 
     :: Try to locate installed VisualStudio VC environment.
     if "%VCINSTALLDIR%" == "" if exist "%VSWHERE_TOOLS_BIN%" (
-        for /f "tokens=*" %%a in ('"%VSWHERE_TOOLS_BIN%" -latest -property installationPath') do (
+        for /f "tokens=*" %%a in ('"%VSWHERE_TOOLS_BIN%" -prerelease -property installationPath') do (
             set VS_VCINSTALL_DIR=%%a\VC\
         )
     )