Skip to content

Fix: Unsupported maccatalyst attribute is getting applied to child attributes but not accounted parent child attributes merge #50334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix: Unsupported maccatalyst attribute is getting applied to child attributes but not accounted parent child attributes merge #50334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2684143
Fix: Unsupported maccatalyst attribute is getting applied to child at…
buyaa-n Apr 30, 2025
809af46
Do now special case maccatalyst suppression for parent/child merge, i…
buyaa-n May 13, 2025
239bc58
Update src/Microsoft.CodeAnalysis.NetAnalyzers/tests/Microsoft.CodeAn…
rolfbjarne Aug 18, 2025
49de9cf
Update src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnal…
rolfbjarne Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ...NetAnalyzers/Microsoft.NetCore.Analyzers/InteropServices/PlatformCompatibilityAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1902,11 +1902,13 @@ static void MergePlatformAttributes(ImmutableArray<AttributeData> immediateAttri
if (childAttributes.TryGetValue(platform, out var childAttribute))
{
// only later versions could narrow, other versions ignored
if (childAttribute.SupportedFirst.IsGreaterThanOrEqualTo(attributes.SupportedFirst) &&
(attributes.SupportedSecond == null || attributes.SupportedSecond < childAttribute.SupportedFirst))
if (childAttribute.SupportedFirst.IsGreaterThanOrEqualTo(attributes.SupportedFirst))
{
attributes.SupportedSecond = childAttribute.SupportedFirst;
supportFound = true;
if (attributes.SupportedSecond == null || attributes.SupportedSecond < childAttribute.SupportedFirst)
{
attributes.SupportedSecond = childAttribute.SupportedFirst;
}
}

if (childAttribute.UnsupportedFirst != null)
Expand Down Expand Up @@ -2011,7 +2013,7 @@ static void CheckAttributesConsistency(SmallDictionary<string, Versions> childAt
{
allowList = true;
}
else if (DenyList(attributes))
else if (DenyList(attributes) || !attributes.IsSet())
{
unsupportedList.Add(platform);
}
Expand Down
98 changes: 98 additions & 0 deletions ...itTests/Microsoft.NetCore.Analyzers/InteropServices/PlatformCompatibilityAnalyzerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4158,6 +4158,104 @@ static void UnsupportsIos() { }
await VerifyAnalyzerCSAsync(source, s_msBuildPlatforms);
}

[Fact, WorkItem(50337, "https://github.com/dotnet/sdk/issues/50337")]
public async Task SuppressedMacCatalystWithinChildAttributesShouldAlsoAppliedToParentAttributesOnMerge()
{
var source = @"
using System;
using System.Runtime.Versioning;

[SupportedOSPlatform (""maccatalyst"")]
[SupportedOSPlatform (""ios"")]
partial class TestType {
[UnsupportedOSPlatform (""maccatalyst"")]
[SupportedOSPlatform (""ios"")]
void DoSomething ()
{
Console.WriteLine (GetSomething);
}

[UnsupportedOSPlatform (""maccatalyst"")]
[SupportedOSPlatform (""ios"")]
public static object GetSomething {
[UnsupportedOSPlatform (""maccatalyst"")]
[SupportedOSPlatform (""ios"")]
get => """";
}
}";
await VerifyAnalyzerCSAsync(source, s_msBuildPlatforms);
}

[Fact]
public async Task SuppressedMacCatalystWithinChildAttributesShouldAlsoAppliedToParentAttributesOnMergeRegression()
{
var source = @"
using System;
using System.Runtime.Versioning;

[assembly: SupportedOSPlatform (""maccatalyst"")]
[assembly: SupportedOSPlatform (""ios"")]
[assembly: SupportedOSPlatform (""macos"")]
[assembly: SupportedOSPlatform (""tvos"")]

[SupportedOSPlatform (""maccatalyst"")]
[SupportedOSPlatform (""ios"")]
[SupportedOSPlatform (""macos"")]
[SupportedOSPlatform (""tvos"")]
partial class TestType {

[UnsupportedOSPlatform (""maccatalyst"")]
[SupportedOSPlatform (""ios"")]
[SupportedOSPlatform (""macos"")]
[SupportedOSPlatform (""tvos"")]
public static IntPtr FromContext (INativeObject context)
{
return context.GetHandle ();
}
}

public static class NativeObjectExtensions {
static public IntPtr GetHandle (this INativeObject self)
{
return IntPtr.Zero;
}
}

public interface INativeObject {}
";
await VerifyAnalyzerCSAsync(source, s_msBuildPlatforms);
}

[Fact]
public async Task ChildMethodNarrowedPlatformSupportCalledShouldWarn()
{
var source = @"
using System;
using System.Runtime.Versioning;

[assembly: SupportedOSPlatform (""macos"")]
[assembly: SupportedOSPlatform (""tvos"")]

[SupportedOSPlatform (""macos"")]
[SupportedOSPlatform (""tvos"")]
partial class TestType {

public static IntPtr FromContext ()
{
return [|GetHandle()|];
}

[SupportedOSPlatform (""macos"")]
[UnsupportedOSPlatform (""tvos"")]
static public IntPtr GetHandle ()
{
return IntPtr.Zero;
}
}
";
await VerifyAnalyzerCSAsync(source, s_msBuildPlatforms);
}

private string GetFormattedString(string resource, params string[] args) =>
string.Format(CultureInfo.InvariantCulture, resource, args);

Expand Down
Loading