diff --git a/src/CoreWlan/CWConfiguration.cs b/src/CoreWlan/CWConfiguration.cs index a1cb076761..87c2bb03ee 100644 --- a/src/CoreWlan/CWConfiguration.cs +++ b/src/CoreWlan/CWConfiguration.cs @@ -1,5 +1,5 @@ // Copyright 2014 Xamarin Inc. All rights reserved. - +#if !__MACCATALYST__ using Foundation; using CoreFoundation; using ObjCRuntime; @@ -17,3 +17,4 @@ namespace CoreWlan { } } } +#endif diff --git a/src/CoreWlan/CWInterface.cs b/src/CoreWlan/CWInterface.cs index 7577226164..ff4886d01c 100644 --- a/src/CoreWlan/CWInterface.cs +++ b/src/CoreWlan/CWInterface.cs @@ -1,5 +1,5 @@ // Copyright 2014 Xamarin Inc. All rights reserved. - +#if !__MACCATALYST__ using Foundation; using CoreFoundation; using ObjCRuntime; @@ -75,3 +75,4 @@ namespace CoreWlan { } } +#endif // !__MACCATALYST__ diff --git a/src/CoreWlan/CWKeychain.cs b/src/CoreWlan/CWKeychain.cs index e1739289ff..1ad00ef523 100644 --- a/src/CoreWlan/CWKeychain.cs +++ b/src/CoreWlan/CWKeychain.cs @@ -1,3 +1,4 @@ +#if !__MACCATALYST__ using System; using System.Runtime.InteropServices; @@ -6,10 +7,7 @@ using Foundation; using ObjCRuntime; using Security; -#if NET using System.Runtime.Versioning; -#endif - #nullable enable @@ -363,3 +361,4 @@ namespace CoreWlan { => TryGetEAPIdentityList (list, out var _); } } +#endif // !__MACCATALYST__ diff --git a/src/CoreWlan/Enums.cs b/src/CoreWlan/Enums.cs index 9f37ec41ee..ab4375a06b 100644 --- a/src/CoreWlan/Enums.cs +++ b/src/CoreWlan/Enums.cs @@ -12,9 +12,9 @@ using System.Runtime.Versioning; namespace CoreWlan { #if NET - [SupportedOSPlatform ("maccatalyst15.0")] + [UnsupportedOSPlatform ("maccatalyst")] #else - [MacCatalyst (15,0)] + [NoMacCatalyst] #endif [Native] [ErrorDomain ("CWErrorDomain")] // enum named `CWErr` in headers @@ -56,9 +56,9 @@ namespace CoreWlan { } #if NET - [SupportedOSPlatform ("maccatalyst15.0")] + [UnsupportedOSPlatform ("maccatalyst")] #else - [MacCatalyst (15,0)] + [NoMacCatalyst] #endif [Native] public enum CWPhyMode : ulong { @@ -72,9 +72,9 @@ namespace CoreWlan { } #if NET - [SupportedOSPlatform ("maccatalyst15.0")] + [UnsupportedOSPlatform ("maccatalyst")] #else - [MacCatalyst (15,0)] + [NoMacCatalyst] #endif [Native] public enum CWInterfaceMode : ulong { @@ -85,9 +85,9 @@ namespace CoreWlan { } #if NET - [SupportedOSPlatform ("maccatalyst15.0")] + [UnsupportedOSPlatform ("maccatalyst")] #else - [MacCatalyst (15,0)] + [NoMacCatalyst] #endif [Native] public enum CWSecurity : ulong { @@ -111,6 +111,11 @@ namespace CoreWlan { Unknown = long.MaxValue, } +#if NET + [UnsupportedOSPlatform ("maccatalyst")] +#else + [NoMacCatalyst] +#endif [Deprecated (PlatformName.MacOSX, 11,0)] [Native] public enum CWIbssModeSecurity : ulong { @@ -120,9 +125,9 @@ namespace CoreWlan { } #if NET - [SupportedOSPlatform ("maccatalyst15.0")] + [UnsupportedOSPlatform ("maccatalyst")] #else - [MacCatalyst (15,0)] + [NoMacCatalyst] #endif [Native] public enum CWChannelWidth : ulong { @@ -134,9 +139,9 @@ namespace CoreWlan { } #if NET - [SupportedOSPlatform ("maccatalyst15.0")] + [UnsupportedOSPlatform ("maccatalyst")] #else - [MacCatalyst (15,0)] + [NoMacCatalyst] #endif [Native] public enum CWChannelBand : ulong { @@ -146,9 +151,9 @@ namespace CoreWlan { } #if NET - [SupportedOSPlatform ("maccatalyst15.0")] + [UnsupportedOSPlatform ("maccatalyst")] #else - [MacCatalyst (15,0)] + [NoMacCatalyst] #endif [Native] public enum CWCipherKeyFlags : ulong { @@ -160,9 +165,9 @@ namespace CoreWlan { } #if NET - [SupportedOSPlatform ("maccatalyst15.0")] + [UnsupportedOSPlatform ("maccatalyst")] #else - [MacCatalyst (15,0)] + [NoMacCatalyst] #endif [Native] public enum CWKeychainDomain : ulong { @@ -172,9 +177,9 @@ namespace CoreWlan { } #if NET - [SupportedOSPlatform ("maccatalyst15.0")] + [UnsupportedOSPlatform ("maccatalyst")] #else - [MacCatalyst (15,0)] + [NoMacCatalyst] #endif [Native] public enum CWEventType : long { diff --git a/src/corewlan.cs b/src/corewlan.cs index 9ae21eab8e..b3b82e3889 100644 --- a/src/corewlan.cs +++ b/src/corewlan.cs @@ -30,7 +30,7 @@ using System; namespace CoreWlan { - [MacCatalyst (15,0)] + [NoMacCatalyst] [BaseType (typeof (NSObject))] interface CWChannel : NSCoding, NSSecureCoding, NSCopying { [Export ("channelNumber")] @@ -85,40 +85,34 @@ namespace CoreWlan { CW8021XProfile[] AllUser8021XProfiles { get; } } - [MacCatalyst (15,0)] + [NoMacCatalyst] [BaseType (typeof (NSObject))] interface CWConfiguration : NSSecureCoding, NSMutableCopying { - [NoMacCatalyst] + [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("rememberedNetworks")] NSSet RememberedNetworks { get; set; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("preferredNetworks")] CWWirelessProfile[] PreferredNetworks { get; set; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("alwaysRememberNetworks")] bool AlwaysRememberNetworks { get; set; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("disconnectOnLogout")] bool DisconnectOnLogout { get; set; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("requireAdminForNetworkChange")] bool RequireAdminForNetworkChange { get; set; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("requireAdminForPowerChange")] bool RequireAdminForPowerChange { get; set; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("requireAdminForIBSSCreation")] bool RequireAdminForIBSSCreation { get; set; } @@ -149,13 +143,12 @@ namespace CoreWlan { [Export ("configuration")] CWConfiguration Create (); - [MacCatalyst (15,0)] [Static] [Export ("configurationWithConfiguration:")] CWConfiguration Create (CWConfiguration configuration); } - [MacCatalyst (15, 0)] + [NoMacCatalyst] [BaseType (typeof (CWConfiguration))] interface CWMutableConfiguration { @@ -176,198 +169,160 @@ namespace CoreWlan { bool RememberJoinedNetworks { get; set; } } - [MacCatalyst (15,0)] + [NoMacCatalyst] [BaseType (typeof (NSObject))] interface CWInterface { - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportsWoW")] bool SupportsWow { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportsWEP")] bool SupportsWep { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportsAES_CCM")] bool SupportsAesCcm { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportsIBSS")] bool SupportsIbss { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportsTKIP")] bool SupportsTkip { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportsPMGT")] bool SupportsPmgt { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportsHostAP")] bool SupportsHostAP { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportsMonitorMode")] bool SupportsMonitorMode { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportsWPA")] bool SupportsWpa { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportsWPA2")] bool SupportsWpa2 { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportsWME")] bool SupportsWme { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportsShortGI40MHz")] bool SupportsShortGI40MHz { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportsShortGI20MHz")] bool SupportsShortGI20MHz { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportsTSN")] bool SupportsTsn { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("power")] bool Power { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("powerSave")] bool PowerSave { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("name")] string Name { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportedChannels")] NSNumber[] SupportedChannels { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("supportedPHYModes")] NSNumber[] SupportedPhyModes { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("channel")] NSNumber Channel { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("phyMode")] NSNumber PhyMode { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("bssidData")] NSData BssidData { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("rssi")] NSNumber Rssi { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("noise")] NSNumber Noise { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("txRate")] NSNumber TxRate { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("securityMode")] NSNumber SecurityMode { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("interfaceState")] NSNumber InterfaceState { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("opMode")] NSNumber OpMode { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("txPower")] NSNumber TxPower { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Static] [Export ("supportedInterfaces")] string[] SupportedInterfaces { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Static] [Export ("interface")] CWInterface MainInterface { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Static] [Export ("interfaceWithName:")] CWInterface FromName ([NullAllowed]string name); - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("isEqualToInterface:")] bool IsEqualToInterface (CWInterface intface); - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("setChannel:error:")] bool SetChannel (nuint channel, out NSError error); - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("scanForNetworksWithParameters:error:")] CWNetwork[] ScanForNetworksWithParameters ([NullAllowed] NSDictionary parameters, out NSError error); - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("associateToNetwork:parameters:error:")] bool AssociateToNetwork ([NullAllowed] CWNetwork network, [NullAllowed] NSDictionary parameters, out NSError error); - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("enableIBSSWithParameters:error:")] bool EnableIBSSWithParameters ([NullAllowed] NSDictionary parameters, out NSError error); - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("commitConfiguration:error:")] bool CommitConfiguration (CWConfiguration config, out NSError error); @@ -530,51 +485,43 @@ namespace CoreWlan { bool IsEqualToProfile (CWWirelessProfile profile); } - [MacCatalyst (15,0)] + [NoMacCatalyst] [BaseType (typeof (NSObject))] interface CWNetwork : NSSecureCoding, NSCopying { - [NoMacCatalyst] + [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [NullAllowed] [Export ("bssidData")] NSData BssidData { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("securityMode")] NSNumber SecurityMode { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("phyMode")] NSNumber PhyMode { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("channel")] NSNumber Channel { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("rssi")] NSNumber Rssi { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("noise")] NSNumber Noise { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("ieData")] NSData IeData { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("isIBSS")] bool IsIBSS { get; } - [NoMacCatalyst] [Availability (Deprecated = Platform.Mac_10_7, Obsoleted = Platform.Mac_10_9)] [Export ("wirelessProfile")] CWWirelessProfile WirelessProfile { get; } @@ -625,7 +572,7 @@ namespace CoreWlan { bool SupportsPhyMode (CWPhyMode phyMode); } - [MacCatalyst (15,0)] + [NoMacCatalyst] [BaseType (typeof (NSObject))] interface CWNetworkProfile : NSCoding, NSSecureCoding, NSCopying, NSMutableCopying { @@ -655,7 +602,7 @@ namespace CoreWlan { bool IsEqualToNetworkProfile (CWNetworkProfile networkProfile); } - [MacCatalyst (15,0)] + [NoMacCatalyst] [BaseType (typeof (CWNetworkProfile))] interface CWMutableNetworkProfile : NSCoding, NSSecureCoding, NSCopying, NSMutableCopying { @@ -667,7 +614,7 @@ namespace CoreWlan { CWSecurity Security { get; set; } } - [Mac (10,10), MacCatalyst (15,0)] + [Mac (10,10), NoMacCatalyst] [BaseType (typeof (NSObject))] interface CWWiFiClient { @@ -708,7 +655,6 @@ namespace CoreWlan { interface ICWEventDelegate { } - [MacCatalyst (15,0)] [BaseType (typeof (NSObject))] [Model] [Protocol] diff --git a/tests/xtro-sharpie/MacCatalyst-CoreWLAN.todo b/tests/xtro-sharpie/MacCatalyst-CoreWLAN.todo deleted file mode 100644 index 10f9beba0a..0000000000 --- a/tests/xtro-sharpie/MacCatalyst-CoreWLAN.todo +++ /dev/null @@ -1,27 +0,0 @@ -!unknown-field! CWErrorDomain bound -!unknown-native-enum! CWChannelBand bound -!unknown-native-enum! CWChannelWidth bound -!unknown-native-enum! CWCipherKeyFlags bound -!unknown-native-enum! CWEventType bound -!unknown-native-enum! CWIbssModeSecurity bound -!unknown-native-enum! CWInterfaceMode bound -!unknown-native-enum! CWKeychainDomain bound -!unknown-native-enum! CWPhyMode bound -!unknown-native-enum! CWSecurity bound -!unknown-pinvoke! CWKeychainCopyEAPIdentityList bound -!unknown-pinvoke! CWKeychainCopyWiFiEAPIdentity bound -!unknown-pinvoke! CWKeychainDeleteWiFiEAPUsernameAndPassword bound -!unknown-pinvoke! CWKeychainDeleteWiFiPassword bound -!unknown-pinvoke! CWKeychainFindWiFiEAPUsernameAndPassword bound -!unknown-pinvoke! CWKeychainFindWiFiPassword bound -!unknown-pinvoke! CWKeychainSetWiFiEAPIdentity bound -!unknown-pinvoke! CWKeychainSetWiFiEAPUsernameAndPassword bound -!unknown-pinvoke! CWKeychainSetWiFiPassword bound -!unknown-type! CWChannel bound -!unknown-type! CWConfiguration bound -!unknown-type! CWInterface bound -!unknown-type! CWMutableConfiguration bound -!unknown-type! CWMutableNetworkProfile bound -!unknown-type! CWNetwork bound -!unknown-type! CWNetworkProfile bound -!unknown-type! CWWiFiClient bound