[NetworkExtension] Update to Xcode 26 beta 1-6. (#23698)

Author: rolfbjarne

src/NetworkExtension/NEEnums.cs

@@ -61,9 +61,15 @@ public enum NEVpnIkeAuthenticationMethod : long {
 	public enum NEVpnIke2EncryptionAlgorithm : long {
 		/// <summary>To be added.</summary>
 		[NoTV]
+		[Deprecated (PlatformName.iOS, 26, 0, "Not supported anymore.")]
+		[Deprecated (PlatformName.MacOSX, 26, 0, "Not supported anymore.")]
+		[Deprecated (PlatformName.MacCatalyst, 26, 0, "Not supported anymore.")]
 		DES = 1,
 		/// <summary>To be added.</summary>
 		[NoTV]
+		[Deprecated (PlatformName.iOS, 26, 0, "Not supported anymore.")]
+		[Deprecated (PlatformName.MacOSX, 26, 0, "Not supported anymore.")]
+		[Deprecated (PlatformName.MacCatalyst, 26, 0, "Not supported anymore.")]
 		TripleDES = 2,
 		/// <summary>To be added.</summary>
 		AES128 = 3,
@@ -87,9 +93,15 @@ public enum NEVpnIke2EncryptionAlgorithm : long {
 	public enum NEVpnIke2IntegrityAlgorithm : long {
 		/// <summary>Indicates the SHA-1 96-bit algorithm.</summary>
 		[NoTV]
+		[Deprecated (PlatformName.iOS, 26, 0, "Not supported anymore.")]
+		[Deprecated (PlatformName.MacOSX, 26, 0, "Not supported anymore.")]
+		[Deprecated (PlatformName.MacCatalyst, 26, 0, "Not supported anymore.")]
 		SHA96 = 1,
 		/// <summary>Indicates the SHA-1 160-bit algorithm.</summary>
 		[NoTV]
+		[Deprecated (PlatformName.iOS, 26, 0, "Not supported anymore.")]
+		[Deprecated (PlatformName.MacOSX, 26, 0, "Not supported anymore.")]
+		[Deprecated (PlatformName.MacCatalyst, 26, 0, "Not supported anymore.")]
 		SHA160 = 2,
 		/// <summary>Indicates the SHA-2 256-bit algorithm.</summary>
 		SHA256 = 3,
@@ -125,12 +137,21 @@ public enum NEVpnIke2DiffieHellman : long {
 		Group0 = Invalid,
 		/// <summary>To be added.</summary>
 		[NoTV]
+		[Deprecated (PlatformName.iOS, 26, 0, "Groups less than 14 are not supported anymore.")]
+		[Deprecated (PlatformName.MacOSX, 26, 0, "Groups less than 14 are not supported anymore.")]
+		[Deprecated (PlatformName.MacCatalyst, 26, 0, "Groups less than 14 are not supported anymore.")]
 		Group1 = 1,
 		/// <summary>To be added.</summary>
 		[NoTV]
+		[Deprecated (PlatformName.iOS, 26, 0, "Groups less than 14 are not supported anymore.")]
+		[Deprecated (PlatformName.MacOSX, 26, 0, "Groups less than 14 are not supported anymore.")]
+		[Deprecated (PlatformName.MacCatalyst, 26, 0, "Groups less than 14 are not supported anymore.")]
 		Group2 = 2,
 		/// <summary>To be added.</summary>
 		[NoTV]
+		[Deprecated (PlatformName.iOS, 26, 0, "Groups less than 14 are not supported anymore.")]
+		[Deprecated (PlatformName.MacOSX, 26, 0, "Groups less than 14 are not supported anymore.")]
+		[Deprecated (PlatformName.MacCatalyst, 26, 0, "Groups less than 14 are not supported anymore.")]
 		Group5 = 5,
 		/// <summary>To be added.</summary>
 		Group14 = 14,

src/networkextension.cs

@@ -700,6 +700,10 @@ interface NEDnsSettings : NSSecureCoding, NSCopying {
 		[Notification]
 		[Field ("NEDNSSettingsConfigurationDidChangeNotification")]
 		NSString ConfigurationDidChangeNotification { get; }
+
+		[TV (26, 0), MacCatalyst (26, 0), Mac (26, 0), iOS (26, 0)]
+		[Export ("allowFailover")]
+		bool AllowFailover { get; set; }
 	}
 
 	/// <summary>Provides filter flow control information to a <see cref="NetworkExtension.NEFilterDataProvider" />.</summary>
@@ -1408,6 +1412,8 @@ interface NEFlowMetaData : NSCopying, NSSecureCoding {
 	[NoMac]
 	[MacCatalyst (13, 1)]
 	[BaseType (typeof (NSObject))]
+	[Deprecated (PlatformName.iOS, 26, 0, message: "Use 'NEHotspotManager' instead.")] // NEHotspotManager is swift only :/
+	[Deprecated (PlatformName.MacCatalyst, 26, 0, message: "Use 'NEHotspotManager' instead.")] // NEHotspotManager is swift only :/
 	interface NEHotspotHelper {
 		[Static]
 		[Internal]
@@ -1553,7 +1559,9 @@ interface NEHotspotHelperResponse {
 		void SetNetworkList (NEHotspotNetwork [] networkList);
 
 		/// <summary>Delivers the response.</summary>
-		///         <remarks>To be added.</remarks>
+		// deprecated, but the replacment API is Swift-only :/
+		[Deprecated (PlatformName.iOS, 26, 0, message: "Use 'NEHotspotEvaluationProvider.HandleCommand' or 'NEHotspotAuthenticationProvider.HandleCommand' instead.")]
+		[Deprecated (PlatformName.MacCatalyst, 26, 0, message: "Use 'NEHotspotEvaluationProvider.HandleCommand' or 'NEHotspotAuthenticationProvider.HandleCommand' instead.")]
 		[Export ("deliver")]
 		void Deliver ();
 	}
@@ -2604,7 +2612,11 @@ interface NEVpnProtocolIpSec {
 	/// <related type="externalDocumentation" href="https://developer.apple.com/library/ios/documentation/NetworkExtension/Reference/NEVPNIKEv2SecurityAssociationParametersClassRef/index.html">Apple documentation for <c>NEVPNIKEv2SecurityAssociationParameters</c></related>
 	[MacCatalyst (13, 1)]
 	[BaseType (typeof (NSObject), Name = "NEVPNIKEv2SecurityAssociationParameters")]
+#if XAMCORE_5_0
+	interface NEVpnIkev2SecurityAssociationParameters : NSSecureCoding, NSCopying {
+#else
 	interface NEVpnIke2SecurityAssociationParameters : NSSecureCoding, NSCopying {
+#endif
 
 		/// <summary>Gets or sets the encryption algorithm for the Security Association.</summary>
 		///         <value>To be added.</value>
@@ -2629,14 +2641,23 @@ interface NEVpnIke2SecurityAssociationParameters : NSSecureCoding, NSCopying {
 		///         <remarks>To be added.</remarks>
 		[Export ("lifetimeMinutes")]
 		int LifetimeMinutes { get; set; } /* int32_t */
+
+		[TV (26, 0), MacCatalyst (26, 0), Mac (26, 0), iOS (26, 0)]
+		[Export ("postQuantumKeyExchangeMethods", ArgumentSemantic.Copy)]
+		[BindAs (typeof (NEVpnIkev2PostQuantumKeyExchangeMethod []))]
+		NSNumber [] PostQuantumKeyExchangeMethods { get; set; }
 	}
 
 	/// <summary>IKEv2 protocol information for VPN connections</summary>
 	/// <remarks>To be added.</remarks>
 	/// <related type="externalDocumentation" href="https://developer.apple.com/library/ios/documentation/NetworkExtension/Reference/NEVPNProtocolIKEv2ClassRef/index.html">Apple documentation for <c>NEVPNProtocolIKEv2</c></related>
 	[MacCatalyst (13, 1)]
 	[BaseType (typeof (NEVpnProtocolIpSec), Name = "NEVPNProtocolIKEv2")]
+#if XAMCORE_5_0
+	interface NEVpnProtocolIkev2 {
+#else
 	interface NEVpnProtocolIke2 {
+#endif
 
 		/// <summary>Gets or sets the rate at which the IKEv2 client will attempt to detect dead peers.</summary>
 		///         <value>To be added.</value>
@@ -2753,6 +2774,10 @@ interface NEVpnProtocolIke2 {
 		[TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
 		[Export ("ppkConfiguration", ArgumentSemantic.Copy), NullAllowed]
 		NEVpnIkev2PpkConfiguration PpkConfiguration { get; set; }
+
+		[TV (26, 0), MacCatalyst (26, 0), Mac (26, 0), iOS (26, 0)]
+		[Export ("allowPostQuantumKeyExchangeFallback")]
+		bool AllowPostQuantumKeyExchangeFallback { get; set; }
 	}
 
 	/// <summary>Subclasses define rules for automatic connection to VPNs.</summary>
@@ -4663,6 +4688,10 @@ interface NEAppPushManager {
 		[NoTV, NoMac, iOS (15, 0), MacCatalyst (15, 0)]
 		[Export ("matchPrivateLTENetworks", ArgumentSemantic.Copy)]
 		NEPrivateLteNetwork [] MatchPrivateLteNetworks { get; set; }
+
+		[MacCatalyst (26, 0), NoTV, NoMac, iOS (26, 0)]
+		[Export ("matchEthernet")]
+		bool MatchEthernet { get; set; }
 	}
 
 	[NoTV, NoMac, iOS (14, 0)]
@@ -4697,6 +4726,10 @@ interface NEAppPushProvider {
 		[NoTV, NoMac, iOS (15, 0), MacCatalyst (15, 0)]
 		[Export ("start")]
 		void Start ();
+
+		[MacCatalyst (26, 0), NoTV, NoMac, iOS (26, 0)]
+		[Export ("unmatchEthernet")]
+		void UnmatchEthernet ();
 	}
 
 	[iOS (14, 0), TV (17, 0)]
@@ -4913,6 +4946,10 @@ interface NERelayManager {
 		[Export ("UIToggleEnabled")]
 		[TV (18, 4), Mac (15, 4), iOS (18, 4), MacCatalyst (18, 4)]
 		bool UIToggleEnabled { [Bind ("isUIToggleEnabled")] get; set; }
+
+		[TV (26, 0), MacCatalyst (26, 0), Mac (26, 0), iOS (26, 0)]
+		[Export ("allowDNSFailover")]
+		bool AllowDNSFailover { [Bind ("isDNSFailoverAllowed")] get; set; }
 	}
 
 	[TV (18, 0), Mac (15, 0), iOS (18, 0), MacCatalyst (18, 0)]
@@ -4946,4 +4983,33 @@ interface NEVpnIkev2PpkConfiguration : NSCopying {
 		[Export ("isMandatory")]
 		bool IsMandatory { get; set; }
 	}
+
+
+	[MacCatalyst (26, 0), NoTV, Mac (26, 0), iOS (26, 0)]
+	[Native]
+	[NativeName ("NEURLFilterVerdict")]
+	public enum NEUrlFilterVerdict : long {
+		Unknown = 1,
+		Allow = 2,
+		Deny = 3,
+	}
+
+	[MacCatalyst (26, 0), NoTV, Mac (26, 0), iOS (26, 0)]
+	[BaseType (typeof (NSObject), Name = "NEURLFilter")]
+	[DisableDefaultCtor]
+	interface NEUrlFilter {
+		[Async]
+		[Static]
+		[Export ("verdictForURL:completionHandler:")]
+		void GetVerdict (NSUrl url, Action<NEUrlFilterVerdict> completionHandler);
+	}
+
+	[MacCatalyst (26, 0), TV (26, 0), Mac (26, 0), iOS (26, 0)]
+	[Native]
+	[NativeName ("NEVPNIKEv2PostQuantumKeyExchangeMethod")]
+	public enum NEVpnIkev2PostQuantumKeyExchangeMethod : long {
+		None = 0,
+		Method36 = 36,
+		Method37 = 37
+	}
 }

tests/cecil-tests/Documentation.KnownFailures.txt

@@ -5473,6 +5473,9 @@ F:NetworkExtension.NETrafficDirection.Any
 F:NetworkExtension.NETrafficDirection.Inbound
 F:NetworkExtension.NETrafficDirection.Outbound
 F:NetworkExtension.NETunnelProviderRoutingMethod.NetworkRule
+F:NetworkExtension.NEUrlFilterVerdict.Allow
+F:NetworkExtension.NEUrlFilterVerdict.Deny
+F:NetworkExtension.NEUrlFilterVerdict.Unknown
 F:NetworkExtension.NEVpnConnectionError.AuthenticationFailed
 F:NetworkExtension.NEVpnConnectionError.ClientCertificateExpired
 F:NetworkExtension.NEVpnConnectionError.ClientCertificateInvalid
@@ -5497,6 +5500,9 @@ F:NetworkExtension.NEVpnIke2CertificateType.Rsapss
 F:NetworkExtension.NEVpnIke2DiffieHellman.Group31
 F:NetworkExtension.NEVpnIke2DiffieHellman.Group32
 F:NetworkExtension.NEVpnIke2EncryptionAlgorithm.ChaCha20Poly1305
+F:NetworkExtension.NEVpnIkev2PostQuantumKeyExchangeMethod.Method36
+F:NetworkExtension.NEVpnIkev2PostQuantumKeyExchangeMethod.Method37
+F:NetworkExtension.NEVpnIkev2PostQuantumKeyExchangeMethod.None
 F:ObjCRuntime.Dlfcn.Mode.First
 F:ObjCRuntime.Dlfcn.Mode.Global
 F:ObjCRuntime.Dlfcn.Mode.Lazy
@@ -15357,6 +15363,7 @@ M:NetworkExtension.NEAppPushProvider.Start(System.Action{Foundation.NSError})
 M:NetworkExtension.NEAppPushProvider.StartAsync
 M:NetworkExtension.NEAppPushProvider.Stop(NetworkExtension.NEProviderStopReason,System.Action)
 M:NetworkExtension.NEAppPushProvider.StopAsync(NetworkExtension.NEProviderStopReason)
+M:NetworkExtension.NEAppPushProvider.UnmatchEthernet
 M:NetworkExtension.NEDnsProxyProvider.HandleNewUdpFlow(NetworkExtension.NEAppProxyUdpFlow,NetworkExtension.NWEndpoint)
 M:NetworkExtension.NEDnsProxyProvider.HandleNewUdpFlowWithInitialFlowEndPoint(NetworkExtension.NEAppProxyUdpFlow,Network.NWEndpoint)
 M:NetworkExtension.NEDnsSettingsManager.LoadFromPreferences(System.Action{Foundation.NSError})
@@ -15408,6 +15415,8 @@ M:NetworkExtension.NETransparentProxyManager.LoadAllFromPreferences(System.Actio
 M:NetworkExtension.NETransparentProxyManager.LoadAllFromPreferencesAsync
 M:NetworkExtension.NETunnelProviderManager.CopyAppRules
 M:NetworkExtension.NETunnelProviderManager.CreatePerAppVpn
+M:NetworkExtension.NEUrlFilter.GetVerdict(Foundation.NSUrl,System.Action{NetworkExtension.NEUrlFilterVerdict})
+M:NetworkExtension.NEUrlFilter.GetVerdictAsync(Foundation.NSUrl)
 M:NetworkExtension.NEVpnConnection.FetchLastDisconnectError(System.Action{Foundation.NSError})
 M:NetworkExtension.NEVpnConnection.FetchLastDisconnectErrorAsync
 M:NetworkExtension.NEVpnIkev2PpkConfiguration.#ctor(System.String,Foundation.NSData)
@@ -23769,6 +23778,7 @@ P:NetworkExtension.NEAppPushManager.Active
 P:NetworkExtension.NEAppPushManager.Delegate
 P:NetworkExtension.NEAppPushManager.Enabled
 P:NetworkExtension.NEAppPushManager.LocalizedDescription
+P:NetworkExtension.NEAppPushManager.MatchEthernet
 P:NetworkExtension.NEAppPushManager.MatchPrivateLteNetworks
 P:NetworkExtension.NEAppPushManager.MatchSsids
 P:NetworkExtension.NEAppPushManager.ProviderBundleIdentifier
@@ -23780,6 +23790,7 @@ P:NetworkExtension.NEDnsOverHttpsSettings.IdentityReference
 P:NetworkExtension.NEDnsOverHttpsSettings.ServerUrl
 P:NetworkExtension.NEDnsOverTlsSettings.IdentityReference
 P:NetworkExtension.NEDnsOverTlsSettings.ServerName
+P:NetworkExtension.NEDnsSettings.AllowFailover
 P:NetworkExtension.NEDnsSettings.DnsProtocol
 P:NetworkExtension.NEDnsSettingsManager.DnsSettings
 P:NetworkExtension.NEDnsSettingsManager.Enabled
@@ -23839,6 +23850,7 @@ P:NetworkExtension.NERelay.IdentityDataPassword
 P:NetworkExtension.NERelay.RawPublicKeys
 P:NetworkExtension.NERelay.SyntheticDnsAnswerIPv4Prefix
 P:NetworkExtension.NERelay.SyntheticDnsAnswerIPv6Prefix
+P:NetworkExtension.NERelayManager.AllowDNSFailover
 P:NetworkExtension.NERelayManager.Enabled
 P:NetworkExtension.NERelayManager.ExcludedDomains
 P:NetworkExtension.NERelayManager.ExcludedFqdns
@@ -23857,6 +23869,7 @@ P:NetworkExtension.NETunnelProviderManager.ContactsDomains
 P:NetworkExtension.NETunnelProviderManager.ExcludedDomains
 P:NetworkExtension.NETunnelProviderManager.MailDomains
 P:NetworkExtension.NETunnelProviderManager.SafariDomains
+P:NetworkExtension.NEVpnIke2SecurityAssociationParameters.PostQuantumKeyExchangeMethods
 P:NetworkExtension.NEVpnIkev2PpkConfiguration.Identifier
 P:NetworkExtension.NEVpnIkev2PpkConfiguration.IsMandatory
 P:NetworkExtension.NEVpnIkev2PpkConfiguration.KeychainReference
@@ -23867,6 +23880,7 @@ P:NetworkExtension.NEVpnProtocol.ExcludeDeviceCommunication
 P:NetworkExtension.NEVpnProtocol.ExcludeLocalNetworks
 P:NetworkExtension.NEVpnProtocol.IncludeAllNetworks
 P:NetworkExtension.NEVpnProtocol.SliceUuid
+P:NetworkExtension.NEVpnProtocolIke2.AllowPostQuantumKeyExchangeFallback
 P:NetworkExtension.NEVpnProtocolIke2.EnableFallback
 P:NetworkExtension.NEVpnProtocolIke2.Mtu
 P:NetworkExtension.NEVpnProtocolIke2.PpkConfiguration
@@ -28683,7 +28697,10 @@ T:NetworkExtension.NETrafficDirection
 T:NetworkExtension.NETransparentProxyManager
 T:NetworkExtension.NETransparentProxyNetworkSettings
 T:NetworkExtension.NETransparentProxyProvider
+T:NetworkExtension.NEUrlFilter
+T:NetworkExtension.NEUrlFilterVerdict
 T:NetworkExtension.NEVpnConnectionError
+T:NetworkExtension.NEVpnIkev2PostQuantumKeyExchangeMethod
 T:NetworkExtension.NEVpnIkev2PpkConfiguration
 T:NetworkExtension.NEVpnIkev2TlsVersion
 T:NotificationCenter.NCWidgetListViewController

tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-NetworkExtension.todo

@@ -6,3 +6,5 @@
 
 !unknown-field! NEAppProxyErrorDomain bound
 
+# headers are clear that NEURLFilter isn't available on tvOS, not sure why xtro thinks otherwise.
+!missing-type! NEURLFilter not bound