diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 1d4c0924af54..080a9298b9d7 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -55,14 +55,14 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre + demands: ImageOverride -equals Build.Windows.Amd64.VS2022 ${{ if eq(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: Windows.Amd64.VS2022.Pre.Open + helixTargetQueue: windows.vs2022.amd64.open ${{ if ne(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: Windows.Amd64.VS2022.Pre + helixTargetQueue: windows.vs2022.amd64 strategy: matrix: Build_Release: @@ -86,14 +86,14 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre + demands: ImageOverride -equals Build.Windows.Amd64.VS2022 ${{ if eq(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: Windows.Amd64.VS2022.Pre.Open + helixTargetQueue: windows.vs2022.amd64.open ${{ if ne(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: Windows.Amd64.VS2022.Pre + helixTargetQueue: windows.vs2022.amd64 strategy: matrix: Build_Debug: @@ -113,10 +113,10 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre.Open + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019 strategy: matrix: Build_Debug: @@ -170,7 +170,7 @@ stages: - Source_Build_Managed pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Pre + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: /eng/common/templates/post-build/post-build.yml parameters: diff --git a/eng/Versions.props b/eng/Versions.props index f6438faebdd4..b705084a0626 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ - 6.0.110 + 6.0.111 servicing