[NetworkExtensions] Add support for Xcode 14 beta 6. (#15847)

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
xamarin · Sep 2, 2022 · 431e578 · 431e578 · vs-mobiletools-engineering-service2 · Sep 2, 2022
1 parent 9d6271f
commit 431e578
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 44 deletions.
diff --git a/src/networkextension.cs b/src/networkextension.cs
@@ -177,6 +177,33 @@ enum NEHotspotNetworkSecurityType : long
 		Unknown = 4,
 	}
 
+	[NoWatch, NoTV, Mac (13,0), iOS (16,0), MacCatalyst (16,0)]
+	[Native]
+	[ErrorDomain ("NEVPNConnectionErrorDomain")]
+	public enum NEVpnConnectionError : long
+	{
+		Overslept = 1,
+		NoNetworkAvailable = 2,
+		UnrecoverableNetworkChange = 3,
+		ConfigurationFailed = 4,
+		ServerAddressResolutionFailed = 5,
+		ServerNotResponding = 6,
+		ServerDead = 7,
+		AuthenticationFailed = 8,
+		ClientCertificateInvalid = 9,
+		ClientCertificateNotYetValid = 10,
+		ClientCertificateExpired = 11,
+		PluginFailed = 12,
+		ConfigurationNotFound = 13,
+		PluginDisabled = 14,
+		NegotiationFailed = 15,
+		ServerDisconnected = 16,
+		ServerCertificateInvalid = 17,
+		ServerCertificateNotYetValid = 18,
+		ServerCertificateExpired = 19,
+	}
+
+
 	[iOS (9,0)][Mac (10,11)]
 	[BaseType (typeof (NSObject))]
 	[Abstract] // documented as such and ...
@@ -930,6 +957,11 @@ interface NEIPv4Settings : NSSecureCoding, NSCopying
 
 		[NullAllowed, Export ("excludedRoutes", ArgumentSemantic.Copy)]
 		NEIPv4Route[] ExcludedRoutes { get; set; }
+
+		[NoWatch, NoTV, NoiOS, Mac (13, 0)]
+		[Export ("router")]
+		[NullAllowed]
+		string Router { get; set; }
 	}
 
 	[iOS (9,0)][Mac (10,11)]
@@ -1249,6 +1281,11 @@ interface NEVpnConnection {
 		[Notification]
 		[Field ("NEVPNStatusDidChangeNotification")]
 		NSString StatusDidChangeNotification { get; }
+
+		[Async]
+		[NoWatch, NoTV, Mac (13,0), iOS (16,0), MacCatalyst (16,0)]
+		[Export ("fetchLastDisconnectErrorWithCompletionHandler:")]
+		void FetchLastDisconnectError (Action<NSError> handler);
 	}
 
 	[Static][Internal]
@@ -2303,6 +2340,11 @@ interface NEDnsOverHttpsSettings {
 		[NullAllowed]
 		[Export ("serverURL", ArgumentSemantic.Copy)]
 		NSUrl ServerUrl { get; set; }
+
+		[NoWatch, NoTV, Mac (13, 0), iOS (16, 0), MacCatalyst (16,0)]
+		[Export ("identityReference", ArgumentSemantic.Copy)]
+		[NullAllowed]
+		NSData IdentityReference { get; set; }
 	}
 
 	[NoWatch, NoTV, Mac (11,0), iOS (14,0)]
@@ -2312,6 +2354,11 @@ interface NEDnsOverTlsSettings {
 		[NullAllowed]
 		[Export ("serverName")]
 		string ServerName { get; set; }
+
+		[NoWatch, NoTV, Mac (13, 0), iOS (16, 0), MacCatalyst (16,0)]
+		[Export ("identityReference", ArgumentSemantic.Copy)]
+		[NullAllowed]
+		NSData IdentityReference { get; set; }
 	}
 
 	[NoWatch, NoTV, Mac (11,0), iOS (14,0)]
@@ -2390,4 +2437,21 @@ interface NEPrivateLteNetwork : NSCopying, NSSecureCoding
 		string TrackingAreaCode { get; set; }
 	}
 
