Skip to content

Commit 687a138

Browse files
authored
[DeviceDiscoveryUI] Update to Xcode 26 beta 1-5. (#23482)
1 parent 30797f9 commit 687a138

File tree

7 files changed

+7
-2
lines changed

7 files changed

+7
-2
lines changed

src/build/dotnet/generator-frameworks.g.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ partial class Frameworks {
5858
"DataDetection",
5959
"DeviceCheck",
6060
"DeviceDiscoveryExtension",
61+
"DeviceDiscoveryUI",
6162
"EventKit",
6263
"EventKitUI",
6364
"ExternalAccessory",

src/devicediscoveryui.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace DeviceDiscoveryUI {
2222
[Internal]
2323
delegate void _DevicePickerCompletionHandler ([NullAllowed] OS_nw_endpoint endpoint, [NullAllowed] OS_nw_error error);
2424

25-
[NoMac, NoiOS, NoMacCatalyst, TV (16, 0)]
25+
[NoMac, iOS (26, 0), NoMacCatalyst, TV (16, 0)]
2626
[BaseType (typeof (UIViewController))]
2727
[DisableDefaultCtor]
2828
interface DDDevicePickerViewController {

src/frameworks.sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2121,6 +2121,7 @@ IOS_FRAMEWORKS = \
21212121
CoreTelephony \
21222122
CoreText \
21232123
DeviceDiscoveryExtension \
2124+
DeviceDiscoveryUI \
21242125
EventKit \
21252126
EventKitUI \
21262127
ExternalAccessory \

src/rsp/dotnet/ios-defines-dotnet.rsp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
-d:HAS_DATADETECTION
5454
-d:HAS_DEVICECHECK
5555
-d:HAS_DEVICEDISCOVERYEXTENSION
56+
-d:HAS_DEVICEDISCOVERYUI
5657
-d:HAS_EVENTKIT
5758
-d:HAS_EVENTKITUI
5859
-d:HAS_EXTERNALACCESSORY

tests/dotnet/UnitTests/ProjectTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2985,6 +2985,7 @@ public void AppendRuntimeIdentifierToOutputPath_DisableDirectoryBuildProps (Appl
29852985
"/System/Library/Frameworks/DataDetection.framework/DataDetection",
29862986
"/System/Library/Frameworks/DeviceCheck.framework/DeviceCheck",
29872987
"/System/Library/Frameworks/DeviceDiscoveryExtension.framework/DeviceDiscoveryExtension",
2988+
"/System/Library/Frameworks/DeviceDiscoveryUI.framework/DeviceDiscoveryUI",
29882989
"/System/Library/Frameworks/EventKit.framework/EventKit",
29892990
"/System/Library/Frameworks/EventKitUI.framework/EventKitUI",
29902991
"/System/Library/Frameworks/ExternalAccessory.framework/ExternalAccessory",

tests/xtro-sharpie/api-annotations-dotnet/iOS-DeviceDiscoveryUI.todo

Lines changed: 0 additions & 1 deletion
This file was deleted.

tools/common/Frameworks.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,7 @@ public static Frameworks CreateiOSFrameworks (bool is_simulator_build)
474474

475475
{ "SecurityUI", "SecurityUI", 18, 4 },
476476

477+
{ "DeviceDiscoveryUI", "DeviceDiscoveryUI", 26, 0 },
477478
// the above MUST be kept in sync with simlauncher
478479
// see tools/mtouch/Makefile
479480
// please also keep it sorted to ease comparison
@@ -632,6 +633,7 @@ public static Frameworks GetMacCatalystFrameworks ()
632633
f.Version = v18_0;
633634
break;
634635
// These frameworks are not available on Mac Catalyst
636+
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.
635637
case "OpenGLES":
636638
case "NewsstandKit":
637639
case "MediaSetup":

0 commit comments

Comments
 (0)