Skip to content

Recognize MacCatalyst as a superset of iOS - #55550

Merged
jeffhandley merged 5 commits into
dotnet:mainfrom
jeffhandley:jeffhandley/ios-maccatalyst
Jul 13, 2021
Merged

Recognize MacCatalyst as a superset of iOS#55550
jeffhandley merged 5 commits into
dotnet:mainfrom
jeffhandley:jeffhandley/ios-maccatalyst

Conversation

@jeffhandley

@jeffhandleyjeffhandley commented Jul 13, 2021

Copy link
Copy Markdown
Member
  1. OperatingSystem.IsIOS() now returns true when running on MacCatalyst
  2. OperatingSystem.IsOSPlatform("ios") now returns true when running on MacCatalyst
  3. [SupportedOSPlatformGuard] attributes are applied to OperatingSystem.IsIOS() and OperatingSystem.IsIOSVersionAtLeast() to indicate those methods guard for either "ios" or "maccatalyst"

This contributes to #53084 (comment).

@jeffhandley
Recognize MacCatalyst as a superset of iOS and apply platform guard a…
52861ea
…ttributes that will inform the analyzer of the relationship.
@ghost

ghost commented Jul 13, 2021

Copy link
Copy Markdown

Note regarding the new-api-needs-documentation label:

This serves as a reminder for when your PR is modifying a ref *.cs file and adding/modifying public APIs, to please make sure the API implementation in the src *.cs file is documented with triple slash comments, so the PR reviewers can sign off that change.

@ghost

ghost commented Jul 13, 2021

Copy link
Copy Markdown

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

akoeplinger
akoeplinger approved these changes Jul 13, 2021
View reviewed changes
Comment threadsrc/libraries/System.Runtime/ref/System.Runtime.cs Outdated
stephentoub
stephentoub reviewed Jul 13, 2021
View reviewed changes
Comment threadsrc/libraries/System.Runtime/ref/System.Runtime.cs Outdated
@jeffhandley
jeffhandley marked this pull request as ready for review July 13, 2021 17:05
buyaa-n
buyaa-n reviewed Jul 13, 2021
View reviewed changes
Comment threadsrc/libraries/System.Private.CoreLib/src/System/OperatingSystem.cs Outdated
buyaa-n
buyaa-n reviewed Jul 13, 2021
View reviewed changes
Comment threadsrc/libraries/System.Private.CoreLib/src/System/OperatingSystem.cs
buyaa-n
buyaa-n approved these changes Jul 13, 2021
View reviewed changes

@buyaa-nbuyaa-n left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ghost

ghost commented Jul 13, 2021

Copy link
Copy Markdown

Hello @jeffhandley!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@jeffhandley

jeffhandley commented Jul 13, 2021

Copy link
Copy Markdown
MemberAuthor

The test failures are Quic tests timing out and they are unrelated.

@jeffhandley
jeffhandley merged commit 14854e2 into dotnet:mainJul 13, 2021
@jeffhandley
jeffhandley deleted the jeffhandley/ios-maccatalyst branch July 13, 2021 21:33
@ManickaPManickaP mentioned this pull request Jul 20, 2021
Merged
@MaximLipninMaximLipnin mentioned this pull request Jul 21, 2021
Closed
This was referenced Jul 28, 2021
Closed
Closed
@ghostghost locked as resolved and limited conversation to collaborators Aug 12, 2021
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@akoeplingerakoeplingerakoeplinger approved these changes
@stephentoubstephentoubstephentoub approved these changes
+1 more reviewer
@buyaa-nbuyaa-nbuyaa-n approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jeffhandley@akoeplinger@stephentoub@buyaa-n