From ce1392a53810a866567cf94f27c255285dee475e Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 29 Nov 2022 18:21:52 -0800
Subject: [PATCH] [release/7.0] Use simpler Docker tags (#29576)

- similar to #29575 but Helix jobs use macOS here
- also align helix.proj (default) Helix queues w/ CI choices
---
 azure-pipelines.yml | 4 ++--
 eng/helix.proj      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9dcd6bcdee7..0d0f00d1076 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -268,12 +268,12 @@ stages:
                   value: $(_BuildConfig)
                 - ${{ if eq(variables['System.TeamProject'], 'public') }}:
                   - name: HelixTargetQueues
-                    value: OSX.1100.Amd64.Open;(Ubuntu.2204.Amd64.SqlServer)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64-20220131172221-d5c5072
+                    value: OSX.1100.Amd64.Open;(Ubuntu.2204.Amd64.SqlServer)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64
                   - name: _HelixAccessToken
                     value: '' # Needed for public queues
                 - ${{ if ne(variables['System.TeamProject'], 'public') }}:
                   - name: HelixTargetQueues
-                    value: OSX.1100.Amd64;(Ubuntu.2204.Amd64.SqlServer)Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64-20220131172221-d5c5072
+                    value: OSX.1100.Amd64;(Ubuntu.2204.Amd64.SqlServer)Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64
                   - name: _HelixAccessToken
                     value: $(HelixApiAccessToken) # Needed for internal queues
               steps:
diff --git a/eng/helix.proj b/eng/helix.proj
index dd38472fa41..1c03c918678 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;Ubuntu.2204.Amd64.Open;OSX.1100.Amd64.Open;Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64-20220131172221-d5c5072</HelixTargetQueues>
+    <HelixTargetQueues Condition = "'$(HelixTargetQueues)' == ''">OSX.1100.Amd64.Open;(Ubuntu.2204.Amd64.SqlServer)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-sqlserver-amd64</HelixTargetQueues>
     <EnableAzurePipelinesReporter>false</EnableAzurePipelinesReporter>
     <HelixSource>efcore/localbuild/</HelixSource>
     <HelixBuild>t001</HelixBuild>