From db841fb86a53102fde91af528dce460cec8c8851 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 10 Jun 2025 18:06:09 +0000
Subject: [PATCH 1/5] Initial plan for issue


From 3fac275870c2d7966871f8160c4d88ce99efc080 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 10 Jun 2025 18:11:17 +0000
Subject: [PATCH 2/5] Update EOL Ubuntu buildtools containers to Ubuntu 22.04

Co-authored-by: steveisok <471438+steveisok@users.noreply.github.com>
---
 eng/common/core-templates/job/source-build.yml | 2 +-
 eng/pipelines/pipeline-resources.yml           | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml
index d805d5faeb..9f6b3ee9e4 100644
--- a/eng/common/core-templates/job/source-build.yml
+++ b/eng/common/core-templates/job/source-build.yml
@@ -60,7 +60,7 @@ jobs:
       pool:
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
           name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
-          demands: ImageOverride -equals build.ubuntu.2004.amd64
+          demands: ImageOverride -equals build.ubuntu.2204.amd64
         ${{ if eq(variables['System.TeamProject'], 'internal') }}:
           name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
           image: 1es-mariner-2
diff --git a/eng/pipelines/pipeline-resources.yml b/eng/pipelines/pipeline-resources.yml
index 6c418d6693..43eb9b388c 100644
--- a/eng/pipelines/pipeline-resources.yml
+++ b/eng/pipelines/pipeline-resources.yml
@@ -53,12 +53,12 @@ extends:
           ROOTFS_DIR: /crossrootfs/arm64
 
       linux_s390x:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-s390x
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-s390x
         env:
           ROOTFS_DIR: /crossrootfs/s390x
 
       linux_ppc64le:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-ppc64le
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-ppc64le
         env:
           ROOTFS_DIR: /crossrootfs/ppc64le
 
@@ -86,8 +86,8 @@ extends:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64
 
       test_ubuntu_20_04:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04
-        options: '--env PYTHONPATH=/usr/bin/python3.8'
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
+        options: '--env PYTHONPATH=/usr/bin/python3.10'
 
       test_ubuntu_22_04:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04

From f05d9df5c4afcf60feb49e72d6bf80d9d12c83e5 Mon Sep 17 00:00:00 2001
From: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
Date: Tue, 10 Jun 2025 11:54:56 -0700
Subject: [PATCH 3/5] Update pipeline-resources.yml

---
 eng/pipelines/pipeline-resources.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/eng/pipelines/pipeline-resources.yml b/eng/pipelines/pipeline-resources.yml
index 43eb9b388c..6733c0dadb 100644
--- a/eng/pipelines/pipeline-resources.yml
+++ b/eng/pipelines/pipeline-resources.yml
@@ -53,17 +53,17 @@ extends:
           ROOTFS_DIR: /crossrootfs/arm64
 
       linux_s390x:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-s390x
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-cross-s390x
         env:
           ROOTFS_DIR: /crossrootfs/s390x
 
       linux_ppc64le:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-ppc64le
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-cross-ppc64le
         env:
           ROOTFS_DIR: /crossrootfs/ppc64le
 
       linux_riscv64:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-riscv64
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-cross-riscv64
         env:
           ROOTFS_DIR: /crossrootfs/riscv64
 
@@ -85,10 +85,6 @@ extends:
       test_opensuse_15_2:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64
 
-      test_ubuntu_20_04:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
-        options: '--env PYTHONPATH=/usr/bin/python3.10'
-
       test_ubuntu_22_04:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
         options: '--env PYTHONPATH=/usr/bin/python3.10'

From 030decbe6fe2285083858179d8f9d3d6e53481d4 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 10 Jun 2025 18:57:35 +0000
Subject: [PATCH 4/5] Revert changes to eng/common directory as requested

Co-authored-by: hoyosjs <19413848+hoyosjs@users.noreply.github.com>
---
 eng/common/core-templates/job/source-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml
index 9f6b3ee9e4..d805d5faeb 100644
--- a/eng/common/core-templates/job/source-build.yml
+++ b/eng/common/core-templates/job/source-build.yml
@@ -60,7 +60,7 @@ jobs:
       pool:
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
           name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
-          demands: ImageOverride -equals build.ubuntu.2204.amd64
+          demands: ImageOverride -equals build.ubuntu.2004.amd64
         ${{ if eq(variables['System.TeamProject'], 'internal') }}:
           name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
           image: 1es-mariner-2

From 2c77c42c038416ecac6523b35352a82a34692d57 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 10 Jun 2025 23:44:34 +0000
Subject: [PATCH 5/5] Remove Ubuntu_20_04 build job using EOL test_ubuntu_20_04
 container

Co-authored-by: hoyosjs <19413848+hoyosjs@users.noreply.github.com>
---
 diagnostics.yml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/diagnostics.yml b/diagnostics.yml
index 03778eaebb..daab98353a 100644
--- a/diagnostics.yml
+++ b/diagnostics.yml
@@ -206,21 +206,6 @@ extends:
       #                          #
       ############################
 
-      - template: /eng/pipelines/build.yml
-        parameters:
-          jobTemplate: ${{ variables.jobTemplate }}
-          name: Ubuntu_20_04
-          osGroup: Linux
-          container: test_ubuntu_20_04
-          dependsOn: Linux
-          testOnly: true
-          buildConfigs:
-          - configuration: Release
-            architecture: x64
-          - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
-            - configuration: Debug
-              architecture: x64
-
       - template: /eng/pipelines/build.yml
         parameters:
           jobTemplate: ${{ variables.jobTemplate }}