[CoreFoundation] Remove !NET code.

dotnet · Feb 26, 2025 · 8d3f452 · 8d3f452
1 parent 97fbaaf
commit 8d3f452
Show file tree

Hide file tree

Showing 29 changed files with 2 additions and 1,024 deletions.
diff --git a/src/CoreFoundation/CFAllocator.cs b/src/CoreFoundation/CFAllocator.cs
@@ -34,10 +34,6 @@
 using Foundation;
 using ObjCRuntime;
 
-#if !NET
-using NativeHandle = System.IntPtr;
-#endif
-
 namespace CoreFoundation {
 
 	// CFBase.h
@@ -50,20 +46,8 @@ public partial class CFAllocator : NativeObject {
 		static CFAllocator? Null_cf;
 #endif
 
-#if !NET
-		[Obsolete ("Use the overload that takes a 'bool owns' parameter instead.")]
-		public CFAllocator (NativeHandle handle)
-			: base (handle, true /* backwards compatibility means we have to pass true here as opposed to the general pattern */)
-		{
-		}
-#endif
-
 		[Preserve (Conditional = true)]
-#if NET
 		internal CFAllocator (NativeHandle handle, bool owns)
-#else
-		public CFAllocator (NativeHandle handle, bool owns)
-#endif
 			: base (handle, owns)
 		{
 		}

diff --git a/src/CoreFoundation/CFArray.cs b/src/CoreFoundation/CFArray.cs
@@ -34,20 +34,12 @@
 using Foundation;
 using ObjCRuntime;
 
-#if NET
 using CFIndex = System.IntPtr;
-#else
-using CFIndex = System.nint;
-#endif
 using CFArrayRef = System.IntPtr;
 using CFAllocatorRef = System.IntPtr;
 
 #nullable enable
 
-#if !NET
-using NativeHandle = System.IntPtr;
-#endif
-
 namespace CoreFoundation {
 
 	// interesting bits: https://github.com/opensource-apple/CF/blob/master/CFArray.c
@@ -56,13 +48,6 @@ public partial class CFArray : NativeObject {
 		// this cache the handle instead of issuing a native call
 		internal static NativeHandle CFNullHandle = _CFNullHandle;
 
-#if !NET
-		internal CFArray (NativeHandle handle)
-			: base (handle, false)
-		{
-		}
-#endif
-
 		[Preserve (Conditional = true)]
 		internal CFArray (NativeHandle handle, bool owns)
 			: base (handle, owns)

diff --git a/src/CoreFoundation/CFBoolean.cs b/src/CoreFoundation/CFBoolean.cs
@@ -35,19 +35,13 @@
 using ObjCRuntime;
 using Foundation;
 
-#if !NET
-using NativeHandle = System.IntPtr;
-#endif
-
 namespace CoreFoundation {
 
 
-#if NET
 	[SupportedOSPlatform ("ios")]
 	[SupportedOSPlatform ("maccatalyst")]
 	[SupportedOSPlatform ("macos")]
 	[SupportedOSPlatform ("tvos")]
-#endif
 	// CFNumber.h
 	partial class CFBoolean : NativeObject {
 		[Preserve (Conditional = true)]

diff --git a/src/CoreFoundation/CFBundle.cs b/src/CoreFoundation/CFBundle.cs
@@ -11,10 +11,6 @@
 using CoreFoundation;
 using Foundation;
 
-#if !NET
-using NativeHandle = System.IntPtr;
-#endif
-
 namespace CoreFoundation {
 
 	public partial class CFBundle : NativeObject {
@@ -28,12 +24,10 @@ public enum PackageType {
 			Bundle
 		}
 
-#if NET
 		[SupportedOSPlatform ("ios")]
 		[SupportedOSPlatform ("maccatalyst")]
 		[SupportedOSPlatform ("macos")]
 		[SupportedOSPlatform ("tvos")]
-#endif
 		public struct PackageInfo {
 			public PackageInfo (CFBundle.PackageType type, string creator)
 			{
@@ -650,21 +644,13 @@ public CFBundle.Architecture []? Architectures {
 		}
 
 #if MONOMAC
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#else
-		[NoMacCatalyst]
-#endif
 		[DllImport (Constants.CoreFoundationLibrary)]
 		extern static byte CFBundleIsExecutableLoadable (IntPtr bundle);
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#else
-		[NoMacCatalyst]
-#endif
 		public static bool IsExecutableLoadable (CFBundle bundle)
 		{
 			if (bundle is null)
@@ -673,21 +659,13 @@ public static bool IsExecutableLoadable (CFBundle bundle)
 			return CFBundleIsExecutableLoadable (bundle.GetCheckedHandle ()) != 0;
 		}
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#else
-		[NoMacCatalyst]
-#endif
 		[DllImport (Constants.CoreFoundationLibrary)]
 		extern static byte CFBundleIsExecutableLoadableForURL (IntPtr bundle);
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#else
-		[NoMacCatalyst]
-#endif
 		public static bool IsExecutableLoadable (NSUrl url)
 		{
 			if (url is null)
@@ -696,21 +674,13 @@ public static bool IsExecutableLoadable (NSUrl url)
 			return CFBundleIsExecutableLoadableForURL (url.Handle) != 0;
 		}
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#else
-		[NoMacCatalyst]
-#endif
 		[DllImport (Constants.CoreFoundationLibrary)]
 		extern static byte CFBundleIsArchitectureLoadable (/*cpu_type_t => integer_t => int*/ Architecture architecture);
 
-#if NET
 		[SupportedOSPlatform ("macos")]
 		[UnsupportedOSPlatform ("maccatalyst")]
-#else
-		[NoMacCatalyst]
-#endif
 		public static bool IsArchitectureLoadable (Architecture architecture) => CFBundleIsArchitectureLoadable (architecture) != 0;
 
 #endif

diff --git a/src/CoreFoundation/CFData.cs b/src/CoreFoundation/CFData.cs
@@ -33,10 +33,6 @@
 using Foundation;
 using ObjCRuntime;
 
-#if !NET
-using NativeHandle = System.IntPtr;
-#endif
-
 namespace CoreFoundation {
 
 	class CFData : NativeObject {

diff --git a/src/CoreFoundation/CFDictionary.cs b/src/CoreFoundation/CFDictionary.cs
@@ -35,10 +35,6 @@
 using Foundation;
 using ObjCRuntime;
 
-#if !NET
-using NativeHandle = System.IntPtr;
-#endif
-
 namespace CoreFoundation {
 
 	class CFDictionary : NativeObject {

diff --git a/src/CoreFoundation/CFException.cs b/src/CoreFoundation/CFException.cs
@@ -37,12 +37,10 @@
 
 namespace CoreFoundation {
 
-#if NET
 	[SupportedOSPlatform ("ios")]
 	[SupportedOSPlatform ("maccatalyst")]
 	[SupportedOSPlatform ("macos")]
 	[SupportedOSPlatform ("tvos")]
-#endif
 	public static class CFErrorDomain {
 
 		/// <summary>To be added.</summary>
@@ -68,12 +66,10 @@ static CFErrorDomain ()
 		}
 	}
 
-#if NET
 	[SupportedOSPlatform ("ios")]
 	[SupportedOSPlatform ("maccatalyst")]
 	[SupportedOSPlatform ("macos")]
 	[SupportedOSPlatform ("tvos")]
-#endif
 	public static class CFExceptionDataKey {
 
 		/// <summary>To be added.</summary>
@@ -103,12 +99,10 @@ static CFExceptionDataKey ()
 		}
 	}
 
-#if NET
 	[SupportedOSPlatform ("ios")]
 	[SupportedOSPlatform ("maccatalyst")]
 	[SupportedOSPlatform ("macos")]
 	[SupportedOSPlatform ("tvos")]
-#endif
 	public class CFException : Exception {
 
 		public CFException (string? description, NSString? domain, nint code, string? failureReason, string? recoverySuggestion)

diff --git a/src/CoreFoundation/CFMachPort.cs b/src/CoreFoundation/CFMachPort.cs
@@ -16,10 +16,6 @@
 using Foundation;
 using ObjCRuntime;
 
-#if !NET
-using NativeHandle = System.IntPtr;
-#endif
-
 namespace CoreFoundation {
 
 #if false
@@ -42,18 +38,8 @@ internal public struct CFMachPortContext {
 	public class CFMachPort : NativeObject {
 		delegate void CFMachPortCallBack (IntPtr cfmachport, IntPtr msg, nint len, IntPtr context);
 
-#if !NET
-		public CFMachPort (NativeHandle handle) : base (handle, false)
-		{
-		}
-#endif
-
 		[Preserve (Conditional = true)]
-#if NET
 		internal CFMachPort (NativeHandle handle, bool owns)
-#else
-		public CFMachPort (NativeHandle handle, bool owns)
-#endif
 			: base (handle, owns)
 		{
 		}