diff options
| author | Steve Pfister <steve.pfister@microsoft.com> | 2022-04-15 23:38:59 +0300 |
|---|---|---|
| committer | Steve Pfister <steve.pfister@microsoft.com> | 2022-04-15 23:43:08 +0300 |
| commit | f287237c5244960d6c175b3403ce8bfda414a651 (patch) | |
| tree | 56f369142865821b29e966dfe300f40bba050c5f | |
| parent | d1be5205007e2546abeb7723799e51298880bf90 (diff) | |
Bump windows image to VS2022
| -rw-r--r-- | azure-pipelines.yml | 5 | ||||
| -rw-r--r-- | llvm.proj | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 79dcd549e514..cfe657dee040 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -153,10 +153,11 @@ stages: ClangTableGenArg: /p:ClangTableGenPath=$(Build.SourcesDirectory)\artifacts\obj\BuildRoot-x64\bin\clang-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 index 0be19a1d217b..8d95548c10ec 100644 --- 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%" -latest -prerelease -property installationPath') do ( set VS_VCINSTALL_DIR=%%a\VC\ ) ) |