+	[NoWatch, NoTV, NoiOS, Mac (13,0)]
+	[BaseType (typeof (NEPacketTunnelProvider))]
+	interface NEEthernetTunnelProvider
+	{
+	}
+
+	[NoWatch, NoTV, NoiOS, Mac (13,0)]
+	[BaseType (typeof (NEPacketTunnelNetworkSettings))]
+	interface NEEthernetTunnelNetworkSettings
+	{
+		[Export ("initWithTunnelRemoteAddress:ethernetAddress:mtu:")]
+		NativeHandle Constructor (string address, string ethernetAddress, nint mtu);
+
+		[Export ("ethernetAddress")]
+		string EthernetAddress { get; }
+	}
+
 }
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/iOS-NetworkExtension.ignore b/tests/xtro-sharpie/api-annotations-dotnet/iOS-NetworkExtension.ignore
@@ -3,3 +3,6 @@
 ## is, which means we can't use the same managed enum for both cases (the native enums aren't entirely identical
 ## either: one is pointer sized while the other is 32-bit always).
 !duplicate-type-name! NWPathStatus enum exists as both NetworkExtension.NWPathStatus and Network.NWPathStatus
+
+# value got removed in xcode14
+!extra-enum-value! Managed value 1 for NEOnDemandRuleInterfaceType.Ethernet is available for the current platform while the value in the native header is not
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/iOS-NetworkExtension.todo b/tests/xtro-sharpie/api-annotations-dotnet/iOS-NetworkExtension.todo
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/macOS-NetworkExtension.ignore b/tests/xtro-sharpie/api-annotations-dotnet/macOS-NetworkExtension.ignore
@@ -3,3 +3,6 @@
 ## is, which means we can't use the same managed enum for both cases (the native enums aren't entirely identical
 ## either: one is pointer sized while the other is 32-bit always).
 !duplicate-type-name! NWPathStatus enum exists as both NetworkExtension.NWPathStatus and Network.NWPathStatus
+
+# enum got removed from mac Os in xcode 14
+!extra-enum-value! Managed value 3 for NEOnDemandRuleInterfaceType.Cellular is available for the current platform while the value in the native header is not
diff --git a/tests/xtro-sharpie/api-annotations-dotnet/macOS-NetworkExtension.todo b/tests/xtro-sharpie/api-annotations-dotnet/macOS-NetworkExtension.todo
diff --git a/tests/xtro-sharpie/iOS-NetworkExtension.ignore b/tests/xtro-sharpie/iOS-NetworkExtension.ignore
@@ -3,3 +3,6 @@
 ## is, which means we can't use the same managed enum for both cases (the native enums aren't entirely identical
 ## either: one is pointer sized while the other is 32-bit always).
 !duplicate-type-name! NWPathStatus enum exists as both NetworkExtension.NWPathStatus and Network.NWPathStatus
+
+# value got removed in xcode14
+!extra-enum-value! Managed value 1 for NEOnDemandRuleInterfaceType.Ethernet is available for the current platform while the value in the native header is not
diff --git a/tests/xtro-sharpie/iOS-NetworkExtension.todo b/tests/xtro-sharpie/iOS-NetworkExtension.todo
diff --git a/tests/xtro-sharpie/macOS-NetworkExtension.ignore b/tests/xtro-sharpie/macOS-NetworkExtension.ignore
@@ -7,3 +7,6 @@
 ## is, which means we can't use the same managed enum for both cases (the native enums aren't entirely identical
 ## either: one is pointer sized while the other is 32-bit always).
 !duplicate-type-name! NWPathStatus enum exists as both NetworkExtension.NWPathStatus and Network.NWPathStatus
+
+# enum got removed from mac Os in xcode 14
+!extra-enum-value! Managed value 3 for NEOnDemandRuleInterfaceType.Cellular is available for the current platform while the value in the native header is not
diff --git a/tests/xtro-sharpie/macOS-NetworkExtension.todo b/tests/xtro-sharpie/macOS-NetworkExtension.todo