From 13415c2717d7de5c5b795f96221fd70d09bec207 Mon Sep 17 00:00:00 2001
From: Jiri Cincura <jiri@cincura.net>
Date: Wed, 25 Jun 2025 14:04:57 +0200
Subject: [PATCH 1/2] Properly configure Helix tests.

---
 eng/helix.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix.proj b/eng/helix.proj
index cd719546149..6a2c1af8ae9 100644
--- a/eng/helix.proj
+++ b/eng/helix.proj
@@ -60,7 +60,7 @@
   </ItemGroup>
 
   <!-- Start SqlServer instance for test projects which uses SqlServer on docker. Also remove other projects as they will be run outside of docker. -->
-  <ItemGroup Condition = "'$(HelixTargetQueue.Contains(`ubuntu-18.04-helix-sqlserver-amd64`))'">
+  <ItemGroup Condition = "'$(HelixTargetQueue.Contains(`ubuntu-22.04-helix-sqlserver-amd64`))'">
     <XUnitProject Remove="$(RepoRoot)/test/**/*.csproj"/>
     <XUnitProject Include="$(SqlServerTests);$(RepoRoot)/test/EFCore.CrossStore.FunctionalTests/*.csproj">
       <PreCommands>$(PreCommands); export MSSQL_SA_PASSWORD=$(MSSQL_SA_PASSWORD); export Test__SqlServer__DefaultConnection="Server=localhost;;Database=master;;User=sa;;Password=$(MSSQL_SA_PASSWORD);;Connect Timeout=60;;ConnectRetryCount=0;;TrustServerCertificate=True"; /opt/mssql/bin/sqlservr --accept-eula &amp;; sleep 120; </PreCommands>

From 34257c7aebfb576996f0ca4fdd8190be73094e9e Mon Sep 17 00:00:00 2001
From: Jiri Cincura <jiri@cincura.net>
Date: Thu, 17 Jul 2025 08:26:59 +0200
Subject: [PATCH 2/2] Test

---
 azure-pipelines-public.yml | 2 +-
 eng/helix.proj             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines-public.yml b/azure-pipelines-public.yml
index 6a3bf435d1d..a7984d46fad 100644
--- a/azure-pipelines-public.yml
+++ b/azure-pipelines-public.yml
@@ -151,7 +151,7 @@ stages:
               - name: _HelixBuildConfig
                 value: $(_BuildConfig)
               - name: HelixTargetQueues
-                value: Windows.10.Amd64.Open;OSX.13.Amd64.Open;Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64
+                value: Windows.10.Amd64.Open;OSX.13.Amd64.Open;ubuntu.2204.amd64.xl.open.rt@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64
               - name: _HelixAccessToken
                 value: '' # Needed for public queues
             steps:
diff --git a/eng/helix.proj b/eng/helix.proj
index 6a2c1af8ae9..2503d94b66c 100644
--- a/eng/helix.proj
+++ b/eng/helix.proj
@@ -17,7 +17,7 @@
 
   <PropertyGroup Condition = "'$(SYSTEM_ACCESSTOKEN)' == ''">
     <!-- Local build outside of Azure Pipeline -->
-    <HelixTargetQueues Condition = "'$(HelixTargetQueues)' == ''">Windows.10.Amd64.Open;OSX.1200.Amd64.Open;OSX.1200.ARM64.Open;Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64</HelixTargetQueues>
+    <HelixTargetQueues Condition = "'$(HelixTargetQueues)' == ''">Windows.10.Amd64.Open;OSX.1200.Amd64.Open;OSX.1200.ARM64.Open;ubuntu.2204.amd64.xl.open.rt@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64</HelixTargetQueues>
     <EnableAzurePipelinesReporter>false</EnableAzurePipelinesReporter>
     <HelixSource>efcore/localbuild/</HelixSource>
     <HelixBuild>t001</HelixBuild>