Skip to content

Commit 4e2f61a

Browse files
author
v-wuzhai
authored
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' (#48305)
2 parents 22baddb + f59acce commit 4e2f61a

File tree

2 files changed

+3
-21
lines changed

2 files changed

+3
-21
lines changed

.github/workflows/pr-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: PR Analysis
22
on:
33
pull_request:
4-
types: [opened, labeled, unlabeled]
4+
types: [opened, synchronize, labeled, unlabeled]
55
permissions:
66
contents: read
77
pull-requests: read

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

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string
4040
{
4141
testProject.AdditionalProperties["StripSymbols"] = "true";
4242
}
43-
var testAsset = _testAssetsManager.CreateTestProject(testProject, identifier: targetFramework);
44-
45-
string[] ignoredPatterns = null;
46-
47-
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
48-
{
49-
ignoredPatterns = new string[]
50-
{
51-
// Both these exclusions can be removed once the min tested version is .NET 10 and the min supported
52-
// XCode version is XCode 16.
53-
54-
// -ld_classic option is required to workaround bugs in XCode 15 and .NET 9 and older runtimes.
55-
// See https://github.com/dotnet/runtime/issues/97745 for details.
56-
"ld: warning: -ld_classic is deprecated and will be removed in a future release",
57-
// These warnings show up when dotnet/runtime compiled using Apple clang 15+ is used
58-
// with classic linker (either Apple clang 14 or clang 15+ with -ld_classic).
59-
"ld: warning: __LD,__compact_unwind entries for",
60-
};
61-
}
43+
var testAsset = _testAssetsManager.CreateTestProject(testProject);
6244

6345
var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
6446
publishCommand
@@ -67,7 +49,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string
6749
.And.NotHaveStdOutContaining("IL2026")
6850
.And.NotHaveStdErrContaining("NETSDK1179")
6951
.And.NotHaveStdErrContaining("warning")
70-
.And.NotHaveStdOutContaining("warning", ignoredPatterns);
52+
.And.NotHaveStdOutContaining("warning");
7153

7254
var buildProperties = testProject.GetPropertyValues(testAsset.TestRoot, targetFramework);
7355
var rid = buildProperties["NETCoreSdkPortableRuntimeIdentifier"];

0 commit comments

Comments
 (0)