diff options
| author | Steve Pfister <steve.pfister@microsoft.com> | 2022-04-15 23:38:59 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2022-07-27 03:04:26 +0300 |
| commit | d87702da408b8aad0680f4f1c8b858c87d98f1df (patch) | |
| tree | 0844b40b7c9dd87d84e4bbfdbbabd54e05248395 | |
| parent | 5dfb6bb92a3fdd15ca4379fcbeb507f34ae6d493 (diff) | |
Bump windows image to VS2022
| -rw-r--r-- | eng/azure-pipelines.yml | 5 | ||||
| -rw-r--r-- | llvm.proj | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index 5d2ad303da90..e4fc7fe349b7 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -155,10 +155,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 8a9c53e3461e..647454d038a6 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\ ) ) |