Skip to content

[DeviceDiscoveryUI] Update to Xcode 26 beta 1-5. #23482

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 3 commits into from
Aug 13, 2025
Merged

[DeviceDiscoveryUI] Update to Xcode 26 beta 1-5. #23482

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c02f1c2
[DeviceDiscoveryUI] Update to Xcode 26 beta 1-4.
rolfbjarne Aug 1, 2025
5a81a74
Merge branch 'xcode26.0' into dev/rolf/s/xcode26.0-b1234-devicediscov…
rolfbjarne Aug 8, 2025
4a1afb3
Fix test
rolfbjarne Aug 12, 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
1 change: 1 addition & 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 @@ -58,6 +58,7 @@ partial class Frameworks {
"DataDetection",
"DeviceCheck",
"DeviceDiscoveryExtension",
"DeviceDiscoveryUI",
"EventKit",
"EventKitUI",
"ExternalAccessory",
Expand Down
2 changes: 1 addition & 1 deletion src/devicediscoveryui.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace DeviceDiscoveryUI {
[Internal]
delegate void _DevicePickerCompletionHandler ([NullAllowed] OS_nw_endpoint endpoint, [NullAllowed] OS_nw_error error);

[NoMac, NoiOS, NoMacCatalyst, TV (16, 0)]
[NoMac, iOS (26, 0), NoMacCatalyst, TV (16, 0)]
[BaseType (typeof (UIViewController))]
[DisableDefaultCtor]
interface DDDevicePickerViewController {
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 @@ -2119,6 +2119,7 @@ IOS_FRAMEWORKS = \
CoreTelephony \
CoreText \
DeviceDiscoveryExtension \
DeviceDiscoveryUI \
EventKit \
EventKitUI \
ExternalAccessory \
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 @@ -53,6 +53,7 @@
-d:HAS_DATADETECTION
-d:HAS_DEVICECHECK
-d:HAS_DEVICEDISCOVERYEXTENSION
-d:HAS_DEVICEDISCOVERYUI
-d:HAS_EVENTKIT
-d:HAS_EVENTKITUI
-d:HAS_EXTERNALACCESSORY
Expand Down
1 change: 0 additions & 1 deletion tests/xtro-sharpie/api-annotations-dotnet/iOS-DeviceDiscoveryUI.todo
View file
Open in desktop

This file was deleted.

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 @@ -474,6 +474,7 @@ public static Frameworks CreateiOSFrameworks (bool is_simulator_build)

{ "SecurityUI", "SecurityUI", 18, 4 },

{ "DeviceDiscoveryUI", "DeviceDiscoveryUI", 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 Expand Up @@ -632,6 +633,7 @@ public static Frameworks GetMacCatalystFrameworks ()
f.Version = v18_0;
break;
// These frameworks are not available on Mac Catalyst
case "DeviceDiscoveryUI": // xtro and introspection says it's not in Mac Catalyst, Apple's website says it is. For now, listen to xtro and introspection, until proven otherwise.
case "OpenGLES":
case "NewsstandKit":
case "MediaSetup":
Expand Down
Loading