Skip to content

[ExtensionKit] Update to Xcode 26 beta 1-5. #23483

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

Merged
merged 7 commits into from
Aug 15, 2025
Merged

[ExtensionKit] Update to Xcode 26 beta 1-5. #23483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
194fb7e
[ExtensionKit] Update to Xcode 26 beta 1-4.
rolfbjarne Aug 1, 2025
b77f15d
Merge branch 'xcode26.0' into dev/rolf/s/xcode26.0-b1234-extensionkit
rolfbjarne Aug 8, 2025
8edff32
Fix test
rolfbjarne Aug 13, 2025
d621982
Merge remote-tracking branch 'origin/xcode26.0' into dev/rolf/s/xcode…
rolfbjarne Aug 13, 2025
a123d21
Merge remote-tracking branch 'origin/xcode26.0' into dev/rolf/s/xcode…
rolfbjarne Aug 13, 2025
e0b2bc8
Merge remote-tracking branch 'origin/xcode26.0' into dev/rolf/s/xcode…
rolfbjarne Aug 14, 2025
6867b4a
Merge remote-tracking branch 'origin/xcode26.0' into dev/rolf/s/xcode…
rolfbjarne Aug 14, 2025
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
2 changes: 2 additions & 0 deletions src/build/dotnet/generator-frameworks.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ partial class Frameworks {
"DeviceDiscoveryUI",
"EventKit",
"EventKitUI",
"ExtensionKit",
"ExternalAccessory",
"FileProvider",
"FileProviderUI",
Expand Down Expand Up @@ -442,6 +443,7 @@ partial class Frameworks {
"EventKit",
"EventKitUI",
"ExecutionPolicy",
"ExtensionKit",
"ExternalAccessory",
"FileProvider",
"Foundation",
Expand Down
7 changes: 4 additions & 3 deletions src/extensionkit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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 {
Expand All @@ -37,14 +37,15 @@ 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);
#endif
}

// @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]
Expand Down
2 changes: 2 additions & 0 deletions src/frameworks.sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2125,6 +2125,7 @@ IOS_FRAMEWORKS = \
DeviceDiscoveryUI \
EventKit \
EventKitUI \
ExtensionKit \
ExternalAccessory \
FileProvider \
FileProviderUI \
Expand Down Expand Up @@ -2306,6 +2307,7 @@ MACCATALYST_FRAMEWORKS = \
EventKit \
EventKitUI \
ExecutionPolicy \
ExtensionKit \
ExternalAccessory \
FileProvider \
GameController \
Expand Down
1 change: 1 addition & 0 deletions src/rsp/dotnet/ios-defines-dotnet.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/rsp/dotnet/maccatalyst-defines-dotnet.rsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions tests/dotnet/UnitTests/ProjectTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 0 additions & 8 deletions tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-ExtensionKit.todo
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-ExtensionKit.todo
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions ...nnotations-dotnet/macOS-ExtensionKit.todo → ...otations-dotnet/macOS-ExtensionKit.ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
# Removed in XAMCORE_5_0
!extra-protocol-member! unexpected selector EXHostViewControllerDelegate::shouldAcceptXPCConnection: found
2 changes: 2 additions & 0 deletions tools/common/Frameworks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading