[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx'

src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs

@@ -39,7 +39,25 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string
             {
                 testProject.AdditionalProperties["StripSymbols"] = "true";
             }
-            var testAsset = _testAssetsManager.CreateTestProject(testProject);
+            var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework);
+
+            string[] ignoredPatterns = null;
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                ignoredPatterns = new string[]
+                {
+                    // Both these exclusions can be removed once the min tested version is .NET 10 and the min supported
+                    // XCode version is XCode 16.
+
+                    // -ld_classic option is required to workaround bugs in XCode 15 and .NET 9 and older runtimes.
+                    // See https://github.com/dotnet/runtime/issues/97745 for details.
+                    "ld: warning: -ld_classic is deprecated and will be removed in a future release",
+                    // These warnings show up when dotnet/runtime compiled using Apple clang 15+ is used
+                    // with classic linker (either Apple clang 14 or clang 15+ with -ld_classic).
+                    "ld: warning: __LD,__compact_unwind entries for",
+                };
+            }
 
             var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
             publishCommand
@@ -48,7 +66,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string
                 .And.NotHaveStdOutContaining("IL2026")
                 .And.NotHaveStdErrContaining("NETSDK1179")
                 .And.NotHaveStdErrContaining("warning")
-                .And.NotHaveStdOutContaining("warning");
+                .And.NotHaveStdOutContaining("warning", ignoredPatterns);
 
             var buildProperties = testProject.GetPropertyValues(testAsset.TestRoot, targetFramework);
             var rid = buildProperties["NETCoreSdkPortableRuntimeIdentifier"];

src/Tests/Microsoft.NET.TestFramework/Assertions/CommandResultAssertions.cs

@@ -66,10 +66,23 @@ public AndConstraint<CommandResultAssertions> HaveStdOutContaining(Func<string,
             return new AndConstraint<CommandResultAssertions>(this);
         }
 
-        public AndConstraint<CommandResultAssertions> NotHaveStdOutContaining(string pattern)
+        public AndConstraint<CommandResultAssertions> NotHaveStdOutContaining(string pattern, string[] ignoredPatterns = null)
         {
-            Execute.Assertion.ForCondition(!_commandResult.StdOut.Contains(pattern))
+            string filteredStdOut = _commandResult.StdOut;
+            if (ignoredPatterns != null && ignoredPatterns.Length > 0)
+            {
+                foreach (var ignoredPattern in ignoredPatterns)
+                {
+                    filteredStdOut = string.Join(Environment.NewLine, filteredStdOut
+                        .Split(new[] { Environment.NewLine }, StringSplitOptions.None)
+                        .Where(line => !line.Contains(ignoredPattern)));
+                }
+            }
+
+            // Perform the assertion on the filtered output
+            Execute.Assertion.ForCondition(!filteredStdOut.Contains(pattern))
                 .FailWith(AppendDiagnosticsTo($"The command output contained a result it should not have contained: {pattern}{Environment.NewLine}"));
+
             return new AndConstraint<CommandResultAssertions>(this);
         }