Skip to content
Merged
Changes from all commits
Commits
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
20 changes: 18 additions & 2 deletions src/tasks/WasmAppBuilder/mono/PInvokeCollector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -290,15 +290,15 @@ private PlatformSupport EvaluatePlatformAttributes(IList<CustomAttributeData> at
{
if (cattr.AttributeType.FullName == "System.Runtime.Versioning.UnsupportedOSPlatformAttribute" &&
cattr.ConstructorArguments.Count > 0 &&
cattr.ConstructorArguments[0].Value?.ToString() == _targetOS)
MatchesTargetOS(cattr.ConstructorArguments[0].Value?.ToString()))
{
return PlatformSupport.Unsupported;
Comment on lines 291 to 295
}
if (cattr.AttributeType.FullName == "System.Runtime.Versioning.SupportedOSPlatformAttribute" &&
cattr.ConstructorArguments.Count > 0)
{
hasSupportedOSPlatform = true;
if (cattr.ConstructorArguments[0].Value?.ToString() == _targetOS)
if (MatchesTargetOS(cattr.ConstructorArguments[0].Value?.ToString()))
hasSupportedTarget = true;
}
}
Expand All @@ -313,6 +313,22 @@ private PlatformSupport EvaluatePlatformAttributes(IList<CustomAttributeData> at

return PlatformSupport.Unknown;
}

private bool MatchesTargetOS(string? platformName)
{
if (string.Equals(platformName, _targetOS, StringComparison.OrdinalIgnoreCase))
return true;

if (platformName?.StartsWith(_targetOS, StringComparison.OrdinalIgnoreCase) != true)
return false;

#if NETFRAMEWORK
string version = platformName.Substring(_targetOS.Length);
#else
ReadOnlySpan<char> version = platformName.AsSpan(_targetOS.Length);
#endif
return Version.TryParse(version, out _);
}
Comment on lines +317 to +331
}

internal sealed class PInvokeCallbackComparer : IComparer<PInvokeCallback>
Expand Down