Merge pull request #309 from spouliot/networkextensions-b1
[networkextension] Small update for iOS 10 beta 1
This commit is contained in:
Коммит
ce9843de12
|
@ -3,6 +3,7 @@ using XamCore.ObjCRuntime;
|
|||
namespace XamCore.NetworkExtension {
|
||||
|
||||
[iOS (8,0)][Mac (10,10)]
|
||||
[ErrorDomain ("NEVPNErrorDomain")]
|
||||
[Native]
|
||||
public enum NEVpnError : nint {
|
||||
ConfigurationInvalid = 1,
|
||||
|
@ -67,7 +68,8 @@ namespace XamCore.NetworkExtension {
|
|||
[iOS (8,0)][Mac (10,10)]
|
||||
[Native]
|
||||
public enum NEVpnIke2DiffieHellman : nint {
|
||||
Group0 = 0,
|
||||
Invalid = 0,
|
||||
Group0 = Invalid,
|
||||
Group1 = 1,
|
||||
Group2 = 2,
|
||||
Group5 = 5,
|
||||
|
@ -118,6 +120,7 @@ namespace XamCore.NetworkExtension {
|
|||
|
||||
// in Xcode7 SDK but marked as 8.0
|
||||
[iOS (8,0)]
|
||||
[ErrorDomain ("NEFilterErrorDomain")]
|
||||
[Native]
|
||||
public enum NEFilterManagerError : nint {
|
||||
None = 0,
|
||||
|
@ -128,6 +131,7 @@ namespace XamCore.NetworkExtension {
|
|||
}
|
||||
|
||||
[iOS (9,0)]
|
||||
[ErrorDomain ("NETunnelProviderErrorDomain")]
|
||||
[Native]
|
||||
public enum NETunnelProviderError : nint {
|
||||
None = 0,
|
||||
|
@ -137,6 +141,7 @@ namespace XamCore.NetworkExtension {
|
|||
}
|
||||
|
||||
[iOS (9,0)]
|
||||
[ErrorDomain ("NEAppProxyErrorDomain")]
|
||||
[Native]
|
||||
public enum NEAppProxyFlowError : nint {
|
||||
None = 0,
|
||||
|
|
|
@ -931,8 +931,10 @@ MULTIPEERCONNECTIVITY_SOURCES = \
|
|||
|
||||
# NetworkExtension
|
||||
|
||||
NETWORKEXTENSION_CORE_SOURCES = \
|
||||
NETWORKEXTENSION_API_SOURCES = \
|
||||
NetworkExtension/NEEnums.cs \
|
||||
|
||||
NETWORKEXTENSION_CORE_SOURCES = \
|
||||
NetworkExtension/NEHotspotHelperOptions.cs \
|
||||
NetworkExtension/NEVpnConnectionStartOptions.cs \
|
||||
|
||||
|
|
|
@ -26,8 +26,10 @@ namespace XamCore.NetworkExtension {
|
|||
[Export ("metaData")]
|
||||
NEFlowMetaData MetaData { get; }
|
||||
|
||||
#if !XAMCORE_4_0
|
||||
[Field ("NEAppProxyErrorDomain")]
|
||||
NSString ErrorDomain { get; }
|
||||
#endif
|
||||
}
|
||||
|
||||
[iOS (9,0)][Mac (10,11, onlyOn64 : true)]
|
||||
|
@ -285,8 +287,10 @@ namespace XamCore.NetworkExtension {
|
|||
[Notification]
|
||||
NSString ConfigurationDidChangeNotification { get; }
|
||||
|
||||
#if !XAMCORE_4_0
|
||||
[Field ("NEFilterErrorDomain")]
|
||||
NSString ErrorDomain { get; }
|
||||
#endif
|
||||
}
|
||||
|
||||
#if !MONOMAC
|
||||
|
@ -620,6 +624,10 @@ namespace XamCore.NetworkExtension {
|
|||
|
||||
[NullAllowed, Export ("defaultPath")]
|
||||
NWPath DefaultPath { get; }
|
||||
|
||||
[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
|
||||
[Export ("displayMessage:completionHandler:")]
|
||||
void DisplayMessage (string message, Action<bool> completionHandler);
|
||||
}
|
||||
|
||||
[iOS (9,0)][Mac (10,11, onlyOn64 : true)]
|
||||
|
@ -741,8 +749,10 @@ namespace XamCore.NetworkExtension {
|
|||
[Export ("routingMethod")]
|
||||
NETunnelProviderRoutingMethod RoutingMethod { get; }
|
||||
|
||||
#if !XAMCORE_4_0
|
||||
[Field ("NETunnelProviderErrorDomain")]
|
||||
NSString ErrorDomain { get; }
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
@ -796,8 +806,10 @@ namespace XamCore.NetworkExtension {
|
|||
// - (void)setAuthorization:(AuthorizationRef)authorization NS_AVAILABLE(10_10, NA);
|
||||
#endif
|
||||
|
||||
#if !XAMCORE_4_0
|
||||
[Field ("NEVPNErrorDomain")]
|
||||
NSString ErrorDomain { get; }
|
||||
#endif
|
||||
|
||||
[Notification]
|
||||
[Field ("NEVPNConfigurationChangeNotification")]
|
||||
|
@ -830,6 +842,10 @@ namespace XamCore.NetworkExtension {
|
|||
[Export ("stopVPNTunnel")]
|
||||
void StopVpnTunnel ();
|
||||
|
||||
[iOS (10,0)][Mac (10,12, onlyOn64 : true)]
|
||||
[Export ("manager")]
|
||||
NEVpnManager Manager { get; }
|
||||
|
||||
[Notification]
|
||||
[Field ("NEVPNStatusDidChangeNotification")]
|
||||
NSString StatusDidChangeNotification { get; }
|
||||
|
|
Загрузка…
Ссылка в новой задаче