From a44a11aed2ad9a5e269cec179f03999310bdd483 Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Tue, 13 Sep 2022 18:54:09 -0700 Subject: [PATCH 1/3] Roll to Windows 2019 image to fix arm cross build --- eng/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index 430636ea71..4b130277e3 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -53,12 +53,12 @@ jobs: # Official Build Windows Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019 # Public Windows Build Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(variables['System.TeamProject'], 'public')) }}: name: NetCore-Public - demands: ImageOverride -equals windows.vs2022.amd64.open + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Open ${{ if and(ne(parameters.dockerImage, ''), ne(parameters.requiresCapPtraceContainer, 'true')) }}: container: ${{ parameters.dockerImage }} From 61f44580b6ad10d97c3e0576f5c8cb777b7f327b Mon Sep 17 00:00:00 2001 From: Juan Hoyos Date: Wed, 14 Sep 2022 12:34:09 -0700 Subject: [PATCH 2/3] Update build.yml --- eng/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index 4b130277e3..f38cebe0c7 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -53,12 +53,12 @@ jobs: # Official Build Windows Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019 + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2022 # Public Windows Build Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(variables['System.TeamProject'], 'public')) }}: name: NetCore-Public - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Open + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2022.Open ${{ if and(ne(parameters.dockerImage, ''), ne(parameters.requiresCapPtraceContainer, 'true')) }}: container: ${{ parameters.dockerImage }} From 1e37e267915e5633932c1598c819aed2620b932c Mon Sep 17 00:00:00 2001 From: Juan Hoyos Date: Wed, 14 Sep 2022 12:34:51 -0700 Subject: [PATCH 3/3] Update build.yml --- eng/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index f38cebe0c7..207ba6c48c 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -53,12 +53,12 @@ jobs: # Official Build Windows Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2022 + demands: ImageOverride -equals Build.Windows.Amd64.VS2022 # Public Windows Build Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(variables['System.TeamProject'], 'public')) }}: name: NetCore-Public - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2022.Open + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Open ${{ if and(ne(parameters.dockerImage, ''), ne(parameters.requiresCapPtraceContainer, 'true')) }}: container: ${{ parameters.dockerImage }}