Skip to content
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

Jump to bottom

[IntentsUI] Add support for Xcode 14 beta 5. #15704

Merged
merged 2 commits into from
Aug 25, 2022
Merged

[IntentsUI] Add support for Xcode 14 beta 5. #15704

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3c276a
[IntentsUI] Add support for Xcode 14 beta 5.
mandel-macaque Aug 18, 2022
2fae6ec
Merge branch 'xcode14' into intentsui-xcode14-beta5
dalexsoto Aug 24, 2022
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
7 changes: 7 additions & 0 deletions src/intents.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@
#endif

#if MONOMAC
using AppKit;
using UIImage = Foundation.NSObject;
#else
using UIKit;
using NSImage = Foundation.NSObject;
Copy link
Member Author

Choose a reason for hiding this comment

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

Kinda ugly, I know, and you might think, why not:

using UIImage = AppKit.NSImage;

But there is a 🕷️ sense that tells me it would kick our asses in the future.

Copy link
Contributor

Choose a reason for hiding this comment

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

anyway the selector would be named differently than imageWithNSImage:

Copy link
Member Author

Choose a reason for hiding this comment

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

@spouliot do we trust apple?

Copy link
Contributor

Choose a reason for hiding this comment

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

only as half far as I can throw them

#endif

#if !NET
Expand Down Expand Up @@ -3802,6 +3804,11 @@ interface INImage : NSCopying, NSSecureCoding {
[Export ("imageNamed:")]
INImage FromName (string name);

[NoWatch, NoTV, NoiOS, Mac (13,0)]
[Static]
[Export ("imageWithNSImage:")]
INImage FromImage (NSImage image);

[Watch (7,0), NoMac, iOS (14,0)]
[MacCatalyst (14,0)]
[Static]
Expand Down
1 change: 0 additions & 1 deletion tests/xtro-sharpie/api-annotations-dotnet/macOS-IntentsUI.todo
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tests/xtro-sharpie/macOS-IntentsUI.todo
View file
Open in desktop

This file was deleted.