Merge commit '555dec74449c484643a1fcbaf5b8fc0021c484c6'

Author: Mirroring

eng/targets/Helix.Common.props

@@ -49,7 +49,7 @@
         <HelixAvailableTargetQueue Include="$(HelixQueueArmDebian12)" Platform="Linux" />
 
         <!-- Mac -->
-        <HelixAvailableTargetQueue Include="OSX.1200.Amd64.Open" Platform="OSX" />
+        <HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
 
         <!-- Windows -->
         <HelixAvailableTargetQueue Include="Windows.Amd64.Server2022.Open" Platform="Windows" />

src/Testing/src/xunit/SkipOnHelixAttribute.cs

@@ -66,7 +66,10 @@ private bool ShouldSkip()
             return true;
         }
 
-        return Queues.ToLowerInvariant().Split(';').Contains(targetQueue);
+        // We have "QueueName" and "QueueName.Open" queues for internal and public builds
+        // If we want to skip the test in the public queue, we want to skip it in the internal queue, and vice versa
+        return Queues.ToLowerInvariant().Split(';').Any(q => q.Equals(targetQueue, StringComparison.Ordinal) || q.StartsWith(targetQueue, StringComparison.Ordinal) || 
+            targetQueue.StartsWith(q, StringComparison.Ordinal));
     }
 
     public static bool OnHelix() => HelixHelper.OnHelix();