diff --git a/CODEOWNERS b/CODEOWNERS index efaaeef8dcfa..632b44abee39 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -14,7 +14,7 @@ /mk @rolfbjarne -/msbuild @kzu @jstedfast @emaf @rolfbjarne @VincentDondain @chamons +/msbuild @jstedfast @emaf @rolfbjarne @VincentDondain @chamons /runtime @rolfbjarne diff --git a/src/Foundation/NSObject.iOS.cs b/src/Foundation/NSObject.iOS.cs index 1a8ffcbcf581..2695e949d5d2 100644 --- a/src/Foundation/NSObject.iOS.cs +++ b/src/Foundation/NSObject.iOS.cs @@ -23,11 +23,6 @@ public partial class NSObject : INativeObject public readonly static Assembly MonoTouchAssembly = typeof (NSObject).Assembly; #endif -#if !XAMCORE_2_0 - const string selAccessibilityDecrement = "accessibilityDecrement"; - const string selAccessibilityIncrement = "accessibilityIncrement"; - const string selAccessibilityScroll = "accessibilityScroll"; -#endif public static NSObject Alloc (Class kls) { var h = Messaging.IntPtr_objc_msgSend (kls.Handle, Selector.GetHandle (Selector.Alloc)); return new NSObject (h, true); @@ -53,40 +48,6 @@ public static void InvokeInBackground (Action action) IsBackground = true, }.Start (action); } - -#if !XAMCORE_2_0 - [Export ("accessibilityDecrement")] - public virtual void AccessibilityDecrement () { - if (IsDirectBinding) { - Messaging.void_objc_msgSend (this.Handle, Selector.GetHandle (selAccessibilityDecrement)); - } else { - Messaging.void_objc_msgSendSuper (this.SuperHandle, Selector.GetHandle (selAccessibilityDecrement)); - } - } - - [Export ("accessibilityIncrement")] - public virtual void AccessibilityIncrement () { - if (IsDirectBinding) { - Messaging.void_objc_msgSend (this.Handle, Selector.GetHandle (selAccessibilityIncrement)); - } else { - Messaging.void_objc_msgSendSuper (this.SuperHandle, Selector.GetHandle (selAccessibilityIncrement)); - } - } - - [Export ("accessibilityScroll:")] - public virtual bool AccessibilityScroll (UIAccessibilityScrollDirection direction) { - if (IsDirectBinding) { - return Messaging.bool_objc_msgSend_int (this.Handle, Selector.GetHandle (selAccessibilityScroll), (int) direction); - } else { - return Messaging.bool_objc_msgSendSuper_int (this.SuperHandle, Selector.GetHandle (selAccessibilityScroll), (int) direction); - } - } - - public virtual void PerformSelector (Selector sel, NSObject obj, float delay) - { - PerformSelector (sel, obj, (double) delay); - } -#endif #endif // !COREBUILD } } diff --git a/src/Foundation/NSObject.mac.cs b/src/Foundation/NSObject.mac.cs index f4808bc3631d..307068ed32eb 100644 --- a/src/Foundation/NSObject.mac.cs +++ b/src/Foundation/NSObject.mac.cs @@ -71,7 +71,6 @@ public partial class NSObject : INativeObject static IntPtr ma = Dlfcn.dlopen (Constants.MediaAccessibilityLibrary, 1); static IntPtr mi = Dlfcn.dlopen (Constants.CoreMidiLibrary, 1); static IntPtr ic = Dlfcn.dlopen (Constants.ImageCaptureCoreLibrary, 1); -#if XAMCORE_2_0 && ARCH_64 static IntPtr it = Dlfcn.dlopen (Constants.IntentsLibrary, 1); static IntPtr me = Dlfcn.dlopen (Constants.MediaLibraryLibrary, 1); static IntPtr gl = Dlfcn.dlopen (Constants.GLKitLibrary, 1); @@ -110,7 +109,6 @@ public partial class NSObject : INativeObject static IntPtr vs = Dlfcn.dlopen (Constants.VideoSubscriberAccountLibrary, 1); static IntPtr un = Dlfcn.dlopen (Constants.UserNotificationsLibrary, 1); static IntPtr il = Dlfcn.dlopen (Constants.iTunesLibraryLibrary, 1); -#endif // ** IF YOU ADD ITEMS HERE PLEASE UPDATE linker/ObjCExtensions.cs and mmp/linker/MonoMac.Tuner/MonoMacNamespaces.cs #if !XAMCORE_4_0 diff --git a/src/Foundation/NSObject2.cs b/src/Foundation/NSObject2.cs index 3367206f8c8f..33107afc5639 100644 --- a/src/Foundation/NSObject2.cs +++ b/src/Foundation/NSObject2.cs @@ -49,7 +49,7 @@ public class NSObjectFlag { [StructLayout (LayoutKind.Sequential)] public partial class NSObject -#if !COREBUILD && XAMCORE_2_0 +#if !COREBUILD : IEquatable #endif { @@ -92,14 +92,11 @@ internal bool IsRegisteredToggleRef { get { return ((flags & Flags.RegisteredToggleRef) == Flags.RegisteredToggleRef); } set { flags = value ? (flags | Flags.RegisteredToggleRef) : (flags & ~Flags.RegisteredToggleRef); } } -#if XAMCORE_2_0 + protected internal bool IsDirectBinding { get { return ((flags & Flags.IsDirectBinding) == Flags.IsDirectBinding); } set { flags = value ? (flags | Flags.IsDirectBinding) : (flags & ~Flags.IsDirectBinding); } } -#else - protected internal bool IsDirectBinding; -#endif internal bool InFinalizerQueue { get { return ((flags & Flags.InFinalizerQueue) == Flags.InFinalizerQueue); } @@ -194,10 +191,10 @@ private void InitializeObject (bool alloced) { if (alloced && handle == IntPtr.Zero && Class.ThrowOnInitFailure) { if (ClassHandle == IntPtr.Zero) throw new Exception (string.Format ("Could not create an native instance of the type '{0}': the native class hasn't been loaded.\n" + - "It is possible to ignore this condition by setting " + (Runtime.IsUnifiedBuild ? "" : (Runtime.CompatNamespace + ".")) + "ObjCRuntime.Class.ThrowOnInitFailure to false.", + "It is possible to ignore this condition by setting ObjCRuntime.Class.ThrowOnInitFailure to false.", GetType ().FullName)); throw new Exception (string.Format ("Failed to create a instance of the native type '{0}'.\n" + - "It is possible to ignore this condition by setting " + (Runtime.IsUnifiedBuild ? "" : (Runtime.CompatNamespace + ".")) + "ObjCRuntime.Class.ThrowOnInitFailure to false.", + "It is possible to ignore this condition by setting ObjCRuntime.Class.ThrowOnInitFailure to false.", new Class (ClassHandle).Name)); } @@ -235,31 +232,6 @@ void ReleaseManagedRef () xamarin_release_managed_ref (handle, this); } -#if !XAMCORE_2_0 - [Export ("encodeWithCoder:")] - public virtual void EncodeTo (NSCoder coder) - { - if (coder == null) - throw new ArgumentNullException ("coder"); - - if (!(this is INSCoding)) - throw new InvalidOperationException ("Type does not conform to NSCoding"); - -#if MONOMAC - if (IsDirectBinding) { - Messaging.void_objc_msgSend_intptr (this.Handle, selEncodeWithCoderHandle, coder.Handle); - } else { - Messaging.void_objc_msgSendSuper_intptr (this.SuperHandle, selEncodeWithCoderHandle, coder.Handle); - } -#else - if (IsDirectBinding) { - Messaging.void_objc_msgSend_intptr (this.Handle, Selector.GetHandle (selEncodeWithCoder), coder.Handle); - } else { - Messaging.void_objc_msgSendSuper_intptr (this.SuperHandle, Selector.GetHandle (selEncodeWithCoder), coder.Handle); - } -#endif - } -#endif static bool IsProtocol (Type type, IntPtr protocol) { while (type != typeof (NSObject) && type != null) { @@ -356,15 +328,6 @@ public virtual bool ConformsToProtocol (IntPtr protocol) return false; } - -#if !XAMCORE_2_0 - [Obsolete ("Low-level API warning: Use at your own risk: this calls the Release method on the underlying object; Use DangerousRelease to avoid this warning.")] - [EditorBrowsable (EditorBrowsableState.Advanced)] - public void Release () - { - DangerousRelease (); - } -#endif [EditorBrowsable (EditorBrowsableState.Advanced)] public void DangerousRelease () @@ -403,15 +366,6 @@ internal static void DangerousAutorelease (IntPtr handle) #endif } -#if !XAMCORE_2_0 - [Obsolete ("Low-level API warning: Use at your own risk: this calls the Retain method on the underlying object; Use DangerousRetain to avoid this warning.")] - [EditorBrowsable (EditorBrowsableState.Advanced)] - public NSObject Retain () - { - return DangerousRetain (); - } -#endif - [EditorBrowsable (EditorBrowsableState.Advanced)] public NSObject DangerousRetain () { @@ -423,15 +377,6 @@ public NSObject DangerousRetain () return this; } -#if !XAMCORE_2_0 - [Obsolete ("Low-level API warning: Use at your own risk: this calls the Retain method on the underlying object; Use DangerousAutorelease to avoid this warning.")] - [EditorBrowsable (EditorBrowsableState.Advanced)] - public NSObject Autorelease () - { - return DangerousAutorelease (); - } -#endif - [EditorBrowsable (EditorBrowsableState.Advanced)] public NSObject DangerousAutorelease () { @@ -667,7 +612,6 @@ public static NSObject FromObject (object obj) else if (t == typeof (PointF)) return NSValue.FromPointF ((PointF) obj); #endif -#if XAMCORE_2_0 if (t == typeof (nint)) return NSNumber.FromNInt ((nint) obj); else if (t == typeof (nuint)) @@ -680,7 +624,6 @@ public static NSObject FromObject (object obj) return NSValue.FromCGRect ((CGRect) obj); else if (t == typeof (CGPoint)) return NSValue.FromCGPoint ((CGPoint) obj); -#endif #if !MONOMAC if (t == typeof (CGAffineTransform)) @@ -720,7 +663,6 @@ public void SetValueForKeyPath (IntPtr handle, NSString keyPath) #endif } -#if XAMCORE_2_0 // if IsDirectBinding is false then we _likely_ have managed state and it's up to the subclass to provide // a correct implementation of GetHashCode / Equals. We default to Object.GetHashCode (like classic) @@ -749,7 +691,6 @@ public override bool Equals (object obj) // IEquatable public bool Equals (NSObject obj) => Equals ((object) obj); -#endif public override string ToString () { diff --git a/src/ObjCRuntime/AdoptsAttribute.cs b/src/ObjCRuntime/AdoptsAttribute.cs index 39182c74c6f4..14592f264de8 100644 --- a/src/ObjCRuntime/AdoptsAttribute.cs +++ b/src/ObjCRuntime/AdoptsAttribute.cs @@ -33,10 +33,7 @@ namespace ObjCRuntime { [AttributeUsage(AttributeTargets.Class, AllowMultiple=true)] -#if XAMCORE_2_0 - sealed -#endif - public class AdoptsAttribute : Attribute { + public sealed class AdoptsAttribute : Attribute { #if !COREBUILD IntPtr handle; diff --git a/src/ObjCRuntime/AlphaAttribute.cs b/src/ObjCRuntime/AlphaAttribute.cs deleted file mode 100644 index 45c0b424ddee..000000000000 --- a/src/ObjCRuntime/AlphaAttribute.cs +++ /dev/null @@ -1,14 +0,0 @@ -// -// Alpha attribute -// - -#if !XAMCORE_2_0 - -using System; - -namespace ObjCRuntime { - public class AlphaAttribute : Attribute { - public AlphaAttribute () {} - } -} -#endif diff --git a/src/ObjCRuntime/BlockProxyAttribute.cs b/src/ObjCRuntime/BlockProxyAttribute.cs index afc8ecf63068..4e20ebc8ca93 100644 --- a/src/ObjCRuntime/BlockProxyAttribute.cs +++ b/src/ObjCRuntime/BlockProxyAttribute.cs @@ -16,10 +16,7 @@ namespace ObjCRuntime { [AttributeUsage (AttributeTargets.Parameter, AllowMultiple=false)] -#if XAMCORE_2_0 - sealed -#endif - public class BlockProxyAttribute : Attribute { + public sealed class BlockProxyAttribute : Attribute { public BlockProxyAttribute (Type t) { Type = t; } public Type Type { get; set; } } diff --git a/src/ObjCRuntime/Blocks.cs b/src/ObjCRuntime/Blocks.cs index 082cc1c40388..55ed61a60395 100644 --- a/src/ObjCRuntime/Blocks.cs +++ b/src/ObjCRuntime/Blocks.cs @@ -40,9 +40,6 @@ namespace ObjCRuntime { #pragma warning disable 649 // Field 'XamarinBlockDescriptor.ref_count' is never assigned to, and will always have its default value 0 [StructLayout (LayoutKind.Sequential)] -#if !XAMCORE_2_0 - public -#endif struct BlockDescriptor { public IntPtr reserved; public IntPtr size; @@ -63,7 +60,6 @@ struct XamarinBlockDescriptor { [StructLayout (LayoutKind.Sequential)] public unsafe struct BlockLiteral { #pragma warning disable 169 -#if XAMCORE_2_0 IntPtr isa; BlockFlags flags; int reserved; @@ -71,15 +67,6 @@ public unsafe struct BlockLiteral { IntPtr block_descriptor; IntPtr local_handle; IntPtr global_handle; -#else - public IntPtr isa; - public BlockFlags flags; - public int reserved; - public IntPtr invoke; - public IntPtr block_descriptor; - public IntPtr local_handle; - public IntPtr global_handle; -#endif #pragma warning restore 169 #if !COREBUILD static IntPtr block_class; diff --git a/src/ObjCRuntime/Class.cs b/src/ObjCRuntime/Class.cs index 8adf32820f9a..9e6c0afe99d6 100644 --- a/src/ObjCRuntime/Class.cs +++ b/src/ObjCRuntime/Class.cs @@ -569,12 +569,7 @@ static unsafe uint GetFullTokenReference (string assembly_name, int module_token Type must have been previously registered. */ [BindingImpl (BindingImplOptions.Optimizable)] // To inline the Runtime.DynamicRegistrationSupported code if possible. -#if !XAMCORE_2_0 && !MONOTOUCH // Accidently exposed this to public, can't break API - public -#else - internal -#endif - static bool IsCustomType (Type type) + internal static bool IsCustomType (Type type) { bool is_custom_type; var @class = GetClassHandle (type, false, out is_custom_type); diff --git a/src/ObjCRuntime/CompileFlagsAttribute.cs b/src/ObjCRuntime/CompileFlagsAttribute.cs deleted file mode 100644 index 19b76fc3bdca..000000000000 --- a/src/ObjCRuntime/CompileFlagsAttribute.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -// Compile flags attribute -// -// Copyright 2010, Novell, Inc. -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -// - -#if MONOMAC && !XAMCORE_2_0 - -using System; - -namespace ObjCRuntime { - public class CompileFlagsAttribute : Attribute { - public CompileFlagsAttribute (string flags) - { - Flags = flags; - } - public string Flags; - } -} - -#endif diff --git a/src/ObjCRuntime/DelayedRegistrationAttribute.cs b/src/ObjCRuntime/DelayedRegistrationAttribute.cs index d8af92999262..097d486714f2 100644 --- a/src/ObjCRuntime/DelayedRegistrationAttribute.cs +++ b/src/ObjCRuntime/DelayedRegistrationAttribute.cs @@ -27,11 +27,7 @@ using System.Runtime.InteropServices; using System.IO; -#if XAMCORE_2_0 namespace ObjCRuntime { -#else -namespace MonoMac { -#endif [AttributeUsage (AttributeTargets.Assembly)] public abstract class DelayedRegistrationAttribute : Attribute { diff --git a/src/ObjCRuntime/Dlfcn.cs b/src/ObjCRuntime/Dlfcn.cs index 1c68b04b364e..041fd5daaf64 100644 --- a/src/ObjCRuntime/Dlfcn.cs +++ b/src/ObjCRuntime/Dlfcn.cs @@ -279,7 +279,6 @@ public static void SetArray (IntPtr handle, string symbol, NSArray array) Marshal.WriteIntPtr (indirect, arrayHandle); } -#if XAMCORE_2_0 public static nint GetNInt (IntPtr handle, string symbol) { return (nint)GetIntPtr (handle, symbol); @@ -325,7 +324,6 @@ public static void SetNFloat (IntPtr handle, string symbol, nfloat value) *ptr = value; } } -#endif public static IntPtr GetIntPtr (IntPtr handle, string symbol) { @@ -343,31 +341,6 @@ public static void SetIntPtr (IntPtr handle, string symbol, IntPtr value) Marshal.WriteIntPtr (indirect, value); } -#if !XAMCORE_2_0 - public static SizeF GetSizeF (IntPtr handle, string symbol) - { - var indirect = dlsym (handle, symbol); - if (indirect == IntPtr.Zero) - return SizeF.Empty; - unsafe { - float *ptr = (float *) indirect; - return new SizeF (ptr [0], ptr [1]); - } - } - - public static void SetSizeF (IntPtr handle, string symbol, SizeF value) - { - var indirect = dlsym (handle, symbol); - if (indirect == IntPtr.Zero) - return; - unsafe { - float *ptr = (float *) indirect; - ptr [0] = value.Width; - ptr [1] = value.Height; - } - } -#endif - public static CGRect GetCGRect (IntPtr handle, string symbol) { var indirect = dlsym (handle, symbol); diff --git a/src/ObjCRuntime/LinkWithAttribute.cs b/src/ObjCRuntime/LinkWithAttribute.cs index a5281c30dfe7..768c0381d98a 100644 --- a/src/ObjCRuntime/LinkWithAttribute.cs +++ b/src/ObjCRuntime/LinkWithAttribute.cs @@ -48,10 +48,7 @@ public enum DlsymOption } [AttributeUsage(AttributeTargets.Assembly, AllowMultiple=true)] -#if XAMCORE_2_0 - sealed -#endif - public class LinkWithAttribute : Attribute { + public sealed class LinkWithAttribute : Attribute { public LinkWithAttribute (string libraryName, LinkTarget target, string linkerFlags) { LibraryName = libraryName; diff --git a/src/ObjCRuntime/Messaging.iOS.cs b/src/ObjCRuntime/Messaging.iOS.cs deleted file mode 100644 index 7f7fd860f89f..000000000000 --- a/src/ObjCRuntime/Messaging.iOS.cs +++ /dev/null @@ -1,341 +0,0 @@ -#if IOS || TVOS - -using System; -#if !XAMCORE_2_0 -using System.Drawing; -#endif -using System.Runtime.InteropServices; - -using Foundation; -using CoreGraphics; - -namespace ObjCRuntime { -#if !XAMCORE_2_0 || COREBUILD - public -#endif - static partial class Messaging { - internal const string LIBOBJC_DYLIB = "/usr/lib/libobjc.dylib"; - -#if !XAMCORE_2_0 - /* void returns */ - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend (IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_intptr (IntPtr receiver, IntPtr selector, IntPtr arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_bool (IntPtr receiver, IntPtr selector, bool arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_rbool (IntPtr receiver, IntPtr selector, ref bool arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_rint (IntPtr receiver, IntPtr selector, ref int arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_rfloat (IntPtr receiver, IntPtr selector, ref float arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_rdouble (IntPtr receiver, IntPtr selector, ref double arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_rintptr (IntPtr receiver, IntPtr selector, ref IntPtr arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_cgsize (IntPtr receiver, IntPtr selector, CGSize arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_cgpoint (IntPtr receiver, IntPtr selector, CGPoint arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_cgrect (IntPtr receiver, IntPtr selector, CGRect arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_nsrange (IntPtr receiver, IntPtr selector, NSRange arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_intptr_int (IntPtr receiver, IntPtr selector, IntPtr arg1, int arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_cgpoint_intptr (IntPtr receiver, IntPtr selector, CGPoint arg1, IntPtr arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_intptr_intptr_bool (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, bool arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_intptr_intptr_float (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, float arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_intptr_intptr_double (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, double arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_intptr_intptr (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper (IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_intptr (IntPtr receiver, IntPtr selector, IntPtr arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_cgsize (IntPtr receiver, IntPtr selector, CGSize arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_cgrect (IntPtr receiver, IntPtr selector, CGRect arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_intptr_intptr_bool (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, bool arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_intptr_intptr_float (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, float arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_intptr_intptr_double (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, double arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void void_objc_msgSend_stret_rcgsize (ref CGSize stret, IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void void_objc_msgSend_stret_rcgrect (ref CGRect stret, IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void void_objc_msgSend_stret_rnsrange (ref NSRange stret, IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void void_objc_msgSend_stret_rcgsize_cgpoint_intptr (ref CGSize stret, IntPtr receiver, IntPtr selector, CGPoint arg1, IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void void_objc_msgSendSuper_stret_rcgrect (ref CGRect stret, IntPtr receiver, IntPtr selector); - - /* intptr returns */ - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr intptr_objc_msgSend (IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr intptr_objc_msgSend_intptr (IntPtr receiver, IntPtr selector, IntPtr arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr intptr_objc_msgSend_float (IntPtr receiver, IntPtr selector, float arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr intptr_objc_msgSend_cgrect (IntPtr receiver, IntPtr selector, CGRect arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static IntPtr intptr_objc_msgSendSuper (IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static IntPtr intptr_objc_msgSendSuper_cgrect (IntPtr receiver, IntPtr selector, CGRect arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static IntPtr intptr_objc_msgSendSuper_intptr (IntPtr receiver, IntPtr selector, IntPtr arg1); - - /* bool returns */ - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend (IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_intptr (IntPtr receiver, IntPtr selector, IntPtr arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_intptr (IntPtr receiver, IntPtr selector, IntPtr arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_int (IntPtr receiver, IntPtr selector, int arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_int (IntPtr receiver, IntPtr selector, int arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static CGSize cgsize_objc_msgSend_cgpoint_intptr (IntPtr receiver, IntPtr selector, CGPoint arg1, IntPtr arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static CGSize cgsize_objc_msgSend (IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr intptr_objc_msgsend_intptr_int (IntPtr receiver, IntPtr selector, IntPtr arg1, int arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static Boolean Boolean_objc_msgSend_IntPtr_Double_IntPtr (IntPtr receiver, IntPtr selector, IntPtr arg1, Double arg2, IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static Boolean Boolean_objc_msgSendSuper_IntPtr_Double_IntPtr (IntPtr receiver, IntPtr selector, IntPtr arg1, Double arg2, IntPtr arg3); - - // the new generator syntax* for System.Boolean is to use 'bool' not 'Boolean' (as needed for the simulator) but keep the old one for binary compatibility - // * https://github.com/mono/maccore/commit/2008d9fd84b28e744321d71104680487155b9fa5 - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_Double_IntPtr (IntPtr receiver, IntPtr selector, IntPtr arg1, Double arg2, IntPtr arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void RectangleF_objc_msgSend_stret_IntPtr_IntPtr (out CGRect retval, IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void RectangleF_objc_msgSendSuper_stret_IntPtr_IntPtr (out CGRect retval, IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_UInt32_IntPtr (IntPtr receiver, IntPtr selector, uint arg1, IntPtr arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_UInt32_IntPtr (IntPtr receiver, IntPtr selector, uint arg1, IntPtr arg2); - - // Compatibility with older monotouch.dll - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_CMTime_CGAffineTransform_CGAffineTransform_CMTimeRange (IntPtr receiver, IntPtr selector, CoreMedia.CMTime arg1, CoreGraphics.CGAffineTransform arg2, CoreGraphics.CGAffineTransform arg3, CoreMedia.CMTimeRange arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_CMTime_CGAffineTransform_CGAffineTransform_CMTimeRange (IntPtr receiver, IntPtr selector, CoreMedia.CMTime arg1, CoreGraphics.CGAffineTransform arg2, CoreGraphics.CGAffineTransform arg3, CoreMedia.CMTimeRange arg4); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_CMTime_CMTime_CMTime (IntPtr receiver, IntPtr selector, CoreMedia.CMTime arg1, CoreMedia.CMTime arg2, CoreMedia.CMTime arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_CMTime_CMTime_CMTime (IntPtr receiver, IntPtr selector, CoreMedia.CMTime arg1, CoreMedia.CMTime arg2, CoreMedia.CMTime arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_CMTime_float_float_CMTimeRange (IntPtr receiver, IntPtr selector, CoreMedia.CMTime arg1, float arg2, float arg3, CoreMedia.CMTimeRange arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_CMTime_float_float_CMTimeRange (IntPtr receiver, IntPtr selector, CoreMedia.CMTime arg1, float arg2, float arg3, CoreMedia.CMTimeRange arg4); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr IntPtr_objc_msgSend_int_IntPtr_IntPtr_IntPtr_IntPtr (IntPtr receiver, IntPtr selector, int arg1, IntPtr arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static IntPtr IntPtr_objc_msgSendSuper_int_IntPtr_IntPtr_IntPtr_IntPtr (IntPtr receiver, IntPtr selector, int arg1, IntPtr arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_Double_float (IntPtr receiver, IntPtr selector, double arg1, float arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_Double_float (IntPtr receiver, IntPtr selector, double arg1, float arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_UInt32_UInt32 (IntPtr receiver, IntPtr selector, uint arg1, uint arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_UInt32_UInt32 (IntPtr receiver, IntPtr selector, uint arg1, uint arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_bool_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, bool arg1, int arg2, System.IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_bool_IntPtr (System.IntPtr receiver, System.IntPtr selector, bool arg1, System.IntPtr arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_bool_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, bool arg1, System.IntPtr arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_CMTimeRange_IntPtr_CMTime_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoTouch.CoreMedia.CMTimeRange arg1, System.IntPtr arg2, MonoTouch.CoreMedia.CMTime arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_float_IntPtr (System.IntPtr receiver, System.IntPtr selector, float arg1, System.IntPtr arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_bool_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, bool arg2, System.IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_bool_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, bool arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_int_bool_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, bool arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_IntPtr_CMTime_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, MonoTouch.CoreMedia.CMTime arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, int arg3, System.IntPtr arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_IntPtr_IntPtr_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, System.IntPtr arg3, int arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_IntPtr_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, System.IntPtr arg3, int arg4, System.IntPtr arg5, System.IntPtr arg6); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, System.IntPtr arg3, System.IntPtr arg4, System.IntPtr arg5, System.IntPtr arg6, System.IntPtr arg7, System.IntPtr arg8); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_bool_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, bool arg1, int arg2, System.IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_bool_IntPtr (System.IntPtr receiver, System.IntPtr selector, bool arg1, System.IntPtr arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_bool_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, bool arg1, System.IntPtr arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_CMTimeRange_IntPtr_CMTime_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoTouch.CoreMedia.CMTimeRange arg1, System.IntPtr arg2, MonoTouch.CoreMedia.CMTime arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_float_IntPtr (System.IntPtr receiver, System.IntPtr selector, float arg1, System.IntPtr arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_bool_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, bool arg2, System.IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_bool_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, bool arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_int_bool_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, bool arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_IntPtr_CMTime_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, MonoTouch.CoreMedia.CMTime arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, int arg3, System.IntPtr arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_IntPtr_IntPtr_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, System.IntPtr arg3, int arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_IntPtr_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, System.IntPtr arg3, int arg4, System.IntPtr arg5, System.IntPtr arg6); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, System.IntPtr arg3, System.IntPtr arg4, System.IntPtr arg5, System.IntPtr arg6, System.IntPtr arg7, System.IntPtr arg8); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static int int_objc_msgSend_IntPtr_IntPtr_int_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, int arg3, int arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static int int_objc_msgSend_IntPtr_IntPtr_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, int arg3, System.IntPtr arg4); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static int int_objc_msgSendSuper_IntPtr_IntPtr_int_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, int arg3, int arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static int int_objc_msgSendSuper_IntPtr_IntPtr_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, int arg3, System.IntPtr arg4); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_CMTime_out_CMTime_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoTouch.CoreMedia.CMTime arg1, out MonoTouch.CoreMedia.CMTime arg2, System.IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_int_int_IntPtr_bool_IntPtr (System.IntPtr receiver, System.IntPtr selector, int arg1, int arg2, System.IntPtr arg3, bool arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_int_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, int arg1, System.IntPtr arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_int_IntPtr_ref_NSRange_ref_NSRange_IntPtr (System.IntPtr receiver, System.IntPtr selector, int arg1, System.IntPtr arg2, ref MonoTouch.Foundation.NSRange arg3, ref MonoTouch.Foundation.NSRange arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_IntPtr_int_IntPtr_out_Boolean_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, System.IntPtr arg3, out bool arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_IntPtr_int_ref_NSPropertyListFormat_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, ref MonoTouch.Foundation.NSPropertyListFormat arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, System.IntPtr arg3, System.IntPtr arg4, System.IntPtr arg5, System.IntPtr arg6); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_IntPtr_RectangleF_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.Drawing.RectangleF arg2, System.IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_NSRange_IntPtr_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoTouch.Foundation.NSRange arg1, System.IntPtr arg2, int arg3, System.IntPtr arg4); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_CMTime_out_CMTime_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoTouch.CoreMedia.CMTime arg1, out MonoTouch.CoreMedia.CMTime arg2, System.IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_int_int_IntPtr_bool_IntPtr (System.IntPtr receiver, System.IntPtr selector, int arg1, int arg2, System.IntPtr arg3, bool arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_int_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, int arg1, System.IntPtr arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_int_IntPtr_ref_NSRange_ref_NSRange_IntPtr (System.IntPtr receiver, System.IntPtr selector, int arg1, System.IntPtr arg2, ref MonoTouch.Foundation.NSRange arg3, ref MonoTouch.Foundation.NSRange arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_IntPtr_int_IntPtr_out_Boolean_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, System.IntPtr arg3, out bool arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_IntPtr_int_ref_NSPropertyListFormat_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, ref MonoTouch.Foundation.NSPropertyListFormat arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, System.IntPtr arg3, System.IntPtr arg4, System.IntPtr arg5, System.IntPtr arg6); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_IntPtr_RectangleF_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.Drawing.RectangleF arg2, System.IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_NSRange_IntPtr_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoTouch.Foundation.NSRange arg1, System.IntPtr arg2, int arg3, System.IntPtr arg4); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void RectangleF_objc_msgSend_stret_IntPtr_IntPtr_IntPtr (out System.Drawing.RectangleF retval, System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, System.IntPtr arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void RectangleF_objc_msgSendSuper_stret_IntPtr_IntPtr_IntPtr (out System.Drawing.RectangleF retval, System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, System.IntPtr arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static uint UInt32_objc_msgSend_IntPtr_Int64_UInt32_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, long arg2, uint arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static uint UInt32_objc_msgSend_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static uint UInt32_objc_msgSendSuper_IntPtr_Int64_UInt32_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, long arg2, uint arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static uint UInt32_objc_msgSendSuper_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_IntPtr_int_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, System.IntPtr arg3, int arg4, System.IntPtr arg5, System.IntPtr arg6); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_IntPtr_ref_RectangleF_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, ref System.Drawing.RectangleF arg2, System.IntPtr arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_IntPtr_int_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, System.IntPtr arg3, int arg4, System.IntPtr arg5, System.IntPtr arg6); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_IntPtr_ref_RectangleF_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, ref System.Drawing.RectangleF arg2, System.IntPtr arg3); - - [DllImport ("__Internal", EntryPoint="xamarin_IntPtr_objc_msgSend_IntPtr")] - public extern static IntPtr monotouch_IntPtr_objc_msgSend_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1); - [DllImport ("__Internal", EntryPoint="xamarin_IntPtr_objc_msgSendSuper_IntPtr")] - public extern static IntPtr monotouch_IntPtr_objc_msgSendSuper_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_IntPtr_UInt32_UInt32_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, uint arg3, uint arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_IntPtr_UInt32_UInt32_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, uint arg3, uint arg4, System.IntPtr arg5); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void Vector3_objc_msgSend_stret_Vector3 (out OpenTK.Vector3 retval, IntPtr receiver, IntPtr selector, OpenTK.Vector3 arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void Vector3_objc_msgSendSuper_stret_Vector3 (out OpenTK.Vector3 retval, IntPtr receiver, IntPtr selector, OpenTK.Vector3 arg1); - - [DllImport ("__Internal", EntryPoint="xamarin_vector_float3__Vector3_objc_msgSend_stret_Vector3")] - public extern static void xamarin_vector_float3__Vector3_objc_msgSend_stret_Vector3 (out global::OpenTK.Vector3 retval, IntPtr receiver, IntPtr selector, global::OpenTK.Vector3 arg1); - [DllImport ("__Internal", EntryPoint="xamarin_vector_float3__Vector3_objc_msgSendSuper_stret_Vector3")] - public extern static void xamarin_vector_float3__Vector3_objc_msgSendSuper_stret_Vector3 (out global::OpenTK.Vector3 retval, IntPtr receiver, IntPtr selector, global::OpenTK.Vector3 arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSendSuper_IntPtr_RectangleF_IntPtr (IntPtr receiver, IntPtr selector, IntPtr arg1, System.Drawing.RectangleF arg2, IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSend_IntPtr_RectangleF_IntPtr (IntPtr receiver, IntPtr selector, IntPtr arg1, System.Drawing.RectangleF arg2, IntPtr arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr IntPtr_objc_msgSend_IntPtr_nint (IntPtr receiver, IntPtr selector, global::System.IntPtr arg1, nint arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static IntPtr IntPtr_objc_msgSendSuper_IntPtr_nint (IntPtr receiver, IntPtr selector, global::System.IntPtr arg1, nint arg2); -#endif - } -} - -#endif // IOS || TVOS diff --git a/src/ObjCRuntime/Messaging.mac.cs b/src/ObjCRuntime/Messaging.mac.cs deleted file mode 100644 index 8a902a7e6775..000000000000 --- a/src/ObjCRuntime/Messaging.mac.cs +++ /dev/null @@ -1,613 +0,0 @@ -// -// Copyright 2010, Novell, Inc. -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -#if MONOMAC - -using System; -using System.Runtime.InteropServices; - -using Foundation; -using CoreGraphics; - -namespace ObjCRuntime { -#if !XAMCORE_2_0 || COREBUILD - public -#endif - static partial class Messaging { - internal const string LIBOBJC_DYLIB = "/usr/lib/libobjc.dylib"; - -#if !XAMCORE_2_0 - // Some explaination here. These are objc_msgSend's we use internally for binding - // but were exposed to the user in compat. We have to keep these unbroken for bindings - // projects and customer code, hense this file even if we stopped using them. - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static uint uint_objc_msgSend (IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static int int_objc_msgSend (IntPtr receiver, IntPtr selector); - - /* void returns */ - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend (IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_intptr (IntPtr receiver, IntPtr selector, IntPtr arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_bool (IntPtr receiver, IntPtr selector, bool arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_rbool (IntPtr receiver, IntPtr selector, ref bool arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_rint (IntPtr receiver, IntPtr selector, ref int arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_rfloat (IntPtr receiver, IntPtr selector, ref float arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_rdouble (IntPtr receiver, IntPtr selector, ref double arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_rintptr (IntPtr receiver, IntPtr selector, ref IntPtr arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_cgsize (IntPtr receiver, IntPtr selector, CGSize arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_cgpoint (IntPtr receiver, IntPtr selector, CGPoint arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_cgrect (IntPtr receiver, IntPtr selector, CGRect arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_nsrange (IntPtr receiver, IntPtr selector, NSRange arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_intptr_int (IntPtr receiver, IntPtr selector, IntPtr arg1, int arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_cgpoint_intptr (IntPtr receiver, IntPtr selector, CGPoint arg1, IntPtr arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_intptr_intptr_bool (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, bool arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_intptr_intptr_float (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, float arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_intptr_intptr_double (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, double arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper (IntPtr [] super, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper (IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_intptr (IntPtr receiver, IntPtr selector, IntPtr arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_cgsize (IntPtr receiver, IntPtr selector, CGSize arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_cgrect (IntPtr receiver, IntPtr selector, CGRect arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_intptr_intptr_bool (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, bool arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_intptr_intptr_float (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, float arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_intptr_intptr_double (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, double arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void void_objc_msgSend_stret_rcgsize (ref CGSize stret, IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void void_objc_msgSend_stret_rcgrect (ref CGRect stret, IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void void_objc_msgSend_stret_rnsrange (ref NSRange stret, IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void void_objc_msgSend_stret_rcgsize_cgpoint_intptr (ref CGSize stret, IntPtr receiver, IntPtr selector, CGPoint arg1, IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void void_objc_msgSendSuper_stret_rcgrect (ref CGRect stret, IntPtr receiver, IntPtr selector); - - /* intptr returns */ - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr IntPtr_objc_msgSend_IntPtr (IntPtr receiver, IntPtr selector, IntPtr arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr intptr_objc_msgSend (IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr intptr_objc_msgSend_intptr (IntPtr receiver, IntPtr selector, IntPtr arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr intptr_objc_msgsend_intptr_int (IntPtr receiver, IntPtr selector, IntPtr arg1, int arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr intptr_objc_msgSend_float (IntPtr receiver, IntPtr selector, float arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr intptr_objc_msgSend_cgrect (IntPtr receiver, IntPtr selector, CGRect arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static IntPtr intptr_objc_msgSendSuper (IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static IntPtr intptr_objc_msgSendSuper_cgrect (IntPtr receiver, IntPtr selector, CGRect arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static IntPtr intptr_objc_msgSendSuper_intptr (IntPtr receiver, IntPtr selector, IntPtr arg1); - - /* bool returns */ - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend (IntPtr receiver, IntPtr selector); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_intptr (IntPtr receiver, IntPtr selector, IntPtr arg1); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_intptr (IntPtr receiver, IntPtr selector, IntPtr arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static CGSize cgsize_objc_msgSend_cgpoint_intptr (IntPtr receiver, IntPtr selector, CGPoint arg1, IntPtr arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static CGSize cgsize_objc_msgSend (IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static Boolean Boolean_objc_msgSend_IntPtr_Double_IntPtr (IntPtr receiver, IntPtr selector, IntPtr arg1, Double arg2, IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static Boolean Boolean_objc_msgSendSuper_IntPtr_Double_IntPtr (IntPtr receiver, IntPtr selector, IntPtr arg1, Double arg2, IntPtr arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_bool_IntPtr (System.IntPtr receiver, System.IntPtr selector, bool arg1, System.IntPtr arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_bool_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, bool arg1, System.IntPtr arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_CMTimeRange_IntPtr_CMTime_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoMac.CoreMedia.CMTimeRange arg1, System.IntPtr arg2, MonoMac.CoreMedia.CMTime arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_bool_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, bool arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_int_UInt32_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, uint arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_int_UInt32_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, uint arg3, System.IntPtr arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_IntPtr_CMTime_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, MonoMac.CoreMedia.CMTime arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_IntPtr_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, System.IntPtr arg3, int arg4, System.IntPtr arg5, System.IntPtr arg6); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, System.IntPtr arg3, System.IntPtr arg4, System.IntPtr arg5, System.IntPtr arg6, System.IntPtr arg7, System.IntPtr arg8); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_out_Boolean_out_Boolean_out_Boolean_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, out bool arg2, out bool arg3, out bool arg4, System.IntPtr arg5, System.IntPtr arg6); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_IntPtr_SecIdentity_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, MonoMac.Security.SecIdentity arg2, System.IntPtr arg3, System.IntPtr arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static bool bool_objc_msgSend_UInt32_IntPtr (System.IntPtr receiver, System.IntPtr selector, uint arg1, System.IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_bool_IntPtr (System.IntPtr receiver, System.IntPtr selector, bool arg1, System.IntPtr arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_bool_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, bool arg1, System.IntPtr arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_CMTimeRange_IntPtr_CMTime_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoMac.CoreMedia.CMTimeRange arg1, System.IntPtr arg2, MonoMac.CoreMedia.CMTime arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_bool_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, bool arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_int_UInt32_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, uint arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_int_UInt32_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, uint arg3, System.IntPtr arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_IntPtr_CMTime_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, MonoMac.CoreMedia.CMTime arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_IntPtr_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, System.IntPtr arg3, int arg4, System.IntPtr arg5, System.IntPtr arg6); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, System.IntPtr arg3, System.IntPtr arg4, System.IntPtr arg5, System.IntPtr arg6, System.IntPtr arg7, System.IntPtr arg8); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_out_Boolean_out_Boolean_out_Boolean_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, out bool arg2, out bool arg3, out bool arg4, System.IntPtr arg5, System.IntPtr arg6); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_SecIdentity_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, MonoMac.Security.SecIdentity arg2, System.IntPtr arg3, System.IntPtr arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_UInt32_IntPtr (System.IntPtr receiver, System.IntPtr selector, uint arg1, System.IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static int int_objc_msgSend_IntPtr_IntPtr_int_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, int arg3, int arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static int int_objc_msgSend_IntPtr_IntPtr_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, int arg3, System.IntPtr arg4); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static int int_objc_msgSendSuper_IntPtr_IntPtr_int_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, int arg3, int arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static int int_objc_msgSendSuper_IntPtr_IntPtr_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, int arg3, System.IntPtr arg4); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_CMTime_out_CMTime_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoMac.CoreMedia.CMTime arg1, out MonoMac.CoreMedia.CMTime arg2, System.IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_int_int_IntPtr_bool_IntPtr (System.IntPtr receiver, System.IntPtr selector, int arg1, int arg2, System.IntPtr arg3, bool arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_int_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, int arg1, System.IntPtr arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_int_IntPtr_ref_NSRange_ref_NSRange_IntPtr (System.IntPtr receiver, System.IntPtr selector, int arg1, System.IntPtr arg2, ref MonoMac.Foundation.NSRange arg3, ref MonoMac.Foundation.NSRange arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_IntPtr_bool_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, bool arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_IntPtr_int_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, int arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_IntPtr_int_IntPtr_out_Boolean_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, System.IntPtr arg3, out bool arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_IntPtr_int_ref_NSPropertyListFormat_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, ref MonoMac.Foundation.NSPropertyListFormat arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_IntPtr_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, int arg3, System.IntPtr arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_IntPtr_NSRange_UInt64_IntPtr_int_IntPtr_out_Int32 (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, MonoMac.Foundation.NSRange arg2, ulong arg3, System.IntPtr arg4, int arg5, System.IntPtr arg6, out int arg7); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_IntPtr_QTTimeRange_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, MonoMac.QTKit.QTTimeRange arg2, System.IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_NSRange_IntPtr_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoMac.Foundation.NSRange arg1, System.IntPtr arg2, int arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_QTTime_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoMac.QTKit.QTTime arg1, System.IntPtr arg2, System.IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr IntPtr_objc_msgSend_QTTimeRange_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoMac.QTKit.QTTimeRange arg1, System.IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_CMTime_out_CMTime_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoMac.CoreMedia.CMTime arg1, out MonoMac.CoreMedia.CMTime arg2, System.IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_int_int_IntPtr_bool_IntPtr (System.IntPtr receiver, System.IntPtr selector, int arg1, int arg2, System.IntPtr arg3, bool arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_int_IntPtr_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, int arg1, System.IntPtr arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_int_IntPtr_ref_NSRange_ref_NSRange_IntPtr (System.IntPtr receiver, System.IntPtr selector, int arg1, System.IntPtr arg2, ref MonoMac.Foundation.NSRange arg3, ref MonoMac.Foundation.NSRange arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_IntPtr_bool_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, bool arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_IntPtr_int_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, int arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_IntPtr_int_IntPtr_out_Boolean_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, System.IntPtr arg3, out bool arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_IntPtr_int_ref_NSPropertyListFormat_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, ref MonoMac.Foundation.NSPropertyListFormat arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_IntPtr_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, System.IntPtr arg2, int arg3, System.IntPtr arg4, System.IntPtr arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_IntPtr_NSRange_UInt64_IntPtr_int_IntPtr_out_Int32 (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, MonoMac.Foundation.NSRange arg2, ulong arg3, System.IntPtr arg4, int arg5, System.IntPtr arg6, out int arg7); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_IntPtr_QTTimeRange_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, MonoMac.QTKit.QTTimeRange arg2, System.IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_NSRange_IntPtr_int_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoMac.Foundation.NSRange arg1, System.IntPtr arg2, int arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_QTTime_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoMac.QTKit.QTTime arg1, System.IntPtr arg2, System.IntPtr arg3); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr IntPtr_objc_msgSendSuper_QTTimeRange_IntPtr (System.IntPtr receiver, System.IntPtr selector, MonoMac.QTKit.QTTimeRange arg1, System.IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static float monomac_float_objc_msgSend (System.IntPtr receiver, System.IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static float monomac_float_objc_msgSendSuper (System.IntPtr receiver, System.IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static System.IntPtr monomac_IntPtr_objc_msgSend_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static System.IntPtr monomac_IntPtr_objc_msgSendSuper_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_IntPtr_int_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, System.IntPtr arg3, int arg4, System.IntPtr arg5, System.IntPtr arg6); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static void void_objc_msgSend_IntPtr_out_Single_int (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, out float arg2, int arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_IntPtr_int_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, System.IntPtr arg3, int arg4, System.IntPtr arg5, System.IntPtr arg6); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_IntPtr_int_IntPtr_IntPtr (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, int arg2, System.IntPtr arg3, System.IntPtr arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static void void_objc_msgSendSuper_IntPtr_out_Single_int (System.IntPtr receiver, System.IntPtr selector, System.IntPtr arg1, out float arg2, int arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr IntPtr_objc_msgSend_IntPtr_IntPtr_IntPtr_NSRange_int (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, IntPtr arg3, MonoMac.Foundation.NSRange arg4, int arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr IntPtr_objc_msgSend_IntPtr_IntPtr_NSRange_int (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, MonoMac.Foundation.NSRange arg3, int arg4); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static IntPtr IntPtr_objc_msgSendSuper_IntPtr_IntPtr_IntPtr_NSRange_int (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, IntPtr arg3, MonoMac.Foundation.NSRange arg4, int arg5); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static IntPtr IntPtr_objc_msgSendSuper_IntPtr_IntPtr_NSRange_int (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, MonoMac.Foundation.NSRange arg3, int arg4); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void AVAudio3DVectorOrientation_objc_msgSendSuper_stret (out global::MonoMac.AVFoundation.AVAudio3DVectorOrientation retval, IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void AVAudio3DVectorOrientation_objc_msgSend_stret (out global::MonoMac.AVFoundation.AVAudio3DVectorOrientation retval, IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void AVAudioConverterPrimeInfo_objc_msgSendSuper_stret (out global::MonoMac.AVFoundation.AVAudioConverterPrimeInfo retval, IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void AVAudioConverterPrimeInfo_objc_msgSend_stret (out global::MonoMac.AVFoundation.AVAudioConverterPrimeInfo retval, IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void AVPixelAspectRatio_objc_msgSendSuper_stret (out global::MonoMac.AVFoundation.AVPixelAspectRatio retval, IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void AVPixelAspectRatio_objc_msgSend_stret (out global::MonoMac.AVFoundation.AVPixelAspectRatio retval, IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret (out NSRange retval, IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_IntPtr (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_IntPtr_NSRange_NSRange (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1, NSRange arg2, NSRange arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_IntPtr_UInt32 (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1, global::System.UInt32 arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_IntPtr_UInt64_NSRange (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1, global::System.UInt64 arg2, NSRange arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_IntPtr_int (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1, int arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_IntPtr_int_IntPtr_bool_int_IntPtr (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1, int arg2, IntPtr arg3, bool arg4, int arg5, IntPtr arg6); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_IntPtr_int_IntPtr_bool_int_out_Int32 (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1, int arg2, IntPtr arg3, bool arg4, int arg5, out int arg6); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_IntPtr_int_NSRange (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1, int arg2, NSRange arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_NSRange (out NSRange retval, IntPtr receiver, IntPtr selector, NSRange arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_NSRange_IntPtr_UInt32 (out NSRange retval, IntPtr receiver, IntPtr selector, NSRange arg1, IntPtr arg2, global::System.UInt32 arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_NSRange_int (out NSRange retval, IntPtr receiver, IntPtr selector, NSRange arg1, int arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_NSRange_out_NSRange (out NSRange retval, IntPtr receiver, IntPtr selector, NSRange arg1, out NSRange arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_PointF (out NSRange retval, IntPtr receiver, IntPtr selector, global::System.Drawing.PointF arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_RectangleF (out NSRange retval, IntPtr receiver, IntPtr selector, global::System.Drawing.RectangleF arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_RectangleF_IntPtr (out NSRange retval, IntPtr receiver, IntPtr selector, global::System.Drawing.RectangleF arg1, IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_UInt32 (out NSRange retval, IntPtr receiver, IntPtr selector, global::System.UInt32 arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_int (out NSRange retval, IntPtr receiver, IntPtr selector, int arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void NSRange_objc_msgSendSuper_stret_int_int_IntPtr (out NSRange retval, IntPtr receiver, IntPtr selector, int arg1, int arg2, IntPtr arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret (out NSRange retval, IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_IntPtr (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_IntPtr_NSRange_NSRange (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1, NSRange arg2, NSRange arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_IntPtr_UInt32 (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1, global::System.UInt32 arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_IntPtr_UInt64_NSRange (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1, global::System.UInt64 arg2, NSRange arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_IntPtr_int (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1, int arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_IntPtr_int_IntPtr_bool_int_IntPtr (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1, int arg2, IntPtr arg3, bool arg4, int arg5, IntPtr arg6); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_IntPtr_int_IntPtr_bool_int_out_Int32 (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1, int arg2, IntPtr arg3, bool arg4, int arg5, out int arg6); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_IntPtr_int_NSRange (out NSRange retval, IntPtr receiver, IntPtr selector, IntPtr arg1, int arg2, NSRange arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_NSRange (out NSRange retval, IntPtr receiver, IntPtr selector, NSRange arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_NSRange_IntPtr_UInt32 (out NSRange retval, IntPtr receiver, IntPtr selector, NSRange arg1, IntPtr arg2, global::System.UInt32 arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_NSRange_int (out NSRange retval, IntPtr receiver, IntPtr selector, NSRange arg1, int arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_NSRange_out_NSRange (out NSRange retval, IntPtr receiver, IntPtr selector, NSRange arg1, out NSRange arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_PointF (out NSRange retval, IntPtr receiver, IntPtr selector, global::System.Drawing.PointF arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_RectangleF (out NSRange retval, IntPtr receiver, IntPtr selector, global::System.Drawing.RectangleF arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_RectangleF_IntPtr (out NSRange retval, IntPtr receiver, IntPtr selector, global::System.Drawing.RectangleF arg1, IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_UInt32 (out NSRange retval, IntPtr receiver, IntPtr selector, global::System.UInt32 arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_int (out NSRange retval, IntPtr receiver, IntPtr selector, int arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void NSRange_objc_msgSend_stret_int_int_IntPtr (out NSRange retval, IntPtr receiver, IntPtr selector, int arg1, int arg2, IntPtr arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void PointF_objc_msgSendSuper_stret (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void PointF_objc_msgSendSuper_stret_IntPtr (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector, IntPtr arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void PointF_objc_msgSendSuper_stret_IntPtr_float (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector, IntPtr arg1, float arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void PointF_objc_msgSendSuper_stret_PointF (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.PointF arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void PointF_objc_msgSendSuper_stret_PointF_IntPtr (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.PointF arg1, IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void PointF_objc_msgSendSuper_stret_PointF_PointF (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.PointF arg1, global::System.Drawing.PointF arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void PointF_objc_msgSendSuper_stret_RectangleF (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.RectangleF arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void PointF_objc_msgSendSuper_stret_int (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector, int arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void PointF_objc_msgSend_stret (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void PointF_objc_msgSend_stret_IntPtr (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector, IntPtr arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void PointF_objc_msgSend_stret_IntPtr_float (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector, IntPtr arg1, float arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void PointF_objc_msgSend_stret_PointF (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.PointF arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void PointF_objc_msgSend_stret_PointF_IntPtr (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.PointF arg1, IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void PointF_objc_msgSend_stret_PointF_PointF (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.PointF arg1, global::System.Drawing.PointF arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void PointF_objc_msgSend_stret_RectangleF (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.RectangleF arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void PointF_objc_msgSend_stret_int (out global::System.Drawing.PointF retval, IntPtr receiver, IntPtr selector, int arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_IntPtr (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, IntPtr arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_IntPtr_IntPtr (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_IntPtr_IntPtr_IntPtr (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, IntPtr arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_IntPtr_IntPtr_int (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, int arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_IntPtr_NSRange_IntPtr_UInt32 (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, IntPtr arg1, NSRange arg2, global::System.IntPtr arg3, global::System.UInt32 arg4); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_IntPtr_SizeF (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, IntPtr arg1, global::System.Drawing.SizeF arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_IntPtr_SizeF_SizeF (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, IntPtr arg1, global::System.Drawing.SizeF arg2, global::System.Drawing.SizeF arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_RectangleF (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.RectangleF arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_SizeF (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.SizeF arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_SizeF_IntPtr (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.SizeF arg1, IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_SizeF_IntPtr_IntPtr_int_int_int (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.SizeF arg1, IntPtr arg2, IntPtr arg3, int arg4, int arg5, int arg6); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_SizeF_bool_bool_int (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.SizeF arg1, bool arg2, bool arg3, int arg4); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_UInt32 (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, global::System.UInt32 arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_bool (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, bool arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper_stret")] - public extern static void SizeF_objc_msgSendSuper_stret_int (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, int arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_IntPtr (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, IntPtr arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_IntPtr_IntPtr (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_IntPtr_IntPtr_IntPtr (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, IntPtr arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_IntPtr_IntPtr_int (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2, int arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_IntPtr_NSRange_IntPtr_UInt32 (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, IntPtr arg1, NSRange arg2, global::System.IntPtr arg3, global::System.UInt32 arg4); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_IntPtr_SizeF (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, IntPtr arg1, global::System.Drawing.SizeF arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_IntPtr_SizeF_SizeF (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, IntPtr arg1, global::System.Drawing.SizeF arg2, global::System.Drawing.SizeF arg3); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_RectangleF (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.RectangleF arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_SizeF (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.SizeF arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_SizeF_IntPtr (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.SizeF arg1, IntPtr arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_SizeF_IntPtr_IntPtr_int_int_int (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.SizeF arg1, IntPtr arg2, IntPtr arg3, int arg4, int arg5, int arg6); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_SizeF_bool_bool_int (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, global::System.Drawing.SizeF arg1, bool arg2, bool arg3, int arg4); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_UInt32 (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, global::System.UInt32 arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_bool (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, bool arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend_stret")] - public extern static void SizeF_objc_msgSend_stret_int (out global::System.Drawing.SizeF retval, IntPtr receiver, IntPtr selector, int arg1); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static uint UInt32_objc_msgSendSuper_IntPtr_NSRange (IntPtr receiver, IntPtr selector, IntPtr arg1, MonoMac.Foundation.NSRange arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static uint UInt32_objc_msgSend_IntPtr_NSRange (IntPtr receiver, IntPtr selector, IntPtr arg1, MonoMac.Foundation.NSRange arg2); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static int int_objc_msgSendSuper_NSRange_IntPtr_IntPtr_IntPtr_IntPtr (IntPtr receiver, IntPtr selector, MonoMac.Foundation.NSRange arg1, IntPtr arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static int int_objc_msgSendSuper_NSRange_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr (IntPtr receiver, IntPtr selector, MonoMac.Foundation.NSRange arg1, IntPtr arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5, IntPtr arg6); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static int int_objc_msgSend_NSRange_IntPtr_IntPtr_IntPtr_IntPtr (IntPtr receiver, IntPtr selector, MonoMac.Foundation.NSRange arg1, IntPtr arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static int int_objc_msgSend_NSRange_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr (IntPtr receiver, IntPtr selector, MonoMac.Foundation.NSRange arg1, IntPtr arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5, IntPtr arg6); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static int int_objc_msgSend_NSRange_IntPtr_IntPtr_IntPtr_IntPtr_IntPtr (IntPtr receiver, IntPtr selector, MonoMac.Foundation.NSRange arg1, IntPtr arg2, IntPtr arg3, IntPtr arg4, IntPtr arg5, IntPtr arg6); - - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSend")] - public extern static IntPtr IntPtr_objc_msgSend_IntPtr_nint (IntPtr receiver, IntPtr selector, global::System.IntPtr arg1, nint arg2); - [DllImport (LIBOBJC_DYLIB, EntryPoint="objc_msgSendSuper")] - public extern static IntPtr IntPtr_objc_msgSendSuper_IntPtr_nint (IntPtr receiver, IntPtr selector, global::System.IntPtr arg1, nint arg2); -#endif - } -} - -#endif // MONOMAC diff --git a/src/ObjCRuntime/Messaging.watch.cs b/src/ObjCRuntime/Messaging.watch.cs deleted file mode 100644 index 76022ae7e6f5..000000000000 --- a/src/ObjCRuntime/Messaging.watch.cs +++ /dev/null @@ -1,16 +0,0 @@ -#if WATCH -using System; -using System.Runtime.InteropServices; - -using Foundation; -using CoreGraphics; - -namespace ObjCRuntime { -#if COREBUILD - public -#endif - static partial class Messaging { - internal const string LIBOBJC_DYLIB = "/usr/lib/libobjc.dylib"; - } -} -#endif // WATCH diff --git a/src/ObjCRuntime/Method.cs b/src/ObjCRuntime/Method.cs index bcc7de9176ad..ab5b73147ecb 100644 --- a/src/ObjCRuntime/Method.cs +++ b/src/ObjCRuntime/Method.cs @@ -5,24 +5,6 @@ namespace ObjCRuntime { internal static class Method { #if !COREBUILD - #if !XAMCORE_2_0 - public static string Signature (MethodBase minfo) { - string signature = null; - - if (minfo.IsConstructor) - signature = "@"; - else if (minfo is MethodInfo) - signature = TypeConverter.ToNative ((minfo as MethodInfo).ReturnType); - - signature += "@:"; - foreach (ParameterInfo param in minfo.GetParameters ()) { - signature += TypeConverter.ToNative (param.ParameterType); - } - - return signature; - } -#endif - public unsafe static IntPtr Trampoline { get { return Runtime.options->Trampolines->tramp; diff --git a/src/ObjCRuntime/MethodDescription.cs b/src/ObjCRuntime/MethodDescription.cs deleted file mode 100644 index d05a1f8bcf61..000000000000 --- a/src/ObjCRuntime/MethodDescription.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Reflection; - -#if !XAMCORE_2_0 -namespace ObjCRuntime { - public struct MethodDescription { - public MethodBase method; - public ArgumentSemantic semantic; - - public MethodDescription (MethodBase method, ArgumentSemantic semantic) { - this.method = method; - this.semantic = semantic; - } - } -} -#endif // !XAMCORE_2_0 diff --git a/src/ObjCRuntime/NSStringMarshal.cs b/src/ObjCRuntime/NSStringMarshal.cs deleted file mode 100644 index 45d62d876999..000000000000 --- a/src/ObjCRuntime/NSStringMarshal.cs +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2011, 2012 Xamarin Inc -using System.Runtime.InteropServices; -using System; -using Foundation; - -#if !XAMCORE_2_0 -namespace ObjCRuntime { - - [StructLayout (LayoutKind.Sequential)] - public unsafe struct NSStringStruct { - public IntPtr ClassPtr; - public int Flags; - public char *UnicodePtr; - public int Length; - -#if !COREBUILD - // The class pointer that we picked at runtime - public readonly static IntPtr ReferencePtr; - - static NSStringStruct () - { - using (var k = new NSString ("")) - ReferencePtr = Marshal.ReadIntPtr (k.Handle); - } -#endif // !COREBUILD - } -} -#endif diff --git a/src/ObjCRuntime/PlatformAvailability.cs b/src/ObjCRuntime/PlatformAvailability.cs index 2bab371d6b22..d680ed3fc5de 100644 --- a/src/ObjCRuntime/PlatformAvailability.cs +++ b/src/ObjCRuntime/PlatformAvailability.cs @@ -91,11 +91,6 @@ public enum Platform : ulong // NOTE: Update PlatformHelper.IsValid when adding a version -#if !XAMCORE_2_0 - [Obsolete ("Use iOS_Version")] iOS = 0x00000000ffffffff, - [Obsolete ("Use Mac_Version")] Mac = 0xffffffff00000000, -#endif - iOS_Version = 0x0000000000ffffff, Mac_Version = 0x00ffffff00000000, @@ -116,9 +111,6 @@ public static bool IsValid (this Platform platform) #pragma warning disable 0618 switch (ToMacVersion (platform)) { case Platform.None: -#if !XAMCORE_2_0 - case Platform.Mac: -#endif case Platform.Mac_Version: case Platform.Mac_10_0: case Platform.Mac_10_1: @@ -141,9 +133,6 @@ public static bool IsValid (this Platform platform) switch (ToIosVersion (platform)) { case Platform.None: -#if !XAMCORE_2_0 - case Platform.iOS: -#endif case Platform.iOS_Version: case Platform.iOS_2_0: case Platform.iOS_2_2: @@ -177,20 +166,6 @@ public static bool IsValid (this Platform platform) #pragma warning restore 0618 } -#if !XAMCORE_2_0 - [Obsolete ("Use ToMacVersion")] - public static Platform ToMac (this Platform platform) - { - return platform & Platform.Mac_Version; - } - - [Obsolete ("Use ToIosVersion")] - public static Platform ToIos (this Platform platform) - { - return platform & Platform.iOS_Version; - } -#endif - public static Platform ToVersion (this Platform platform) { return platform & ~(Platform.Mac_Arch | Platform.iOS_Arch); @@ -221,20 +196,6 @@ public static Platform ToIosArch (this Platform platform) return platform & Platform.iOS_Arch; } -#if !XAMCORE_2_0 - [Obsolete ("Use CompareMacVersion")] - public static int CompareMac (this Platform a, Platform b) - { - return CompareMacVersion (a, b); - } - - [Obsolete ("UseCompareIosVersion")] - public static int CompareIos (this Platform a, Platform b) - { - return CompareIosVersion (a, b); - } -#endif - public static int CompareMacVersion (this Platform a, Platform b) { return ((ulong)ToMacVersion (a)).CompareTo ((ulong)ToMacVersion (b)); @@ -446,13 +407,6 @@ public Platform Unavailable { case Platform.Mac_Version: case Platform.iOS_Version: case Platform.iOS_Version | Platform.Mac_Version: -#if !XAMCORE_2_0 -#pragma warning disable 0618 - case Platform.Mac: - case Platform.iOS: - case Platform.iOS | Platform.Mac: -#pragma warning restore 0618 -#endif unavailable = value; break; default: diff --git a/src/ObjCRuntime/ReleaseAttribute.cs b/src/ObjCRuntime/ReleaseAttribute.cs index 3ee4bdb4691b..f083cd4f5c06 100644 --- a/src/ObjCRuntime/ReleaseAttribute.cs +++ b/src/ObjCRuntime/ReleaseAttribute.cs @@ -5,10 +5,7 @@ namespace ObjCRuntime { [AttributeUsage (AttributeTargets.ReturnValue)] -#if XAMCORE_2_0 - sealed -#endif - public class ReleaseAttribute : Attribute { + public sealed class ReleaseAttribute : Attribute { } } diff --git a/src/ObjCRuntime/RequiredFrameworkAttribute.cs b/src/ObjCRuntime/RequiredFrameworkAttribute.cs index 1dfdf9b5e6a9..afc789075980 100644 --- a/src/ObjCRuntime/RequiredFrameworkAttribute.cs +++ b/src/ObjCRuntime/RequiredFrameworkAttribute.cs @@ -27,11 +27,7 @@ using System.Runtime.InteropServices; using System.IO; -#if XAMCORE_2_0 namespace ObjCRuntime { -#else -namespace MonoMac { -#endif [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)] public class RequiredFrameworkAttribute : Attribute diff --git a/src/ObjCRuntime/Runtime.cs b/src/ObjCRuntime/Runtime.cs index 1b14c9f798f5..d106c051be3a 100644 --- a/src/ObjCRuntime/Runtime.cs +++ b/src/ObjCRuntime/Runtime.cs @@ -26,12 +26,6 @@ namespace ObjCRuntime { public partial class Runtime { #if !COREBUILD -#if XAMCORE_2_0 - internal const bool IsUnifiedBuild = true; -#else - internal const bool IsUnifiedBuild = false; -#endif - static Dictionary block_to_delegate_cache; static Dictionary intptr_ctor_cache; static Dictionary intptr_bool_ctor_cache; @@ -842,11 +836,6 @@ internal static ProtocolMemberAttribute GetProtocolMemberAttribute (Type type, s // delegate // [EditorBrowsable (EditorBrowsableState.Never)] -#if XAMCORE_2_0 - internal -#else - public -#endif static MethodInfo GetBlockWrapperCreator (MethodInfo method, int parameter) { // A mirror of this method is also implemented in StaticRegistrar:FindBlockProxyCreatorMethod @@ -927,22 +916,12 @@ static MethodInfo GetBlockWrapperCreator (MethodInfo method, int parameter) // objective c blocks into strongly typed delegates. // [EditorBrowsable (EditorBrowsableState.Never)] -#if XAMCORE_2_0 - internal -#else - public -#endif static Delegate CreateBlockProxy (MethodInfo method, IntPtr block) { return (Delegate) method.Invoke (null, new object [] { block } ); } -#if XAMCORE_2_0 - internal -#else - public -#endif - static Delegate GetDelegateForBlock (IntPtr methodPtr, Type type) + internal static Delegate GetDelegateForBlock (IntPtr methodPtr, Type type) { if (block_to_delegate_cache == null) block_to_delegate_cache = new Dictionary (); diff --git a/src/ObjCRuntime/Runtime.iOS.cs b/src/ObjCRuntime/Runtime.iOS.cs index 2c8c9dcaf2e2..01df8c173e54 100644 --- a/src/ObjCRuntime/Runtime.iOS.cs +++ b/src/ObjCRuntime/Runtime.iOS.cs @@ -28,8 +28,6 @@ public static partial class Runtime { #else #error Unknown platform #endif - internal const string CompatNamespace = "MonoTouch"; -#if XAMCORE_2_0 #if WATCH internal const string AssemblyName = "Xamarin.Watch.dll"; #elif TVOS @@ -39,9 +37,6 @@ public static partial class Runtime { #else #error Unknown platform #endif -#else - internal const string AssemblyName = "monotouch.dll"; -#endif public static Arch Arch; // default: = Arch.DEVICE; diff --git a/src/ObjCRuntime/Runtime.mac.cs b/src/ObjCRuntime/Runtime.mac.cs index 246acc6b3291..6185f0726db6 100644 --- a/src/ObjCRuntime/Runtime.mac.cs +++ b/src/ObjCRuntime/Runtime.mac.cs @@ -38,12 +38,7 @@ namespace ObjCRuntime { public static partial class Runtime { #if !COREBUILD internal const string ProductName = "Xamarin.Mac"; - internal const string CompatNamespace = "MonoMac"; -#if XAMCORE_2_0 internal const string AssemblyName = "Xamarin.Mac.dll"; -#else - internal const string AssemblyName = "XamMac.dll"; -#endif public static string FrameworksPath { get; set; diff --git a/src/ObjCRuntime/Selector.cs b/src/ObjCRuntime/Selector.cs index c0431fe4bd60..c1fb64bb8a21 100644 --- a/src/ObjCRuntime/Selector.cs +++ b/src/ObjCRuntime/Selector.cs @@ -56,14 +56,6 @@ internal unsafe Selector (IntPtr sel, bool check) name = GetName (sel); } -#if !XAMCORE_2_0 - [Obsolete ("Use the (string) constructor.")] - public Selector (string name, bool alloc) - : this (name) - { - } -#endif - public Selector (string name) { this.name = name; diff --git a/src/ObjCRuntime/Selector.iOS.cs b/src/ObjCRuntime/Selector.iOS.cs deleted file mode 100644 index 55bf36114e99..000000000000 --- a/src/ObjCRuntime/Selector.iOS.cs +++ /dev/null @@ -1,16 +0,0 @@ -#if !MONOMAC - -using System; -using System.Runtime.InteropServices; -using Foundation; - -namespace ObjCRuntime { - public partial class Selector { -#if !XAMCORE_2_0 - public static IntPtr Init = Selector.GetHandle ("init"); - public static IntPtr InitWithCoder = Selector.GetHandle ("initWithCoder:"); -#endif - } -} - -#endif // !MONOMAC diff --git a/src/ObjCRuntime/Selector.mac.cs b/src/ObjCRuntime/Selector.mac.cs index 8996750cfd4b..399c8dd950a5 100644 --- a/src/ObjCRuntime/Selector.mac.cs +++ b/src/ObjCRuntime/Selector.mac.cs @@ -28,17 +28,9 @@ using System.Runtime.InteropServices; namespace ObjCRuntime { -#if !XAMCORE_2_0 - [StructLayout(LayoutKind.Sequential)] -#endif public partial class Selector { -#if !XAMCORE_2_0 - public static readonly IntPtr Init = Selector.GetHandle ("init"); - public static readonly IntPtr InitWithCoder = Selector.GetHandle ("initWithCoder:"); -#else internal static readonly IntPtr Init = Selector.GetHandle ("init"); internal static readonly IntPtr InitWithCoder = Selector.GetHandle ("initWithCoder:"); -#endif internal static IntPtr AllocHandle = Selector.GetHandle (Alloc); internal static IntPtr ReleaseHandle = Selector.GetHandle (Release); diff --git a/src/ObjCRuntime/ThreadSafeAttribute.cs b/src/ObjCRuntime/ThreadSafeAttribute.cs index 15270bd2c1cd..a434c5cae1c7 100644 --- a/src/ObjCRuntime/ThreadSafeAttribute.cs +++ b/src/ObjCRuntime/ThreadSafeAttribute.cs @@ -28,10 +28,7 @@ namespace ObjCRuntime { -#if XAMCORE_2_0 - sealed -#endif - public class ThreadSafeAttribute : Attribute { + public sealed class ThreadSafeAttribute : Attribute { public ThreadSafeAttribute () { diff --git a/src/ObjCRuntime/Trampolines.cs b/src/ObjCRuntime/Trampolines.cs deleted file mode 100644 index 8facc8cdac69..000000000000 --- a/src/ObjCRuntime/Trampolines.cs +++ /dev/null @@ -1,45 +0,0 @@ -// -// Trampoline caching support -// -// Copyright 2013 Xamarin Inc -// -// Authors: -// Miguel de Icaza (miguel@xamarin.com) -// -#if !XAMCORE_2_0 -using System; -using System.Reflection; -using System.Collections.Generic; -using System.Runtime.InteropServices; - -using ObjCRuntime; - -namespace ObjCRuntime { - - public static partial class Trampolines { - static Dictionary cache; - - public static Delegate Lookup (IntPtr methodPtr, Type type) - { - if (cache == null) - cache = new Dictionary (Runtime.IntPtrEqualityComparer); - - // We do not care if there is a race condition and we initialize two caches - // since the worst that can happen is that we end up with an extra - // delegate->function pointer. - Delegate val; - lock (cache) { - if (cache.TryGetValue (methodPtr, out val)) - return val; - } - - val = Marshal.GetDelegateForFunctionPointer (methodPtr, type); - - lock (cache){ - cache [methodPtr] = val; - } - return val; - } - } -} -#endif \ No newline at end of file diff --git a/src/ObjCRuntime/TransientAttribute.cs b/src/ObjCRuntime/TransientAttribute.cs index 3e44659bf672..e74636eae7bb 100644 --- a/src/ObjCRuntime/TransientAttribute.cs +++ b/src/ObjCRuntime/TransientAttribute.cs @@ -11,9 +11,6 @@ namespace ObjCRuntime { [AttributeUsage (AttributeTargets.Parameter, AllowMultiple=false)] -#if XAMCORE_2_0 - sealed -#endif - public class TransientAttribute : Attribute { + public sealed class TransientAttribute : Attribute { } } diff --git a/src/OpenGL/FrameEventArgs.cs b/src/OpenGL/FrameEventArgs.cs index b7c5b9ba8653..c13ed7a321f6 100644 --- a/src/OpenGL/FrameEventArgs.cs +++ b/src/OpenGL/FrameEventArgs.cs @@ -25,8 +25,7 @@ // #endregion -#if OPENTK_DLL || !XAMCORE_2_0 - +#if OPENTK_DLL using System; namespace OpenTK @@ -70,4 +69,4 @@ internal set { } } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/IGameWindow.cs b/src/OpenGL/IGameWindow.cs index 869330d0540b..0c517792282f 100644 --- a/src/OpenGL/IGameWindow.cs +++ b/src/OpenGL/IGameWindow.cs @@ -25,7 +25,7 @@ // #endregion -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL using System; using System.Collections.Generic; @@ -81,4 +81,4 @@ public interface IGameWindow : INativeWindow } } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/INativeWindow.cs b/src/OpenGL/INativeWindow.cs index 6b08f8f4a143..10a86b9d773a 100644 --- a/src/OpenGL/INativeWindow.cs +++ b/src/OpenGL/INativeWindow.cs @@ -25,7 +25,7 @@ // #endregion -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL using System; using System.Collections.Generic; @@ -40,13 +40,6 @@ namespace OpenTK /// public interface INativeWindow : IDisposable { -#if !XAMCORE_2_0 - /// - /// Gets or sets the of the window. - /// - Icon Icon { get; set; } -#endif - /// /// Gets or sets the title of the window. /// @@ -240,4 +233,4 @@ public interface INativeWindow : IDisposable } } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/MonoMacGameView.cs b/src/OpenGL/MonoMacGameView.cs index 4c70befa2893..60580118ea30 100644 --- a/src/OpenGL/MonoMacGameView.cs +++ b/src/OpenGL/MonoMacGameView.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL using System; using System.Drawing; @@ -314,13 +314,6 @@ Point INativeWindow.Location { set { throw new NotSupportedException ();} } -#if !XAMCORE_2_0 - Icon INativeWindow.Icon { - get { throw new NotSupportedException ();} - set { throw new NotSupportedException ();} - } -#endif - Size size; public Size Size { @@ -644,4 +637,4 @@ event EventHandler INativeWindow.IconChanged { } } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/OpenTK/Audio/BlittableValueType.cs b/src/OpenGL/OpenTK/Audio/BlittableValueType.cs index b08c02d86c7c..c493277d1449 100644 --- a/src/OpenGL/OpenTK/Audio/BlittableValueType.cs +++ b/src/OpenGL/OpenTK/Audio/BlittableValueType.cs @@ -25,7 +25,7 @@ // #endregion -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL using System; using System.Collections.Generic; @@ -286,4 +286,4 @@ public static int StrideOf(T[, ,] type) #endregion } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/OpenTK/Audio/ContextHandle.cs b/src/OpenGL/OpenTK/Audio/ContextHandle.cs index af457b723bad..ee0a569b60ea 100644 --- a/src/OpenGL/OpenTK/Audio/ContextHandle.cs +++ b/src/OpenGL/OpenTK/Audio/ContextHandle.cs @@ -6,7 +6,7 @@ */ #endregion -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL using System; using System.Collections.Generic; @@ -178,4 +178,4 @@ public bool Equals(ContextHandle other) } } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/OpenTK/Audio/OpenAL/AL/AL.cs b/src/OpenGL/OpenTK/Audio/OpenAL/AL/AL.cs index 404129e41a1d..330d1a645a1c 100644 --- a/src/OpenGL/OpenTK/Audio/OpenAL/AL/AL.cs +++ b/src/OpenGL/OpenTK/Audio/OpenAL/AL/AL.cs @@ -7,7 +7,7 @@ * http://www.OpenTK.net */ #endregion -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL using System; using System.Runtime.InteropServices; @@ -1655,4 +1655,4 @@ public static ALDistanceModel GetDistanceModel() } } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/OpenTK/Audio/OpenAL/AL/ALEnums.cs b/src/OpenGL/OpenTK/Audio/OpenAL/AL/ALEnums.cs index f9fc4ca3273f..1e6e0042f6c8 100644 --- a/src/OpenGL/OpenTK/Audio/OpenAL/AL/ALEnums.cs +++ b/src/OpenGL/OpenTK/Audio/OpenAL/AL/ALEnums.cs @@ -7,7 +7,7 @@ * http://www.OpenTK.net */ #endregion -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL using System; @@ -432,4 +432,4 @@ public enum ALDistanceModel : int } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/OpenTK/Audio/OpenAL/Alc/Alc.cs b/src/OpenGL/OpenTK/Audio/OpenAL/Alc/Alc.cs index 667d9478c232..81bf927d90a4 100644 --- a/src/OpenGL/OpenTK/Audio/OpenAL/Alc/Alc.cs +++ b/src/OpenGL/OpenTK/Audio/OpenAL/Alc/Alc.cs @@ -7,7 +7,7 @@ * http://www.OpenTK.net */ #endregion -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL using System; using System.Collections.Generic; @@ -445,4 +445,4 @@ public static void CaptureSamples(IntPtr device, T[, ,] buffer, int samples) } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/OpenTK/Audio/OpenAL/Alc/AlcEnums.cs b/src/OpenGL/OpenTK/Audio/OpenAL/Alc/AlcEnums.cs index fbac9fb98c96..261381a8a18a 100644 --- a/src/OpenGL/OpenTK/Audio/OpenAL/Alc/AlcEnums.cs +++ b/src/OpenGL/OpenTK/Audio/OpenAL/Alc/AlcEnums.cs @@ -7,7 +7,7 @@ * http://www.OpenTK.net */ #endregion -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL using System; @@ -136,4 +136,4 @@ public enum AlcGetInteger : int } } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/OpenTK/Graphics/Color4.cs b/src/OpenGL/OpenTK/Graphics/Color4.cs index 1b0b43394d0a..9eaed548558d 100644 --- a/src/OpenGL/OpenTK/Graphics/Color4.cs +++ b/src/OpenGL/OpenTK/Graphics/Color4.cs @@ -25,7 +25,7 @@ // #endregion -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL using System; using System.Collections.Generic; @@ -933,4 +933,4 @@ public bool Equals(Color4 other) } } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/OpenTK/Graphics/OpenGL/GL.cs b/src/OpenGL/OpenTK/Graphics/OpenGL/GL.cs index a7a62fda1ded..6361ce78dd46 100644 --- a/src/OpenGL/OpenTK/Graphics/OpenGL/GL.cs +++ b/src/OpenGL/OpenTK/Graphics/OpenGL/GL.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL namespace OpenTK.Graphics.OpenGL { @@ -116687,4 +116687,4 @@ bool IsProgram(UInt32 id) } } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/OpenTK/Graphics/OpenGL/GLCore.cs b/src/OpenGL/OpenTK/Graphics/OpenGL/GLCore.cs index 30bd632fe322..0176064a2113 100644 --- a/src/OpenGL/OpenTK/Graphics/OpenGL/GLCore.cs +++ b/src/OpenGL/OpenTK/Graphics/OpenGL/GLCore.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL namespace OpenTK.Graphics.OpenGL { @@ -6705,4 +6705,4 @@ internal static partial class Core } } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/OpenTK/Graphics/OpenGL/GLEnums.cs b/src/OpenGL/OpenTK/Graphics/OpenGL/GLEnums.cs index 0ea2f1bb376a..2027f65e6db5 100644 --- a/src/OpenGL/OpenTK/Graphics/OpenGL/GLEnums.cs +++ b/src/OpenGL/OpenTK/Graphics/OpenGL/GLEnums.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL using System; @@ -14553,4 +14553,4 @@ public enum WinSpecularFog : int } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/OpenTK/Graphics/OpenGL/GLHelper.cs b/src/OpenGL/OpenTK/Graphics/OpenGL/GLHelper.cs index b46043ecd056..9d8769bf0dcb 100644 --- a/src/OpenGL/OpenTK/Graphics/OpenGL/GLHelper.cs +++ b/src/OpenGL/OpenTK/Graphics/OpenGL/GLHelper.cs @@ -25,7 +25,7 @@ // OTHER DEALINGS IN THE SOFTWARE. // -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL #region --- Using Directives --- @@ -1095,4 +1095,4 @@ public static void TexEnv(TextureEnvTarget target, TextureEnvParameter pname, Co } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/WindowBorder.cs b/src/OpenGL/WindowBorder.cs index 44a35563d81e..7259088cec80 100644 --- a/src/OpenGL/WindowBorder.cs +++ b/src/OpenGL/WindowBorder.cs @@ -1,4 +1,4 @@ -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL using System; using System.Collections.Generic; @@ -26,4 +26,4 @@ public enum WindowBorder } } -#endif // !XAMCORE_2_0 +#endif // OPENTK_DLL diff --git a/src/OpenGL/WindowState.cs b/src/OpenGL/WindowState.cs index 25be9be64461..a5474e50adc7 100644 --- a/src/OpenGL/WindowState.cs +++ b/src/OpenGL/WindowState.cs @@ -6,7 +6,7 @@ */ #endregion -#if OPENTK_DLL || !XAMCORE_2_0 +#if OPENTK_DLL using System; using System.Collections.Generic; diff --git a/src/PassKit/PKEnums.cs b/src/PassKit/PKEnums.cs index 4b23558deaff..99530e2a40b6 100644 --- a/src/PassKit/PKEnums.cs +++ b/src/PassKit/PKEnums.cs @@ -25,10 +25,6 @@ public enum PKPassKitErrorCode : long { InvalidData = 1, UnsupportedVersion, InvalidSignature, -#if !XAMCORE_2_0 - [Obsolete ("renamed to InvalidSignature")] // after betas? - CertificateRevoked = InvalidSignature, -#endif [iOS (8,0)] NotEntitled } diff --git a/src/PdfKit/Enums.cs b/src/PdfKit/Enums.cs index dd7391e4fa73..2f11af27dc21 100644 --- a/src/PdfKit/Enums.cs +++ b/src/PdfKit/Enums.cs @@ -29,7 +29,7 @@ using System; using ObjCRuntime; -#if MONOMAC || (IOS && XAMCORE_2_0) +#if MONOMAC || IOS namespace PdfKit { diff --git a/src/PdfKit/PdfAnnotation.cs b/src/PdfKit/PdfAnnotation.cs index ad62dadb320e..3686056a23fe 100644 --- a/src/PdfKit/PdfAnnotation.cs +++ b/src/PdfKit/PdfAnnotation.cs @@ -12,7 +12,6 @@ using Foundation; using ObjCRuntime; -#if XAMCORE_2_0 namespace PdfKit { public partial class PdfAnnotation { @@ -70,4 +69,3 @@ public CGPoint[] QuadrilateralPoints { } } } -#endif // XAMCORE_2_0 diff --git a/src/PdfKit/PdfKit.cs b/src/PdfKit/PdfKit.cs index 3ad7f99fcdad..eca0fb3cac25 100644 --- a/src/PdfKit/PdfKit.cs +++ b/src/PdfKit/PdfKit.cs @@ -3,7 +3,6 @@ using CoreGraphics; using Foundation; -#if XAMCORE_2_0 namespace PdfKit { partial class PdfBorder { nfloat [] DashPattern { @@ -55,4 +54,3 @@ CGPoint [] QuadrilateralPoints { } #endif // !IOS } -#endif diff --git a/src/Photos/Enums.cs b/src/Photos/Enums.cs index c4a4eeb4814f..ae2e51cd8d18 100644 --- a/src/Photos/Enums.cs +++ b/src/Photos/Enums.cs @@ -111,11 +111,7 @@ public enum PHCollectionListSubtype : long { [Obsolete ("Incorrect value (exists in 'PHAssetCollectionSubtype').")] SmartAlbumScreenshots = 211, #endif -#if XAMCORE_2_0 Any = Int64.MaxValue, -#else - Any = Int32.MaxValue, -#endif } // NSUInteger -> PhotosTypes.h @@ -188,11 +184,7 @@ public enum PHAssetCollectionSubtype : long { SmartAlbumUnableToUpload = 216, -#if XAMCORE_2_0 Any = Int64.MaxValue -#else - Any = Int32.MaxValue -#endif } // NSUInteger -> PhotosTypes.h diff --git a/src/QTKit/Defs.cs b/src/QTKit/Defs.cs index 0ab6debe3ee0..75c84768cc38 100644 --- a/src/QTKit/Defs.cs +++ b/src/QTKit/Defs.cs @@ -34,7 +34,6 @@ public partial struct QTTime { public static readonly QTTime Zero = new QTTime (0, 1, 0); public static readonly QTTime IndefiniteTime = new QTTime (0, 1, TimeFlags.TimeIsIndefinite); -#if XAMCORE_2_0 // QTKit/Headers/QTTime.h: // typedef struct { // long long timeValue; @@ -59,23 +58,12 @@ public TimeFlags Flags { get { return (TimeFlags)(long)flags; } set { flags = (nint)(long)value; } } -#else - public long TimeValue; - public int TimeScale; - public TimeFlags Flags; -#endif public QTTime (long timeValue, nint timeScale, TimeFlags flags) { -#if XAMCORE_2_0 this.timeValue = timeValue; this.timeScale = timeScale; this.flags = (nint)(long)flags; -#else - TimeValue = timeValue; - TimeScale = timeScale; - Flags = flags; -#endif } public QTTime (long timeValue, nint timeScale) @@ -94,7 +82,6 @@ public override string ToString () [Deprecated (PlatformName.MacOSX, 10, 9)] public struct QTTimeRange { -#if XAMCORE_2_0 // QTKit/Headers/QTTime.h: // typedef struct { // QTTime time; @@ -112,20 +99,11 @@ public QTTime Duration { get { return duration; } set { duration = value; } } -#else - public QTTime Time; - public QTTime Duration; -#endif public QTTimeRange (QTTime time, QTTime duration) { -#if XAMCORE_2_0 this.time = time; this.duration = duration; -#else - Time = time; - Duration = duration; -#endif } public override string ToString () diff --git a/src/ReplayKit/RPBroadcastConfiguration.cs b/src/ReplayKit/RPBroadcastConfiguration.cs index daaffa636641..fd1d1e8abc4d 100644 --- a/src/ReplayKit/RPBroadcastConfiguration.cs +++ b/src/ReplayKit/RPBroadcastConfiguration.cs @@ -44,11 +44,7 @@ public AVVideoCodecSettings VideoCompressionProperties { return weak == null ? null : new AVVideoCodecSettings (new NSMutableDictionary (weak)); } set { -#if XAMCORE_2_0 WeakVideoCompressionProperties = value == null ? null : new NSDictionary (value.Dictionary.Handle); -#else - WeakVideoCompressionProperties = value == null ? null : new NSDictionary (value.Dictionary.Handle); -#endif } } } diff --git a/src/SceneKit/Defs.cs b/src/SceneKit/Defs.cs index e6c6ac762948..14ef5a952afe 100644 --- a/src/SceneKit/Defs.cs +++ b/src/SceneKit/Defs.cs @@ -293,11 +293,7 @@ public enum SCNPhysicsCollisionCategory : ulong { None = 0, Default = 1 << 0, Static = 1 << 1, -#if XAMCORE_2_0 All = UInt64.MaxValue -#else - All = UInt32.MaxValue -#endif } [Watch (3,0)] diff --git a/src/SceneKit/SCNCompat.cs b/src/SceneKit/SCNCompat.cs index e6ed7d6b9483..0939823f90d0 100644 --- a/src/SceneKit/SCNCompat.cs +++ b/src/SceneKit/SCNCompat.cs @@ -85,7 +85,6 @@ public virtual bool WriteToUrl (NSUrl url, NSDictionary options, SCNSceneExportD #endif #if !XAMCORE_4_0 -#if XAMCORE_2_0 || !MONOMAC public abstract partial class SCNSceneRenderer : NSObject { [Mac (10, 10)] [Obsolete ("Use 'SCNSceneRenderer_Extensions.PrepareAsync' instead.")] @@ -103,7 +102,6 @@ public unsafe virtual Task PresentSceneAsync (SCNScene scene, global::SpriteKit. } } #endif -#endif #if !XAMCORE_4_0 diff --git a/src/SceneKit/SCNGeometrySource.cs b/src/SceneKit/SCNGeometrySource.cs index aa6fb63fcbea..4d94ad6202fb 100644 --- a/src/SceneKit/SCNGeometrySource.cs +++ b/src/SceneKit/SCNGeometrySource.cs @@ -11,7 +11,7 @@ using CoreGraphics; using Foundation; -#if (XAMCORE_2_0 || !MONOMAC) && !WATCH +#if !WATCH using Metal; #endif @@ -74,7 +74,7 @@ public static SCNGeometrySource FromData (NSData data, SCNGeometrySourceSemantic return FromData (data, SemanticToToken (semantic), vectorCount, floatComponents, componentsPerVector, bytesPerComponent, offset, stride); } -#if (XAMCORE_2_0 || !MONOMAC) && !WATCH +#if !WATCH public static SCNGeometrySource FromMetalBuffer (IMTLBuffer mtlBuffer, MTLVertexFormat vertexFormat, SCNGeometrySourceSemantics semantic, nint vertexCount, nint offset, nint stride) { return FromMetalBuffer (mtlBuffer, vertexFormat, SemanticToToken (semantic), vertexCount, offset, stride); diff --git a/src/SceneKit/SCNJavaScript.cs b/src/SceneKit/SCNJavaScript.cs index e6f809398fc9..0a617d8e50b6 100644 --- a/src/SceneKit/SCNJavaScript.cs +++ b/src/SceneKit/SCNJavaScript.cs @@ -7,7 +7,7 @@ // Copyright 2014 Xamarin Inc. All rights reserved. // -#if (XAMCORE_2_0 || !MONOMAC) && !WATCH +#if !WATCH using System; using System.Runtime.InteropServices; @@ -34,4 +34,4 @@ public static void ExportModule (JSContext context) } } -#endif \ No newline at end of file +#endif diff --git a/src/SceneKit/SCNMatrix4.cs b/src/SceneKit/SCNMatrix4.cs index d9a860e3e416..8b44eafe86a2 100644 --- a/src/SceneKit/SCNMatrix4.cs +++ b/src/SceneKit/SCNMatrix4.cs @@ -74,10 +74,7 @@ public struct SCNMatrix4 : IEquatable /// /// The identity matrix /// -#if XAMCORE_2_0 - readonly -#endif - public static SCNMatrix4 Identity = new SCNMatrix4(SCNVector4.UnitX, SCNVector4.UnitY, SCNVector4.UnitZ, SCNVector4.UnitW); + public readonly static SCNMatrix4 Identity = new SCNMatrix4(SCNVector4.UnitX, SCNVector4.UnitY, SCNVector4.UnitZ, SCNVector4.UnitW); #endregion @@ -731,42 +728,6 @@ public static SCNMatrix4 CreatePerspectiveOffCenter(pfloat left, pfloat right, p #endregion - #region Obsolete Functions - -#if !XAMCORE_2_0 - #region Translation Functions - - /// - /// Builds a translation matrix. - /// - /// The translation vector. - /// A new SCNMatrix4 instance. - [Obsolete("Use CreateTranslation instead.")] - public static SCNMatrix4 Translation(SCNVector3 trans) - { - return Translation(trans.X, trans.Y, trans.Z); - } - - /// - /// Build a translation matrix with the given translation - /// - /// X translation - /// Y translation - /// Z translation - /// A Translation matrix - [Obsolete("Use CreateTranslation instead.")] - public static SCNMatrix4 Translation(pfloat x, pfloat y, pfloat z) - { - SCNMatrix4 result = Identity; - result.Row3 = new SCNVector4(x, y, z, 1.0f); - return result; - } - - #endregion -#endif // !XAMCORE_2_0 - - #endregion - #region Scale Functions /// @@ -810,88 +771,6 @@ public static SCNMatrix4 Scale(pfloat x, pfloat y, pfloat z) #region Rotation Functions -#if !XAMCORE_2_0 - /// - /// Build a rotation matrix that rotates about the x-axis - /// - /// angle in radians to rotate counter-clockwise around the x-axis - /// A rotation matrix - [Obsolete("Use CreateRotationX instead.")] - public static SCNMatrix4 RotateX(pfloat angle) - { - pfloat cos = (pfloat)System.Math.Cos(angle); - pfloat sin = (pfloat)System.Math.Sin(angle); - - SCNMatrix4 result; - result.Row0 = SCNVector4.UnitX; - result.Row1 = new SCNVector4(0.0f, cos, sin, 0.0f); - result.Row2 = new SCNVector4(0.0f, -sin, cos, 0.0f); - result.Row3 = SCNVector4.UnitW; - return result; - } - - /// - /// Build a rotation matrix that rotates about the y-axis - /// - /// angle in radians to rotate counter-clockwise around the y-axis - /// A rotation matrix - [Obsolete("Use CreateRotationY instead.")] - public static SCNMatrix4 RotateY(pfloat angle) - { - pfloat cos = (pfloat)System.Math.Cos(angle); - pfloat sin = (pfloat)System.Math.Sin(angle); - - SCNMatrix4 result; - result.Row0 = new SCNVector4(cos, 0.0f, -sin, 0.0f); - result.Row1 = SCNVector4.UnitY; - result.Row2 = new SCNVector4(sin, 0.0f, cos, 0.0f); - result.Row3 = SCNVector4.UnitW; - return result; - } - - /// - /// Build a rotation matrix that rotates about the z-axis - /// - /// angle in radians to rotate counter-clockwise around the z-axis - /// A rotation matrix - [Obsolete("Use CreateRotationZ instead.")] - public static SCNMatrix4 RotateZ(pfloat angle) - { - pfloat cos = (pfloat)System.Math.Cos(angle); - pfloat sin = (pfloat)System.Math.Sin(angle); - - SCNMatrix4 result; - result.Row0 = new SCNVector4(cos, sin, 0.0f, 0.0f); - result.Row1 = new SCNVector4(-sin, cos, 0.0f, 0.0f); - result.Row2 = SCNVector4.UnitZ; - result.Row3 = SCNVector4.UnitW; - return result; - } - - /// - /// Build a rotation matrix to rotate about the given axis - /// - /// the axis to rotate about - /// angle in radians to rotate counter-clockwise (looking in the direction of the given axis) - /// A rotation matrix - [Obsolete("Use CreateFromAxisAngle instead.")] - public static SCNMatrix4 Rotate(SCNVector3 axis, pfloat angle) - { - pfloat cos = (pfloat)System.Math.Cos(-angle); - pfloat sin = (pfloat)System.Math.Sin(-angle); - pfloat t = 1.0f - cos; - - axis.Normalize(); - - SCNMatrix4 result; - result.Row0 = new SCNVector4(t * axis.X * axis.X + cos, t * axis.X * axis.Y - sin * axis.Z, t * axis.X * axis.Z + sin * axis.Y, 0.0f); - result.Row1 = new SCNVector4(t * axis.X * axis.Y + sin * axis.Z, t * axis.Y * axis.Y + cos, t * axis.Y * axis.Z - sin * axis.X, 0.0f); - result.Row2 = new SCNVector4(t * axis.X * axis.Z - sin * axis.Y, t * axis.Y * axis.Z + sin * axis.X, t * axis.Z * axis.Z + cos, 0.0f); - result.Row3 = SCNVector4.UnitW; - return result; - } -#endif - /// /// Build a rotation matrix from a quaternion /// @@ -966,49 +845,6 @@ public static SCNMatrix4 LookAt(pfloat eyeX, pfloat eyeY, pfloat eyeZ, pfloat ta return LookAt(new SCNVector3(eyeX, eyeY, eyeZ), new SCNVector3(targetX, targetY, targetZ), new SCNVector3(upX, upY, upZ)); } -#if !XAMCORE_2_0 - /// - /// Build a projection matrix - /// - /// Left edge of the view frustum - /// Right edge of the view frustum - /// Bottom edge of the view frustum - /// Top edge of the view frustum - /// Distance to the near clip plane - /// Distance to the far clip plane - /// A projection matrix that transforms camera space to raster space - [Obsolete("Use CreatePerspectiveOffCenter instead.")] - public static SCNMatrix4 Frustum(pfloat left, pfloat right, pfloat bottom, pfloat top, pfloat near, pfloat far) - { - pfloat invRL = 1.0f / (right - left); - pfloat invTB = 1.0f / (top - bottom); - pfloat invFN = 1.0f / (far - near); - return new SCNMatrix4(new SCNVector4(2.0f * near * invRL, 0.0f, 0.0f, 0.0f), - new SCNVector4(0.0f, 2.0f * near * invTB, 0.0f, 0.0f), - new SCNVector4((right + left) * invRL, (top + bottom) * invTB, -(far + near) * invFN, -1.0f), - new SCNVector4(0.0f, 0.0f, -2.0f * far * near * invFN, 0.0f)); - } - - /// - /// Build a projection matrix - /// - /// Angle of the field of view in the y direction (in radians) - /// Aspect ratio of the view (width / height) - /// Distance to the near clip plane - /// Distance to the far clip plane - /// A projection matrix that transforms camera space to raster space - [Obsolete("Use CreatePerspectiveFieldOfView instead.")] - public static SCNMatrix4 Perspective(pfloat fovy, pfloat aspect, pfloat near, pfloat far) - { - pfloat yMax = near * (float)System.Math.Tan(0.5f * fovy); - pfloat yMin = -yMax; - pfloat xMin = yMin * aspect; - pfloat xMax = yMax * aspect; - - return Frustum(xMin, xMax, yMin, yMax, near, far); - } -#endif - #endregion #region Multiply Functions diff --git a/src/SceneKit/SCNQuaternion.cs b/src/SceneKit/SCNQuaternion.cs index 5c859d4dc34f..f1a38382d15f 100644 --- a/src/SceneKit/SCNQuaternion.cs +++ b/src/SceneKit/SCNQuaternion.cs @@ -109,17 +109,6 @@ public SCNQuaternion (Quaternion openTkQuaternion) : this (new SCNVector3 (openT #region Properties -#if !XAMCORE_2_0 - /// - /// Gets or sets an OpenTK.Vector3 with the X, Y and Z components of this instance. - /// - [Obsolete("Use Xyz property instead.")] - [CLSCompliant(false)] - [EditorBrowsable(EditorBrowsableState.Never)] - [XmlIgnore] - public SCNVector3 XYZ { get { return Xyz; } set { Xyz = value; } } -#endif - /// /// Gets or sets an OpenTK.Vector3 with the X, Y and Z components of this instance. /// @@ -262,10 +251,7 @@ public void Conjugate() /// /// Defines the identity quaternion. /// -#if XAMCORE_2_0 - readonly -#endif - public static SCNQuaternion Identity = new SCNQuaternion(0, 0, 0, 1); + public readonly static SCNQuaternion Identity = new SCNQuaternion(0, 0, 0, 1); #endregion @@ -331,36 +317,6 @@ public static void Sub(ref SCNQuaternion left, ref SCNQuaternion right, out SCNQ #region Mult -#if !XAMCORE_2_0 - /// - /// Multiplies two instances. - /// - /// The first instance. - /// The second instance. - /// A new instance containing the result of the calculation. - [Obsolete("Use Multiply instead.")] - public static SCNQuaternion Mult(SCNQuaternion left, SCNQuaternion right) - { - return new SCNQuaternion( - right.W * left.Xyz + left.W * right.Xyz + SCNVector3.Cross(left.Xyz, right.Xyz), - left.W * right.W - SCNVector3.Dot(left.Xyz, right.Xyz)); - } - - /// - /// Multiplies two instances. - /// - /// The first instance. - /// The second instance. - /// A new instance containing the result of the calculation. - [Obsolete("Use Multiply instead.")] - public static void Mult(ref SCNQuaternion left, ref SCNQuaternion right, out SCNQuaternion result) - { - result = new SCNQuaternion( - right.W * left.Xyz + left.W * right.Xyz + SCNVector3.Cross(left.Xyz, right.Xyz), - left.W * right.W - SCNVector3.Dot(left.Xyz, right.Xyz)); - } -#endif - /// /// Multiplies two instances. /// @@ -398,14 +354,6 @@ public static void Multiply(ref SCNQuaternion quaternion, float scale, out SCNQu result = new SCNQuaternion(quaternion.X * scale, quaternion.Y * scale, quaternion.Z * scale, quaternion.W * scale); } -#if !XAMCORE_2_0 - [Obsolete ("Use the overload without the 'ref float scale'.")] - public static void Multiply(ref SCNQuaternion quaternion, ref float scale, out SCNQuaternion result) - { - result = new SCNQuaternion(quaternion.X * scale, quaternion.Y * scale, quaternion.Z * scale, quaternion.W * scale); - } -#endif - /// /// Multiplies an instance by a scalar. /// diff --git a/src/SceneKit/SCNTechnique.cs b/src/SceneKit/SCNTechnique.cs index 213cbf4cdee6..e1e5663ec831 100644 --- a/src/SceneKit/SCNTechnique.cs +++ b/src/SceneKit/SCNTechnique.cs @@ -19,12 +19,5 @@ public NSObject this[NSString key] { get { return _GetObject (key); } set { _SetObject (value, key); } } - -#if !XAMCORE_2_0 - public NSDictionary ToDictionary () - { - return DictionaryRepresentation; - } -#endif } } diff --git a/src/SceneKit/SCNVector3.cs b/src/SceneKit/SCNVector3.cs index 424033332542..f402a5215333 100644 --- a/src/SceneKit/SCNVector3.cs +++ b/src/SceneKit/SCNVector3.cs @@ -120,87 +120,6 @@ public SCNVector3(SCNVector4 v) #region Instance -#if !XAMCORE_2_0 - #region public void Add() - - /// Add the Vector passed as parameter to this instance. - /// Right operand. This parameter is only read from. - [Obsolete("Use static Add() method instead.")] - public void Add(SCNVector3 right) - { - this.X += right.X; - this.Y += right.Y; - this.Z += right.Z; - } - - /// Add the Vector passed as parameter to this instance. - /// Right operand. This parameter is only read from. - [CLSCompliant(false)] - [Obsolete("Use static Add() method instead.")] - public void Add(ref SCNVector3 right) - { - this.X += right.X; - this.Y += right.Y; - this.Z += right.Z; - } - - #endregion public void Add() - - #region public void Sub() - - /// Subtract the Vector passed as parameter from this instance. - /// Right operand. This parameter is only read from. - [Obsolete("Use static Subtract() method instead.")] - public void Sub(SCNVector3 right) - { - this.X -= right.X; - this.Y -= right.Y; - this.Z -= right.Z; - } - - /// Subtract the Vector passed as parameter from this instance. - /// Right operand. This parameter is only read from. - [CLSCompliant(false)] - [Obsolete("Use static Subtract() method instead.")] - public void Sub(ref SCNVector3 right) - { - this.X -= right.X; - this.Y -= right.Y; - this.Z -= right.Z; - } - - #endregion public void Sub() - - #region public void Mult() - - /// Multiply this instance by a scalar. - /// Scalar operand. - [Obsolete("Use static Multiply() method instead.")] - public void Mult(pfloat f) - { - this.X *= f; - this.Y *= f; - this.Z *= f; - } - - #endregion public void Mult() - - #region public void Div() - - /// Divide this instance by a scalar. - /// Scalar operand. - [Obsolete("Use static Divide() method instead.")] - public void Div(pfloat f) - { - pfloat mult = 1.0f / f; - this.X *= mult; - this.Y *= mult; - this.Z *= mult; - } - - #endregion public void Div() -#endif - #region public pfloat Length /// @@ -290,47 +209,6 @@ public void NormalizeFast() #endregion -#if !XAMCORE_2_0 - #region public void Scale() - - /// - /// Scales the current SCNVector3 by the given amounts. - /// - /// The scale of the X component. - /// The scale of the Y component. - /// The scale of the Z component. - [Obsolete("Use static Multiply() method instead.")] - public void Scale(pfloat sx, pfloat sy, pfloat sz) - { - this.X = X * sx; - this.Y = Y * sy; - this.Z = Z * sz; - } - - /// Scales this instance by the given parameter. - /// The scaling of the individual components. - [Obsolete("Use static Multiply() method instead.")] - public void Scale(SCNVector3 scale) - { - this.X *= scale.X; - this.Y *= scale.Y; - this.Z *= scale.Z; - } - - /// Scales this instance by the given parameter. - /// The scaling of the individual components. - [CLSCompliant(false)] - [Obsolete("Use static Multiply() method instead.")] - public void Scale(ref SCNVector3 scale) - { - this.X *= scale.X; - this.Y *= scale.Y; - this.Z *= scale.Z; - } - - #endregion public void Scale() -#endif - #endregion #region Static @@ -369,113 +247,6 @@ public void Scale(ref SCNVector3 scale) #endregion - #region Obsolete - -#if !XAMCORE_2_0 - #region Sub - - /// - /// Subtract one Vector from another - /// - /// First operand - /// Second operand - /// Result of subtraction - [Obsolete("Use static Subtract() method instead.")] - public static SCNVector3 Sub(SCNVector3 a, SCNVector3 b) - { - a.X -= b.X; - a.Y -= b.Y; - a.Z -= b.Z; - return a; - } - - /// - /// Subtract one Vector from another - /// - /// First operand - /// Second operand - /// Result of subtraction - [Obsolete("Use static Subtract() method instead.")] - public static void Sub(ref SCNVector3 a, ref SCNVector3 b, out SCNVector3 result) - { - result.X = a.X - b.X; - result.Y = a.Y - b.Y; - result.Z = a.Z - b.Z; - } - - #endregion - - #region Mult - - /// - /// Multiply a vector and a scalar - /// - /// Vector operand - /// Scalar operand - /// Result of the multiplication - [Obsolete("Use static Multiply() method instead.")] - public static SCNVector3 Mult(SCNVector3 a, pfloat f) - { - a.X *= f; - a.Y *= f; - a.Z *= f; - return a; - } - - /// - /// Multiply a vector and a scalar - /// - /// Vector operand - /// Scalar operand - /// Result of the multiplication - [Obsolete("Use static Multiply() method instead.")] - public static void Mult(ref SCNVector3 a, pfloat f, out SCNVector3 result) - { - result.X = a.X * f; - result.Y = a.Y * f; - result.Z = a.Z * f; - } - - #endregion - - #region Div - - /// - /// Divide a vector by a scalar - /// - /// Vector operand - /// Scalar operand - /// Result of the division - [Obsolete("Use static Divide() method instead.")] - public static SCNVector3 Div(SCNVector3 a, pfloat f) - { - pfloat mult = 1.0f / f; - a.X *= mult; - a.Y *= mult; - a.Z *= mult; - return a; - } - - /// - /// Divide a vector by a scalar - /// - /// Vector operand - /// Scalar operand - /// Result of the division - [Obsolete("Use static Divide() method instead.")] - public static void Div(ref SCNVector3 a, pfloat f, out SCNVector3 result) - { - pfloat mult = 1.0f / f; - result.X = a.X * mult; - result.Y = a.Y * mult; - result.Z = a.Z * mult; - } - - #endregion -#endif // !XAMCORE_2_0 - - #endregion - #region Add /// diff --git a/src/SceneKit/SCNVector4.cs b/src/SceneKit/SCNVector4.cs index f733aa4c94ac..850a828ec456 100644 --- a/src/SceneKit/SCNVector4.cs +++ b/src/SceneKit/SCNVector4.cs @@ -74,42 +74,27 @@ public struct SCNVector4 : IEquatable /// /// Defines a unit-length SCNVector4 that points towards the X-axis. /// -#if XAMCORE_2_0 - readonly -#endif - public static SCNVector4 UnitX = new SCNVector4(1, 0, 0, 0); + public readonly static SCNVector4 UnitX = new SCNVector4(1, 0, 0, 0); /// /// Defines a unit-length SCNVector4 that points towards the Y-axis. /// -#if XAMCORE_2_0 - readonly -#endif - public static SCNVector4 UnitY = new SCNVector4(0, 1, 0, 0); + public readonly static SCNVector4 UnitY = new SCNVector4(0, 1, 0, 0); /// /// Defines a unit-length SCNVector4 that points towards the Z-axis. /// -#if XAMCORE_2_0 - readonly -#endif - public static SCNVector4 UnitZ = new SCNVector4(0, 0, 1, 0); + public readonly static SCNVector4 UnitZ = new SCNVector4(0, 0, 1, 0); /// /// Defines a unit-length SCNVector4 that points towards the W-axis. /// -#if XAMCORE_2_0 - readonly -#endif - public static SCNVector4 UnitW = new SCNVector4(0, 0, 0, 1); + public readonly static SCNVector4 UnitW = new SCNVector4(0, 0, 0, 1); /// /// Defines a zero-length SCNVector4. /// -#if XAMCORE_2_0 - readonly -#endif - public static SCNVector4 Zero = new SCNVector4(0, 0, 0, 0); + public readonly static SCNVector4 Zero = new SCNVector4(0, 0, 0, 0); /// /// Defines an instance with all components set to 1. @@ -212,93 +197,6 @@ public SCNVector4(SCNVector4 v) #region Instance -#if !XAMCORE_2_0 - #region public void Add() - - /// Add the Vector passed as parameter to this instance. - /// Right operand. This parameter is only read from. - [Obsolete("Use static Add() method instead.")] - public void Add(SCNVector4 right) - { - this.X += right.X; - this.Y += right.Y; - this.Z += right.Z; - this.W += right.W; - } - - /// Add the Vector passed as parameter to this instance. - /// Right operand. This parameter is only read from. - [CLSCompliant(false)] - [Obsolete("Use static Add() method instead.")] - public void Add(ref SCNVector4 right) - { - this.X += right.X; - this.Y += right.Y; - this.Z += right.Z; - this.W += right.W; - } - - #endregion public void Add() - - #region public void Sub() - - /// Subtract the Vector passed as parameter from this instance. - /// Right operand. This parameter is only read from. - [Obsolete("Use static Subtract() method instead.")] - public void Sub(SCNVector4 right) - { - this.X -= right.X; - this.Y -= right.Y; - this.Z -= right.Z; - this.W -= right.W; - } - - /// Subtract the Vector passed as parameter from this instance. - /// Right operand. This parameter is only read from. - [CLSCompliant(false)] - [Obsolete("Use static Subtract() method instead.")] - public void Sub(ref SCNVector4 right) - { - this.X -= right.X; - this.Y -= right.Y; - this.Z -= right.Z; - this.W -= right.W; - } - - #endregion public void Sub() - - #region public void Mult() - - /// Multiply this instance by a scalar. - /// Scalar operand. - [Obsolete("Use static Multiply() method instead.")] - public void Mult(pfloat f) - { - this.X *= f; - this.Y *= f; - this.Z *= f; - this.W *= f; - } - - #endregion public void Mult() - - #region public void Div() - - /// Divide this instance by a scalar. - /// Scalar operand. - [Obsolete("Use static Divide() method instead.")] - public void Div(pfloat f) - { - pfloat mult = 1.0f / f; - this.X *= mult; - this.Y *= mult; - this.Z *= mult; - this.W *= mult; - } - - #endregion public void Div() -#endif // !XAMCORE_2_0 - #region public float Length /// @@ -390,51 +288,6 @@ public void NormalizeFast() #endregion -#if !XAMCORE_2_0 - #region public void Scale() - - /// - /// Scales the current SCNVector4 by the given amounts. - /// - /// The scale of the X component. - /// The scale of the Y component. - /// The scale of the Z component. - /// The scale of the Z component. - [Obsolete("Use static Multiply() method instead.")] - public void Scale(pfloat sx, pfloat sy, pfloat sz, pfloat sw) - { - this.X = X * sx; - this.Y = Y * sy; - this.Z = Z * sz; - this.W = W * sw; - } - - /// Scales this instance by the given parameter. - /// The scaling of the individual components. - [Obsolete("Use static Multiply() method instead.")] - public void Scale(SCNVector4 scale) - { - this.X *= scale.X; - this.Y *= scale.Y; - this.Z *= scale.Z; - this.W *= scale.W; - } - - /// Scales this instance by the given parameter. - /// The scaling of the individual components. - [CLSCompliant(false)] - [Obsolete("Use static Multiply() method instead.")] - public void Scale(ref SCNVector4 scale) - { - this.X *= scale.X; - this.Y *= scale.Y; - this.Z *= scale.Z; - this.W *= scale.W; - } - - #endregion public void Scale() -#endif // !XAMCORE_2_0 - #endregion #region Static diff --git a/src/SearchKit/SearchKit.cs b/src/SearchKit/SearchKit.cs index 8685d2bca4e7..15836928dd7c 100644 --- a/src/SearchKit/SearchKit.cs +++ b/src/SearchKit/SearchKit.cs @@ -21,9 +21,6 @@ using CoreFoundation; using ObjCRuntime; using Foundation; -#if !XAMCORE_2_0 -using MonoMac; -#endif using System.Runtime.InteropServices; diff --git a/src/Security/Authorization.cs b/src/Security/Authorization.cs index 5cd0ad7c6966..0f513bfc00d6 100644 --- a/src/Security/Authorization.cs +++ b/src/Security/Authorization.cs @@ -82,11 +82,7 @@ public class AuthorizationEnvironment { [StructLayout (LayoutKind.Sequential)] struct AuthorizationItem { public IntPtr /* AuthorizationString = const char * */ name; -#if XAMCORE_2_0 public nint /* size_t */ valueLen; -#else - public IntPtr /* size_t */ valueLen; -#endif public IntPtr /* void* */ value; public int /* UInt32 */ flags; // zero } @@ -149,11 +145,7 @@ static void EncodeString (ref AuthorizationItem item, string key, string value) item.name = Marshal.StringToHGlobalAuto (key); if (value != null){ item.value = Marshal.StringToHGlobalAuto (value); -#if XAMCORE_2_0 item.valueLen = value.Length; -#else - item.valueLen = (IntPtr) value.Length; -#endif } } diff --git a/src/Security/Certificate.cs b/src/Security/Certificate.cs index 0c0b70260ade..94179241cdeb 100644 --- a/src/Security/Certificate.cs +++ b/src/Security/Certificate.cs @@ -421,11 +421,7 @@ public void Dispose () GC.SuppressFinalize (this); } -#if XAMCORE_2_0 protected virtual void Dispose (bool disposing) -#else - public virtual void Dispose (bool disposing) -#endif { if (handle != IntPtr.Zero){ CFObject.CFRelease (handle); @@ -521,11 +517,7 @@ public void Dispose () GC.SuppressFinalize (this); } -#if XAMCORE_2_0 protected virtual void Dispose (bool disposing) -#else - public virtual void Dispose (bool disposing) -#endif { if (handle != IntPtr.Zero){ CFObject.CFRelease (handle); @@ -701,17 +693,6 @@ public SecStatusCode RawVerify (SecPadding padding, byte [] signedData, byte [] [DllImport (Constants.SecurityLibrary)] extern static SecStatusCode SecKeyEncrypt (IntPtr handle, SecPadding padding, IntPtr plainText, nint plainTextLen, IntPtr cipherText, ref nint cipherTextLengh); -#if !XAMCORE_2_0 - [Obsolete ("Use the 'Encrypt' overload which returns (out) the cipherTextLen value so you can adjust it if needed.")] - public unsafe SecStatusCode Encrypt (SecPadding padding, IntPtr plainText, int plainTextLen, IntPtr cipherText, int cipherTextLen) - { - if (handle == IntPtr.Zero) - throw new ObjectDisposedException ("SecKey"); - - nint len = (nint) cipherTextLen; - return SecKeyEncrypt (handle, padding, plainText, (nint) plainTextLen, cipherText, ref len); - } -#endif public unsafe SecStatusCode Encrypt (SecPadding padding, IntPtr plainText, nint plainTextLen, IntPtr cipherText, ref nint cipherTextLen) { if (handle == IntPtr.Zero) @@ -747,17 +728,6 @@ public SecStatusCode Encrypt (SecPadding padding, byte [] plainText, out byte [] [DllImport (Constants.SecurityLibrary)] extern static SecStatusCode SecKeyDecrypt (IntPtr handle, SecPadding padding, IntPtr cipherTextLen, nint cipherLen, IntPtr plainText, ref nint plainTextLen); -#if !XAMCORE_2_0 - [Obsolete ("Use the 'Decrypt' overload which returns (ref) the plainTextLen value so you can adjust it if needed.")] - public unsafe SecStatusCode Decrypt (SecPadding padding, IntPtr cipherText, int cipherTextLen, IntPtr plainText, int plainTextLen) - { - if (handle == IntPtr.Zero) - throw new ObjectDisposedException ("SecKey"); - - int len = plainTextLen; - return SecKeyDecrypt (handle, padding, cipherText, cipherTextLen, plainText, ref len); - } -#endif public unsafe SecStatusCode Decrypt (SecPadding padding, IntPtr cipherText, nint cipherTextLen, IntPtr plainText, ref nint plainTextLen) { if (handle == IntPtr.Zero) @@ -789,16 +759,6 @@ SecStatusCode _Decrypt (SecPadding padding, byte [] cipherText, ref byte [] plai } } -#if !XAMCORE_2_0 - [Obsolete ("Use the 'Decrypt' overload which returns (out) the plainText array so you can adjust it if needed.")] - public SecStatusCode Decrypt (SecPadding padding, byte [] cipherText, byte [] plainText) - { - if (plainText == null) - throw new ArgumentNullException ("plainText"); - - return _Decrypt (padding, cipherText, ref plainText); - } -#endif public SecStatusCode Decrypt (SecPadding padding, byte [] cipherText, out byte [] plainText) { plainText = null; @@ -1035,11 +995,7 @@ public void Dispose () GC.SuppressFinalize (this); } -#if XAMCORE_2_0 protected virtual void Dispose (bool disposing) -#else - public virtual void Dispose (bool disposing) -#endif { if (handle != IntPtr.Zero){ CFObject.CFRelease (handle); diff --git a/src/Security/Items.cs b/src/Security/Items.cs index fb5b9aee2015..d281696c111f 100644 --- a/src/Security/Items.cs +++ b/src/Security/Items.cs @@ -78,7 +78,6 @@ public enum SecAuthenticationType { Ntlm, Msn, Dpa, Rpa, HttpBasic, HttpDigest, HtmlForm, Default } -#if XAMCORE_2_0 public class SecKeyChain : INativeObject { internal SecKeyChain (IntPtr handle) @@ -87,9 +86,6 @@ internal SecKeyChain (IntPtr handle) } public IntPtr Handle { get; internal set; } -#else - public static class SecKeyChain { -#endif static NSNumber SetLimit (NSMutableDictionary dict, int max) { @@ -700,11 +696,7 @@ public void Dispose () GC.SuppressFinalize (this); } -#if XAMCORE_2_0 protected virtual void Dispose (bool disposing) -#else - public virtual void Dispose (bool disposing) -#endif { if (queryDict != null){ if (disposing){ @@ -941,7 +933,7 @@ public string Service { } } -#if !MONOMAC || !XAMCORE_2_0 +#if !MONOMAC public string UseOperationPrompt { get { return FetchString (SecItem.UseOperationPrompt); @@ -973,7 +965,7 @@ public SecAuthenticationUI AuthenticationUI { } } -#if XAMCORE_2_0 && !WATCH && !TVOS +#if !WATCH && !TVOS [iOS (9, 0), Mac (10, 11)] public LocalAuthentication.LAContext AuthenticationContext { get { @@ -1339,7 +1331,6 @@ public SecPolicy MatchPolicy { } } -#if XAMCORE_2_0 public SecKeyChain[] MatchItemList { get { return NSArray.ArrayFromHandle (Fetch (SecItem.MatchItemList)); @@ -1352,19 +1343,6 @@ public SecKeyChain[] MatchItemList { SetValue (array, SecItem.MatchItemList); } } -#else - public NSArray MatchItemList { - get { - return (NSArray) Runtime.GetNSObject (Fetch (SecItem.MatchItemList)); - } - - set { - if (value == null) - throw new ArgumentNullException ("value"); - SetValue (value, SecItem.MatchItemList); - } - } -#endif public NSData [] MatchIssuers { get { @@ -1442,21 +1420,6 @@ public NSData ValueData { } } -#if !XAMCORE_2_0 - [Obsolete ("Use 'GetValueRef' and 'SetValueRef' instead.")] - public NSObject ValueRef { - get { - return FetchObject (SecItem.ValueRef); - } - - set { - if (value == null) - throw new ArgumentNullException ("value"); - SetValue (value, SecItem.ValueRef); - } - } -#endif - public T GetValueRef () where T : class, INativeObject { return Runtime.GetINativeObject (queryDict.LowlevelObjectForKey (SecItem.ValueRef), false); diff --git a/src/Security/SecAccessControl.cs b/src/Security/SecAccessControl.cs index 2d97bcef007a..a79a60b2059e 100644 --- a/src/Security/SecAccessControl.cs +++ b/src/Security/SecAccessControl.cs @@ -107,11 +107,7 @@ public SecAccessControl (SecAccessible accessible, SecAccessControlCreateFlags f Flags = flags; } -#if XAMCORE_2_0 protected virtual void Dispose (bool disposing) -#else - public virtual void Dispose (bool disposing) -#endif { if (handle != IntPtr.Zero){ CFObject.CFRelease (handle); diff --git a/src/Security/SecureTransport.cs b/src/Security/SecureTransport.cs index 68cf2e1b5cf4..de852b946666 100644 --- a/src/Security/SecureTransport.cs +++ b/src/Security/SecureTransport.cs @@ -14,10 +14,6 @@ namespace Security { public enum SslProtocol { Unknown = 0, Ssl_3_0 = 2, -#if !XAMCORE_2_0 - [Obsolete ("Use 'Ssl_3_0'.")] - Ssl3_0 = Ssl_3_0, -#endif Tls_1_0 = 4, Tls_1_1 = 7, Tls_1_2 = 8, diff --git a/src/Social/Enums.cs b/src/Social/Enums.cs index aabc32bc9650..2b3716ded0f3 100644 --- a/src/Social/Enums.cs +++ b/src/Social/Enums.cs @@ -7,8 +7,6 @@ // Copyright 2012-2014 Xamarin Inc // -#if XAMCORE_2_0 || !MONOMAC - using ObjCRuntime; namespace Social { @@ -39,4 +37,3 @@ public enum SLServiceKind { #endif } } -#endif diff --git a/src/Social/SLRequest.cs b/src/Social/SLRequest.cs index 6fe1bcbe0d33..8d0a0ea8aa4f 100644 --- a/src/Social/SLRequest.cs +++ b/src/Social/SLRequest.cs @@ -6,7 +6,7 @@ // // Copyright 2012-2013 Xamarin Inc // -#if XAMCORE_2_0 || !MONOMAC + using System; using ObjCRuntime; using Foundation; @@ -40,4 +40,3 @@ public static SLRequest Create (SLServiceKind serviceKind, SLRequestMethod metho } } } -#endif diff --git a/src/SpriteKit/ObsoleteCompat.cs b/src/SpriteKit/ObsoleteCompat.cs index e8553139d3e6..4bcc08652fa6 100644 --- a/src/SpriteKit/ObsoleteCompat.cs +++ b/src/SpriteKit/ObsoleteCompat.cs @@ -28,69 +28,4 @@ public virtual void SetTimingFunction (SKActionTimingFunction timingFunction) } } #endif - -#if !XAMCORE_2_0 && !MONOMAC - public partial class SKPhysicsBody { - - [Obsolete ("Use the 'FromBodies' method instead.")] - public static SKPhysicsBody BodyWithBodies (SKPhysicsBody [] bodies) - { - return FromBodies (bodies); - } - - [Obsolete ("Use the 'CreateCircularBody' method instead.")] - public static SKPhysicsBody BodyWithCircleOfRadius (nfloat radius) - { - return CreateCircularBody (radius); - } - - [Obsolete ("Use the 'CreateCircularBody' method instead.")] - public static SKPhysicsBody BodyWithCircleOfRadius (nfloat radius, CGPoint center) - { - return CreateCircularBody (radius, center); - } - - [Obsolete ("Use the 'CreateRectangularBody' method instead.")] - public static SKPhysicsBody BodyWithRectangleOfSize (CGSize size) - { - return CreateRectangularBody (size); - } - - [Obsolete ("Use the 'CreateRectangularBody' method instead.")] - public static SKPhysicsBody BodyWithRectangleOfSize (CGSize size, CGPoint center) - { - return CreateRectangularBody (size, center); - } - - [Obsolete ("Use the 'CreateBodyFromPath' method instead.")] - public static SKPhysicsBody BodyWithPolygonFromPath (CGPath path) - { - return CreateBodyFromPath (path); - } - - [Obsolete ("Use the 'CreateEdge' method instead.")] - public static SKPhysicsBody BodyWithEdgeFromPoint (CGPoint fromPoint, CGPoint toPoint) - { - return CreateEdge (fromPoint, toPoint); - } - - [Obsolete ("Use the 'CreateEdgeChain' method instead.")] - public static SKPhysicsBody BodyWithEdgeChainFromPath (CGPath path) - { - return CreateEdgeChain (path); - } - - [Obsolete ("Use the 'CreateEdgeLoop' method instead.")] - public static SKPhysicsBody BodyWithEdgeLoopFromPath (CGPath path) - { - return CreateEdgeLoop (path); - } - - [Obsolete ("Use the 'CreateEdgeLoop' method instead.")] - public static SKPhysicsBody BodyWithEdgeLoopFromRect (CGRect rect) - { - return CreateEdgeLoop (rect); - } - } -#endif } diff --git a/src/SpriteKit/SKAction.cs b/src/SpriteKit/SKAction.cs index c62a046a7f7f..a3f1c28e1b2e 100644 --- a/src/SpriteKit/SKAction.cs +++ b/src/SpriteKit/SKAction.cs @@ -18,7 +18,6 @@ namespace SpriteKit { public delegate void SKActionTimingFunction (float /* float, not CGFloat */ time); #endif -#if XAMCORE_2_0 || !MONOMAC public partial class SKAction { public static SKAction ResizeTo (CGSize size, double duration) @@ -26,23 +25,9 @@ public static SKAction ResizeTo (CGSize size, double duration) return SKAction.ResizeTo (size.Width, size.Height, duration); } -#if !XAMCORE_2_0 - [Obsolete ("Use 'Run(Action)' instead.")] - public static SKAction RunBlock (Action block) - { - return Run (block); - } - - [Obsolete ("Use 'Run(Action,DispatchQueue)' instead.")] - public static SKAction RunBlock (Action block, DispatchQueue queue) - { - return Run (block, queue); - } -#endif #if !XAMCORE_4_0 [Obsolete ("Use 'TimingFunction2' instead.")] public virtual SKActionTimingFunction TimingFunction { get; set; } #endif } -#endif } diff --git a/src/SpriteKit/SKKeyframeSequence.cs b/src/SpriteKit/SKKeyframeSequence.cs index 153fde26d65e..9c227574eaa6 100644 --- a/src/SpriteKit/SKKeyframeSequence.cs +++ b/src/SpriteKit/SKKeyframeSequence.cs @@ -16,7 +16,6 @@ using ObjCRuntime; namespace SpriteKit { -#if XAMCORE_2_0 || !MONOMAC public partial class SKKeyframeSequence { [DesignatedInitializer] @@ -57,5 +56,4 @@ static NSNumber[] Convert (double [] values) return array; } } -#endif -} \ No newline at end of file +} diff --git a/src/SpriteKit/SKNode.cs b/src/SpriteKit/SKNode.cs index 0247f5c1d15d..adb9ac9d128d 100644 --- a/src/SpriteKit/SKNode.cs +++ b/src/SpriteKit/SKNode.cs @@ -15,7 +15,6 @@ namespace SpriteKit { -#if XAMCORE_2_0 || !MONOMAC public partial class SKNode : IEnumerable, IEnumerable { [iOS (8,0), Mac (10,10)] @@ -72,5 +71,4 @@ public static SKNode Create (string filename, Type [] types, out NSError error) [Watch (5,0), TV (12,0), Mac (10,14), iOS (12,0)] public static SKNode Create (string filename, NSSet classes, out NSError error) => Create (filename, classes.Handle, out error); } -#endif } diff --git a/src/SpriteKit/SKShapeNode.cs b/src/SpriteKit/SKShapeNode.cs index ce0030700823..f679cb143a98 100644 --- a/src/SpriteKit/SKShapeNode.cs +++ b/src/SpriteKit/SKShapeNode.cs @@ -11,7 +11,6 @@ using CoreGraphics; using ObjCRuntime; -#if XAMCORE_2_0 || !MONOMAC namespace SpriteKit { public partial class SKShapeNode : SKNode { @@ -60,5 +59,3 @@ public static SKShapeNode FromSplinePoints (CGPoint [] points, int offset, int l } } } - -#endif // XAMCORE_2_0 || !MONOMAC diff --git a/src/SpriteKit/SKUniform.cs b/src/SpriteKit/SKUniform.cs index 3b4b558060ce..1706d8044486 100644 --- a/src/SpriteKit/SKUniform.cs +++ b/src/SpriteKit/SKUniform.cs @@ -21,7 +21,7 @@ using MatrixFloat3x3 = global::OpenTK.NMatrix3; using MatrixFloat4x4 = global::OpenTK.NMatrix4; -#if (XAMCORE_2_0 || !MONOMAC) && !WATCH +#if !WATCH namespace SpriteKit { public partial class SKUniform { @@ -274,4 +274,4 @@ public virtual Matrix4 FloatMatrix4Value #endif // !XAMCORE_4_0 } } -#endif // XAMCORE_2_0 +#endif // !WATCH diff --git a/src/SpriteKit/SKVideoNode.cs b/src/SpriteKit/SKVideoNode.cs index 1514727a8c0e..f4830e1d1aaf 100644 --- a/src/SpriteKit/SKVideoNode.cs +++ b/src/SpriteKit/SKVideoNode.cs @@ -11,7 +11,7 @@ using Foundation; using ObjCRuntime; -#if (XAMCORE_2_0 || !MONOMAC) && !WATCH +#if !WATCH namespace SpriteKit { public partial class SKVideoNode : SKNode { @@ -77,4 +77,4 @@ public SKVideoNode (NSUrl url) } } } -#endif // XAMCORE_2_0 +#endif // !WATCH diff --git a/src/SpriteKit/SKWarpGeometryGrid.cs b/src/SpriteKit/SKWarpGeometryGrid.cs index bf8c20743a19..ba6fbc2f0b20 100644 --- a/src/SpriteKit/SKWarpGeometryGrid.cs +++ b/src/SpriteKit/SKWarpGeometryGrid.cs @@ -13,7 +13,6 @@ using Vector2 = global::OpenTK.Vector2; -#if XAMCORE_2_0 || !MONOMAC namespace SpriteKit { public partial class SKWarpGeometryGrid @@ -76,4 +75,3 @@ public unsafe SKWarpGeometryGrid GetGridByReplacingDestPositions (Vector2 [] des } } } -#endif // XAMCORE_2_0 diff --git a/src/SystemConfiguration/CaptiveNetwork.cs b/src/SystemConfiguration/CaptiveNetwork.cs index 84c7f7aa799d..301276697a45 100644 --- a/src/SystemConfiguration/CaptiveNetwork.cs +++ b/src/SystemConfiguration/CaptiveNetwork.cs @@ -64,16 +64,6 @@ public static partial class CaptiveNetwork { extern static IntPtr /* CFDictionaryRef __nullable */ CNCopyCurrentNetworkInfo ( /* CFStringRef __nonnull */ IntPtr interfaceName); -#if !XAMCORE_2_0 - [Obsolete ("Replaced by TryCopyCurrentNetworkInfo")] - static public NSDictionary CopyCurrentNetworkInfo (string interfaceName) - { - NSDictionary dict; - TryCopyCurrentNetworkInfo (interfaceName, out dict); - return dict ?? new NSDictionary (); - } -#endif - static public StatusCode TryCopyCurrentNetworkInfo (string interfaceName, out NSDictionary currentNetworkInfo) { using (var nss = new NSString (interfaceName)) { @@ -95,16 +85,6 @@ static public StatusCode TryCopyCurrentNetworkInfo (string interfaceName, out NS [DllImport (Constants.SystemConfigurationLibrary)] extern static IntPtr /* CFArrayRef __nullable */ CNCopySupportedInterfaces (); -#if !XAMCORE_2_0 - [Obsolete ("Replaced by 'TryGetSupportedInterfaces'.")] - static public string[] GetSupportedInterfaces () - { - string[] result; - TryGetSupportedInterfaces (out result); - return result; - } -#endif - static public StatusCode TryGetSupportedInterfaces (out string[] supportedInterfaces) { IntPtr array = CNCopySupportedInterfaces (); diff --git a/src/SystemConfiguration/NetworkReachability.cs b/src/SystemConfiguration/NetworkReachability.cs index 2e6463117206..7f974a2b4d05 100644 --- a/src/SystemConfiguration/NetworkReachability.cs +++ b/src/SystemConfiguration/NetworkReachability.cs @@ -184,11 +184,7 @@ public void Dispose () GC.SuppressFinalize (this); } -#if XAMCORE_2_0 protected virtual void Dispose (bool disposing) -#else - public virtual void Dispose (bool disposing) -#endif { if (handle != IntPtr.Zero){ CFObject.CFRelease (handle); @@ -241,14 +237,6 @@ static void Callback (IntPtr handle, NetworkReachabilityFlags flags, IntPtr info r.notification (flags); } -#if !XAMCORE_2_0 - [Advice ("Use 'SetNotification' instead.")] - public bool SetCallback (Notification callback) - { - return SetNotification (callback) == StatusCode.OK; - } -#endif - public StatusCode SetNotification (Notification callback) { if (notification == null){ diff --git a/src/Twitter/TWCompat.cs b/src/Twitter/TWCompat.cs index 84eb885cd4e5..1adbe0246a97 100644 --- a/src/Twitter/TWCompat.cs +++ b/src/Twitter/TWCompat.cs @@ -1,6 +1,6 @@ // Copyright 2016 Xamarin Inc. All rights reserved. -#if !XAMCORE_3_0 && XAMCORE_2_0 +#if !XAMCORE_3_0 using System; diff --git a/src/UIKit/Compat.cs b/src/UIKit/Compat.cs index 2959720c07ca..265861bfc8df 100644 --- a/src/UIKit/Compat.cs +++ b/src/UIKit/Compat.cs @@ -14,24 +14,6 @@ namespace UIKit { -#if !XAMCORE_2_0 - public partial class UIPrintFormatter { - - [Obsolete ("This cannot be directly created. Use UISimpleTextPrintFormatter instead.")] - public UIPrintFormatter (string text) - { - } - - [Obsolete ("This cannot be directly created. Use UISimpleTextPrintFormatter instead.")] - public UIPrintFormatter (MonoTouch.Foundation.NSAttributedString attributedText) - { - } - - [Obsolete ("This cannot be used directly. Use UISimpleTextPrintFormatter instead.")] - public virtual MonoTouch.Foundation.NSAttributedString AttributedText { get; set; } - } -#endif - #if !XAMCORE_3_0 public partial class UIAdaptivePresentationControllerDelegate { @@ -42,17 +24,6 @@ public virtual UIViewController GetAdaptivePresentationStyle (UIPresentationCont } } -#if !XAMCORE_2_0 - public partial class UIPopoverPresentationControllerDelegate { - - [Obsolete ("Incorrect signature. Use the overload with a UITraitCollection parameter.")] - public override UIViewController GetAdaptivePresentationStyle (UIPresentationController controller, UIModalPresentationStyle style) - { - return null; - } - } -#endif - public partial class UIAdaptivePresentationControllerDelegate_Extensions { [Obsolete ("Incorrect signature. Use the overload with a UITraitCollection parameter.")] diff --git a/src/UIKit/NSLayoutConstraint.cs b/src/UIKit/NSLayoutConstraint.cs index d77a4fe6ba88..2197ce33e33e 100644 --- a/src/UIKit/NSLayoutConstraint.cs +++ b/src/UIKit/NSLayoutConstraint.cs @@ -7,7 +7,7 @@ // Copyright 2015, Xamarin Inc // -#if !WATCH && XAMCORE_2_0 +#if !WATCH using System; using Foundation; diff --git a/src/UIKit/NSLayoutManager.cs b/src/UIKit/NSLayoutManager.cs index 704d01df406c..92efd00f5cd4 100644 --- a/src/UIKit/NSLayoutManager.cs +++ b/src/UIKit/NSLayoutManager.cs @@ -51,7 +51,7 @@ public unsafe nuint GetGlyphs ( fixed (short* glyphs = glyphBuffer) { nuint rv; -#if XAMCORE_2_0 && ARCH_32 +#if ARCH_32 // Unified/32: the output array is not the correct size, it needs to be int[], and it's an array of NSGlyphProperty (which is long) nint[] tmpArray = null; if (props != null) @@ -67,7 +67,7 @@ public unsafe nuint GetGlyphs ( } } } -#if XAMCORE_2_0 && ARCH_32 +#if ARCH_32 // Marshal back from the tmpArray. if (tmpArray != null) { for (int i = 0; i < props.Length; i++) diff --git a/src/UIKit/UIAppearance.cs b/src/UIKit/UIAppearance.cs index a65e747282da..dc7649ca0c03 100644 --- a/src/UIKit/UIAppearance.cs +++ b/src/UIKit/UIAppearance.cs @@ -17,10 +17,6 @@ namespace UIKit { public partial class UIAppearance { -#if !XAMCORE_2_0 - public readonly static IntPtr SelectorAppearance = Selector.GetHandle ("appearance"); -#endif - public override bool Equals (object other) { UIAppearance ao = other as UIAppearance; diff --git a/src/UIKit/UIControl.cs b/src/UIKit/UIControl.cs index 5b8fa4adb8e2..e4fc1e47b5c2 100644 --- a/src/UIKit/UIControl.cs +++ b/src/UIKit/UIControl.cs @@ -47,27 +47,15 @@ protected override void Dispose (bool disposing) } public partial class UIControl { -#if XAMCORE_2_0 static ConditionalWeakTable>> allTargets = new ConditionalWeakTable>> (); -#else - Dictionary> targets; -#endif - public void AddTarget (EventHandler notification, UIControlEvent events) { -#if XAMCORE_2_0 var targets = allTargets.GetValue (this, k => { MarkDirty (); return new Dictionary> (); }); -#else - if (targets == null) { - targets = new Dictionary> (); - MarkDirty (); - } -#endif Dictionary t; if (!targets.TryGetValue (notification, out t)) { @@ -88,7 +76,6 @@ public void AddTarget (EventHandler notification, UIControlEvent events) public void RemoveTarget (EventHandler notification, UIControlEvent events) { -#if XAMCORE_2_0 Dictionary> targets; if (allTargets == null) @@ -96,10 +83,6 @@ public void RemoveTarget (EventHandler notification, UIControlEvent events) if (!allTargets.TryGetValue (this, out targets)) return; -#else - if (targets == null) - return; -#endif Dictionary t; if (!targets.TryGetValue (notification, out t)) diff --git a/src/UIKit/UIDevice.cs b/src/UIKit/UIDevice.cs index 2f012cfc41f1..81b3bc7e1543 100644 --- a/src/UIKit/UIDevice.cs +++ b/src/UIKit/UIDevice.cs @@ -20,12 +20,5 @@ public bool CheckSystemVersion (int major, int minor) return Runtime.CheckSystemVersion (major, minor, SystemVersion); #endif } - -#if !XAMCORE_2_0 - [Obsolete ("Deprecated in iOS 5.0. Apple now reject application using it the selector is removed and an empty string is returned")] - public virtual string UniqueIdentifier { - get { return string.Empty; } - } -#endif } } diff --git a/src/UIKit/UIEnums.cs b/src/UIKit/UIEnums.cs index f6b74fb9ebcb..3bfcf422ae59 100644 --- a/src/UIKit/UIEnums.cs +++ b/src/UIKit/UIEnums.cs @@ -773,11 +773,7 @@ public enum UIDataDetectorType : ulong { LookupSuggestion = 1 << 6, None = 0, -#if XAMCORE_2_0 All = UInt64.MaxValue -#else - All = UInt32.MaxValue -#endif } // NSInteger -> UIActionSheet.h @@ -914,11 +910,7 @@ public enum UIPopoverArrowDirection : ulong { Left = 1 << 2, Right = 1 << 3, Any = Up | Down | Left | Right, -#if XAMCORE_2_0 Unknown = UInt64.MaxValue -#else - Unknown = UInt32.MaxValue -#endif }; // NSInteger -> UIMenuController.h @@ -1330,7 +1322,7 @@ public enum UICollectionElementKindSection { } // uint64_t -> UIAccessibilityConstants.h - // note: IMO not really worth changing to ulong in XAMCORE_2_0 + // note: IMO not really worth changing to ulong for backwards compatibility concerns // This is not an enum in ObjC but several fields exported (and we have them too) // Unit tests (ViewTest.cs) already ensure we expose the same value as iOS returns [Flags] @@ -1421,11 +1413,7 @@ public enum UIBarPosition : long { public enum UICollisionBehaviorMode : ulong { Items = 1, Boundaries = 2, -#if XAMCORE_2_0 Everything = UInt64.MaxValue -#else - Everything = UInt32.MaxValue -#endif } // uint32_t -> UIFontDescriptor.h diff --git a/src/UIKit/UIFont.cs b/src/UIKit/UIFont.cs index bf0c7dfbc359..b18409e5c554 100644 --- a/src/UIKit/UIFont.cs +++ b/src/UIKit/UIFont.cs @@ -15,12 +15,6 @@ namespace UIKit { public partial class UIFont { -#if !XAMCORE_2_0 - [Obsolete ("This constructor does not return a valid, default, instance", true)] - public UIFont () - { - } -#endif public override string ToString () { return String.Format ("{0} {1}", Name, PointSize); diff --git a/src/UIKit/UIFontDescriptor.cs b/src/UIKit/UIFontDescriptor.cs index 69765a0b7ea4..3fb2c3c0c6c9 100644 --- a/src/UIKit/UIFontDescriptor.cs +++ b/src/UIKit/UIFontDescriptor.cs @@ -99,22 +99,6 @@ public CGAffineTransform? Matrix { } } -#if !XAMCORE_2_0 - public NSDictionary Variation { - get { - return GetNSDictionary (UIFontDescriptor.VariationAttribute); - } - set { - if (value == null){ - RemoveValue (UIFontDescriptor.VariationAttribute); - return; - } - - Dictionary [UIFontDescriptor.VariationAttribute] = value; - } - } -#endif - public NSCharacterSet CharacterSet { get { return Dictionary [UIFontDescriptor.CharacterSetAttribute] as NSCharacterSet; @@ -365,14 +349,6 @@ public NSString TextStyle { } } -#if !XAMCORE_2_0 - public NSDictionary Variation { - get { - return GetObject (UIFontDescriptor.VariationAttribute) as NSDictionary; - } - } -#endif - public NSCharacterSet CharacterSet { get { return GetObject (UIFontDescriptor.CharacterSetAttribute) as NSCharacterSet; diff --git a/src/UIKit/UIGestureRecognizer.cs b/src/UIKit/UIGestureRecognizer.cs index 9ef4b782084d..132585919312 100644 --- a/src/UIKit/UIGestureRecognizer.cs +++ b/src/UIKit/UIGestureRecognizer.cs @@ -25,10 +25,7 @@ public partial class UIGestureRecognizer { Dictionary recognizers = new Dictionary (); const string tsel = "target"; internal const string parametrized_selector = "target:"; -#if !XAMCORE_2_0 - [Obsolete ("Don't use, this field has been removed the Unified API. Use 'Selector.GetHandle ()' instead.")] - public static Selector ParametrizedSelector = new Selector ("target:"); -#endif + [DesignatedInitializer] public UIGestureRecognizer (Action action) : this (Selector.GetHandle (tsel), new ParameterlessDispatch (action)) { diff --git a/src/UIKit/UIGuidedAccessRestriction.cs b/src/UIKit/UIGuidedAccessRestriction.cs index 6d1c4c0ed4ac..b25f23b0c133 100644 --- a/src/UIKit/UIGuidedAccessRestriction.cs +++ b/src/UIKit/UIGuidedAccessRestriction.cs @@ -95,20 +95,6 @@ public static void ConfigureAccessibilityFeatures (UIGuidedAccessAccessibilityFe #endif #endif // !COREBUILD } - -#if !XAMCORE_2_0 - [Obsolete ("Use IUIGuidedAccessRestrictionDelegate")] - public interface IUIGuidedAccessRestriction : INativeObject { - - string [] GetGuidedAccessRestrictionIdentifiers { get; } - - void GuidedAccessRestrictionChangedState (string restrictionIdentifier, UIGuidedAccessRestrictionState newRestrictionState); - - string GetTextForGuidedAccessRestriction (string restrictionIdentifier); - - string GetDetailTextForGuidedAccessRestriction (string restrictionIdentifier); - } -#endif } #endif // !WATCH diff --git a/src/UIKit/UIImage.cs b/src/UIKit/UIImage.cs index dde9dd601c1c..28ae3810e42b 100644 --- a/src/UIKit/UIImage.cs +++ b/src/UIKit/UIImage.cs @@ -87,20 +87,6 @@ public UIImage Scale (CGSize newSize) return scaledImage; } -#if !XAMCORE_2_0 - [Obsolete ("This is identical to FromFile. Caching is done when using FromBundle")] - public static UIImage FromFileUncached (string filename) - { - return FromFile (filename); - } - - [Obsolete ("This always returns null. Use the overload that accept a System.String 'name' instead.")] - public static UIImage CreateAnimatedImage (UIImage [] images, UIEdgeInsets capInsets, double duration) - { - return null; - } -#endif - // required because of GetCallingAssembly (if we ever inline across assemblies) [MethodImpl (MethodImplOptions.NoInlining)] public static UIImage FromResource (Assembly assembly, string name) diff --git a/src/UIKit/UIImagePickerController.cs b/src/UIKit/UIImagePickerController.cs index d6baea22701b..1ad783f6aafc 100644 --- a/src/UIKit/UIImagePickerController.cs +++ b/src/UIKit/UIImagePickerController.cs @@ -19,27 +19,6 @@ namespace UIKit { public partial class UIImagePickerController { - -// the newer (4.1 fields) are defined in uikit.cs -#if !XAMCORE_2_0 - public readonly static NSString MediaType; - public readonly static NSString OriginalImage; - public readonly static NSString EditedImage; - public readonly static NSString CropRect; - public readonly static NSString MediaURL; - - static UIImagePickerController () - { - var handle = Libraries.UIKit.Handle; - - MediaType = Dlfcn.GetStringConstant (handle, "UIImagePickerControllerMediaType"); - OriginalImage = Dlfcn.GetStringConstant (handle, "UIImagePickerControllerOriginalImage"); - EditedImage = Dlfcn.GetStringConstant (handle, "UIImagePickerControllerEditedImage"); - CropRect = Dlfcn.GetStringConstant (handle, "UIImagePickerControllerCropRect"); - MediaURL = Dlfcn.GetStringConstant (handle, "UIImagePickerControllerMediaURL"); - } -#endif - // // The following construct emulates the support for: // id diff --git a/src/UIKit/UINavigationBar.cs b/src/UIKit/UINavigationBar.cs index 953e6738625e..0f2a3a2d6ef2 100644 --- a/src/UIKit/UINavigationBar.cs +++ b/src/UIKit/UINavigationBar.cs @@ -18,24 +18,6 @@ namespace UIKit { public partial class UINavigationBar { - -#if !XAMCORE_2_0 - [Obsolete ("Use TitleTextAttributes property with UIStringAttributes")] - public UITextAttributes GetTitleTextAttributes () - { - return new UITextAttributes (_TitleTextAttributes); - } - - [Obsolete ("Use TitleTextAttributes with UIStringAttributes")] - public void SetTitleTextAttributes (UITextAttributes attributes) - { - if (attributes == null) - throw new ArgumentNullException ("attributes"); - - _TitleTextAttributes = attributes.ToDictionary (); - } -#endif - public partial class UINavigationBarAppearance { public virtual UITextAttributes GetTitleTextAttributes () { diff --git a/src/UIKit/UIPickerView.cs b/src/UIKit/UIPickerView.cs index 058fa7dd3658..d024a238b548 100644 --- a/src/UIKit/UIPickerView.cs +++ b/src/UIKit/UIPickerView.cs @@ -10,18 +10,6 @@ namespace UIKit { public partial class UIPickerView : UIView, IUITableViewDataSource { private UIPickerViewModel model; -#if !XAMCORE_2_0 - [Obsolete ("Use Model instead")] - public UIPickerViewModel Source { - get { - return Model; - } - set { - Model = value; - } - } -#endif - public UIPickerViewModel Model { get { return model; diff --git a/src/UIKit/UIScreen.cs b/src/UIKit/UIScreen.cs index 991048927241..0f2150224c3e 100644 --- a/src/UIKit/UIScreen.cs +++ b/src/UIKit/UIScreen.cs @@ -19,14 +19,6 @@ namespace UIKit { public partial class UIScreen { -#if !XAMCORE_2_0 - [Obsolete ("Use CreateDisplayLink instead")] - CoreAnimation.CADisplayLink DisplayLink (NSObject target, Selector sel) - { - return CreateDisplayLink (target, sel); - } -#endif - public CoreAnimation.CADisplayLink CreateDisplayLink (Action action) { if (action == null) diff --git a/src/UIKit/UITableView.cs b/src/UIKit/UITableView.cs index 0071707ffae5..24ea6cafec52 100644 --- a/src/UIKit/UITableView.cs +++ b/src/UIKit/UITableView.cs @@ -54,29 +54,14 @@ public void RegisterClassForHeaderFooterViewReuse (Type cellType, NSString reuse RegisterClassForHeaderFooterViewReuse (cellType == null ? IntPtr.Zero : Class.GetHandle (cellType), reuseIdentifier); } -#if !XAMCORE_2_0 - [Obsolete ("Use RegisterNibForCellReuse")] - public void RegisterNibforCellReuse (UINib nib, string reuseIdentifier) - { - RegisterNibForCellReuse (nib, reuseIdentifier); - } -#endif - // This is not obsolete, we provide both a (UINib,string) overload and a (UINib,NSString) overload. // The difference is that in Unified the overridable method is the (UINib,NSString) overload to // be consistent with other API taking a reuseIdentifier. -#if XAMCORE_2_0 public void RegisterNibForCellReuse (UINib nib, string reuseIdentifier) { using (var str = (NSString) reuseIdentifier) RegisterNibForCellReuse (nib, str); } -#else - public void RegisterNibForCellReuse (UINib nib, NSString reuseIdentifier) - { - RegisterNibForCellReuse (nib, (string) reuseIdentifier); - } -#endif public UITableViewCell DequeueReusableCell (string reuseIdentifier, NSIndexPath indexPath) { @@ -93,18 +78,11 @@ public UITableViewHeaderFooterView DequeueReusableHeaderFooterView (string reuse // This is not obsolete, we provide both a (UINib,string) overload and a (UINib,NSString) overload. // The difference is that in Unified the overridable method is the (UINib,NSString) overload to // be consistent with other API taking a reuseIdentifier. -#if XAMCORE_2_0 public void RegisterNibForHeaderFooterViewReuse (UINib nib, string reuseIdentifier) { using (var str = (NSString) reuseIdentifier) RegisterNibForHeaderFooterViewReuse (nib, str); } -#else - public virtual void RegisterNibForHeaderFooterViewReuse (UINib nib, NSString reuseIdentifier) - { - RegisterNibForHeaderFooterViewReuse (nib, (string) reuseIdentifier); - } -#endif } } #endif // !WATCH diff --git a/src/UIKit/UITextField.cs b/src/UIKit/UITextField.cs index d0ad89f90584..a86986d8a07d 100644 --- a/src/UIKit/UITextField.cs +++ b/src/UIKit/UITextField.cs @@ -41,7 +41,6 @@ internal virtual _UITextFieldDelegate CreateInternalEventDelegateType () internal _UITextFieldDelegate EnsureUITextFieldDelegate () { -#if XAMCORE_2_0 if (Delegate != null) UIApplication.EnsureEventAndDelegateAreNotMismatched (Delegate, GetInternalEventDelegateType); _UITextFieldDelegate del = Delegate as _UITextFieldDelegate; @@ -50,23 +49,11 @@ internal _UITextFieldDelegate EnsureUITextFieldDelegate () Delegate = (IUITextFieldDelegate)del; } return del; -#else - var del = Delegate; - if (del == null || (!(del is _UITextFieldDelegate))){ - del = new _UITextFieldDelegate (); - Delegate = del; - } - return (_UITextFieldDelegate) del; -#endif } #pragma warning disable 672 [Register] -#if XAMCORE_2_0 internal class _UITextFieldDelegate : NSObject, IUITextFieldDelegate { -#else - internal class _UITextFieldDelegate : UITextFieldDelegate { -#endif public _UITextFieldDelegate () { IsDirectBinding = false; } internal EventHandler editingEnded; diff --git a/src/UIKit/UITypes.cs b/src/UIKit/UITypes.cs index 1442938f12ee..defda6bc89cf 100644 --- a/src/UIKit/UITypes.cs +++ b/src/UIKit/UITypes.cs @@ -146,11 +146,7 @@ public override int GetHashCode () public static UIFloatRange Zero; [Field ("UIFloatRangeInfinite")] // fake (but helps testing and could also help documentation) -#if !XAMCORE_2_0 - public static UIFloatRange Infinite = new UIFloatRange (float.NegativeInfinity, float.PositiveInfinity); -#else public static UIFloatRange Infinite = new UIFloatRange (nfloat.NegativeInfinity, nfloat.PositiveInfinity); -#endif } #endif diff --git a/src/UIKit/UIView.cs b/src/UIKit/UIView.cs index 6930e1c69c79..25bddeb46870 100644 --- a/src/UIKit/UIView.cs +++ b/src/UIKit/UIView.cs @@ -47,19 +47,6 @@ public static void BeginAnimations (string animation) { BeginAnimations (animation, IntPtr.Zero); } - -#if !XAMCORE_2_0 - [CompilerGenerated] - [iOS (4,2)] - public virtual bool EnableInputClicksWhenVisible { - [iOS (4,2)] - [Export ("enableInputClicksWhenVisible")] - get { - global::MonoTouch.UIKit.UIApplication.EnsureUIThread (); - return false; - } - } -#endif [Register] class _UIViewStaticCallback : NSObject { @@ -157,21 +144,6 @@ public static void Transition (UIView withView, double duration, UIViewAnimation }); } -#if !XAMCORE_2_0 - [Advice ("Use the version with a 'ref float actualFontSize'.")] - public CGSize DrawString (string str, CGPoint point, nfloat width, UIKit.UIFont font, nfloat minFontSize, nfloat actualFontSize, UIKit.UILineBreakMode breakMode, UIKit.UIBaselineAdjustment adjustment) - { - nfloat temp = actualFontSize; - return DrawString (str, point, width, font, minFontSize, ref temp, breakMode, adjustment); - } - - [Obsolete ("Use 'TranslatesAutoresizingMaskIntoConstraints'.")] - bool TranslatesAutoresizingMaskIntoConstrainst { - get { return TranslatesAutoresizingMaskIntoConstraints; } - set { TranslatesAutoresizingMaskIntoConstraints = value; } - } -#endif - public static Task AnimateAsync (double duration, Action animation) { return AnimateNotifyAsync (duration, animation); diff --git a/src/UIKit/UIWindow.cs b/src/UIKit/UIWindow.cs index 2973489ebdfc..8f37e93a28ba 100644 --- a/src/UIKit/UIWindow.cs +++ b/src/UIKit/UIWindow.cs @@ -17,17 +17,6 @@ namespace UIKit { public partial class UIWindow { -#if !XAMCORE_2_0 - // we already have a UIWindowLevel static class for the constants - [Obsolete ("Use UIWindowLevel.Normal")] - public const float LevelNormal = 0f; - - [Obsolete ("Use UIWindowLevel.Alert")] - public const float LevelAlert = 100f; - - [Obsolete ("Use UIWindowLevel.StatusBar")] - public const float LevelStatusBar = 1000f; -#endif #if !XAMCORE_4_0 // duplicates from UIKeyboard without a [Notification] diff --git a/src/UserNotifications/UNNotificationAttachment.cs b/src/UserNotifications/UNNotificationAttachment.cs index bf708ef77adb..6224cf3e6f8c 100644 --- a/src/UserNotifications/UNNotificationAttachment.cs +++ b/src/UserNotifications/UNNotificationAttachment.cs @@ -7,7 +7,7 @@ // Copyright 2016 Xamarin Inc. All rights reserved. // -#if XAMCORE_2_0 && !TVOS +#if !TVOS using System; using Foundation; @@ -20,5 +20,5 @@ public static UNNotificationAttachment FromIdentifier (string identifier, NSUrl } } } -#endif // XAMCORE_2_0 && !TVOS +#endif // !TVOS diff --git a/src/VideoToolbox/VTCompressionProperties.cs b/src/VideoToolbox/VTCompressionProperties.cs index a8ad8eb0bb06..f98538402da0 100644 --- a/src/VideoToolbox/VTCompressionProperties.cs +++ b/src/VideoToolbox/VTCompressionProperties.cs @@ -321,13 +321,8 @@ public List DataRateLimits { var list = new List (); for (nuint i = 0; i < (nuint)arr.Count; i += 2) { var rateLimit = new VTDataRateLimit ( -#if XAMCORE_2_0 arr.GetItem (i).UInt32Value, arr.GetItem (i + 1).DoubleValue -#else - arr.GetItem ((nint)i).UInt32Value, - arr.GetItem ((nint)(i + 1)).DoubleValue -#endif ); list.Add (rateLimit); } @@ -384,7 +379,7 @@ public VTFieldDetail FieldDetail { } } } -#if XAMCORE_2_0 + public VTColorPrimaries ColorPrimaries { get { var key = GetNSStringValue (VTCompressionPropertyKey.ColorPrimaries); @@ -421,7 +416,6 @@ public VTColorPrimaries ColorPrimaries { } } } -#endif public VTTransferFunction TransferFunction { get { diff --git a/src/VideoToolbox/VTPixelTransferProperties.cs b/src/VideoToolbox/VTPixelTransferProperties.cs index 4603b7a39355..3db4b216fec0 100644 --- a/src/VideoToolbox/VTPixelTransferProperties.cs +++ b/src/VideoToolbox/VTPixelTransferProperties.cs @@ -84,7 +84,6 @@ public VTDownsamplingMode DownsamplingMode { } } -#if XAMCORE_2_0 [iOS (10,0)] public VTColorPrimaries DestinationColorPrimaries { get { @@ -122,7 +121,6 @@ public VTColorPrimaries DestinationColorPrimaries { } } } -#endif [iOS (10,0)] public VTTransferFunction DestinationTransferFunction { diff --git a/src/Vision/VNBarcodeSymbologyExtensions.cs b/src/Vision/VNBarcodeSymbologyExtensions.cs index c81da5c9f663..74b9c9d0fc1a 100644 --- a/src/Vision/VNBarcodeSymbologyExtensions.cs +++ b/src/Vision/VNBarcodeSymbologyExtensions.cs @@ -7,7 +7,6 @@ // Copyright 2017 Xamarin Inc. All rights reserved. // -#if XAMCORE_2_0 using System; using Foundation; @@ -36,4 +35,3 @@ public static VNBarcodeSymbology [] GetValues (NSString [] constants) } } } -#endif diff --git a/src/Vision/VNDetectBarcodesRequest.cs b/src/Vision/VNDetectBarcodesRequest.cs index d29e7bcf10b0..4e57b5dd69f5 100644 --- a/src/Vision/VNDetectBarcodesRequest.cs +++ b/src/Vision/VNDetectBarcodesRequest.cs @@ -7,7 +7,6 @@ // Copyright 2017 Xamarin Inc. All rights reserved. // -#if XAMCORE_2_0 using System; namespace Vision { @@ -19,4 +18,3 @@ public VNBarcodeSymbology [] Symbologies { } } } -#endif diff --git a/src/Vision/VNFaceLandmarkRegion2D.cs b/src/Vision/VNFaceLandmarkRegion2D.cs index f26555d8396f..d3d37f6122a5 100644 --- a/src/Vision/VNFaceLandmarkRegion2D.cs +++ b/src/Vision/VNFaceLandmarkRegion2D.cs @@ -7,8 +7,6 @@ // Copyright 2017 Xamarin Inc. All rights reserved. // -#if XAMCORE_2_0 - using System; using CoreGraphics; @@ -51,4 +49,3 @@ public virtual CGPoint [] GetPointsInImage (CGSize imageSize) } } } -#endif diff --git a/src/Vision/VNRequest.cs b/src/Vision/VNRequest.cs index 4ca7adbfea77..7cad34766128 100644 --- a/src/Vision/VNRequest.cs +++ b/src/Vision/VNRequest.cs @@ -7,8 +7,6 @@ // Copyright 2017 Xamarin Inc. All rights reserved. // -#if XAMCORE_2_0 - using System; using Foundation; using ObjCRuntime; @@ -26,4 +24,3 @@ public virtual T [] GetResults () where T : VNObservation } } } -#endif diff --git a/src/Vision/VNRequestRevision.cs b/src/Vision/VNRequestRevision.cs index 4f6afbbef648..496aee1d4ebb 100644 --- a/src/Vision/VNRequestRevision.cs +++ b/src/Vision/VNRequestRevision.cs @@ -7,8 +7,6 @@ // Copyright 2018 Microsoft Corporation. // -#if XAMCORE_2_0 - using System; using Foundation; using ObjCRuntime; @@ -40,4 +38,3 @@ internal static T [] GetSupportedVersions (NSIndexSet indexSet) where T : str } } } -#endif diff --git a/src/Vision/VNUtils.cs b/src/Vision/VNUtils.cs index 51b28b5da5d1..0a5eabb2f666 100644 --- a/src/Vision/VNUtils.cs +++ b/src/Vision/VNUtils.cs @@ -7,8 +7,6 @@ // Copyright 2017 Xamarin Inc. All rights reserved. // -#if XAMCORE_2_0 - using System; using System.Runtime.InteropServices; using CoreGraphics; @@ -71,4 +69,3 @@ public static CGPoint GetImagePoint (Vector2 faceLandmarkPoint, CGRect faceBound public static nuint GetElementTypeSize (VNElementType elementType) => VNElementTypeSize ((nuint) (ulong) elementType); } } -#endif diff --git a/src/WKWebKit/Defs.cs b/src/WKWebKit/Defs.cs index bf74dd244f02..c48cde09c5c5 100644 --- a/src/WKWebKit/Defs.cs +++ b/src/WKWebKit/Defs.cs @@ -91,11 +91,7 @@ public enum WKDataDetectorTypes : ulong { FlightNumber = 1 << 5, LookupSuggestion = 1 << 6, SpotlightSuggestion = LookupSuggestion, -#if XAMCORE_2_0 All = UInt64.MaxValue -#else - All = UInt32.MaxValue -#endif } [iOS (10,0)][Mac (10,12)] @@ -105,10 +101,6 @@ public enum WKAudiovisualMediaTypes : ulong { None = 0, Audio = 1 << 0, Video = 1 << 1, -#if XAMCORE_2_0 All = UInt64.MaxValue -#else - All = UInt32.MaxValue -#endif } } diff --git a/src/WKWebKit/WKWindowFeatures.cs b/src/WKWebKit/WKWindowFeatures.cs index 5a7b5cb27412..4ddd20dde4ea 100644 --- a/src/WKWebKit/WKWindowFeatures.cs +++ b/src/WKWebKit/WKWindowFeatures.cs @@ -13,7 +13,6 @@ namespace WebKit { -#if XAMCORE_2_0 || !MONOMAC public partial class WKWindowFeatures { public bool? MenuBarVisibility { @@ -58,5 +57,4 @@ public nfloat? Height { get { return NFloatValue (height); } } } -#endif } diff --git a/src/WebKit/Enums.cs b/src/WebKit/Enums.cs index 97340f9c7b3b..b4a9ab0848ee 100644 --- a/src/WebKit/Enums.cs +++ b/src/WebKit/Enums.cs @@ -79,11 +79,7 @@ public enum WebDragSourceAction : ulong { Image = 2, Link = 4, Selection = 8, -#if XAMCORE_2_0 Any = UInt64.MaxValue -#else - Any = UInt32.MaxValue -#endif } [Flags] @@ -93,11 +89,7 @@ public enum WebDragDestinationAction : ulong { Image = 2, Link = 4, Selection = 8, -#if XAMCORE_2_0 Any = UInt64.MaxValue -#else - Any = UInt32.MaxValue -#endif } #if !XAMCORE_4_0 diff --git a/src/WebKit/WebKit.cs b/src/WebKit/WebKit.cs index 50d1496655c5..bdba3eed9467 100644 --- a/src/WebKit/WebKit.cs +++ b/src/WebKit/WebKit.cs @@ -8,13 +8,4 @@ public void LoadHtmlString (string htmlString, NSUrl baseUrl) LoadHtmlString ((NSString) htmlString, baseUrl); } } - -#if !XAMCORE_2_0 - public partial class WebScriptObject { - public void SetWebScriptValueAtIndex (int /* unsigned int */ index, NSObject value) - { - SetWebScriptValueAtIndexvalue (index, value); - } - } -#endif } diff --git a/src/bgen/bgen.csproj b/src/bgen/bgen.csproj index fcebddf9e6ca..57fbe7a6b51d 100644 --- a/src/bgen/bgen.csproj +++ b/src/bgen/bgen.csproj @@ -313,7 +313,6 @@ - diff --git a/src/frameworks.sources b/src/frameworks.sources index 3e8167a59977..6829f2119e17 100644 --- a/src/frameworks.sources +++ b/src/frameworks.sources @@ -1698,16 +1698,12 @@ SHARED_CORE_SOURCES = \ MonoPInvokeCallbackAttribute.cs \ $(BUILD_DIR)/common/NativeTypes/Drawing.cs \ $(BUILD_DIR)/common/NativeTypes/Primitives.cs \ - ObjCRuntime/AlphaAttribute.cs \ ObjCRuntime/ArgumentSemantic.cs \ ObjCRuntime/BindAsAttribute.cs \ ObjCRuntime/Blocks.cs \ ObjCRuntime/Class.cs \ ObjCRuntime/INativeObject.cs \ ObjCRuntime/LinkWithAttribute.cs \ - ObjCRuntime/Messaging.iOS.cs \ - ObjCRuntime/Messaging.mac.cs \ - ObjCRuntime/Messaging.watch.cs \ ObjCRuntime/NativeAttribute.cs \ ObjCRuntime/PlatformAvailability.cs \ ObjCRuntime/PlatformAvailability2.cs \ @@ -1736,7 +1732,6 @@ SHARED_SOURCES = \ ObjCRuntime/BindingImplAttribute.cs \ ObjCRuntime/CategoryAttribute.cs \ ObjCRuntime/Class.mac.cs \ - ObjCRuntime/CompileFlagsAttribute.cs \ ObjCRuntime/DelayedRegistrationAttribute.cs \ ObjCRuntime/DesignatedInitializerAttribute.cs \ ObjCRuntime/Dlfcn.cs \ @@ -1745,8 +1740,6 @@ SHARED_SOURCES = \ ObjCRuntime/Exceptions.cs \ ObjCRuntime/ExceptionMode.cs \ ObjCRuntime/Method.cs \ - ObjCRuntime/MethodDescription.cs \ - ObjCRuntime/NSStringMarshal.cs \ ObjCRuntime/ObjectWrapper.cs \ ObjCRuntime/Registrar.cs \ ObjCRuntime/ReleaseAttribute.cs \ @@ -1756,7 +1749,6 @@ SHARED_SOURCES = \ ObjCRuntime/Runtime.mac.cs \ ObjCRuntime/RuntimeException.cs \ ObjCRuntime/RuntimeOptions.cs \ - ObjCRuntime/Selector.iOS.cs \ ObjCRuntime/Selector.mac.cs \ ObjCRuntime/SelectorMarshaler.cs \ ObjCRuntime/Stret.cs \ diff --git a/src/generator.cs b/src/generator.cs index 980e40ed4e1d..049a760dc10d 100644 --- a/src/generator.cs +++ b/src/generator.cs @@ -2273,9 +2273,9 @@ public void Go () print (m, "namespace {0} {{", ns.ObjCRuntime); print (m, "\tpartial class Messaging {"); + print (m, "\t\tinternal const string LIBOBJC_DYLIB = \"/usr/lib/libobjc.dylib\";\n"); if (BindThirdPartyLibrary){ print (m, "\t\tstatic internal System.Reflection.Assembly this_assembly = typeof (Messaging).Assembly;\n"); - print (m, "\t\tconst string LIBOBJC_DYLIB = \"/usr/lib/libobjc.dylib\";\n"); // IntPtr_objc_msgSend[Super]: for init print (m, "\t\t[DllImport (LIBOBJC_DYLIB, EntryPoint=\"objc_msgSend\")]"); print (m, "\t\tpublic extern static IntPtr IntPtr_objc_msgSend (IntPtr receiever, IntPtr selector);"); diff --git a/src/generator.csproj b/src/generator.csproj index dbe3bb3265d0..3e180796a983 100644 --- a/src/generator.csproj +++ b/src/generator.csproj @@ -375,7 +375,6 @@ - diff --git a/src/passkit.cs b/src/passkit.cs index d7f3a42d7314..726deb1167d7 100644 --- a/src/passkit.cs +++ b/src/passkit.cs @@ -29,18 +29,14 @@ interface PKContact : NSSecureCoding [NullAllowed, Export ("name", ArgumentSemantic.Strong)] NSPersonNameComponents Name { get; set; } -#if XAMCORE_2_0 // The Contacts framework (CNPostalAddress) uses generics heavily, which is only supported in Unified (for now at least) [NullAllowed, Export ("postalAddress", ArgumentSemantic.Retain)] CNPostalAddress PostalAddress { get; set; } -#endif // XAMCORE_2_0 [NullAllowed, Export ("emailAddress", ArgumentSemantic.Strong)] string EmailAddress { get; set; } -#if XAMCORE_2_0 // The Contacts framework (CNPhoneNumber) uses generics heavily, which is only supported in Unified (for now at least) [NullAllowed, Export ("phoneNumber", ArgumentSemantic.Strong)] CNPhoneNumber PhoneNumber { get; set; } -#endif // XAMCORE_2_0 [iOS (9,2)] [Deprecated (PlatformName.iOS, 10,3, message:"Use 'SubLocality' and 'SubAdministrativeArea' on 'PostalAddress' instead.")] @@ -244,10 +240,6 @@ interface PKPayment { delegate void PKPaymentShippingAddressSelected (PKPaymentAuthorizationStatus status, PKShippingMethod [] shippingMethods, PKPaymentSummaryItem [] summaryItems); delegate void PKPaymentShippingMethodSelected (PKPaymentAuthorizationStatus status, PKPaymentSummaryItem[] summaryItems); -#if !XAMCORE_2_0 - delegate void PKPaymentAuthorizationHandler (PKPaymentAuthorizationStatus status); -#endif - [Protocol, Model] [BaseType (typeof (NSObject))] interface PKPaymentAuthorizationViewControllerDelegate { @@ -258,12 +250,7 @@ interface PKPaymentAuthorizationViewControllerDelegate { #if !XAMCORE_4_0 [Abstract] #endif - void DidAuthorizePayment (PKPaymentAuthorizationViewController controller, PKPayment payment, -#if XAMCORE_2_0 - Action completion); -#else - PKPaymentAuthorizationHandler completion); -#endif + void DidAuthorizePayment (PKPaymentAuthorizationViewController controller, PKPayment payment, Action completion); [iOS (11,0)] [Export ("paymentAuthorizationViewController:didAuthorizePayment:handler:")] @@ -492,12 +479,10 @@ interface PKPaymentRequest { [Export ("paymentShippingAddressInvalidErrorWithKey:localizedDescription:")] NSError CreatePaymentShippingAddressInvalidError (NSString postalAddressKey, [NullAllowed] string localizedDescription); -#if XAMCORE_2_0 [Watch (4,0)][iOS (11,0)] [Static] [Wrap ("CreatePaymentShippingAddressInvalidError (postalAddress.GetConstant ()!, localizedDescription)")] NSError CreatePaymentShippingAddressInvalidError (CNPostalAddressKeyOption postalAddress, [NullAllowed] string localizedDescription); -#endif [Watch (4,0)][iOS (11,0)] [Static] @@ -505,12 +490,10 @@ interface PKPaymentRequest { [Export ("paymentBillingAddressInvalidErrorWithKey:localizedDescription:")] NSError CreatePaymentBillingAddressInvalidError (NSString postalAddressKey, [NullAllowed] string localizedDescription); -#if XAMCORE_2_0 [Watch (4,0)][iOS (11,0)] [Static] [Wrap ("CreatePaymentBillingAddressInvalidError (postalAddress.GetConstant ()!, localizedDescription)")] NSError CreatePaymentBillingAddressInvalidError (CNPostalAddressKeyOption postalAddress, [NullAllowed] string localizedDescription); -#endif [Watch (4,0)][iOS (11,0)] [Static] diff --git a/src/pdfkit.cs b/src/pdfkit.cs index f188f198eceb..8043cf78c87e 100644 --- a/src/pdfkit.cs +++ b/src/pdfkit.cs @@ -26,7 +26,7 @@ // // PdfKit.cs: Bindings for the PdfKit API // -#if MONOMAC || (IOS && XAMCORE_2_0) +#if MONOMAC || IOS using System; #if MONOMAC @@ -454,9 +454,7 @@ interface PdfAppearanceCharacteristics : NSCopying { [iOS (11,0)] [BaseType (typeof (NSObject), Name = "PDFAction")] -#if XAMCORE_2_0 [Abstract] -#endif interface PdfAction : NSCopying { //This is an abstract superclass with no public init - should it have a private constructor?? //As it is, I can create instances, that segfault when you access the type method. @@ -980,11 +978,7 @@ interface PdfAnnotationLink { [BaseType (typeof (PdfAnnotation), Name = "PDFAnnotationMarkup")] interface PdfAnnotationMarkup { [Export ("quadrilateralPoints", ArgumentSemantic.Assign), NullAllowed] -#if XAMCORE_2_0 NSArray WeakQuadrilateralPoints { get; set; } -#else - NSArray QuadrilateralPoints { get; set; } -#endif [Export ("markupType")] PdfMarkupType MarkupType { get; set; } @@ -1067,11 +1061,7 @@ interface PdfBorder : NSCoding, NSCopying { nfloat LineWidth { get; set; } [Export ("dashPattern", ArgumentSemantic.Assign), NullAllowed] -#if XAMCORE_2_0 NSArray WeakDashPattern { get; set; } -#else - NSArray DashPattern { get; set; } -#endif [Mac (10,13)] [Export ("borderKeyValues", ArgumentSemantic.Copy)] @@ -2046,4 +2036,4 @@ interface PdfViewDelegate { } } -#endif // MONOMAC || (IOS && XAMCORE_2_0) +#endif // MONOMAC || IOS diff --git a/src/photos.cs b/src/photos.cs index ea6d1df3cea4..c2ee062b241a 100644 --- a/src/photos.cs +++ b/src/photos.cs @@ -1043,9 +1043,7 @@ interface PHObjectPlaceholder { [BaseType (typeof (NSObject))] interface PHPhotoLibraryChangeObserver { -#if XAMCORE_2_0 [Abstract] -#endif [Export ("photoLibraryDidChange:")] void PhotoLibraryDidChange (PHChange changeInstance); } @@ -1232,13 +1230,11 @@ interface PHLivePhotoEditingContext { [Wrap ("_PrepareLivePhotoForPlayback (targetSize, (options as NSDictionary), handler)", IsVirtual = true)] void PrepareLivePhotoForPlayback (CGSize targetSize, [NullAllowed] NSDictionary options, Action handler); -#if XAMCORE_2_0 // the API existed earlier but the key needed to create the strong dictionary did not work [iOS (11,0)][TV (11,0)][Mac (10,12)] [Async] [Wrap ("_PrepareLivePhotoForPlayback (targetSize, options.GetDictionary (), handler)")] void PrepareLivePhotoForPlayback (CGSize targetSize, [NullAllowed] PHLivePhotoEditingOption options, Action handler); -#endif [Internal] [Export ("saveLivePhotoToOutput:options:completionHandler:")] @@ -1252,13 +1248,11 @@ interface PHLivePhotoEditingContext { [Wrap ("_SaveLivePhoto (output, options, handler)", IsVirtual = true)] void SaveLivePhoto (PHContentEditingOutput output, [NullAllowed] NSDictionary options, Action handler); -#if XAMCORE_2_0 // the API existed earlier but the key needed to create the strong dictionary did not work [iOS (11,0)][TV (11,0)][Mac (10,12)] [Async] [Wrap ("_SaveLivePhoto (output, options.GetDictionary (), handler)")] void SaveLivePhoto (PHContentEditingOutput output, [NullAllowed] PHLivePhotoEditingOption options, Action handler); -#endif [Export ("cancel")] void Cancel (); @@ -1288,7 +1282,6 @@ interface PHLivePhotoFrame { nfloat RenderScale { get; } } -#if XAMCORE_2_0 // fails to build with mac/classic [iOS (11,0)] [TV (11,0)] [Mac (10,12)] @@ -1305,7 +1298,6 @@ interface PHLivePhotoEditingOptionKeys { interface PHLivePhotoEditingOption { bool ShouldRenderAtPlaybackTime { get; } } -#endif [Mac (10,13)] [NoiOS][NoTV] diff --git a/src/scenekit.cs b/src/scenekit.cs index 007ceb9b19af..72af65af49c7 100644 --- a/src/scenekit.cs +++ b/src/scenekit.cs @@ -53,8 +53,7 @@ using CoreGraphics; using SpriteKit; -// MonoMac (classic) does not support those 64bits only frameworks -#if (XAMCORE_2_0 || !MONOMAC) && !WATCH +#if !WATCH using ModelIO; using Metal; using GameplayKit; @@ -138,9 +137,7 @@ interface ISCNAnimatable {} [Model, Protocol] [BaseType (typeof (NSObject))] interface SCNAnimatable { -#if XAMCORE_2_0 [Abstract] -#endif [NoWatch] [Export ("addAnimation:forKey:")] #if !XAMCORE_4_0 @@ -149,34 +146,25 @@ interface SCNAnimatable { void AddAnimation (ISCNAnimationProtocol scnAnimation, [NullAllowed] string key); #endif -#if XAMCORE_2_0 #if XAMCORE_4_0 [Abstract] #endif [iOS (11,0), TV (11,0), Watch (4,0), Mac (10,13)] [Export ("addAnimationPlayer:forKey:")] void AddAnimation (SCNAnimationPlayer player, [NullAllowed] NSString key); -#endif -#if XAMCORE_2_0 [Abstract] -#endif [Export ("removeAllAnimations")] void RemoveAllAnimations (); -#if XAMCORE_2_0 [Abstract] -#endif [Export ("removeAnimationForKey:")] void RemoveAnimation (NSString key); -#if XAMCORE_2_0 [Abstract] -#endif [Export ("animationKeys")] NSString [] GetAnimationKeys (); -#if XAMCORE_2_0 #if XAMCORE_4_0 [Abstract] #endif @@ -184,11 +172,8 @@ interface SCNAnimatable { [iOS (11,0), TV (11,0), Watch (4,0), Mac (10,13)] [Export ("animationPlayerForKey:")] SCNAnimationPlayer GetAnimationPlayer (NSString key); -#endif -#if XAMCORE_2_0 [Abstract] -#endif [Deprecated (PlatformName.TvOS, 11, 0, message: "Use 'GetAnimationPlayer' instead.")] [Deprecated (PlatformName.iOS, 11, 0, message: "Use 'GetAnimationPlayer' instead.")] [Deprecated (PlatformName.MacOSX, 10, 13,message: "Use 'GetAnimationPlayer' instead.")] @@ -196,9 +181,7 @@ interface SCNAnimatable { [Export ("animationForKey:")] CAAnimation GetAnimation (NSString key); -#if XAMCORE_2_0 [Abstract] -#endif [Deprecated (PlatformName.WatchOS, 4, 0, message: "Use 'SCNAnimationPlayer.Paused' instead.")] [Deprecated (PlatformName.TvOS, 11, 0, message: "Use 'SCNAnimationPlayer.Paused' instead.")] [Deprecated (PlatformName.iOS, 11, 0, message: "Use 'SCNAnimationPlayer.Paused' instead.")] @@ -207,9 +190,7 @@ interface SCNAnimatable { [Export ("pauseAnimationForKey:")] void PauseAnimation (NSString key); -#if XAMCORE_2_0 [Abstract] -#endif [Deprecated (PlatformName.WatchOS, 4, 0, message: "Use 'SCNAnimationPlayer.Paused' instead.")] [Deprecated (PlatformName.TvOS, 11, 0, message: "Use 'SCNAnimationPlayer.Paused' instead.")] [Deprecated (PlatformName.iOS, 11, 0, message: "Use 'SCNAnimationPlayer.Paused' instead.")] @@ -218,9 +199,7 @@ interface SCNAnimatable { [Export ("resumeAnimationForKey:")] void ResumeAnimation (NSString key); -#if XAMCORE_2_0 [Abstract] -#endif [Watch (3, 0)] [Deprecated (PlatformName.WatchOS, 4, 0, message: "Use 'SCNAnimationPlayer.Paused' instead.")] [TV (9, 0)] @@ -232,9 +211,7 @@ interface SCNAnimatable { [Export ("isAnimationForKeyPaused:")] bool IsAnimationPaused (NSString key); -#if XAMCORE_2_0 [Abstract] -#endif [Deprecated (PlatformName.WatchOS, 4, 0, message: "Use 'RemoveAnimationUsingBlendOutDuration' instead.")] [Deprecated (PlatformName.TvOS, 11, 0, message: "Use 'RemoveAnimationUsingBlendOutDuration' instead.")] [Deprecated (PlatformName.iOS, 11, 0, message: "Use 'RemoveAnimationUsingBlendOutDuration' instead.")] @@ -340,9 +317,7 @@ interface SCNAudioSource : NSCopying, NSSecureCoding [Model, Protocol] [BaseType (typeof (NSObject))] interface SCNBoundingVolume { -#if XAMCORE_2_0 [Abstract] -#endif [Export ("getBoundingBoxMin:max:")] bool GetBoundingBox (ref SCNVector3 min, ref SCNVector3 max); @@ -351,9 +326,7 @@ interface SCNBoundingVolume { [Export ("setBoundingBoxMin:max:")] void SetBoundingBox (ref SCNVector3 min, ref SCNVector3 max); -#if XAMCORE_2_0 [Abstract] -#endif [Export ("getBoundingSphereCenter:radius:")] bool GetBoundingSphere (ref SCNVector3 center, ref nfloat radius); } @@ -552,7 +525,6 @@ interface SCNCamera : SCNAnimatable, SCNTechniqueSupport, NSCopying, NSSecureCod [Export ("categoryBitMask")] nuint CategoryBitMask { get; set; } -#if XAMCORE_2_0 [NoWatch] [iOS (9,0), Mac(10,11)] [Static] @@ -614,7 +586,6 @@ interface SCNCamera : SCNAnimatable, SCNTechniqueSupport, NSCopying, NSSecureCod [Watch (4, 0), TV (11, 0), Mac (10, 13), iOS (11, 0)] [Export ("screenSpaceAmbientOcclusionNormalThreshold")] nfloat ScreenSpaceAmbientOcclusionNormalThreshold { get; set; } -#endif [Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)] [Export ("projectionTransformWithViewportSize:")] @@ -952,7 +923,6 @@ interface SCNGeometry : SCNAnimatable, SCNBoundingVolume, SCNShadable, NSCopying [Export ("wantsAdaptiveSubdivision")] bool WantsAdaptiveSubdivision { get; set; } -#if XAMCORE_2_0 [NoWatch] [iOS (9,0), Mac(10,11)] [Static] @@ -963,7 +933,6 @@ interface SCNGeometry : SCNAnimatable, SCNBoundingVolume, SCNShadable, NSCopying [TV (12,0)] [NullAllowed, Export ("tessellator", ArgumentSemantic.Retain)] SCNGeometryTessellator Tessellator { get; set; } -#endif } [Watch (3,0)] @@ -1010,13 +979,11 @@ interface SCNGeometrySource : NSSecureCoding { [Export ("geometrySourceWithTextureCoordinates:count:"), Internal] SCNGeometrySource FromTextureCoordinates (IntPtr texcoords, nint count); -#if XAMCORE_2_0 || !MONOMAC [NoWatch] [iOS (9,0)][Mac (10,11)] [Static] [Export ("geometrySourceWithBuffer:vertexFormat:semantic:vertexCount:dataOffset:dataStride:")] SCNGeometrySource FromMetalBuffer (IMTLBuffer mtlBuffer, MTLVertexFormat vertexFormat, NSString geometrySourceSemantic, nint vertexCount, nint offset, nint stride); -#endif } [Watch (3,0)] @@ -1092,16 +1059,14 @@ interface SCNGeometryElement : NSSecureCoding { [Export ("maximumPointScreenSpaceRadius")] nfloat MaximumPointScreenSpaceRadius { get; set; } -#if XAMCORE_2_0 [NoWatch] [iOS (9,0), Mac(10,11)] [Static] [Export ("geometryElementWithMDLSubmesh:")] SCNGeometryElement FromSubmesh (MDLSubmesh submesh); -#endif } -#if XAMCORE_2_0 && !WATCH +#if !WATCH [NoWatch, Mac (10, 13), iOS (11,0)] [TV (12,0)] [BaseType (typeof(NSObject))] @@ -1163,12 +1128,6 @@ interface SCNHitTest { [Field ("SCNHitTestIgnoreHiddenNodesKey")] NSString IgnoreHiddenNodesKey { get; } -#if !XAMCORE_2_0 // Less preferred name, but let's not break stable API - [Mac (10,9), iOS (8,0)] - [Obsolete ("Use IgnoreHiddenNodesKey")] - [Field ("SCNHitTestIgnoreHiddenNodesKey")] - NSString IgnoreHiddenNodes { get; } -#endif [TV (10, 0), Mac (10, 12), iOS (10, 0)] [Field ("SCNHitTestOptionCategoryBitMask")] NSString OptionCategoryBitMaskKey { get; } @@ -1387,13 +1346,11 @@ interface SCNLight : SCNAnimatable, SCNTechniqueSupport, NSCopying, NSSecureCodi [Export ("sphericalHarmonicsCoefficients", ArgumentSemantic.Copy)] NSData SphericalHarmonicsCoefficients { get; } -#if XAMCORE_2_0 [NoWatch] [iOS (9,0), Mac(10,11)] [Static] [Export ("lightWithMDLLight:")] SCNLight FromModelLight (MDLLight mdllight); -#endif [Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)] [Export ("probeType", ArgumentSemantic.Assign)] @@ -1644,7 +1601,6 @@ interface SCNMaterial : SCNAnimatable, SCNShadable, NSCopying, NSSecureCoding { [Export ("roughness")] SCNMaterialProperty Roughness { get; } -#if XAMCORE_2_0 [NoWatch] [iOS (9,0), Mac(10,11)] [Static] @@ -1663,8 +1619,6 @@ interface SCNMaterial : SCNAnimatable, SCNShadable, NSCopying, NSSecureCoding { [Export ("colorBufferWriteMask", ArgumentSemantic.Assign)] SCNColorMask ColorBufferWriteMask { get; set; } -#endif - [Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)] [Export ("clearCoat")] SCNMaterialProperty ClearCoat { get; } @@ -1730,13 +1684,11 @@ interface SCNMaterialProperty : SCNAnimatable, NSSecureCoding { [Wrap ("Contents")] NSUrl ContentUrl { get; set; } -#if XAMCORE_2_0 || !MONOMAC [Wrap ("Contents")] SKScene ContentScene { get; set; } [Wrap ("Contents")] SKTexture ContentTexture { get; set; } -#endif [Wrap ("Contents")] NSImage [] ContentImageCube { get; set; } @@ -2063,13 +2015,11 @@ interface SCNNode : SCNAnimatable, SCNBoundingVolume, SCNActionable, NSCopying, #endregion -#if XAMCORE_2_0 [NoWatch] [iOS (9,0), Mac(10,11)] [Static] [Export ("nodeWithMDLObject:")] SCNNode FromModelObject (MDLObject mdlObject); -#endif // From SCNNode (Transforms) Category @@ -2498,20 +2448,18 @@ interface SCNProgram : NSCopying, NSSecureCoding { [Export ("opaque")] bool Opaque { [Bind ("isOpaque")] get; set; } -#if XAMCORE_2_0 [NoWatch] [iOS (9,0)][Mac (10,11)] [NullAllowed] [Export ("library", ArgumentSemantic.Retain)] IMTLLibrary Library { get; set; } -#endif } [iOS (8,0), NoWatch] [BaseType (typeof (NSObject))] [Model, Protocol] interface SCNProgramDelegate { -#if MONOMAC || !XAMCORE_2_0 +#if MONOMAC #if XAMCORE_3_0 [Availability (Unavailable = Platform.iOS_Version)] #endif @@ -2530,7 +2478,7 @@ interface SCNProgramDelegate { [Export ("program:handleError:")] void HandleError (SCNProgram program, NSError error); -#if MONOMAC || !XAMCORE_2_0 +#if MONOMAC #if XAMCORE_3_0 [Availability (Unavailable = Platform.iOS_Version)] [NoTV, NoWatch] @@ -2570,9 +2518,7 @@ interface SCNPyramid { [iOS (8,0), NoWatch] [BaseType (typeof (NSObject))] -#if !MONOMAC || XAMCORE_2_0 [DisableDefaultCtor] // NSInvalidArgumentException Reason: -[SCNRenderer init]: unrecognized selector sent to instance 0x7ce85a30 -#endif interface SCNRenderer : SCNSceneRenderer, SCNTechniqueSupport { // We already pull in the Scene property from the SCNSceneRenderer protocol, no need to redefine it here. // [Export ("scene", ArgumentSemantic.Retain)] @@ -2608,7 +2554,6 @@ interface SCNRenderer : SCNSceneRenderer, SCNTechniqueSupport { [Export ("nextFrameTime")] double NextFrameTimeInSeconds { get; } -#if XAMCORE_2_0 || !MONOMAC [NoWatch] [iOS (9,0)][Mac (10,11)] [Static] @@ -2623,7 +2568,7 @@ interface SCNRenderer : SCNSceneRenderer, SCNTechniqueSupport { [Watch (4,0), TV (11,0), Mac (10, 13), iOS (11,0)] [Export ("renderWithViewport:commandBuffer:passDescriptor:")] void Render (CGRect viewport, IMTLCommandBuffer commandBuffer, MTLRenderPassDescriptor renderPassDescriptor); -#endif + [TV (10, 0), Mac (10, 12), iOS (10, 0)] [Export ("updateProbes:atTime:")] void Update (SCNNode [] lightProbes, double time); @@ -2664,7 +2609,7 @@ interface SCNRenderingArguments { [iOS (8,0)] [BaseType (typeof (NSObject))] interface SCNScene : -#if (XAMCORE_2_0 || !MONOMAC) && !WATCH +#if !WATCH GKSceneRootNodeType , #endif NSSecureCoding { @@ -2789,13 +2734,11 @@ bool WriteToUrl (NSUrl url, [Field ("SCNSceneUpAxisAttributeKey")] NSString UpAxisAttributeKey { get; } -#if XAMCORE_2_0 [NoWatch] [iOS (9,0), Mac(10,11)] [Static] [Export ("sceneWithMDLAsset:")] SCNScene FromAsset (MDLAsset asset); -#endif [Watch (6,0), TV (13,0), Mac (10,15), iOS (13,0)] [Export ("wantsScreenSpaceReflection")] @@ -2888,11 +2831,7 @@ interface SCNSceneSource { NSObject GetEntryWithIdentifier (string uid, Class entryClass); [Export ("identifiersOfEntriesWithClass:")] -#if XAMCORE_2_0 string [] GetIdentifiersOfEntries (Class entryClass); -#else - NSObject [] IdentifiersOfEntriesWithClass (Class entryClass); -#endif [Mac (10,9)] [Export ("entriesPassingTest:")] @@ -2919,18 +2858,6 @@ interface SCNSceneSourceLoading { [Field ("SCNSceneSourceOverrideAssetURLsKey")] NSString OverrideAssetUrlsKey { get; } - // Less preferred spelling, don't break stable API - // note: was never released for XI -#if !XAMCORE_2_0 && MONOMAC - [Obsolete ("Use AssetDirectoryUrlsKey")] - [Field ("SCNSceneSourceAssetDirectoryURLsKey")] - NSString AssetDirectoryURLsKey { get; } - - [Obsolete ("Use OverrideAssetUrlsKey")] - [Field ("SCNSceneSourceOverrideAssetURLsKey")] - NSString OverrideAssetURLsKey { get; } -#endif - [Field ("SCNSceneSourceStrictConformanceKey")] NSString StrictConformanceKey { get; } @@ -3034,9 +2961,7 @@ interface ISCNSceneRenderer {} [Protocol, Model] [BaseType (typeof (NSObject))] interface SCNSceneRenderer { -#if XAMCORE_2_0 [Abstract] -#endif [Export ("delegate", ArgumentSemantic.Weak), NullAllowed] NSObject WeakSceneRendererDelegate { get; set; } @@ -3044,39 +2969,27 @@ interface SCNSceneRenderer { [Protocolize] SCNSceneRendererDelegate SceneRendererDelegate { get; set; } -#if XAMCORE_2_0 [Abstract] -#endif [Export ("playing")] bool Playing { [Bind ("isPlaying")] get; set; } -#if XAMCORE_2_0 [Abstract] -#endif [Export ("loops")] bool Loops { get; set; } -#if XAMCORE_2_0 [Abstract] -#endif [Export ("pointOfView", ArgumentSemantic.Retain)] SCNNode PointOfView { get; set; } -#if XAMCORE_2_0 [Abstract] -#endif [Export ("autoenablesDefaultLighting")] bool AutoenablesDefaultLighting { get; set; } -#if XAMCORE_2_0 [Abstract] -#endif [Export ("jitteringEnabled")] bool JitteringEnabled { [Bind ("isJitteringEnabled")] get; set; } -#if XAMCORE_2_0 [Abstract] -#endif #if XAMCORE_4_0 [Unavailable (PlatformName.WatchOS)] #else @@ -3099,32 +3012,23 @@ interface SCNSceneRenderer { [Wrap ("HitTest (thePoint, options.GetDictionary ())")] SCNHitTestResult [] HitTest (CGPoint thePoint, SCNHitTestOptions options); -#if XAMCORE_2_0 [Abstract] -#endif [Mac (10,9)] [Export ("showsStatistics")] bool ShowsStatistics { get; set; } -#if XAMCORE_2_0 [Abstract] -#endif [Mac (10,10)] [Export ("sceneTime")] double SceneTimeInSeconds { get; set; } -#if XAMCORE_2_0 [Abstract] -#endif [Mac (10,10)] [NullAllowed] [Export ("scene", ArgumentSemantic.Retain)] SCNScene Scene { get; set; } -#if XAMCORE_2_0 [Abstract] -#endif -#if XAMCORE_2_0 || !MONOMAC // It seems swift has this property listed as an optional[0] and an Apple sample[1] sets this to null // [0]: https://developer.apple.com/documentation/scenekit/scnscenerenderer/1524051-overlayskscene // [1]: https://github.com/xamarin/xamarin-macios/issues/3392 @@ -3132,45 +3036,33 @@ interface SCNSceneRenderer { [Mac (10,10)] [Export ("overlaySKScene", ArgumentSemantic.Retain)] SKScene OverlayScene { get; set; } -#endif -#if XAMCORE_2_0 [Abstract] -#endif [Mac (10,9)] [Export ("isNodeInsideFrustum:withPointOfView:")] bool IsNodeInsideFrustum (SCNNode node, SCNNode pointOfView); -#if XAMCORE_2_0 [Abstract] -#endif [Mac (10,9)] [Export ("projectPoint:")] SCNVector3 ProjectPoint (SCNVector3 point); -#if XAMCORE_2_0 [Abstract] -#endif [Mac (10,9)] [Export ("unprojectPoint:")] SCNVector3 UnprojectPoint (SCNVector3 point); -#if XAMCORE_2_0 [Abstract] -#endif [Mac (10,9)] [Export ("prepareObject:shouldAbortBlock:")] bool Prepare (NSObject obj, [NullAllowed] Func abortHandler); -#if XAMCORE_2_0 [Abstract] -#endif [Mac (10,10)] [Async] [Export ("prepareObjects:withCompletionHandler:")] void Prepare (NSObject [] objects, [NullAllowed] Action completionHandler); -#if XAMCORE_2_0 || !MONOMAC #if XAMCORE_4_0 [Abstract] // this protocol existed before iOS 9 (or OSX 10.11) and we cannot add abstract members to it (breaking changes) #endif @@ -3178,7 +3070,6 @@ interface SCNSceneRenderer { [Async] [Export ("presentScene:withTransition:incomingPointOfView:completionHandler:")] void PresentScene (SCNScene scene, SKTransition transition, [NullAllowed] SCNNode pointOfView, [NullAllowed] Action completionHandler); -#endif #if XAMCORE_4_0 [Abstract] // this protocol existed before iOS 9 (or OSX 10.11) and we cannot add abstract members to it (breaking changes) @@ -3201,8 +3092,6 @@ interface SCNSceneRenderer { [Export ("renderingAPI")] SCNRenderingApi RenderingApi { get; } - // MonoMac / XM Classic does not have 64bits frameworks, e.g. Metal, and can't have those API -#if XAMCORE_2_0 || !MONOMAC #if XAMCORE_4_0 [Abstract] // this protocol existed before iOS 9 (or OSX 10.11) and we cannot add abstract members to it (breaking changes) #endif @@ -3250,7 +3139,6 @@ interface SCNSceneRenderer { [iOS (9,0)][Mac (10,11)] [NullAllowed, Export ("commandQueue")] IMTLCommandQueue CommandQueue { get; } -#endif #if XAMCORE_4_0 [Abstract] // this protocol existed before iOS 9 (or OSX 10.11) and we cannot add abstract members to it (breaking changes) @@ -3376,12 +3264,6 @@ interface SCNText { [Export ("chamferRadius")] nfloat ChamferRadius { get; set; } -#if MONOMAC && !XAMCORE_2_0 - [Availability (Deprecated = Platform.Mac_10_9)] - [Export ("chamferSegmentCount")] - nint ChamferSegmentCount { get; set; } -#endif - [Static, Export ("textWithString:extrusionDepth:")] SCNText Create (NSObject str, nfloat extrusionDepth); @@ -3518,10 +3400,7 @@ interface SCNRenderingOptionsKeys { [StrongDictionary ("SCNRenderingOptionsKeys")] interface SCNRenderingOptions { - -#if XAMCORE_2_0 || !MONOMAC IMTLDevice Device { get; set; } -#endif bool LowPowerDevice { get; set; } } @@ -3555,11 +3434,7 @@ interface SCNView : SCNSceneRenderer, SCNTechniqueSupport { [Deprecated (PlatformName.iOS, 12, 0, message: "Please use Metal instead of OpenGL API.")] [Deprecated (PlatformName.TvOS, 12, 0, message: "Please use Metal instead of OpenGL API.")] [Export ("eaglContext", ArgumentSemantic.Retain)] -#if XAMCORE_2_0 EAGLContext EAGLContext { get; set; } -#else - new EAGLContext Context { get; set; } -#endif #endif #if !WATCH @@ -3595,7 +3470,6 @@ interface SCNView : SCNSceneRenderer, SCNTechniqueSupport { [Export ("antialiasingMode")] SCNAntialiasingMode AntialiasingMode { get; set; } -#if XAMCORE_2_0 [Watch (4, 0), TV (11, 0), Mac (10, 13), iOS (11, 0)] [Export ("cameraControlConfiguration")] ISCNCameraControlConfiguration CameraControlConfiguration { get; } @@ -3603,7 +3477,7 @@ interface SCNView : SCNSceneRenderer, SCNTechniqueSupport { [Watch (4, 0), TV (11, 0), Mac (10, 13), iOS (11, 0)] [Export ("defaultCameraController")] SCNCameraController DefaultCameraController { get; } -#endif + [Watch (4,0), TV (11,0), Mac (10,13), iOS (11,0)] [Export ("rendersContinuously")] bool RendersContinuously { get; set; } @@ -3780,9 +3654,7 @@ interface SCNIKConstraint { [Watch (3,0)] [Mac (10,9), iOS (8,0)] [BaseType (typeof (SCNConstraint))] -#if !MONOMAC || XAMCORE_2_0 [DisableDefaultCtor] -#endif interface SCNLookAtConstraint { [Export ("target", ArgumentSemantic.Retain), NullAllowed] SCNNode Target { get; [Mac (10, 12), iOS (10, 0), TV (10, 0)] set; } @@ -3873,51 +3745,35 @@ interface _SCNShaderModifiers { [Protocol, Model] [BaseType (typeof (NSObject))] interface SCNActionable { -#if XAMCORE_2_0 [Abstract] -#endif [Export ("runAction:")] void RunAction (SCNAction action); -#if XAMCORE_2_0 [Abstract] -#endif [Export ("runAction:completionHandler:")] void RunAction (SCNAction action, [NullAllowed] Action block); -#if XAMCORE_2_0 [Abstract] -#endif [Export ("runAction:forKey:")] void RunAction (SCNAction action, [NullAllowed] string key); -#if XAMCORE_2_0 [Abstract] -#endif [Export ("runAction:forKey:completionHandler:")] void RunAction (SCNAction action, [NullAllowed] string key, [NullAllowed] Action block); -#if XAMCORE_2_0 [Abstract] -#endif [Export ("hasActions")] bool HasActions (); -#if XAMCORE_2_0 [Abstract] -#endif [Export ("actionForKey:")] SCNAction GetAction (string key); -#if XAMCORE_2_0 [Abstract] -#endif [Export ("removeActionForKey:")] void RemoveAction (string key); -#if XAMCORE_2_0 [Abstract] -#endif [Export ("removeAllActions")] void RemoveAllActions (); @@ -4095,12 +3951,7 @@ interface SCNShadable { interface SCNTechnique : SCNAnimatable, NSCopying, NSSecureCoding { [Export ("dictionaryRepresentation")] -#if XAMCORE_2_0 NSDictionary ToDictionary (); -#else - [Obsolete ("Use ToDictionary () instead")] - NSDictionary DictionaryRepresentation { get; } -#endif [Static, Export ("techniqueWithDictionary:")] SCNTechnique Create (NSDictionary dictionary); @@ -4121,12 +3972,10 @@ interface SCNTechnique : SCNAnimatable, NSCopying, NSSecureCoding { [Internal, Export ("setObject:forKeyedSubscript:")] void _SetObject ([NullAllowed] NSObject obj, INSCopying key); -#if XAMCORE_2_0 // Metal is 64 bit only [NoWatch] [TV (13,0), Mac (10,15), iOS (13,0)] [NullAllowed, Export ("library", ArgumentSemantic.Strong)] IMTLLibrary Library { get; set; } -#endif } [Watch (3,0)] diff --git a/src/security.cs b/src/security.cs index 1884080b7099..ce5d449ebba1 100644 --- a/src/security.cs +++ b/src/security.cs @@ -640,10 +640,8 @@ interface SecClass { IntPtr Identity { get; } } -#if XAMCORE_2_0 // Technically the type could be static but Apple might had non static members in future releases and break out API [DisableDefaultCtor] // not required, nor useful -#endif [Partial] interface SecImportExport { [Field ("kSecImportExportPassphrase")] @@ -725,7 +723,7 @@ interface SecItem { [Field ("kSecUseDataProtectionKeychain")] IntPtr UseDataProtectionKeychain { get; } -#if !MONOMAC || !XAMCORE_2_0 // Don't break compat API +#if !MONOMAC // Don't break compat API [iOS (8,0)] [Field ("kSecUseOperationPrompt")] IntPtr UseOperationPrompt { get; } diff --git a/src/social.cs b/src/social.cs index 99d71f79ebeb..920efdaf90e2 100644 --- a/src/social.cs +++ b/src/social.cs @@ -6,7 +6,7 @@ // // Copyright 2012-2013 Xamarin Inc // -#if XAMCORE_2_0 || !MONOMAC + using System; using ObjCRuntime; using Foundation; @@ -135,15 +135,11 @@ interface SLComposeViewController { #else [BaseType (typeof (UIViewController))] #endif -#if XAMCORE_2_0 #if MONOMAC interface SLComposeServiceViewController : NSTextViewDelegate { #else interface SLComposeServiceViewController : UITextViewDelegate { #endif -#else - interface SLComposeServiceViewController { -#endif [Export ("initWithNibName:bundle:")] [PostGet ("NibBundle")] IntPtr Constructor ([NullAllowed] string nibName, [NullAllowed] NSBundle bundle); @@ -234,4 +230,3 @@ interface SLComposeSheetConfigurationItem { } #endif } -#endif diff --git a/src/spritekit.cs b/src/spritekit.cs index 44da943835f9..bfb1f1204269 100644 --- a/src/spritekit.cs +++ b/src/spritekit.cs @@ -5,7 +5,7 @@ // Aaron Bockover (abock@xamarin.com) // // Copyright 2013-2015 Xamarin Inc -#if XAMCORE_2_0 || !MONOMAC + using System; using System.ComponentModel; @@ -224,13 +224,8 @@ partial interface SKNode : NSSecureCoding, NSCopying { [Export ("userData", ArgumentSemantic.Retain)] NSMutableDictionary UserData { get; set; } -#if XAMCORE_2_0 [Export ("setScale:")] void SetScale (nfloat scale); -#else - [Export ("scale")] - nfloat Scale { set; } -#endif [Export ("addChild:")] [PostGet ("Children")] @@ -535,7 +530,7 @@ Vector4 Direction { [iOS (7,0)] [BaseType (typeof (SKEffectNode))] interface SKScene -#if (XAMCORE_2_0 || !MONOMAC) && !WATCH +#if !WATCH : GKSceneRootNodeType #endif { @@ -3516,4 +3511,3 @@ Quaternion Quaternion { } } } -#endif diff --git a/src/twitter.cs b/src/twitter.cs index 41c44532b4c5..cddecbde6bd5 100644 --- a/src/twitter.cs +++ b/src/twitter.cs @@ -16,10 +16,6 @@ namespace Twitter { delegate void TWRequestHandler (NSData responseData, NSHttpUrlResponse urlResponse, NSError error); -#if !XAMCORE_2_0 - delegate void TWTweetComposeHandler (TWTweetComposeViewControllerResult result); -#endif - [Availability (Deprecated = Platform.iOS_6_0, Message = "Use the 'Social' framework.")] [BaseType (typeof (NSObject))] interface TWRequest { @@ -57,13 +53,8 @@ interface TWTweetComposeViewController { [PostGet ("NibBundle")] IntPtr Constructor ([NullAllowed] string nibName, [NullAllowed] NSBundle bundle); -#if XAMCORE_2_0 [Export ("completionHandler")] Action CompletionHandler { get; set; } -#else - [Export ("setCompletionHandler:")] - void SetCompletionHandler (TWTweetComposeHandler handler); -#endif [Static] [Export ("canSendTweet")] diff --git a/src/uikit.cs b/src/uikit.cs index 7b306e4fc3a2..7f08a5da952a 100644 --- a/src/uikit.cs +++ b/src/uikit.cs @@ -27,7 +27,6 @@ using CoreData; using UserNotifications; -#if XAMCORE_2_0 #if IOS using FileProvider; using LinkPresentation; @@ -77,7 +76,6 @@ using UITableView = Foundation.NSObject; using UICollectionReusableView = Foundation.NSObject; #endif // WATCH -#endif // XAMCORE_2_0 using System; using System.ComponentModel; @@ -210,11 +208,7 @@ interface CIColor {} [Category (allowStaticMembers: true)] // Classic isn't internal so we need this [BaseType (typeof (NSAttributedString))] interface NSAttributedStringAttachmentConveniences { -#if XAMCORE_2_0 [Internal] -#else - [EditorBrowsable (EditorBrowsableState.Advanced)] // this is not the one we want to be seen (compat only) -#endif [Static, Export ("attributedStringWithAttachment:")] NSAttributedString FromTextAttachment (NSTextAttachment attachment); } @@ -344,7 +338,6 @@ interface NSMutableAttributedStringKitAdditions { } #if !WATCH -#if XAMCORE_2_0 // NSLayoutAnchor is a generic type, which we only support in Unified (for now) [NoWatch] [iOS (9,0)] [BaseType (typeof(NSObject))] @@ -451,7 +444,6 @@ interface NSLayoutDimension [Export ("constraintLessThanOrEqualToAnchor:multiplier:constant:")] NSLayoutConstraint ConstraintLessThanOrEqualTo (NSLayoutDimension anchor, nfloat multiplier, nfloat constant); } -#endif // XAMCORE_2_0 [NoWatch] [BaseType (typeof (NSObject))] @@ -503,7 +495,6 @@ interface NSLayoutConstraint { [Static, Export ("deactivateConstraints:")] void DeactivateConstraints (NSLayoutConstraint [] constraints); -#if XAMCORE_2_0 [iOS (10,0), TV (10,0)] [Export ("firstAnchor", ArgumentSemantic.Copy)] [Internal] @@ -513,7 +504,6 @@ interface NSLayoutConstraint { [Export ("secondAnchor", ArgumentSemantic.Copy)] [Internal] IntPtr _SecondAnchor (); -#endif } [NoWatch] @@ -719,15 +709,11 @@ interface NSShadow : NSSecureCoding, NSCopying { [Protocol] [BaseType (typeof (NSObject))] partial interface NSTextAttachmentContainer { -#if XAMCORE_2_0 [Abstract] -#endif [Export ("imageForBounds:textContainer:characterIndex:")] UIImage GetImageForBounds (CGRect bounds, NSTextContainer textContainer, nuint characterIndex); -#if XAMCORE_2_0 [Abstract] -#endif [Export ("attachmentBoundsForTextContainer:proposedLineFragment:glyphPosition:characterIndex:")] CGRect GetAttachmentBounds (NSTextContainer textContainer, CGRect proposedLineFragment, CGPoint glyphPosition, nuint characterIndex); } @@ -1552,10 +1538,8 @@ interface UIAccessibilityCustomRotorSearchPredicate { } [BaseType (typeof (UIResponder))] -#if XAMCORE_2_0 // only happens on the simulator (not devices) on iOS8 (still make sense) [DisableDefaultCtor] // NSInvalidArgumentException Reason: Use initWithAccessibilityContainer: -#endif interface UIAccessibilityElement : UIAccessibilityIdentification { [Export ("initWithAccessibilityContainer:")] IntPtr Constructor (NSObject container); @@ -1606,21 +1590,12 @@ interface UIAccessibilityFocus { } interface UIAccessibilityAction { -#if !XAMCORE_2_0 - [New] // To avoid the warning that we are overwriting the method in NSObject. -#endif [Export ("accessibilityIncrement")] void AccessibilityIncrement (); -#if !XAMCORE_2_0 - [New] // To avoid the warning that we are overwriting the method in NSObject -#endif [Export ("accessibilityDecrement")] void AccessibilityDecrement (); -#if !XAMCORE_2_0 - [New] // To avoid the warning that we are overwriting the method in NSObject -#endif [Export ("accessibilityScroll:")] bool AccessibilityScroll (UIAccessibilityScrollDirection direction); @@ -2717,11 +2692,7 @@ interface UIApplication { [NoTV] [Deprecated (PlatformName.iOS, 10, 0, message: "Use 'UNUserNotificationCenter.AddNotificationRequest' instead.")] [Export ("presentLocalNotificationNow:")] -#if XAMCORE_2_0 void PresentLocalNotificationNow (UILocalNotification notification); -#else - void PresentLocationNotificationNow (UILocalNotification notification); -#endif // from @interface UIApplication (UILocalNotifications) [NoTV] @@ -3017,13 +2988,11 @@ interface UIApplicationShortcutIcon : NSCopying [Export ("iconWithSystemImageName:")] UIApplicationShortcutIcon FromSystemImageName (string systemImageName); -#if XAMCORE_2_0 #if IOS // This is inside ContactsUI.framework [Unavailable (PlatformName.MacCatalyst)][Advice ("This API is not available when using UIKit on macOS.")] [Static, Export ("iconWithContact:")] UIApplicationShortcutIcon FromContact (CNContact contact); #endif // IOS -#endif } [NoTV] @@ -3562,12 +3531,12 @@ interface UIApplicationDelegate { [Export ("application:userDidAcceptCloudKitShareWithMetadata:")] void UserDidAcceptCloudKitShare (UIApplication application, CKShareMetadata cloudKitShareMetadata); -#if XAMCORE_2_0 && !TVOS +#if !TVOS [NoTV] [iOS (11,0), Watch (4,0)] [Export ("application:handleIntent:completionHandler:")] void HandleIntent (UIApplication application, INIntent intent, Action completionHandler); -#endif // XAMCORE_2_0 && !TVOS +#endif // !TVOS [iOS (13,0), TV (13,0), Watch (6,0)] [Export ("application:configurationForConnectingSceneSession:options:")] @@ -3867,20 +3836,10 @@ interface UICollectionView : NSCoding, UIDataSourceTranslating void RegisterNibForSupplementaryView (UINib nib, NSString kind, NSString reuseIdentifier); [Export ("dequeueReusableCellWithReuseIdentifier:forIndexPath:")] -#if XAMCORE_2_0 - UICollectionReusableView -#else - NSObject -#endif - DequeueReusableCell (NSString reuseIdentifier, NSIndexPath indexPath); + UICollectionReusableView DequeueReusableCell (NSString reuseIdentifier, NSIndexPath indexPath); [Export ("dequeueReusableSupplementaryViewOfKind:withReuseIdentifier:forIndexPath:")] -#if XAMCORE_2_0 - UICollectionReusableView -#else - NSObject -#endif - DequeueReusableSupplementaryView (NSString kind, NSString identifier, NSIndexPath indexPath); + UICollectionReusableView DequeueReusableSupplementaryView (NSString kind, NSString identifier, NSIndexPath indexPath); [Export ("indexPathsForSelectedItems")] NSIndexPath [] GetIndexPathsForSelectedItems (); @@ -5884,13 +5843,6 @@ partial interface UIFontDescriptor : NSSecureCoding, NSCopying { [Internal, Field ("UIFontDescriptorMatrixAttribute")] NSString MatrixAttribute { get; } -#if !XAMCORE_2_0 - // that got removed in iOS7 betas... so we remove it from unified - // in case Apple starts to disallow it (and rejects apps that refers to it) - [Internal, Field ("UIFontDescriptorVariationAttribute")] - NSString VariationAttribute { get; } -#endif - [Internal, Field ("UIFontDescriptorCharacterSetAttribute")] NSString CharacterSetAttribute { get; } @@ -6687,25 +6639,11 @@ interface UITextRange { [Export ("isEmpty")] bool IsEmpty { get; } -#if XAMCORE_2_0 [Export ("start")] UITextPosition Start { get; } [Export ("end")] UITextPosition End { get; } -#else - [Export ("start"), Obsolete ("Use 'Start' instead.")] - UITextPosition start { get; } - - [Wrap ("start")] - UITextPosition Start { get; } - - [Export ("end"), Obsolete ("Use 'End' instead.")] - UITextPosition end { get; } - - [Wrap ("end")] - UITextPosition End { get; } -#endif } interface IUITextInput {} @@ -6947,19 +6885,10 @@ interface UITextInputTokenizer { } -#if XAMCORE_2_0 [BaseType (typeof (NSObject))] interface UITextInputStringTokenizer : UITextInputTokenizer{ -#else - [BaseType (typeof (UITextInputTokenizer))] - interface UITextInputStringTokenizer { -#endif [Export ("initWithTextInput:")] -#if XAMCORE_2_0 IntPtr Constructor (IUITextInput textInput); -#else - IntPtr Constructor (NSObject /* UITextInput */ textInput); -#endif } [BaseType (typeof (NSObject))] @@ -6968,35 +6897,19 @@ interface UITextInputStringTokenizer { interface UITextInputDelegate { [Abstract] [Export ("selectionWillChange:")] -#if XAMCORE_2_0 void SelectionWillChange (IUITextInput uiTextInput); -#else - void SelectionWillChange (NSObject /* UITextInput */ uiTextInput); -#endif [Abstract] [Export ("selectionDidChange:")] -#if XAMCORE_2_0 void SelectionDidChange (IUITextInput uiTextInput); -#else - void SelectionDidChange (NSObject /* UITextInput */ uiTextInput); -#endif [Abstract] [Export ("textWillChange:")] -#if XAMCORE_2_0 void TextWillChange (IUITextInput textInput); -#else - void TextWillChange (NSObject /* UITextInput */ textInput); -#endif [Abstract] [Export ("textDidChange:")] -#if XAMCORE_2_0 void TextDidChange (IUITextInput textInput); -#else - void TextDidChange (NSObject /* UITextInput */ textInput); -#endif } [BaseType (typeof (NSObject))] @@ -8154,9 +8067,7 @@ interface UIControl { [Model] [Protocol] interface UIBarPositioning { -#if XAMCORE_2_0 [Abstract] -#endif [iOS (7,0)] [Export ("barPosition")] UIBarPosition BarPosition { get; } @@ -8968,7 +8879,6 @@ interface UIImagePickerController { [Export ("videoExportPreset")] string VideoExportPreset { get; set; } -#if XAMCORE_2_0 // manually bound (const fields) in monotouch.dll - unlike the newer fields (static properties) [Field ("UIImagePickerControllerMediaType")] @@ -8985,7 +8895,6 @@ interface UIImagePickerController { [Field ("UIImagePickerControllerMediaURL")] NSString MediaURL { get; } -#endif [Deprecated (PlatformName.iOS, 11, 0, message: "Use 'UIImagePickerController.PHAsset' instead.")] [Field ("UIImagePickerControllerReferenceURL")] @@ -9176,11 +9085,7 @@ interface UINavigationBar : UIBarPositioning, NSCoding { [Export ("popNavigationItemAnimated:")] [PostGet ("Items")] // that will [PostGet] TopItem too -#if XAMCORE_2_0 UINavigationItem PopNavigationItem (bool animated); -#else - UINavigationItem PopNavigationItemAnimated (bool animated); -#endif [Export ("topItem", ArgumentSemantic.Retain)] UINavigationItem TopItem { get; } @@ -9436,11 +9341,7 @@ interface UINavigationController { [Export ("popViewControllerAnimated:")] [PostGet ("ViewControllers")] // that will PostGet TopViewController and VisibleViewController too -#if XAMCORE_2_0 UIViewController PopViewController (bool animated); -#else - UIViewController PopViewControllerAnimated (bool animated); -#endif [Export ("popToViewController:animated:")] [PostGet ("ViewControllers")] // that will PostGet TopViewController and VisibleViewController too @@ -11066,23 +10967,6 @@ interface UISearchBar : UIBarPositioning, UITextInputTraits [Export ("backgroundImageForBarPosition:barMetrics:")] [Appearance] UIImage BackgroundImageForBarPosition (UIBarPosition barPosition, UIBarMetrics barMetrics); - -#if !XAMCORE_2_0 - // documented in https://developer.apple.com/library/prerelease/ios/releasenotes/General/iOS70APIDiffs/ - // (but non-clickable) and NOT in the header files (or in the UISearchBar web documentation) - // that makes them private API - - [iOS (7,0)] - [Export ("setBackgroundImage:forBarMetrics:")] - [Appearance] - void SetBackgroundImage ([NullAllowed] UIImage backgroundImage, UIBarMetrics barMetrics); - - // note that this one "work" on 7.x (i.e. as a private API) but does not on iOS8 - [iOS (7,0)] - [Export ("backgroundImageForBarMetrics:")] - [Appearance] - UIImage BackgroundImageForBarMetrics (UIBarMetrics barMetrics); -#endif [iOS (7,0), Export ("barTintColor", ArgumentSemantic.Retain)] [Appearance] @@ -11369,9 +11253,7 @@ interface UISearchDisplayDelegate { [Protocol, Model] [BaseType (typeof (NSObject))] partial interface UISearchResultsUpdating { -#if XAMCORE_2_0 [Abstract] -#endif [Export ("updateSearchResultsForSearchController:")] void UpdateSearchResultsForSearchController (UISearchController searchController); } @@ -11812,11 +11694,7 @@ interface UITabBar [NoTV] [Export ("endCustomizingAnimated:")] -#if XAMCORE_2_0 bool EndCustomizing (bool animated); -#else - bool EndCustomizingAnimated (bool animated); -#endif [NoTV] [Export ("isCustomizing")] @@ -12286,11 +12164,7 @@ interface UITableView : NSCoding, UIDataSourceTranslating NSIndexPath [] IndexPathsForSelectedRows { get; } [Export ("registerNib:forCellReuseIdentifier:")] -#if XAMCORE_2_0 void RegisterNibForCellReuse ([NullAllowed] UINib nib, NSString reuseIdentifier); -#else - void RegisterNibForCellReuse ([NullAllowed] UINib nib, string reuseIdentifier); -#endif [Field ("UITableViewSelectionDidChangeNotification")] [Notification] @@ -12325,11 +12199,7 @@ interface UITableView : NSCoding, UIDataSourceTranslating void RegisterClassForCellReuse (IntPtr /*Class*/ cellClass, NSString reuseIdentifier); [Export ("registerNib:forHeaderFooterViewReuseIdentifier:")] -#if XAMCORE_2_0 void RegisterNibForHeaderFooterViewReuse (UINib nib, NSString reuseIdentifier); -#else - void RegisterNibForHeaderFooterViewReuse (UINib nib, string reuseIdentifier); -#endif [Export ("registerClass:forHeaderFooterViewReuseIdentifier:"), Internal] void RegisterClassForHeaderFooterViewReuse (IntPtr /*Class*/ aClass, NSString reuseIdentifier); @@ -12701,11 +12571,7 @@ interface UITableViewCell : NSCoding, UIGestureRecognizerDelegate { UIView SelectedBackgroundView { get; set; } [Export ("reuseIdentifier", ArgumentSemantic.Copy)] -#if XAMCORE_2_0 NSString ReuseIdentifier { get; } -#else - string ReuseIdentifier { get; } -#endif [RequiresSuper] [Export ("prepareForReuse")] @@ -13695,84 +13561,6 @@ interface UIView : UIAppearance, UIAppearanceContainer, UIAccessibility, UIDynam [Export ("bounds")] new CGRect Bounds { get; set; } -#if !XAMCORE_2_0 - // note: duplicate from maccore's foundation.cs where it's binded on NSString2 - [Bind ("drawAtPoint:withFont:")] - //[Obsolete ("Deprecated in iOS7. Use NSString.DrawString(CGPoint, UIStringAttributes) instead")] - [ThreadSafe] - CGSize DrawString ([Target] string str, CGPoint point, UIFont font); - - // note: duplicate from maccore's foundation.cs where it's binded on NSString2 - [Bind ("drawAtPoint:forWidth:withFont:lineBreakMode:")] - //[Obsolete ("Deprecated in iOS7. Use NSString.DrawString(CGRect, UIStringAttributes) instead")] - [ThreadSafe] - CGSize DrawString ([Target] string str, CGPoint point, nfloat width, UIFont font, UILineBreakMode breakMode); - - // note: duplicate from maccore's foundation.cs where it's binded on NSString2 - [Bind ("drawAtPoint:forWidth:withFont:fontSize:lineBreakMode:baselineAdjustment:")] - //[Obsolete ("Deprecated in iOS7. Use NSString.DrawString(CGRect, UIStringAttributes) instead")] - [ThreadSafe] - CGSize DrawString ([Target] string str, CGPoint point, nfloat width, UIFont font, nfloat fontSize, UILineBreakMode breakMode, UIBaselineAdjustment adjustment); - - // note: duplicate from maccore's foundation.cs where it's binded on NSString2 - [Bind ("drawAtPoint:forWidth:withFont:minFontSize:actualFontSize:lineBreakMode:baselineAdjustment:")] - //[Obsolete ("Deprecated in iOS7. Use NSString.DrawString(CGRect, UIStringAttributes) instead")] - [ThreadSafe] - CGSize DrawString ([Target] string str, CGPoint point, nfloat width, UIFont font, nfloat minFontSize, ref nfloat actualFontSize, UILineBreakMode breakMode, UIBaselineAdjustment adjustment); - - // note: duplicate from maccore's foundation.cs where it's binded on NSString2 - [Bind ("drawInRect:withFont:")] - //[Obsolete ("Deprecated in iOS7. Use NSString.DrawString(CGRect, UIStringAttributes) instead")] - [ThreadSafe] - CGSize DrawString ([Target] string str, CGRect rect, UIFont font); - - // note: duplicate from maccore's foundation.cs where it's binded on NSString2 - [Bind ("drawInRect:withFont:lineBreakMode:")] - //[Obsolete ("Deprecated in iOS7. Use NSString.DrawString(CGRect, UIStringAttributes) instead")] - [ThreadSafe] - CGSize DrawString ([Target] string str, CGRect rect, UIFont font, UILineBreakMode mode); - - // note: duplicate from maccore's foundation.cs where it's binded on NSString2 - [Bind ("drawInRect:withFont:lineBreakMode:alignment:")] - //[Obsolete ("Deprecated in iOS7. Use NSString.DrawString(CGRect, UIStringAttributes) instead")] - [ThreadSafe] - CGSize DrawString ([Target] string str, CGRect rect, UIFont font, UILineBreakMode mode, UITextAlignment alignment); - - [Bind ("endEditing:")] - bool EndEditing (bool force); - - // note: duplicate from maccore's foundation.cs where it's binded on NSString2 - [Bind ("sizeWithFont:")] - //[Obsolete ("Deprecated in iOS7. Use NSString.GetSizeUsingAttributes(UIStringAttributes) instead.")] - [ThreadSafe] - CGSize StringSize ([Target] string str, UIFont font); - - // note: duplicate from maccore's foundation.cs where it's binded on NSString2 - [Bind ("sizeWithFont:forWidth:lineBreakMode:")] - [ThreadSafe] - //[Obsolete ("Deprecated in iOS7. Use NSString.GetBoundingRect (CGSize, NSStringDrawingOptions, UIStringAttributes,NSStringDrawingContext) instead.")] - CGSize StringSize ([Target] string str, UIFont font, nfloat forWidth, UILineBreakMode breakMode); - - // note: duplicate from maccore's foundation.cs where it's binded on NSString2 - [Bind ("sizeWithFont:constrainedToSize:")] - //[Obsolete ("Deprecated in iOS7. Use NSString.GetBoundingRect (CGSize, NSStringDrawingOptions, UIStringAttributes,NSStringDrawingContext) instead.")] - [ThreadSafe] - CGSize StringSize ([Target] string str, UIFont font, CGSize constrainedToSize); - - // note: duplicate from maccore's foundation.cs where it's binded on NSString2 - [Bind ("sizeWithFont:constrainedToSize:lineBreakMode:")] - //[Obsolete ("Deprecated in iOS7. Use NSString.GetBoundingRect (CGSize, NSStringDrawingOptions, UIStringAttributes,NSStringDrawingContext) instead.")] - [ThreadSafe] - CGSize StringSize ([Target] string str, UIFont font, CGSize constrainedToSize, UILineBreakMode lineBreakMode); - - // note: duplicate from maccore's foundation.cs where it's binded on NSString2 - [Bind ("sizeWithFont:minFontSize:actualFontSize:forWidth:lineBreakMode:")] - // Wait for guidance here: https://devforums.apple.com/thread/203655 - //[Obsolete ("Deprecated on iOS7. No guidance.")] - [ThreadSafe] - CGSize StringSize ([Target] string str, UIFont font, nfloat minFontSize, ref nfloat actualFontSize, nfloat forWidth, UILineBreakMode lineBreakMode); -#endif // !XAMCORE_2_0 - [Export ("userInteractionEnabled")] bool UserInteractionEnabled { [Bind ("isUserInteractionEnabled")]get; set; } @@ -14278,7 +14066,6 @@ [Static] [Export ("areAnimationsEnabled")] [Static] double InheritedAnimationDuration { get; } -#if XAMCORE_2_0 // NSLayoutXAxisAnchor is a generic type, only supported in Unified (for now) [iOS (9,0)] [Export ("leadingAnchor")] NSLayoutXAxisAnchor LeadingAnchor { get; } @@ -14326,7 +14113,6 @@ [Static] [Export ("areAnimationsEnabled")] [iOS (9,0)] [Export ("lastBaselineAnchor")] NSLayoutYAxisAnchor LastBaselineAnchor { get; } -#endif // XAMCORE_2_0 [iOS (9,0)] [Export ("layoutGuides")] @@ -14483,11 +14269,7 @@ interface UIViewController : NSCoding, UIAppearanceContainer, UIContentContainer [NoTV] [Export ("dismissModalViewControllerAnimated:")] [Availability (Deprecated = Platform.iOS_6_0, Message = "Use 'DismissViewController (bool, NSAction)' instead.")] -#if XAMCORE_2_0 void DismissModalViewController (bool animated); -#else - void DismissModalViewControllerAnimated (bool animated); -#endif [NoTV] [Export ("modalViewController")] @@ -15117,15 +14899,11 @@ partial interface UIViewControllerContextTransitioning { [Export ("finalFrameForViewController:")] CGRect GetFinalFrameForViewController (UIViewController vc); -#if XAMCORE_2_0 [Abstract] -#endif [Export ("viewForKey:")] UIView GetViewFor (NSString uiTransitionContextToOrFromKey); -#if XAMCORE_2_0 [Abstract] -#endif [Export ("targetTransform")] CGAffineTransform TargetTransform { get; } @@ -15147,16 +14925,12 @@ interface IUITraitEnvironment {} [Protocol] [iOS (8,0)] partial interface UITraitEnvironment { -#if XAMCORE_2_0 [Abstract] -#endif [iOS (8,0)] [Export ("traitCollection")] UITraitCollection TraitCollection { get; } -#if XAMCORE_2_0 [Abstract] -#endif [iOS (8,0)] [Export ("traitCollectionDidChange:")] void TraitCollectionDidChange ([NullAllowed] UITraitCollection previousTraitCollection); @@ -15358,11 +15132,7 @@ interface IUIViewControllerInteractiveTransitioning {} [Protocol] partial interface UIViewControllerTransitioningDelegate { [Export ("animationControllerForPresentedController:presentingController:sourceController:")] -#if XAMCORE_2_0 IUIViewControllerAnimatedTransitioning GetAnimationControllerForPresentedController (UIViewController presented, UIViewController presenting, UIViewController source); -#else - IUIViewControllerAnimatedTransitioning PresentingController (UIViewController presented, UIViewController presenting, UIViewController source); -#endif [Export ("animationControllerForDismissedController:")] IUIViewControllerAnimatedTransitioning GetAnimationControllerForDismissedController (UIViewController dismissed); @@ -15468,16 +15238,12 @@ partial interface UIViewControllerTransitionCoordinatorContext { [Export ("containerView")] UIView ContainerView { get; } -#if XAMCORE_2_0 [Abstract] -#endif [iOS (8,0)] [Export ("targetTransform")] CGAffineTransform TargetTransform (); -#if XAMCORE_2_0 [Abstract] -#endif [iOS (8,0)] [Export ("viewForKey:")] [EditorBrowsable (EditorBrowsableState.Advanced)] // this is not the one we want to be seen (compat only) @@ -16007,18 +15773,10 @@ interface UIStoryboard { UIStoryboard FromName (string name, [NullAllowed] NSBundle storyboardBundleOrNil); [Export ("instantiateInitialViewController")] -#if XAMCORE_2_0 UIViewController InstantiateInitialViewController (); -#else - NSObject InstantiateInitialViewController (); -#endif [Export ("instantiateViewControllerWithIdentifier:")] -#if XAMCORE_2_0 UIViewController InstantiateViewController (string identifier); -#else - NSObject InstantiateViewController (string identifier); -#endif [iOS (13,0), TV (13,0), NoWatch] [Export ("instantiateInitialViewControllerWithCreator:")] @@ -16203,12 +15961,6 @@ partial interface UIPopoverPresentationController { [Export ("delegate", ArgumentSemantic.UnsafeUnretained)] NSObject WeakDelegate { get; set; } -#if !XAMCORE_2_0 - [Wrap ("WeakDelegate")] - [Obsolete ("Use the Delegate property")] - UIPopoverPresentationControllerDelegate Delegat { get; set; } -#endif - [Wrap ("WeakDelegate")] [NullAllowed] [Protocolize] @@ -16523,11 +16275,7 @@ interface UIPrintInteractionControllerDelegate { [iOS (7,0), Export ("printInteractionController:cutLengthForPaper:")] [NoDefaultValue] -#if XAMCORE_2_0 [DelegateName ("Func")] -#else - [DelegateName ("Func")] -#endif nfloat CutLengthForPaper (UIPrintInteractionController printInteractionController, UIPrintPaper paper); [iOS (9, 0)] @@ -16589,33 +16337,15 @@ interface UIPrintInteractionController { [Export ("presentAnimated:completionHandler:")] [Async (ResultTypeName = "UIPrintInteractionResult")] - // documentation (and header) mistake that Apple corrected (IIRC I filled that issue) -#if XAMCORE_2_0 - bool -#else - void -#endif - Present (bool animated, UIPrintInteractionCompletionHandler completion); + bool Present (bool animated, UIPrintInteractionCompletionHandler completion); [Export ("presentFromBarButtonItem:animated:completionHandler:")] [Async (ResultTypeName = "UIPrintInteractionResult")] - // documentation (and header) mistake that Apple corrected (IIRC I filled that issue) -#if XAMCORE_2_0 - bool -#else - void -#endif - PresentFromBarButtonItem (UIBarButtonItem item, bool animated, UIPrintInteractionCompletionHandler completion); + bool PresentFromBarButtonItem (UIBarButtonItem item, bool animated, UIPrintInteractionCompletionHandler completion); [Export ("presentFromRect:inView:animated:completionHandler:")] [Async (ResultTypeName = "UIPrintInteractionResult")] - // documentation (and header) mistake that Apple corrected (IIRC I filled that issue) -#if XAMCORE_2_0 - bool -#else - void -#endif - PresentFromRectInView (CGRect rect, UIView view, bool animated, UIPrintInteractionCompletionHandler completion); + bool PresentFromRectInView (CGRect rect, UIView view, bool animated, UIPrintInteractionCompletionHandler completion); [iOS (7,0), Export ("showsNumberOfCopies")] bool ShowsNumberOfCopies { get; set; } @@ -17141,7 +16871,6 @@ interface UILayoutGuide : NSCoding [Export ("identifier")] string Identifier { get; set; } -#if XAMCORE_2_0 // NSLayoutXAxisAnchor is a generic type, only supported in Unified (for now) [Export ("leadingAnchor", ArgumentSemantic.Strong)] NSLayoutXAxisAnchor LeadingAnchor { get; } @@ -17171,7 +16900,6 @@ interface UILayoutGuide : NSCoding [Export ("centerYAnchor", ArgumentSemantic.Strong)] NSLayoutYAxisAnchor CenterYAnchor { get; } -#endif // XAMCORE_2_0 } [NoWatch] @@ -17184,7 +16912,6 @@ interface UILayoutSupport { [Abstract] nfloat Length { get; } -#if XAMCORE_2_0 // NSLayoutYAxisAnchor is generic, which is only supported in Unified (for now at least) [iOS (9,0)] [Export ("topAnchor", ArgumentSemantic.Strong)] #if XAMCORE_4_0 @@ -17208,7 +16935,6 @@ interface UILayoutSupport { [Abstract] #endif NSLayoutDimension HeightAnchor { get; } -#endif // XAMCORE_2_0 } interface IUILayoutSupport {} diff --git a/src/usernotifications.cs b/src/usernotifications.cs index 02bc3632ece4..8582a57f61e7 100644 --- a/src/usernotifications.cs +++ b/src/usernotifications.cs @@ -264,10 +264,8 @@ interface UNNotificationAttachmentOptions { [Export ("ThumbnailHidden")] bool ThumbnailHidden { get; set; } -#if XAMCORE_2_0 [Export ("ThumbnailClippingRect")] CGRect ThumbnailClippingRect { get; set; } -#endif // According to apple docs UNNotificationAttachmentOptionsThumbnailTimeKey // can be either a CMTime or a NSNumber (in seconds). Exposing both options // in the strong dictionary because watchOS does not have CMTime or diff --git a/src/vision.cs b/src/vision.cs index 94fb535058c1..646a3d32a3d2 100644 --- a/src/vision.cs +++ b/src/vision.cs @@ -7,8 +7,6 @@ // Copyright 2017 Xamarin Inc. All rights reserved. // -#if XAMCORE_2_0 - using System; using CoreFoundation; using CoreGraphics; @@ -2306,4 +2304,3 @@ interface VNRequestProgressProviding { } -#endif diff --git a/src/webkit.cs b/src/webkit.cs index d9094895314d..cb897383207c 100644 --- a/src/webkit.cs +++ b/src/webkit.cs @@ -27,9 +27,7 @@ using AppKit; using CoreGraphics; using ObjCRuntime; -#if XAMCORE_2_0 using JavaScriptCore; -#endif namespace WebKit { @@ -1054,25 +1052,15 @@ partial interface DomEntityReference { partial interface DomEventTarget : NSCopying { [Export ("addEventListener:listener:useCapture:")] -#if XAMCORE_2_0 [Abstract] void AddEventListener (string type, IDomEventListener listener, bool useCapture); -#else - void AddEventListener (string type, DomEventListener listener, bool useCapture); -#endif [Export ("removeEventListener:listener:useCapture:")] -#if XAMCORE_2_0 [Abstract] void RemoveEventListener (string type, IDomEventListener listener, bool useCapture); -#else - void RemoveEventListener (string type, DomEventListener listener, bool useCapture); -#endif [Export ("dispatchEvent:")] -#if XAMCORE_2_0 [Abstract] -#endif bool DispatchEvent (DomEvent evt); } @@ -1941,11 +1929,9 @@ partial interface WebFrame { [Export ("globalContext")] /* JSGlobalContextRef */ IntPtr GlobalContext { get; } -#if XAMCORE_2_0 [Mac (10,10)] [Export ("javaScriptContext", ArgumentSemantic.Strong)] JSContext JavaScriptContext { get; } -#endif } [Deprecated (PlatformName.MacOSX, 10, 14, message: "No longer supported.")] @@ -1995,10 +1981,8 @@ partial interface WebFrameLoadDelegate { [Export ("webView:windowScriptObjectAvailable:"), EventArgs ("WebFrameScriptObject")] void WindowScriptObjectAvailable (WebView webView, WebScriptObject windowScriptObject); -#if XAMCORE_2_0 [Export ("webView:didCreateJavaScriptContext:forFrame:"), EventArgs ("WebFrameJavaScriptContext")] void DidCreateJavaScriptContext (WebView webView, JSContext context, WebFrame frame); -#endif } [Deprecated (PlatformName.MacOSX, 10, 14, message: "No longer supported.")] @@ -2373,11 +2357,7 @@ partial interface WebUIDelegate { bool UIRunBeforeUnload (WebView sender, string message, WebFrame initiatedByFrame); [Export ("webView:runOpenPanelForFileButtonWithResultListener:"), EventArgs ("WebViewRunOpenPanel")] -#if XAMCORE_2_0 void UIRunOpenPanelForFileButton (WebView sender, IWebOpenPanelResultListener resultListener); -#else - void UIRunOpenPanelForFileButton (WebView sender, WebOpenPanelResultListener resultListener); -#endif [Export ("webView:mouseDidMoveOverElement:modifierFlags:"), EventArgs ("WebViewMouseMoved")] void UIMouseDidMoveOverElement (WebView sender, NSDictionary elementInformation, NSEventModifierMask modifierFlags); @@ -2465,21 +2445,14 @@ partial interface WebScriptObject { NSObject WebScriptValueAtIndex (int /* unsigned int */ index); [Export ("setWebScriptValueAtIndex:value:")] -#if XAMCORE_2_0 void SetWebScriptValueAtIndex (int /* unsigned int */ index, NSObject value); -#else - [Obsolete ("Use 'SetWebScriptValueAtIndex' instead.")] - void SetWebScriptValueAtIndexvalue (int /* unsigned int */ index, NSObject value); -#endif [Export ("setException:")] void SetException (string description); -#if XAMCORE_2_0 [Mac (10,10)] [Export ("JSValue")] JSValue JSValue { get; } -#endif } [Deprecated (PlatformName.MacOSX, 10, 14, message: "No longer supported.")] diff --git a/src/wkwebkit.cs b/src/wkwebkit.cs index 1db0827d296d..81fbddb12d5d 100644 --- a/src/wkwebkit.cs +++ b/src/wkwebkit.cs @@ -333,7 +333,6 @@ interface WKSnapshotConfiguration : NSCopying { bool AfterScreenUpdates { get; set; } } -#if XAMCORE_2_0 interface IWKUrlSchemeHandler {} [Mac (10,13), iOS (11,0)] [Protocol (Name = "WKURLSchemeHandler")] @@ -347,7 +346,7 @@ interface WKUrlSchemeHandler [Export ("webView:stopURLSchemeTask:")] void StopUrlSchemeTask (WKWebView webView, IWKUrlSchemeTask urlSchemeTask); } -#endif + interface IWKUrlSchemeTask {} [Mac (10,13), iOS (11,0)] @@ -816,7 +815,6 @@ interface WKWebViewConfiguration : NSCopying, NSSecureCoding { [Export ("ignoresViewportScaleLimits")] bool IgnoresViewportScaleLimits { get; set; } -#if XAMCORE_2_0 [Mac (10,13), iOS (11,0)] [Export ("setURLSchemeHandler:forURLScheme:")] void SetUrlSchemeHandler ([NullAllowed] IWKUrlSchemeHandler urlSchemeHandler, string urlScheme); @@ -825,7 +823,6 @@ interface WKWebViewConfiguration : NSCopying, NSSecureCoding { [Export ("urlSchemeHandlerForURLScheme:")] [return: NullAllowed] IWKUrlSchemeHandler GetUrlSchemeHandler (string urlScheme); -#endif [Mac (10,15)] [iOS (13,0)]