From 73ffc37abbcede36ebe00c74ab9bba1c1fef76eb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 8 Jan 2026 20:07:10 +0000 Subject: [PATCH 1/4] Initial plan From c0c1e8d47410b3ba29427fd85a47d4680fe53078 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 8 Jan 2026 20:09:39 +0000 Subject: [PATCH 2/4] Update arm64 builds from Mariner 2 to Azure Linux 3 Co-authored-by: lbussell <36081148+lbussell@users.noreply.github.com> --- eng/docker-tools/templates/stages/dotnet/build-and-test.yml | 3 ++- eng/docker-tools/templates/variables/dotnet/common.yml | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eng/docker-tools/templates/stages/dotnet/build-and-test.yml b/eng/docker-tools/templates/stages/dotnet/build-and-test.yml index 311b16133..4e3059ab5 100644 --- a/eng/docker-tools/templates/stages/dotnet/build-and-test.yml +++ b/eng/docker-tools/templates/stages/dotnet/build-and-test.yml @@ -80,11 +80,12 @@ stages: linuxArm64Pool: os: linux hostArchitecture: Arm64 - image: $(linuxArm64PoolImage) ${{ if eq(variables['System.TeamProject'], parameters.publicProjectName) }}: name: $(linuxArm64PublicPoolName) + image: $(linuxArm64PublicPoolImage) ${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}: name: $(linuxArm64InternalPoolName) + image: $(linuxArm64InternalPoolImage) # Linux Arm32 linuxArm32Pool: diff --git a/eng/docker-tools/templates/variables/dotnet/common.yml b/eng/docker-tools/templates/variables/dotnet/common.yml index 8f98c0921..3d313a3c6 100644 --- a/eng/docker-tools/templates/variables/dotnet/common.yml +++ b/eng/docker-tools/templates/variables/dotnet/common.yml @@ -18,8 +18,10 @@ variables: - name: linuxAmd64InternalPoolName value: NetCore1ESPool-Internal -- name: linuxArm64PoolImage - value: Mariner-2-Docker-ARM64 +- name: linuxArm64PublicPoolImage + value: azure-linux-3-arm64-public +- name: linuxArm64InternalPoolImage + value: azure-linux-3-arm64 - name: linuxArm64PublicPoolName value: Docker-Linux-Arm-Public - name: linuxArm64InternalPoolName From 75c3f4c15c31e6ed488ad94d9fc8b97c2e578890 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 8 Jan 2026 12:59:39 -0800 Subject: [PATCH 3/4] Update eng/docker-tools/templates/stages/dotnet/build-and-test.yml --- eng/docker-tools/templates/stages/dotnet/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/docker-tools/templates/stages/dotnet/build-and-test.yml b/eng/docker-tools/templates/stages/dotnet/build-and-test.yml index 4e3059ab5..f9e26f242 100644 --- a/eng/docker-tools/templates/stages/dotnet/build-and-test.yml +++ b/eng/docker-tools/templates/stages/dotnet/build-and-test.yml @@ -82,7 +82,7 @@ stages: hostArchitecture: Arm64 ${{ if eq(variables['System.TeamProject'], parameters.publicProjectName) }}: name: $(linuxArm64PublicPoolName) - image: $(linuxArm64PublicPoolImage) + demands: ImageOverride -equals $(linuxArm64PublicPoolImage) ${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}: name: $(linuxArm64InternalPoolName) image: $(linuxArm64InternalPoolImage) From c15ec457d71c1fcfa1dd1b2faf9cacf6e3347030 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 8 Jan 2026 23:05:16 +0000 Subject: [PATCH 4/4] Update Arm32 build legs to use Azure Linux 3 images Co-authored-by: lbussell <36081148+lbussell@users.noreply.github.com> --- eng/docker-tools/templates/stages/dotnet/build-and-test.yml | 3 ++- eng/docker-tools/templates/variables/dotnet/common.yml | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eng/docker-tools/templates/stages/dotnet/build-and-test.yml b/eng/docker-tools/templates/stages/dotnet/build-and-test.yml index f9e26f242..30ec5240e 100644 --- a/eng/docker-tools/templates/stages/dotnet/build-and-test.yml +++ b/eng/docker-tools/templates/stages/dotnet/build-and-test.yml @@ -91,11 +91,12 @@ stages: linuxArm32Pool: os: linux hostArchitecture: Arm64 - image: $(linuxArm32PoolImage) ${{ if eq(variables['System.TeamProject'], parameters.publicProjectName) }}: name: $(linuxArm32PublicPoolName) + demands: ImageOverride -equals $(linuxArm32PublicPoolImage) ${{ if eq(variables['System.TeamProject'], parameters.internalProjectName) }}: name: $(linuxArm32InternalPoolName) + image: $(linuxArm32InternalPoolImage) # Windows Server 2016 windows2016Pool: diff --git a/eng/docker-tools/templates/variables/dotnet/common.yml b/eng/docker-tools/templates/variables/dotnet/common.yml index 3d313a3c6..31659f3d9 100644 --- a/eng/docker-tools/templates/variables/dotnet/common.yml +++ b/eng/docker-tools/templates/variables/dotnet/common.yml @@ -27,8 +27,10 @@ variables: - name: linuxArm64InternalPoolName value: Docker-Linux-Arm-Internal -- name: linuxArm32PoolImage - value: Mariner-2-Docker-ARM64 +- name: linuxArm32PublicPoolImage + value: azure-linux-3-arm64-public +- name: linuxArm32InternalPoolImage + value: azure-linux-3-arm64 - name: linuxArm32PublicPoolName value: Docker-Linux-Arm-Public - name: linuxArm32InternalPoolName