From 34d49bd8ef7fed914cf9542adea620195e502b44 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 26 Jul 2022 15:15:37 -0700 Subject: [PATCH] Workaround missing lib with non-preview images --- azure-pipelines.yml | 2 +- azure-pipelines1.yml | 2 +- eng/pipeline.yml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 22e9ca34f17..723462b80f3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -75,7 +75,7 @@ stages: # agent pool can't be read from a user-defined variable (Azure DevOps limitation) pool: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre + demands: ImageOverride -equals Build.Windows.Amd64.VS2022 # runAsPublic is used in expressions, which can't read from user-defined variables runAsPublic: false diff --git a/azure-pipelines1.yml b/azure-pipelines1.yml index 2563f269441..16c0136138c 100644 --- a/azure-pipelines1.yml +++ b/azure-pipelines1.yml @@ -69,7 +69,7 @@ stages: # agent pool can't be read from a user-defined variable (Azure DevOps limitation) pool: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre + demands: ImageOverride -equals Build.Windows.Amd64.VS2022 # runAsPublic is used in expressions, which can't read from user-defined variables runAsPublic: false diff --git a/eng/pipeline.yml b/eng/pipeline.yml index 3d6fbe7cb39..9809ff4a289 100644 --- a/eng/pipeline.yml +++ b/eng/pipeline.yml @@ -31,10 +31,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre + demands: ImageOverride -equals Build.Windows.Amd64.VS2022 helixRepo: $(repoName) jobs: @@ -46,10 +46,10 @@ jobs: # agent pool can't be read from a user-defined variable (Azure DevOps limitation) ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre.Open + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre + demands: ImageOverride -equals Build.Windows.Amd64.VS2022 variables: # needed for signing - name: _TeamName