[AppKit] Fix all availability attributes in this framework. (#22261)

* Add missing availability attributes for .NET. * Remove !.NET availability attributes / code. * Remove redundant .NET availability attributes. * Don't use deprecated APIs when there's an equivalent non-deprecated version available. This is a step towards fixing #21185.
dotnet · Mar 3, 2025 · 486ffef · 486ffef · vs-mobiletools-engineering-service2 · Mar 3, 2025
1 parent f6c6aba
commit 486ffef
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 139 deletions.
diff --git a/src/AppKit/AppKitThreadAccessException.cs b/src/AppKit/AppKitThreadAccessException.cs
@@ -4,10 +4,8 @@
 #nullable enable
 
 namespace AppKit {
-#if NET
 	[SupportedOSPlatform ("macos")]
 	[SupportedOSPlatform ("maccatalyst")]
-#endif
 	public class AppKitThreadAccessException : Exception {
 		public AppKitThreadAccessException () : base ("AppKit Consistency error: you are calling a method that can only be invoked from the UI thread.")
 		{

diff --git a/src/AppKit/Defs.cs b/src/AppKit/Defs.cs
@@ -29,10 +29,8 @@
 #nullable enable
 
 namespace AppKit {
-#if NET
 	[SupportedOSPlatform ("macos")]
 	[SupportedOSPlatform ("maccatalyst")]
-#endif
 	[StructLayout (LayoutKind.Sequential)]
 	public struct NSEdgeInsets {
 		public nfloat Top;

diff --git a/src/AppKit/NSAccessibility.cs b/src/AppKit/NSAccessibility.cs
@@ -26,14 +26,9 @@
 namespace AppKit {
 	public partial interface INSAccessibility { }
 
-#if NET
 	[SupportedOSPlatform ("macos")]
-#endif
 	public partial class NSAccessibility {
 #if !COREBUILD
-#if NET
-		[SupportedOSPlatform ("macos")]
-#endif
 		[DllImport (Constants.AppKitLibrary)]
 		static extern CGRect NSAccessibilityFrameInView (NativeHandle parentView, CGRect frame);
 
@@ -42,9 +37,6 @@ public static CGRect GetFrameInView (NSView parentView, CGRect frame)
 			return NSAccessibilityFrameInView (parentView.GetHandle (), frame);
 		}
 
-#if NET
-		[SupportedOSPlatform ("macos")]
-#endif
 		[DllImport (Constants.AppKitLibrary)]
 		static extern CGPoint NSAccessibilityPointInView (NativeHandle parentView, CGPoint point);
 

diff --git a/src/AppKit/NSBezierPath.cs b/src/AppKit/NSBezierPath.cs
@@ -123,10 +123,6 @@ public unsafe void AppendPathWithGlyphs (uint [] glyphs, NSFont font)
 		}
 #endif
 
-#if NET
-		[SupportedOSPlatform ("macos")]
-		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public unsafe void Append (uint [] glyphs, NSFont font)
 		{
 			if (glyphs is null)

diff --git a/src/AppKit/NSButton.cs b/src/AppKit/NSButton.cs
@@ -51,10 +51,6 @@ public partial class NSButton {
 			set { base.Cell = value; }
 		}
 
-#if NET
-		[SupportedOSPlatform ("macos")]
-		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public static NSButton CreateButton (string title, NSImage image, Action action)
 		{
 			var dispatcher = new NSActionDispatcher (action);
@@ -63,10 +59,6 @@ public static NSButton CreateButton (string title, NSImage image, Action action)
 			return control;
 		}
 
-#if NET
-		[SupportedOSPlatform ("macos")]
-		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public static NSButton CreateButton (string title, Action action)
 		{
 			var dispatcher = new NSActionDispatcher (action);
@@ -75,10 +67,6 @@ public static NSButton CreateButton (string title, Action action)
 			return control;
 		}
 
-#if NET
-		[SupportedOSPlatform ("macos")]
-		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public static NSButton CreateButton (NSImage image, Action action)
 		{
 			var dispatcher = new NSActionDispatcher (action);
@@ -87,10 +75,6 @@ public static NSButton CreateButton (NSImage image, Action action)
 			return control;
 		}
 
-#if NET
-		[SupportedOSPlatform ("macos")]
-		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public static NSButton CreateCheckbox (string title, Action action)
 		{
 			var dispatcher = new NSActionDispatcher (action);
@@ -99,10 +83,6 @@ public static NSButton CreateCheckbox (string title, Action action)
 			return control;
 		}
 
-#if NET
-		[SupportedOSPlatform ("macos")]
-		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public static NSButton CreateRadioButton (string title, Action action)
 		{
 			var dispatcher = new NSActionDispatcher (action);

diff --git a/src/AppKit/NSFont.cs b/src/AppKit/NSFont.cs
@@ -21,10 +21,6 @@ public partial class NSFont {
 			return new NSFont (font.Handle);
 		}
 
-#if NET
-		[SupportedOSPlatform ("macos")]
-		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public unsafe CGRect [] GetBoundingRects (CGGlyph [] glyphs)
 		{
 			if (glyphs is null)
@@ -41,10 +37,6 @@ public unsafe CGRect [] GetBoundingRects (CGGlyph [] glyphs)
 			return bounds;
 		}
 
-#if NET
-		[SupportedOSPlatform ("macos")]
-		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public unsafe CGSize [] GetAdvancements (CGGlyph [] glyphs)
 		{
 			if (glyphs is null)
@@ -151,41 +143,29 @@ public unsafe CGSize [] GetAdvancements (CGGlyph [] glyphs)
 			return ptr == IntPtr.Zero ? null : new NSFont (ptr);
 		}
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[ObsoletedOSPlatform ("macos10.13")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#else
-		[Deprecated (PlatformName.MacOSX, 10, 13)]
-#endif
 		public virtual NSFont? PrinterFont {
 			get {
 				var ptr = _PrinterFont;
 				return ptr == IntPtr.Zero ? null : new NSFont (ptr);
 			}
 		}
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[ObsoletedOSPlatform ("macos10.13")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#else
-		[Deprecated (PlatformName.MacOSX, 10, 13)]
-#endif
 		public virtual NSFont? ScreenFont {
 			get {
 				var ptr = _ScreenFont;
 				return ptr == IntPtr.Zero ? null : new NSFont (ptr);
 			}
 		}
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[ObsoletedOSPlatform ("macos10.13")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#else
-		[Deprecated (PlatformName.MacOSX, 10, 13)]
-#endif
 		public virtual NSFont? ScreenFontWithRenderingMode (NSFontRenderingMode renderingMode)
 		{
 			var ptr = _ScreenFontWithRenderingMode (renderingMode);
@@ -198,42 +178,24 @@ public virtual NSFont? ScreenFont {
 			return ptr == IntPtr.Zero ? null : new NSFont (ptr);
 		}
 
-#if NET
-		[SupportedOSPlatform ("macos")]
-		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public static NSFont? SystemFontOfSize (nfloat fontSize, nfloat weight)
 		{
 			var ptr = _SystemFontOfSize (fontSize, weight);
 			return ptr == IntPtr.Zero ? null : new NSFont (ptr);
 		}
 
-#if NET
-		[SupportedOSPlatform ("macos13.0")]
-		[UnsupportedOSPlatform ("maccatalyst")]
-#else
-		[Mac (13, 0)]
-#endif
 		public static NSFont? SystemFontOfSize (nfloat fontSize, nfloat weight, nfloat width)
 		{
 			var ptr = _SystemFontOfSize (fontSize, weight, width);
 			return ptr == IntPtr.Zero ? null : new NSFont (ptr);
 		}
 
-#if NET
-		[SupportedOSPlatform ("macos")]
-		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public static NSFont? MonospacedDigitSystemFontOfSize (nfloat fontSize, nfloat weight)
 		{
 			var ptr = _MonospacedDigitSystemFontOfSize (fontSize, weight);
 			return ptr == IntPtr.Zero ? null : new NSFont (ptr);
 		}
 
-#if NET
-		[SupportedOSPlatform ("macos")]
-		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public static NSFont? MonospacedSystemFont (nfloat fontSize, nfloat weight)
 		{
 			var ptr = _MonospacedSystemFont (fontSize, weight);

diff --git a/src/AppKit/NSGestureRecognizer.cs b/src/AppKit/NSGestureRecognizer.cs
@@ -36,10 +36,8 @@ public NSGestureRecognizer (Selector sel, Token token) : this (token, sel)
 			MarkDirty ();
 		}
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		[Register ("__NSGestureRecognizerToken")]
 		[Preserve (Conditional = true)]
 		public class Token : NSObject {
@@ -49,10 +47,8 @@ public Token ()
 			}
 		}
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		[Register ("__NSGestureRecognizerParameterlessToken")]
 		[Preserve (Conditional = true)]
 		public class ParameterlessDispatch : Token {
@@ -71,10 +67,8 @@ public void Activated ()
 			}
 		}
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		[Register ("__NSGestureRecognizerParametrizedToken")]
 		[Preserve (Conditional = true)]
 		public class ParametrizedDispatch : Token {

diff --git a/src/AppKit/NSGraphics.cs b/src/AppKit/NSGraphics.cs
@@ -38,9 +38,7 @@
 #nullable enable
 
 namespace AppKit {
-#if NET
 	[SupportedOSPlatform ("macos")]
-#endif
 	public static class NSGraphics {
 		public static readonly float White = 1;
 		public static readonly float Black = 0;
@@ -179,21 +177,13 @@ 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);
@@ -250,21 +240,13 @@ public static CGRect DrawTiledRects (CGRect aRect, CGRect clipRect, NSRectEdge [
 		[DllImport (Constants.AppKitLibrary, EntryPoint = "NSDrawWindowBackground")]
 		public extern static void DrawWindowBackground (CGRect aRect);
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[ObsoletedOSPlatform ("macos10.11", "Not usually necessary, 'NSAnimationContext.RunAnimation' can be used instead and not suffer from performance issues.")]
-#else
-		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Not usually necessary, 'NSAnimationContext.RunAnimation' can be used instead and not suffer from performance issues.")]
-#endif
 		[DllImport (Constants.AppKitLibrary, EntryPoint = "NSDisableScreenUpdates")]
 		public extern static void DisableScreenUpdates ();
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[ObsoletedOSPlatform ("macos10.11", "Not usually necessary, 'NSAnimationContext.RunAnimation' can be used instead and not suffer from performance issues.")]
-#else
-		[Deprecated (PlatformName.MacOSX, 10, 11, message: "Not usually necessary, 'NSAnimationContext.RunAnimation' can be used instead and not suffer from performance issues.")]
-#endif
 		[DllImport (Constants.AppKitLibrary, EntryPoint = "NSEnableScreenUpdates")]
 		public extern static void EnableScreenUpdates ();
 

diff --git a/src/AppKit/NSSegmentedControl.cs b/src/AppKit/NSSegmentedControl.cs
@@ -23,10 +23,8 @@ public partial class NSSegmentedControl {
 			set { base.Cell = value; }
 		}
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public static NSSegmentedControl FromLabels (string [] labels, NSSegmentSwitchTracking trackingMode, Action action)
 		{
 			var dispatcher = new NSActionDispatcher (action);
@@ -35,10 +33,8 @@ public static NSSegmentedControl FromLabels (string [] labels, NSSegmentSwitchTr
 			return control;
 		}
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public static NSSegmentedControl FromImages (NSImage [] images, NSSegmentSwitchTracking trackingMode, Action action)
 		{
 			var dispatcher = new NSActionDispatcher (action);

diff --git a/src/AppKit/NSSlider.cs b/src/AppKit/NSSlider.cs
@@ -39,10 +39,8 @@ namespace AppKit {
 	public partial class NSSlider {
 		NSActionDispatcher? dispatcher;
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public static NSSlider FromTarget (Action action)
 		{
 			var dispatcher = new NSActionDispatcher (action);
@@ -51,10 +49,8 @@ public static NSSlider FromTarget (Action action)
 			return control;
 		}
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#endif
 		public static NSSlider FromValue (double value, double minValue, double maxValue, Action action)
 		{
 			var dispatcher = new NSActionDispatcher (action);

diff --git a/src/AppKit/NSStringAttributes.cs b/src/AppKit/NSStringAttributes.cs
@@ -205,7 +205,7 @@ int SetUnderlineStyle (NSString attr, NSUnderlineStyle style,
 		{
 			var value = (int) style | (int) pattern;
 			if (byWord) {
-				value |= (int) NSAttributedString.UnderlineByWordMaskAttributeName;
+				value |= (int) NSUnderlineStyle.ByWord;
 			}
 
 			SetNumberValue (attr, value);

diff --git a/src/AppKit/NSStringDrawing.cs b/src/AppKit/NSStringDrawing.cs
@@ -9,12 +9,10 @@
 
 namespace AppKit {
 
-#if NET
 	[SupportedOSPlatform ("macos")]
-	[SupportedOSPlatform ("ios")]
-	[SupportedOSPlatform ("maccatalyst")]
-	[SupportedOSPlatform ("tvos")]
-#endif
+	[UnsupportedOSPlatform ("ios")]
+	[UnsupportedOSPlatform ("tvos")]
+	[UnsupportedOSPlatform ("maccatalyst")]
 	// Manual bindings, easier than make the generator support extension methods on non-NSObject-derived types (string in this case).
 	public unsafe static partial class NSStringDrawing {
 		public static void DrawAtPoint (this string This, CGPoint point, NSDictionary? attributes)