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

[iosurface] IOSurface is not usable before iOS/tvOS 11. Fixes #59201 #2706

Merged
merged 1 commit into from
Sep 15, 2017
Merged

[iosurface] IOSurface is not usable before iOS/tvOS 11. Fixes #59201 #2706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 1 addition & 11 deletions src/Constants.iOS.cs.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,17 +115,7 @@ namespace MonoTouch {
public const string VisionLibrary = "/System/Library/Frameworks/Vision.framework/Vision";
public const string FileProviderLibrary = "/System/Library/Frameworks/FileProvider.framework/FileProvider";
public const string FileProviderUILibrary = "/System/Library/Frameworks/FileProviderUI.framework/FileProviderUI";
public static string IOSurfaceLibrary {
get {
// Disabled because of bug #59201
// #if !COREBUILD && !MTOUCH
// // Sidenote: this is in /System/Library/Frameworks/IOSurface.framework/IOSurface in macOS 10.12.
// if (!XamCore.UIKit.UIDevice.CurrentDevice.CheckSystemVersion (11, 0))
// return "/System/Library/PrivateFrameworks/IOSurface.framework/IOSurface";
// #endif
return "/System/Library/Frameworks/IOSurface.framework/IOSurface";
}
}
public const string IOSurfaceLibrary = "/System/Library/Frameworks/IOSurface.framework/IOSurface";
public const string PdfKitLibrary = "/System/Library/Frameworks/PDFKit.framework/PDFKit";
}
}
12 changes: 1 addition & 11 deletions src/Constants.tvos.cs.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,6 @@ namespace ObjCRuntime {
public const string DeviceCheckLibrary = "/System/Library/Frameworks/DeviceCheck.framework/DeviceCheck";
public const string CoreMLLibrary = "/System/Library/Frameworks/CoreML.framework/CoreML";
public const string VisionLibrary = "/System/Library/Frameworks/Vision.framework/Vision";
public static string IOSurfaceLibrary {
get {
// Disabled because of bug #59201
// #if !COREBUILD && !MTOUCH
// // Sidenote: this is in /System/Library/Frameworks/IOSurface.framework/IOSurface in macOS 10.12.
// if (!XamCore.UIKit.UIDevice.CurrentDevice.CheckSystemVersion (11, 0))
// return "/System/Library/PrivateFrameworks/IOSurface.framework/IOSurface";
// #endif
return "/System/Library/Frameworks/IOSurface.framework/IOSurface";
}
}
public const string IOSurfaceLibrary = "/System/Library/Frameworks/IOSurface.framework/IOSurface";
}
}
4 changes: 2 additions & 2 deletions tools/common/Frameworks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,12 @@ public static Frameworks GetiOSFrameworks (Application app)
{ "UserNotificationsUI", "UserNotificationsUI", 10 },
{ "Intents", "Intents", 10 },
{ "IntentsUI", "IntentsUI", 10 },
{ "IOSurface", "IOSurface", 10 },

{ "ARKit", "ARKit", 11 },
{ "CoreNFC", "CoreNFC", 11 },
{ "DeviceCheck", "DeviceCheck", 11 },
{ "IdentityLookup", "IdentityLookup", 11 },
{ "IOSurface", "IOSurface", 11 },
{ "CoreML", "CoreML", 11 },
{ "Vision", "Vision", 11 },
{ "FileProvider", "FileProvider", 11 },
Expand Down Expand Up @@ -361,10 +361,10 @@ public static Frameworks TVOSFrameworks {
{ "UserNotifications", "UserNotifications", 10 },
{ "VideoSubscriberAccount", "VideoSubscriberAccount", 10 },
{ "VideoToolbox", "VideoToolbox", 10,2 },
{ "IOSurface", "IOSurface", 10 },

{ "DeviceCheck", "DeviceCheck", 11 },
{ "CoreML", "CoreML", 11 },
{ "IOSurface", "IOSurface", 11 },
{ "Vision", "Vision", 11 },
};
}
Expand Down
2 changes: 1 addition & 1 deletion tools/mtouch/BuildTasks.mtouch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ protected override async Task ExecuteAsync ()
// /System/Library/PrivateFrameworks/JavaScriptCore.framework/JavaScriptCore instead of
// /System/Library/Frameworks/JavaScriptCore.framework/JavaScriptCore
// more details in https://bugzilla.xamarin.com/show_bug.cgi?id=31036
if (Target.WeakFrameworks.Count > 0)
if (CompilerFlags.WeakFrameworks.Count > 0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 nice one!

Target.AdjustDylibs ();
Driver.Watch ("Native Link", 1);
}
Expand Down