[introspection] Remove a few version checks which are now constant values. (#13348)

* Mac.Is32BitMavericks is always false (we only run on 64-bit macOS), so remove corresponding code.
* Mac.IsElCapitanOrHigher is never used; remove
* Remove a few unused Mac.Version_* fields.
This commit is contained in:
Rolf Bjarne Kvinge 2021-11-15 07:57:39 +01:00 коммит произвёл GitHub
Родитель ac6f75b55a
Коммит a1768573e3
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 0 добавлений и 42 удалений

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

@ -12,9 +12,6 @@ using System;
namespace Xamarin.Tests { namespace Xamarin.Tests {
public static class Mac { public static class Mac {
public static readonly Version Version_10_7 = new Version (10, 7);
public static readonly Version Version_10_8 = new Version (10, 8);
public static readonly Version Version_10_9 = new Version (10, 9);
public static readonly Version Version_10_10 = new Version (10, 10); public static readonly Version Version_10_10 = new Version (10, 10);
public static readonly Version Version_10_11 = new Version (10, 11); public static readonly Version Version_10_11 = new Version (10, 11);
@ -22,9 +19,7 @@ namespace Xamarin.Tests {
public static bool CheckSystemVersion (int major, int minor) => host.Version >= new Version (major, minor); public static bool CheckSystemVersion (int major, int minor) => host.Version >= new Version (major, minor);
public static bool CheckSystemVersion (int major, int minor, int build) => host.Version >= new Version (major, minor, build); public static bool CheckSystemVersion (int major, int minor, int build) => host.Version >= new Version (major, minor, build);
public static bool Is32BitMavericks => host.IsArch32 && IsAtLeast (Version_10_9);
public static bool IsYosemiteOrHigher => IsAtLeast (Version_10_10); public static bool IsYosemiteOrHigher => IsAtLeast (Version_10_10);
public static bool IsElCapitanOrHigher => IsAtLeast (Version_10_11);
public static bool IsAtLeast (int major, int minor) => IsAtLeast (new Version (major, minor)); public static bool IsAtLeast (int major, int minor) => IsAtLeast (new Version (major, minor));
public static bool IsAtLeast (Version version) => host.IsMac && host.Version >= version; public static bool IsAtLeast (Version version) => host.IsMac && host.Version >= version;
} }

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

@ -94,24 +94,6 @@ namespace Introspection {
case "MonoMac.AppKit.NSWindow": case "MonoMac.AppKit.NSWindow":
case "AppKit.NSWindow": case "AppKit.NSWindow":
return true; return true;
case "MonoMac.Foundation.NSUrlSession":
case "Foundation.NSUrlSession":
case "MonoMac.Foundation.NSUrlSessionTask":
case "Foundation.NSUrlSessionTask":
case "MonoMac.Foundation.NSUrlSessionDataTask":
case "Foundation.NSUrlSessionDataTask":
case "MonoMac.Foundation.NSUrlSessionUploadTask":
case "Foundation.NSUrlSessionUploadTask":
case "MonoMac.Foundation.NSUrlSessionDownloadTask":
case "Foundation.NSUrlSessionDownloadTask":
case "MonoMac.Foundation.NSUrlSessionConfiguration":
case "Foundation.NSUrlSessionConfiguration":
// These types were introduced as 64-bit only in Mavericks, and 32+64bits in Yosemite. We can't
// express that with our AvailabilityAttribute, we set it as available (for all architectures, since
// we can't distinguish them) starting with Mavericks.
if (Mac.Is32BitMavericks)
return true;
break;
case "GLKit.GLKSkyboxEffect": case "GLKit.GLKSkyboxEffect":
// Crashes inside libGL.dylib, most likely because something hasn't been initialized yet, because // Crashes inside libGL.dylib, most likely because something hasn't been initialized yet, because

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

@ -61,20 +61,6 @@ namespace Introspection {
protected override bool Skip (PropertyInfo p) protected override bool Skip (PropertyInfo p)
{ {
switch (p.DeclaringType.Name) {
case "NSUrlSessionDownloadDelegate":
switch (p.Name) {
case "TaskResumeDataKey":
// This field was introduced as 64-bit only in Mavericks, and 32+64bits in Yosemite. We can't
// express that with our AvailabilityAttribute, we set it as available (for all architectures, since
// we can't distinguish them) starting with Mavericks.
if (Mac.Is32BitMavericks)
return true;
break;
}
break;
}
switch (p.Name) { switch (p.Name) {
case "CharacteristicValidRangeString": case "CharacteristicValidRangeString":
return Mac.CheckSystemVersion (10, 13); // radar 32858911 return Mac.CheckSystemVersion (10, 13); // radar 32858911
@ -178,11 +164,6 @@ namespace Introspection {
// kCLErrorUserInfoAlternateRegionKey also returns null on iOS // kCLErrorUserInfoAlternateRegionKey also returns null on iOS
case "kCLErrorUserInfoAlternateRegionKey": case "kCLErrorUserInfoAlternateRegionKey":
return true; return true;
case "NSURLSessionTransferSizeUnknown":
case "NSURLSessionDownloadTaskResumeData":
if (Mac.Is32BitMavericks)
return true;
goto default;
case "QCCompositionInputRSSArticleDurationKey": case "QCCompositionInputRSSArticleDurationKey":
case "QCCompositionInputRSSFeedURLKey": case "QCCompositionInputRSSFeedURLKey":
case "QCCompositionProtocolRSSVisualizer": case "QCCompositionProtocolRSSVisualizer":