Skip to content

Recognize MacCatalyst as a superset of iOS #55550

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

Merged
jeffhandley merged 5 commits into from
Jul 13, 2021
Merged

Recognize MacCatalyst as a superset of iOS #55550

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
52861ea
Recognize MacCatalyst as a superset of iOS and apply platform guard a…
jeffhandley Jul 9, 2021
c74858f
Remove errant remarks comment
jeffhandley Jul 13, 2021
03306cd
Remove unused private field from maccatalyst and ios
jeffhandley Jul 13, 2021
6db3d88
Remove errant blank line
jeffhandley Jul 13, 2021
17bd9a5
Only apply guard attributes for additional platforms, not the inferre…
jeffhandley Jul 13, 2021
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
Prev Previous commit
Next Next commit
Remove unused private field from maccatalyst and ios
  • Loading branch information
@jeffhandley
jeffhandley committed Jul 13, 2021
commit 03306cd7f3ff59ad4b5497cd09ac08b9ea898490
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/OperatingSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace System
{
public sealed class OperatingSystem : ISerializable, ICloneable
{
#if TARGET_UNIX && !TARGET_OSX
#if TARGET_UNIX && !TARGET_OSX && !TARGET_MACCATALYST && !TARGET_IOS
private static readonly string s_osPlatformName = Interop.Sys.GetUnixName();
#endif

Expand Down