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

dotnet · Sep 11, 2024 · d99f6f8 · d99f6f8
1 parent 0f285bb
commit d99f6f8
Show file tree

Hide file tree

Showing 33 changed files with 3,300 additions and 2,453 deletions.
diff --git a/src/AppKit/Enums.cs b/src/AppKit/Enums.cs
@@ -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;
 
@@ -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]
@@ -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,
@@ -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 {

diff --git a/src/AppKit/NSGraphics.cs b/src/AppKit/NSGraphics.cs
@@ -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);

diff --git a/src/UIKit/UIEnums.cs b/src/UIKit/UIEnums.cs
@@ -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 {