Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NetworkExtension] Add support for Xcode 15 #19059

Merged
merged 6 commits into from
Oct 2, 2023
Merged

[NetworkExtension] Add support for Xcode 15 #19059

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f1ddb6
[NetworkExtension] Add support for Xcode 15
haritha-mohan Sep 19, 2023
15c8130
Auto-format source code
Sep 19, 2023
7a8d1c2
fix avail attrs
haritha-mohan Sep 21, 2023
2ef2d95
Merge branch 'net8.0-xcode15' into net8.0-xcode15-networkextension
haritha-mohan Sep 22, 2023
a8603b5
address release attribute error on a per platform basis bc no longer …
haritha-mohan Sep 27, 2023
7cb0ebb
remove xtro ignore from watchos cuz not supported
haritha-mohan Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion src/NetworkExtension/NEEnums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ public enum NEVpnIkeAuthenticationMethod : long {
[MacCatalyst (13, 1)]
[Native ("NEVPNIKEv2EncryptionAlgorithm")]
public enum NEVpnIke2EncryptionAlgorithm : long {
[NoTV]
DES = 1,
[NoTV]
TripleDES = 2,
AES128 = 3,
AES256 = 4,
Expand All @@ -52,7 +54,9 @@ public enum NEVpnIke2EncryptionAlgorithm : long {
[MacCatalyst (13, 1)]
[Native ("NEVPNIKEv2IntegrityAlgorithm")]
public enum NEVpnIke2IntegrityAlgorithm : long {
[NoTV]
SHA96 = 1,
[NoTV]
SHA160 = 2,
SHA256 = 3,
SHA384 = 4,
Expand All @@ -73,8 +77,11 @@ public enum NEVpnIke2DeadPeerDetectionRate : long {
public enum NEVpnIke2DiffieHellman : long {
Invalid = 0,
Group0 = Invalid,
[NoTV]
Group1 = 1,
[NoTV]
Group2 = 2,
[NoTV]
Group5 = 5,
Group14 = 14,
Group15 = 15,
Expand All @@ -87,6 +94,8 @@ public enum NEVpnIke2DiffieHellman : long {
[iOS (13, 0)]
[MacCatalyst (13, 1)]
Group31 = 31,
[TV (17, 0), NoWatch, Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
Group32 = 32,
}

[MacCatalyst (13, 1)]
Expand All @@ -104,6 +113,7 @@ public enum NEOnDemandRuleInterfaceType : long {
Any = 0,
Ethernet = 1,
WiFi = 2,
[NoTV]
Cellular = 3
}

Expand All @@ -121,12 +131,16 @@ public enum NEVpnIke2CertificateType : long {
ECDSA256 = 2,
ECDSA384 = 3,
ECDSA521 = 4,
[NoTV]
[iOS (13, 0)]
[MacCatalyst (13, 1)]
Ed25519 = 5,
[TV (17, 0), NoWatch, Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
Rsapss = 6,
}

// in Xcode7 SDK but marked as 8.0
[NoTV]
[MacCatalyst (13, 1)]
[ErrorDomain ("NEFilterErrorDomain")]
[Native]
Expand Down Expand Up @@ -225,6 +239,7 @@ public enum NWUdpSessionState : long {
Cancelled = 5
}

[NoTV]
[MacCatalyst (13, 1)]
[Native]
public enum NETunnelProviderRoutingMethod : long {
Expand All @@ -236,6 +251,7 @@ public enum NETunnelProviderRoutingMethod : long {
}

#if !MONOMAC
[NoTV]
[NoMac]
[MacCatalyst (13, 1)]
[Native]
Expand All @@ -249,6 +265,7 @@ public enum NEHotspotHelperCommandType : long {
Logoff = 6
}

[NoTV]
[NoMac]
[MacCatalyst (13, 1)]
[Native]
Expand All @@ -258,6 +275,7 @@ public enum NEHotspotHelperConfidence : long {
High = 2
}

[NoTV]
[NoMac]
[MacCatalyst (13, 1)]
[Native]
Expand All @@ -283,7 +301,7 @@ public enum NEAppPushManagerError : long {
InactiveSession = 4,
}

[NoWatch, NoTV, Mac (11, 0), iOS (14, 0)]
[NoWatch, Mac (11, 0), iOS (14, 0)]
[MacCatalyst (14, 0)]
[Native ("NEDNSProtocol")]
public enum NEDnsProtocol : long {
Expand All @@ -303,4 +321,13 @@ public enum NEDnsSettingsManagerError : long {
CannotBeRemoved = 4,
}

[TV (17, 0), NoWatch, Mac (14, 0), iOS (17, 0), MacCatalyst (17, 0)]
[Native]
public enum NERelayManagerError : long {
Invalid = 1,
Disabled = 2,
Stale = 3,
CannotBeRemoved = 4,
}

}
2 changes: 1 addition & 1 deletion src/NetworkExtension/NEHotspotConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#nullable enable

#if !MONOMAC
#if !MONOMAC && !TVOS

using Foundation;

Expand Down
4 changes: 3 additions & 1 deletion src/NetworkExtension/NEHotspotEapSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@

#nullable enable

#if !MONOMAC
#if !MONOMAC && !TVOS
using System;
using Foundation;
using ObjCRuntime;

namespace NetworkExtension {

public partial class NEHotspotEapSettings {

public NEHotspotConfigurationEapType [] SupportedEapTypes {
Expand Down
2 changes: 1 addition & 1 deletion src/NetworkExtension/NEHotspotHelperOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#nullable enable

#if !MONOMAC
#if !MONOMAC && !TVOS

using Foundation;

Expand Down
1 change: 1 addition & 0 deletions src/build/generator-frameworks.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ partial class Frameworks {
"MultipeerConnectivity",
"NaturalLanguage",
"Network",
"NetworkExtension",
"OpenGLES",
"OSLog",
"Photos",
Expand Down
1 change: 1 addition & 0 deletions src/frameworks.sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2317,6 +2317,7 @@ TVOS_FRAMEWORKS = \
MobileCoreServices \
ModelIO \
MultipeerConnectivity \
NetworkExtension \
OpenGLES \
Photos \
PhotosUI \
Expand Down
Loading