diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 1bffe245953b..e0dd0ea54a99 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -95,7 +95,7 @@ stages: demands: ImageOverride -equals 1es-windows-2022-open ${{ if ne(variables['System.TeamProject'], 'public') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022preview.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 ${{ if eq(variables['System.TeamProject'], 'public') }}: helixTargetQueue: Windows.Amd64.VS2022.Pre.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: diff --git a/eng/Versions.props b/eng/Versions.props index 987c7e7fbd6e..5483bb040395 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.419 + 8.0.420 8.0.400 true diff --git a/eng/template-engine.yml b/eng/template-engine.yml index 08626c003cd8..0324544cfffa 100644 --- a/eng/template-engine.yml +++ b/eng/template-engine.yml @@ -6,10 +6,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2022preview.amd64.open + demands: ImageOverride -equals windows.vs2022.amd64.open ${{ if ne(variables['System.TeamProject'], 'public') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022preview.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 ${{ if eq(variables['System.TeamProject'], 'public') }}: helixTargetQueue: Windows.Amd64.VS2022.Pre.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: @@ -24,18 +24,18 @@ jobs: - template: /eng/build-pr.yml parameters: - agentOs: Ubuntu_20_04_TemplateEngine + agentOs: Ubuntu_22_04_TemplateEngine pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals 1es-ubuntu-2004-open + demands: ImageOverride -equals build.ubuntu.2204.amd64.open ${{ if ne(variables['System.TeamProject'], 'public') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals 1es-ubuntu-2004 + demands: ImageOverride -equals build.ubuntu.2204.amd64 ${{ if eq(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: 'ubuntu.2004.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-amd64' + helixTargetQueue: 'ubuntu.2204.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64' ${{ if ne(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: Ubuntu.2004.Amd64 + helixTargetQueue: Ubuntu.2204.Amd64 strategy: matrix: Build_Release: