xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[ClassKit] Add support for Xcode 12 beta 1. (#9008)

This commit is contained in:
Manuel de la Pena 2020-07-06 10:56:54 -04:00 коммит произвёл GitHub
Родитель 347a4959b1
Коммит 599249fd27
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 105 добавлений и 146 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
src/Constants.mac.cs.in
Просмотреть файл

@ -173,5 +173,6 @@ namespace ObjCRuntime {
// macOS 10.16
public const string UserNotificationsUILibrary = "/System/Library/Frameworks/UserNotificationsUI.framework/UserNotificationsUI";
public const string ClassKitLibrary = "/System/Library/Frameworks/ClassKit.framework/ClassKit";
}
}

112
src/classkit.cs
Просмотреть файл

@ -15,7 +15,8 @@ using System.Reflection;
namespace ClassKit {
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[Native]
enum CLSBinaryValueType : long {
TrueFalse = 0,
@ -25,7 +26,8 @@ namespace ClassKit {
CorrectIncorrect,
}
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[Native]
enum CLSContextType : long {
None = 0,
@ -50,7 +52,8 @@ namespace ClassKit {
Custom,
}
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[Native]
[ErrorDomain ("CLSErrorCodeDomain")]
public enum CLSErrorCode : long {
@ -66,7 +69,9 @@ namespace ClassKit {
PartialFailure,
}
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
enum CLSContextTopic {
[Field ("CLSContextTopicMath")]
Math,
@ -86,7 +91,20 @@ namespace ClassKit {
HealthAndFitness,
}
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (14, 0)]
[Native]
public enum CLSProgressReportingCapabilityKind : long {
Duration = 0,
Percent,
Binary,
Quantity,
Score,
}
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[Static]
interface CLSErrorUserInfoKeys {
@ -97,7 +115,8 @@ namespace ClassKit {
NSString UnderlyingErrorsKey { get; }
}
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[Static]
interface CLSPredicateKeyPath {
[Field ("CLSPredicateKeyPathDateCreated")]
@ -119,7 +138,8 @@ namespace ClassKit {
NSString Parent { get; }
}
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[BaseType (typeof (NSObject))]
[DisableDefaultCtor]
interface CLSObject : NSSecureCoding {
@ -131,7 +151,8 @@ namespace ClassKit {
NSDate DateLastModified { get; }
}
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[BaseType (typeof (CLSObject))]
[DisableDefaultCtor]
interface CLSActivity {
@ -167,7 +188,8 @@ namespace ClassKit {
void Stop ();
}
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[BaseType (typeof (CLSObject))]
[DisableDefaultCtor]
interface CLSActivityItem {
@ -179,7 +201,8 @@ namespace ClassKit {
string Identifier { get; }
}
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[BaseType (typeof (CLSActivityItem))]
[DisableDefaultCtor]
interface CLSBinaryItem {
@ -195,7 +218,8 @@ namespace ClassKit {
IntPtr Constructor (string identifier, string title, CLSBinaryValueType valueType);
}
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[BaseType (typeof (CLSObject))]
[DisableDefaultCtor]
interface CLSContext {
@ -248,6 +272,41 @@ namespace ClassKit {
[Export ("resignActive")]
void ResignActive ();
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (14, 0)]
[Export ("assignable")]
bool Assignable { [Bind ("isAssignable")] get; set; }
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (14, 0)]
[Export ("suggestedAge", ArgumentSemantic.Assign)]
NSRange SuggestedAge { get; set; }
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (14, 0)]
[Export ("suggestedCompletionTime", ArgumentSemantic.Assign)]
NSRange SuggestedCompletionTime { get; set; }
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (14, 0)]
[Export ("progressReportingCapabilities", ArgumentSemantic.Copy)]
NSSet<CLSProgressReportingCapability> ProgressReportingCapabilities { get; }
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (14, 0)]
[Export ("setType:")]
void SetType (CLSContextType type);
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (14, 0)]
[Export ("addProgressReportingCapabilities:")]
void AddProgressReportingCapabilities (NSSet<CLSProgressReportingCapability> capabilities);
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (14, 0)]
[Export ("resetProgressReportingCapabilities")]
void ResetProgressReportingCapabilities ();
// From CLSContext (Hierarchy) Category
[NullAllowed, Export ("parent")]
@ -274,7 +333,8 @@ namespace ClassKit {
interface ICLSDataStoreDelegate { }
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[Protocol, Model]
[BaseType (typeof (NSObject))]
interface CLSDataStoreDelegate {
@ -285,7 +345,8 @@ namespace ClassKit {
CLSContext CreateContext (string identifier, CLSContext parentContext, string [] parentIdentifierPath);
}
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[BaseType (typeof (NSObject))]
[DisableDefaultCtor]
interface CLSDataStore {
@ -332,7 +393,8 @@ namespace ClassKit {
void Remove (CLSContext context);
}
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[BaseType (typeof (CLSActivityItem))]
[DisableDefaultCtor]
interface CLSQuantityItem {
@ -345,7 +407,8 @@ namespace ClassKit {
IntPtr Constructor (string identifier, string title);
}
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[BaseType (typeof (CLSActivityItem))]
[DisableDefaultCtor]
interface CLSScoreItem {
@ -361,11 +424,28 @@ namespace ClassKit {
IntPtr Constructor (string identifier, string title, double score, double maxScore);
}
[NoWatch, NoTV, NoMac, iOS (12,2)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (12,2)]
[Protocol]
interface CLSContextProvider {
[Abstract]
[Export ("updateDescendantsOfContext:completion:")]
void UpdateDescendants (CLSContext context, Action<NSError> completion);
}
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10,16), iOS (14,0)]
[BaseType (typeof (CLSObject))]
[DisableDefaultCtor]
interface CLSProgressReportingCapability {
[Export ("kind", ArgumentSemantic.Assign)]
CLSProgressReportingCapabilityKind Kind { get; }
[Export ("details")]
string Details { get; }
[Export ("initWithKind:details:")]
IntPtr Constructor (CLSProgressReportingCapabilityKind kind, string details);
}
}

6
src/foundation.cs
Просмотреть файл

@ -5294,11 +5294,13 @@ namespace Foundation
// From NSUserActivity (CLSDeepLinks)
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[Export ("isClassKitDeepLink")]
bool IsClassKitDeepLink { get; }
[NoWatch, NoTV, NoMac, iOS (11,4)]
[Introduced (PlatformName.MacCatalyst, 14, 0)]
[NoWatch, NoTV, Mac (10, 16), iOS (11,4)]
[NullAllowed, Export ("contextIdentifierPath", ArgumentSemantic.Strong)]
string[] ContextIdentifierPath { get; }

1
src/frameworks.sources
Просмотреть файл

@ -1799,6 +1799,7 @@ MAC_FRAMEWORKS = \
AVKit \
BusinessChat \
CFNetwork \
ClassKit \
CloudKit \
Contacts \
ContactsUI \

2
tests/apitest/src/EveryFrameworkSmokeTest.cs
Просмотреть файл

@ -76,6 +76,8 @@ namespace Xamarin.Mac.Tests
case "NetworkLibrary":
case "UserNotificationsLibrary":
case "VideoSubscriberAccountLibrary":
// macOS 10.16
case "ClassKit":
return LoadStatus.Acceptable;
}
}

15
tests/xtro-sharpie/iOS-ClassKit.todo
Просмотреть файл

@ -1,15 +0,0 @@
!missing-enum! CLSProgressReportingCapabilityKind not bound
!missing-selector! CLSContext::addProgressReportingCapabilities: not bound
!missing-selector! CLSContext::isAssignable not bound
!missing-selector! CLSContext::progressReportingCapabilities not bound
!missing-selector! CLSContext::resetProgressReportingCapabilities not bound
!missing-selector! CLSContext::setAssignable: not bound
!missing-selector! CLSContext::setSuggestedAge: not bound
!missing-selector! CLSContext::setSuggestedCompletionTime: not bound
!missing-selector! CLSContext::setType: not bound
!missing-selector! CLSContext::suggestedAge not bound
!missing-selector! CLSContext::suggestedCompletionTime not bound
!missing-selector! CLSProgressReportingCapability::details not bound
!missing-selector! CLSProgressReportingCapability::initWithKind:details: not bound
!missing-selector! CLSProgressReportingCapability::kind not bound
!missing-type! CLSProgressReportingCapability not bound

113
tests/xtro-sharpie/macOS-ClassKit.todo
Просмотреть файл

@ -1,113 +0,0 @@
!missing-enum! CLSBinaryValueType not bound
!missing-enum! CLSContextType not bound
!missing-enum! CLSErrorCode not bound
!missing-enum! CLSProgressReportingCapabilityKind not bound
!missing-field! CLSContextTopicArtsAndMusic not bound
!missing-field! CLSContextTopicComputerScienceAndEngineering not bound
!missing-field! CLSContextTopicHealthAndFitness not bound
!missing-field! CLSContextTopicLiteracyAndWriting not bound
!missing-field! CLSContextTopicMath not bound
!missing-field! CLSContextTopicScience not bound
!missing-field! CLSContextTopicSocialScience not bound
!missing-field! CLSContextTopicWorldLanguage not bound
!missing-field! CLSErrorCodeDomain not bound
!missing-field! CLSErrorObjectKey not bound
!missing-field! CLSErrorUnderlyingErrorsKey not bound
!missing-field! CLSPredicateKeyPathDateCreated not bound
!missing-field! CLSPredicateKeyPathIdentifier not bound
!missing-field! CLSPredicateKeyPathParent not bound
!missing-field! CLSPredicateKeyPathTitle not bound
!missing-field! CLSPredicateKeyPathTopic not bound
!missing-field! CLSPredicateKeyPathUniversalLinkURL not bound
!missing-protocol! CLSContextProvider not bound
!missing-protocol! CLSDataStoreDelegate not bound
!missing-selector! +CLSDataStore::shared not bound
!missing-selector! CLSActivity::addAdditionalActivityItem: not bound
!missing-selector! CLSActivity::additionalActivityItems not bound
!missing-selector! CLSActivity::addProgressRangeFromStart:toEnd: not bound
!missing-selector! CLSActivity::duration not bound
!missing-selector! CLSActivity::isStarted not bound
!missing-selector! CLSActivity::primaryActivityItem not bound
!missing-selector! CLSActivity::progress not bound
!missing-selector! CLSActivity::setPrimaryActivityItem: not bound
!missing-selector! CLSActivity::setProgress: not bound
!missing-selector! CLSActivity::start not bound
!missing-selector! CLSActivity::stop not bound
!missing-selector! CLSActivityItem::identifier not bound
!missing-selector! CLSActivityItem::setTitle: not bound
!missing-selector! CLSActivityItem::title not bound
!missing-selector! CLSBinaryItem::initWithIdentifier:title:type: not bound
!missing-selector! CLSBinaryItem::setValue: not bound
!missing-selector! CLSBinaryItem::value not bound
!missing-selector! CLSBinaryItem::valueType not bound
!missing-selector! CLSContext::addChildContext: not bound
!missing-selector! CLSContext::addProgressReportingCapabilities: not bound
!missing-selector! CLSContext::becomeActive not bound
!missing-selector! CLSContext::createNewCLSContext not bound
!missing-selector! CLSContext::currentCLSContext not bound
!missing-selector! CLSContext::customTypeName not bound
!missing-selector! CLSContext::descendantMatchingIdentifierPath:completion: not bound
!missing-selector! CLSContext::displayOrder not bound
!missing-selector! CLSContext::identifier not bound
!missing-selector! CLSContext::identifierPath not bound
!missing-selector! CLSContext::initWithType:identifier:title: not bound
!missing-selector! CLSContext::isActive not bound
!missing-selector! CLSContext::isAssignable not bound
!missing-selector! CLSContext::parent not bound
!missing-selector! CLSContext::progressReportingCapabilities not bound
!missing-selector! CLSContext::removeFromParent not bound
!missing-selector! CLSContext::resetProgressReportingCapabilities not bound
!missing-selector! CLSContext::resignActive not bound
!missing-selector! CLSContext::setAssignable: not bound
!missing-selector! CLSContext::setCustomTypeName: not bound
!missing-selector! CLSContext::setDisplayOrder: not bound
!missing-selector! CLSContext::setSuggestedAge: not bound
!missing-selector! CLSContext::setSuggestedCompletionTime: not bound
!missing-selector! CLSContext::setSummary: not bound
!missing-selector! CLSContext::setThumbnail: not bound
!missing-selector! CLSContext::setTitle: not bound
!missing-selector! CLSContext::setTopic: not bound
!missing-selector! CLSContext::setType: not bound
!missing-selector! CLSContext::setUniversalLinkURL: not bound
!missing-selector! CLSContext::suggestedAge not bound
!missing-selector! CLSContext::suggestedCompletionTime not bound
!missing-selector! CLSContext::summary not bound
!missing-selector! CLSContext::thumbnail not bound
!missing-selector! CLSContext::title not bound
!missing-selector! CLSContext::topic not bound
!missing-selector! CLSContext::type not bound
!missing-selector! CLSContext::universalLinkURL not bound
!missing-selector! CLSDataStore::activeContext not bound
!missing-selector! CLSDataStore::completeAllAssignedActivitiesMatching: not bound
!missing-selector! CLSDataStore::contextsMatchingIdentifierPath:completion: not bound
!missing-selector! CLSDataStore::contextsMatchingPredicate:completion: not bound
!missing-selector! CLSDataStore::delegate not bound
!missing-selector! CLSDataStore::mainAppContext not bound
!missing-selector! CLSDataStore::removeContext: not bound
!missing-selector! CLSDataStore::runningActivity not bound
!missing-selector! CLSDataStore::saveWithCompletion: not bound
!missing-selector! CLSDataStore::setDelegate: not bound
!missing-selector! CLSObject::dateCreated not bound
!missing-selector! CLSObject::dateLastModified not bound
!missing-selector! CLSProgressReportingCapability::details not bound
!missing-selector! CLSProgressReportingCapability::initWithKind:details: not bound
!missing-selector! CLSProgressReportingCapability::kind not bound
!missing-selector! CLSQuantityItem::initWithIdentifier:title: not bound
!missing-selector! CLSQuantityItem::quantity not bound
!missing-selector! CLSQuantityItem::setQuantity: not bound
!missing-selector! CLSScoreItem::initWithIdentifier:title:score:maxScore: not bound
!missing-selector! CLSScoreItem::maxScore not bound
!missing-selector! CLSScoreItem::score not bound
!missing-selector! CLSScoreItem::setMaxScore: not bound
!missing-selector! CLSScoreItem::setScore: not bound
!missing-selector! NSUserActivity::contextIdentifierPath not bound
!missing-selector! NSUserActivity::isClassKitDeepLink not bound
!missing-type! CLSActivity not bound
!missing-type! CLSActivityItem not bound
!missing-type! CLSBinaryItem not bound
!missing-type! CLSContext not bound
!missing-type! CLSDataStore not bound
!missing-type! CLSObject not bound
!missing-type! CLSProgressReportingCapability not bound
!missing-type! CLSQuantityItem not bound
!missing-type! CLSScoreItem not bound

1
tools/common/Frameworks.cs
Просмотреть файл

@ -195,6 +195,7 @@ public class Frameworks : Dictionary <string, Framework>
{ "AutomaticAssessmentConfiguration", "AutomaticAssessmentConfiguration", 10,15,4 },
{ "UserNotificationsUI", "UserNotificationsUI", 10,16 },
{ "ClassKit", "ClassKit", 10,16 },
};
}
return mac_frameworks;