From ab0dba34d90ecc1c2815c8149b8197031a1af795 Mon Sep 17 00:00:00 2001
From: Rich Lander <rlander@microsoft.com>
Date: Fri, 9 May 2025 09:07:44 -0700
Subject: [PATCH 1/4] Upgrade Ubuntu VMs

---
 eng/targets/Helix.Common.props | 2 +-
 eng/targets/Helix.targets      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index c5628d35c2ff..126e641e015a 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -28,7 +28,7 @@
       <!-- aspnetcore-ci[-official] (ci.yml) -->
       <!-- aspnetcore-quarantined-pr (quarantined-pr.yml) -->
       <ItemGroup>
-        <HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="Ubuntu.2204.Amd64.Open" Platform="Linux" />
         <HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
         <HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
       </ItemGroup>
diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index 70e01877befa..06b782dbe7d6 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -21,7 +21,7 @@
       $(HelixQueueDebian12);
       $(HelixQueueFedora40);
       $(HelixQueueMariner);
-      Ubuntu.2004.Amd64.Open;
+      Ubuntu.2204.Amd64.Open;
     </SkipHelixQueues>
     <SkipHelixArm>true</SkipHelixArm>
   </PropertyGroup>

From 651fbb8cdbea7d19ad18a7344c4f2d99b0331c61 Mon Sep 17 00:00:00 2001
From: Rich Lander <rlander@microsoft.com>
Date: Fri, 23 May 2025 13:32:56 -0700
Subject: [PATCH 2/4] Update eng/targets/Helix.Common.props

---
 eng/targets/Helix.Common.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index 78bb74208f2b..bd1df3e1c8b2 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -29,7 +29,7 @@
       <!-- aspnetcore-ci[-official] (ci.yml) -->
       <!-- aspnetcore-quarantined-pr (quarantined-pr.yml) -->
       <ItemGroup>
-        <HelixAvailableTargetQueue Include="Ubuntu.2204.Amd64.Open" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="AzureLinux.3.Amd64.Open" Platform="Linux" />
         <HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
         <HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
       </ItemGroup>

From 100658b9ddc0775fa63a411e5757cc3e62861250 Mon Sep 17 00:00:00 2001
From: Rich Lander <rlander@microsoft.com>
Date: Fri, 23 May 2025 13:33:30 -0700
Subject: [PATCH 3/4] Update eng/targets/Helix.targets

---
 eng/targets/Helix.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index eef1c0f22b10..a835df987ab1 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -21,7 +21,7 @@
       $(HelixQueueAzureLinux);
       $(HelixQueueDebian);
       $(HelixQueueFedora40);
-      Ubuntu.2204.Amd64.Open;
+      AzureLinux.3.Amd64.Open;
     </SkipHelixQueues>
     <SkipHelixArm>true</SkipHelixArm>
   </PropertyGroup>

From 5df16bd280e5b417785607a1f5485d2e8bbcc93e Mon Sep 17 00:00:00 2001
From: Rich Lander <rlander@microsoft.com>
Date: Wed, 4 Jun 2025 20:06:07 -0700
Subject: [PATCH 4/4] Update Azure Linux and Ubuntu

---
 eng/targets/Helix.Common.props                             | 7 +++++--
 eng/targets/Helix.targets                                  | 2 +-
 .../test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj    | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index bd1df3e1c8b2..ca9ee0879af0 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -2,10 +2,11 @@
   <!-- This file is shared between Helix.proj and .csproj files. -->
   <PropertyGroup>
     <HelixQueueAlmaLinux>(AlmaLinux.9.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-9-helix-amd64</HelixQueueAlmaLinux>
-    <HelixQueueAlpine>(Alpine.321.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64</HelixQueueAlpine>
+    <HelixQueueAlpine>(Alpine.322.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-helix-amd64</HelixQueueAlpine>
     <HelixQueueAzureLinux>(AzureLinux.30.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64</HelixQueueAzureLinux>
     <HelixQueueDebian>(Debian.13.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-helix-amd64</HelixQueueDebian>
     <HelixQueueFedora>(Fedora.42.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-42-helix-amd64</HelixQueueFedora>
+    <HelixQueueUbuntu>(Ubuntu.2404.Amd64.Open)azurelinux.3.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04-helix-amd64</HelixQueueUbuntu>
     <!-- Arm64 -->
     <HelixQueueArmDebian>(Debian.13.Arm64.Open)ubuntu.2204.armarch.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-13-helix-arm64v8</HelixQueueArmDebian>
 
@@ -29,6 +30,7 @@
       <!-- aspnetcore-ci[-official] (ci.yml) -->
       <!-- aspnetcore-quarantined-pr (quarantined-pr.yml) -->
       <ItemGroup>
+        <HelixAvailableTargetQueue Include="Ubuntu.2204.Amd64.Open" Platform="Linux" />
         <HelixAvailableTargetQueue Include="AzureLinux.3.Amd64.Open" Platform="Linux" />
         <HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
         <HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
@@ -43,9 +45,10 @@
 
         <!-- Containers -->
         <HelixAvailableTargetQueue Include="$(HelixQueueAlpine)" Platform="Linux" />
-        <HelixAvailableTargetQueue Include="$(HelixQueueAzureLinux)" Platform="Linux" />
         <HelixAvailableTargetQueue Include="$(HelixQueueDebian)" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="$(HelixQueueAzureLinux)" Platform="Linux" />
         <HelixAvailableTargetQueue Include="$(HelixQueueFedora)" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="$(HelixQueueUbuntu)" Platform="Linux" />
         <!-- Arm64 -->
         <HelixAvailableTargetQueue Include="$(HelixQueueArmDebian)" Platform="Linux" />
 
diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index a835df987ab1..e6ec5c9855a0 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -18,9 +18,9 @@
     <SkipHelixQueues>
       $(HelixQueueAlmaLinux);
       $(HelixQueueAlpine);
-      $(HelixQueueAzureLinux);
       $(HelixQueueDebian);
       $(HelixQueueFedora40);
+      $(HelixQueueUbuntu);
       AzureLinux.3.Amd64.Open;
     </SkipHelixQueues>
     <SkipHelixArm>true</SkipHelixArm>
diff --git a/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj b/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj
index e4150c38bcd7..ea08fa328d5d 100644
--- a/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj
+++ b/src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj
@@ -28,8 +28,8 @@
     <!-- Disabling on those OSes until a better fix can be identified -->
     <SkipHelixQueues>
       $(HelixQueueArmDebian);
-      $(HelixQueueAzureLinux);
       $(HelixQueueDebian);
+      $(HelixQueueUbuntu);
       $(SkipHelixQueues)
     </SkipHelixQueues>
   </PropertyGroup>