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

[AppKit/UIKit] Implement Xcode 16.0 beta 1-6 changes. #21130

Merged
merged 15 commits into from
Sep 11, 2024
Merged

[AppKit/UIKit] Implement Xcode 16.0 beta 1-6 changes. #21130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7776a17
[xcode16] Revert workarounds for breaking changes in earlier betas du…
rolfbjarne Aug 27, 2024
0fb87bc
[cecil-tests] Ignore APIs with [EditorBrowsable (Never)]
rolfbjarne Aug 27, 2024
71a75ff
[cecil-tests] Correctly handle NS* types in UIKit
rolfbjarne Aug 27, 2024
240473d
[bgen] Forward EditorBrowsable attributes from api definitions to str…
rolfbjarne Aug 27, 2024
ac075ff
[AppKit/UIKit] Implement Xcode 16.0 beta 1-6 changes.
rolfbjarne Jun 21, 2024
6fd9dc2
Auto-format source code
Aug 27, 2024
d2d5e53
Fix APIs
rolfbjarne Aug 29, 2024
30b6935
Merge remote-tracking branch 'origin/xcode16' into dev/rolf/xcode16-b…
rolfbjarne Sep 2, 2024
1a6c334
[introspection] Fix legacy test issue by removing the API in question.
rolfbjarne Sep 3, 2024
f00ddd0
[cecil-tests] Fix known issue.
rolfbjarne Sep 3, 2024
f0f5721
Adjust availability after running tests on older macOS versions.
rolfbjarne Sep 4, 2024
8dd8481
Merge remote-tracking branch 'origin/xcode16' into dev/rolf/xcode16-b…
rolfbjarne Sep 4, 2024
d502b18
Remove dead comment.
rolfbjarne Sep 6, 2024
bec6de8
Merge remote-tracking branch 'origin/xcode16' into dev/rolf/xcode16-b…
rolfbjarne Sep 6, 2024
0a45ca9
Make PR faster.
rolfbjarne Sep 6, 2024
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
2 changes: 1 addition & 1 deletion Make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ INCLUDE_TVOS=1
INCLUDE_MACCATALYST=1
INCLUDE_DEVICE=1
INCLUDE_DOTNET_WATCHOS=
INCLUDE_XAMARIN_LEGACY=1
INCLUDE_XAMARIN_LEGACY=
Copy link
Member Author

@rolfbjarne rolfbjarne Sep 11, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

This change is already in the xcode16 branch, so it will disappear when the PR is merged.

INCLUDE_HOTRESTART=1

ENABLE_DOTNET=1
Expand Down
30 changes: 29 additions & 1 deletion src/AppKit/Enums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.ComponentModel;
using ObjCRuntime;
using Foundation;

Expand Down Expand Up @@ -891,7 +892,10 @@ public enum NSWindowStyle : ulong {
[NoMacCatalyst]
[Native]
public enum NSWindowSharingType : ulong {
None, ReadOnly, ReadWrite
None,
ReadOnly,
[Deprecated (PlatformName.MacOSX, 15, 0, message: "Use 'ReadOnly' instead.")]
ReadWrite,
}

[NoMacCatalyst]
Expand Down Expand Up @@ -1983,13 +1987,29 @@ public enum NSFontCollectionOptions : long {
ApplicationOnlyMask = 1
}

#if XAMCORE_5_0
[NoMacCatalyst]
#else
[MacCatalyst (13, 1)]
[Deprecated (PlatformName.MacCatalyst, 13, 1, message: "This enum doesn't exist on this platform.")]
#if __MACCATALYST__
[EditorBrowsable (EditorBrowsableState.Never)]
#endif
#endif
[Native]
public enum NSCollectionViewDropOperation : long {
On = 0, Before = 1
}

#if XAMCORE_5_0
[NoMacCatalyst]
#else
[MacCatalyst (13, 1)]
[Deprecated (PlatformName.MacCatalyst, 13, 1, message: "This enum doesn't exist on this platform.")]
#if __MACCATALYST__
[EditorBrowsable (EditorBrowsableState.Never)]
#endif
#endif
[Native]
public enum NSCollectionViewItemHighlightState : long {
None = 0,
Expand All @@ -1998,7 +2018,15 @@ public enum NSCollectionViewItemHighlightState : long {
AsDropTarget = 3
}

#if XAMCORE_5_0
[NoMacCatalyst]
#else
[MacCatalyst (13, 1)]
[Deprecated (PlatformName.MacCatalyst, 13, 1, message: "This enum doesn't exist on this platform.")]
#if __MACCATALYST__
[EditorBrowsable (EditorBrowsableState.Never)]
#endif
#endif
[Native]
[Flags]
public enum NSCollectionViewScrollPosition : ulong {
Expand Down
12 changes: 12 additions & 0 deletions src/AppKit/NSGraphics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,21 @@ public static void FrameRect (CGRect rect, nfloat frameWidth, NSCompositingOpera
NSFrameRectWithWidthUsingOperation (rect, frameWidth, (nuint) (ulong) operation);
}

#if NET
[SupportedOSPlatform ("macos")]
[ObsoletedOSPlatform ("macos14.0", "Use 'NSCursor.DisappearingItemCursor' instead." )]
#else
[Deprecated (PlatformName.MacOSX, 14, 0, message: "Use 'NSCursor.DisappearingItemCursor' instead.")]
#endif
[DllImport (Constants.AppKitLibrary, EntryPoint = "NSShowAnimationEffect")]
extern static void NSShowAnimationEffect (nuint animationEffect, CGPoint centerLocation, CGSize size, NativeHandle animationDelegate, NativeHandle didEndSelector, IntPtr contextInfo);

#if NET
[SupportedOSPlatform ("macos")]
[ObsoletedOSPlatform ("macos14.0", "Use 'NSCursor.DisappearingItemCursor' instead." )]
#else
[Deprecated (PlatformName.MacOSX, 14, 0, message: "Use 'NSCursor.DisappearingItemCursor' instead.")]
#endif
public static void ShowAnimationEffect (NSAnimationEffect animationEffect, CGPoint centerLocation, CGSize size, NSObject animationDelegate, Selector didEndSelector, IntPtr contextInfo)
{
NSShowAnimationEffect ((nuint) (ulong) animationEffect, centerLocation, size, animationDelegate.GetHandle (), didEndSelector.Handle, contextInfo);
Expand Down
2 changes: 1 addition & 1 deletion src/UIKit/UIEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3183,7 +3183,7 @@ public enum UIEventButtonMask : ulong {
Secondary = 1L << 1,
}

[Flags, TV (13, 4), NoWatch, iOS (13, 4)]
[Flags, TV (13, 4), Watch (6, 2), iOS (13, 4)]
[MacCatalyst (13, 1)]
[Native]
public enum UIAxis : ulong {
Expand Down
Loading