From fec85b404c937d07c731f115db0c6086eba0a082 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 27 Jan 2022 14:25:01 -0800 Subject: [PATCH 1/4] Update .vsts-ci.yml --- .vsts-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 652748bb7..f4cd67b9f 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -391,7 +391,12 @@ stages: - Source_Build_Create_Tarball publishUsingPipelines: true pool: - vmImage: vs2017-win2016 + ${{ if eq(variables['System.TeamProject'], 'public') }}: + vmImage: windows-2017 + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017 + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - template: eng\common\templates\post-build\post-build.yml From a94ba2175c7f68eaaefe8fdc006d38311e30894a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 27 Jan 2022 14:28:30 -0800 Subject: [PATCH 2/4] Update .vsts-ci.yml --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index f4cd67b9f..1d18d9dd0 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -392,7 +392,7 @@ stages: publishUsingPipelines: true pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - vmImage: windows-2017 + vmImage: vs2017-win2016 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017 From 78e0c0c70a26c3521717e11b9c99b611b4dc4252 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 31 Jan 2022 13:49:58 -0800 Subject: [PATCH 3/4] Update .vsts-ci.yml --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 1d18d9dd0..b8230ba91 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -392,7 +392,7 @@ stages: publishUsingPipelines: true pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - vmImage: vs2017-win2016 + vmImage: windows-latest ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017 From cfe37ec6f22f5ec76f02ac2499c293726c5d1f7d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 31 Jan 2022 13:51:01 -0800 Subject: [PATCH 4/4] Update .vsts-ci.yml --- .vsts-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index b8230ba91..7fb2a509d 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -391,8 +391,6 @@ stages: - Source_Build_Create_Tarball publishUsingPipelines: true pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - vmImage: windows-latest ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Windows.10.Amd64.VS2017