[tests][intro] Fix CoreImage location check for older macOS versions (#5176)

addendum to https://github.com/xamarin/xamarin-macios/pull/5159

failure on internal bots 4f1c39a00f (commitcomment-31401007)
This commit is contained in:
Sebastien Pouliot 2018-11-23 18:25:31 -05:00 коммит произвёл GitHub
Родитель db4e24e99f
Коммит 930e37232f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 7 добавлений и 4 удалений

Просмотреть файл

@ -62,8 +62,8 @@ namespace MonoMac {
public const string CoreMediaLibrary = "/System/Library/Frameworks/CoreMedia.framework/CoreMedia";
public const string ScriptingBridgeLibrary = "/System/Library/Frameworks/ScriptingBridge.framework/ScriptingBridge";
public const string CoreDataLibrary = "/System/Library/Frameworks/CoreData.framework/CoreData";
public const string CoreImageLibrary = "/System/Library/Frameworks/CoreImage.framework/Versions/Current/CoreImage";
public const string CFNetworkLibrary = "/System/Library/Frameworks//CFNetwork.framework/CFNetwork";
public const string CoreImageLibrary = "/System/Library/Frameworks/QuartzCore.framework/Versions/A/Frameworks/CoreImage.framework/CoreImage";
public const string CFNetworkLibrary = "/System/Library/Frameworks/CFNetwork.framework/CFNetwork";
public const string CoreMidiLibrary = "/System/Library/Frameworks/CoreMIDI.framework/CoreMIDI";
public const string QuickLookLibrary = "/System/Library/Frameworks/QuickLook.framework/QuickLook";
public const string AVFoundationLibrary = "/System/Library/Frameworks/AVFoundation.framework/AVFoundation";

Просмотреть файл

@ -1042,8 +1042,11 @@ namespace Introspection
#if MONOMAC
// on macOS the file should exist on the specified path
// for iOS the simulator paths do not match the strings
if (!File.Exists (lib))
return false;
if (!File.Exists (lib)) {
if (lib != Constants.CoreImageLibrary)
return false;
// location changed in 10.11 but it loads fine (and fixing it breaks on earlier macOS)
}
#endif
var h = IntPtr.Zero;
try {