diff --git a/src/build/dotnet/generator-frameworks.g.cs b/src/build/dotnet/generator-frameworks.g.cs index 686bedb20c99..b489927f1384 100644 --- a/src/build/dotnet/generator-frameworks.g.cs +++ b/src/build/dotnet/generator-frameworks.g.cs @@ -61,6 +61,7 @@ partial class Frameworks { "DeviceDiscoveryUI", "EventKit", "EventKitUI", + "ExtensionKit", "ExternalAccessory", "FileProvider", "FileProviderUI", @@ -442,6 +443,7 @@ partial class Frameworks { "EventKit", "EventKitUI", "ExecutionPolicy", + "ExtensionKit", "ExternalAccessory", "FileProvider", "Foundation", diff --git a/src/extensionkit.cs b/src/extensionkit.cs index 6fbc3ee7652c..842096420ac1 100644 --- a/src/extensionkit.cs +++ b/src/extensionkit.cs @@ -16,7 +16,7 @@ #endif namespace ExtensionKit { - [Mac (13, 0), NoiOS, NoMacCatalyst, NoTV] + [Mac (13, 0), iOS (26, 0), MacCatalyst (26, 0), NoTV] [BaseType (typeof (UIViewController))] interface EXAppExtensionBrowserViewController { [DesignatedInitializer] @@ -26,7 +26,7 @@ interface EXAppExtensionBrowserViewController { interface IEXHostViewControllerDelegate { } - [Mac (13, 0), NoiOS, NoMacCatalyst, NoTV] + [Mac (13, 0), iOS (26, 0), MacCatalyst (26, 0), NoTV] [Protocol, Model] [BaseType (typeof (NSObject))] interface EXHostViewControllerDelegate { @@ -37,6 +37,7 @@ interface EXHostViewControllerDelegate { void WillDeactivate (EXHostViewController viewController, [NullAllowed] NSError error); #if !XAMCORE_5_0 + [NoiOS, NoMacCatalyst, NoTV] [Obsoleted (PlatformName.MacOSX, 14, 0, message: "No longer required.")] [Export ("shouldAcceptXPCConnection:")] bool ShouldAcceptXpcConnection (NSXpcConnection connection); @@ -44,7 +45,7 @@ interface EXHostViewControllerDelegate { } // @interface EXHostViewController : NSViewController - [Mac (13, 0), NoiOS, NoMacCatalyst, NoTV] + [Mac (13, 0), iOS (26, 0), MacCatalyst (26, 0), NoTV] [BaseType (typeof (UIViewController))] interface EXHostViewController { [DesignatedInitializer] diff --git a/src/frameworks.sources b/src/frameworks.sources index 808b36dd6113..86c1b3a71f44 100644 --- a/src/frameworks.sources +++ b/src/frameworks.sources @@ -2125,6 +2125,7 @@ IOS_FRAMEWORKS = \ DeviceDiscoveryUI \ EventKit \ EventKitUI \ + ExtensionKit \ ExternalAccessory \ FileProvider \ FileProviderUI \ @@ -2306,6 +2307,7 @@ MACCATALYST_FRAMEWORKS = \ EventKit \ EventKitUI \ ExecutionPolicy \ + ExtensionKit \ ExternalAccessory \ FileProvider \ GameController \ diff --git a/src/rsp/dotnet/ios-defines-dotnet.rsp b/src/rsp/dotnet/ios-defines-dotnet.rsp index 3f2d3fd1d505..3e057b6fee73 100644 --- a/src/rsp/dotnet/ios-defines-dotnet.rsp +++ b/src/rsp/dotnet/ios-defines-dotnet.rsp @@ -56,6 +56,7 @@ -d:HAS_DEVICEDISCOVERYUI -d:HAS_EVENTKIT -d:HAS_EVENTKITUI +-d:HAS_EXTENSIONKIT -d:HAS_EXTERNALACCESSORY -d:HAS_FILEPROVIDER -d:HAS_FILEPROVIDERUI diff --git a/src/rsp/dotnet/maccatalyst-defines-dotnet.rsp b/src/rsp/dotnet/maccatalyst-defines-dotnet.rsp index 8df65d1d4685..bcbe653cc76d 100644 --- a/src/rsp/dotnet/maccatalyst-defines-dotnet.rsp +++ b/src/rsp/dotnet/maccatalyst-defines-dotnet.rsp @@ -51,6 +51,7 @@ -d:HAS_EVENTKIT -d:HAS_EVENTKITUI -d:HAS_EXECUTIONPOLICY +-d:HAS_EXTENSIONKIT -d:HAS_EXTERNALACCESSORY -d:HAS_FILEPROVIDER -d:HAS_FOUNDATION diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs index 009e0bf5119d..6ccb80785aa7 100644 --- a/tests/dotnet/UnitTests/ProjectTest.cs +++ b/tests/dotnet/UnitTests/ProjectTest.cs @@ -2988,6 +2988,7 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl "/System/Library/Frameworks/DeviceDiscoveryUI.framework/DeviceDiscoveryUI", "/System/Library/Frameworks/EventKit.framework/EventKit", "/System/Library/Frameworks/EventKitUI.framework/EventKitUI", + "/System/Library/Frameworks/ExtensionKit.framework/ExtensionKit", "/System/Library/Frameworks/ExternalAccessory.framework/ExternalAccessory", "/System/Library/Frameworks/FileProvider.framework/FileProvider", "/System/Library/Frameworks/FileProviderUI.framework/FileProviderUI", @@ -3454,6 +3455,7 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl "/System/iOSSupport/System/Library/Frameworks/CoreLocationUI.framework/Versions/A/CoreLocationUI", "/System/iOSSupport/System/Library/Frameworks/CoreNFC.framework/Versions/A/CoreNFC", "/System/iOSSupport/System/Library/Frameworks/EventKitUI.framework/Versions/A/EventKitUI", + "/System/iOSSupport/System/Library/Frameworks/ExtensionKit.framework/Versions/A/ExtensionKit", "/System/iOSSupport/System/Library/Frameworks/GameController.framework/Versions/A/GameController", "/System/iOSSupport/System/Library/Frameworks/GameKit.framework/Versions/A/GameKit", "/System/iOSSupport/System/Library/Frameworks/GameSave.framework/Versions/A/GameSave", diff --git a/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-ExtensionKit.todo b/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-ExtensionKit.todo deleted file mode 100644 index 27ee1f23753b..000000000000 --- a/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-ExtensionKit.todo +++ /dev/null @@ -1,8 +0,0 @@ -!missing-protocol! EXHostViewControllerDelegate not bound -!missing-selector! EXHostViewController::delegate not bound -!missing-selector! EXHostViewController::makeXPCConnectionWithError: not bound -!missing-selector! EXHostViewController::placeholderView not bound -!missing-selector! EXHostViewController::setDelegate: not bound -!missing-selector! EXHostViewController::setPlaceholderView: not bound -!missing-type! EXAppExtensionBrowserViewController not bound -!missing-type! EXHostViewController not bound diff --git a/tests/xtro-sharpie/api-annotations-dotnet/iOS-ExtensionKit.todo b/tests/xtro-sharpie/api-annotations-dotnet/iOS-ExtensionKit.todo deleted file mode 100644 index 27ee1f23753b..000000000000 --- a/tests/xtro-sharpie/api-annotations-dotnet/iOS-ExtensionKit.todo +++ /dev/null @@ -1,8 +0,0 @@ -!missing-protocol! EXHostViewControllerDelegate not bound -!missing-selector! EXHostViewController::delegate not bound -!missing-selector! EXHostViewController::makeXPCConnectionWithError: not bound -!missing-selector! EXHostViewController::placeholderView not bound -!missing-selector! EXHostViewController::setDelegate: not bound -!missing-selector! EXHostViewController::setPlaceholderView: not bound -!missing-type! EXAppExtensionBrowserViewController not bound -!missing-type! EXHostViewController not bound diff --git a/tests/xtro-sharpie/api-annotations-dotnet/macOS-ExtensionKit.todo b/tests/xtro-sharpie/api-annotations-dotnet/macOS-ExtensionKit.ignore similarity index 81% rename from tests/xtro-sharpie/api-annotations-dotnet/macOS-ExtensionKit.todo rename to tests/xtro-sharpie/api-annotations-dotnet/macOS-ExtensionKit.ignore index 332a517adcc0..e33f8b93b2d6 100644 --- a/tests/xtro-sharpie/api-annotations-dotnet/macOS-ExtensionKit.todo +++ b/tests/xtro-sharpie/api-annotations-dotnet/macOS-ExtensionKit.ignore @@ -1 +1,2 @@ +# Removed in XAMCORE_5_0 !extra-protocol-member! unexpected selector EXHostViewControllerDelegate::shouldAcceptXPCConnection: found diff --git a/tools/common/Frameworks.cs b/tools/common/Frameworks.cs index 0c92370bef4b..a846d039386a 100644 --- a/tools/common/Frameworks.cs +++ b/tools/common/Frameworks.cs @@ -477,7 +477,9 @@ public static Frameworks CreateiOSFrameworks (bool is_simulator_build) { "SecurityUI", "SecurityUI", 18, 4 }, { "DeviceDiscoveryUI", "DeviceDiscoveryUI", 26, 0 }, + { "ExtensionKit", "ExtensionKit", 26, 0 }, { "GameSave", "GameSave", 26, 0 }, + // the above MUST be kept in sync with simlauncher // see tools/mtouch/Makefile // please also keep it sorted to ease comparison