From dd394471a5aa59f2f3269847bddb31f1c97cd8d1 Mon Sep 17 00:00:00 2001 From: Vincent Dondain Date: Tue, 20 Aug 2019 22:41:08 -0400 Subject: [PATCH] [fileprovider] Update for Xcode 11 beta 6 (#6801) --- src/fileprovider.cs | 96 ++++++++-------------- src/foundation.cs | 2 +- tests/xtro-sharpie/iOS-FileProvider.todo | 14 ---- tests/xtro-sharpie/macOS-FileProvider.todo | 2 - 4 files changed, 34 insertions(+), 80 deletions(-) delete mode 100644 tests/xtro-sharpie/iOS-FileProvider.todo delete mode 100644 tests/xtro-sharpie/macOS-FileProvider.todo diff --git a/src/fileprovider.cs b/src/fileprovider.cs index f8c90ccaf1..e553af17b5 100644 --- a/src/fileprovider.cs +++ b/src/fileprovider.cs @@ -61,29 +61,24 @@ namespace FileProvider { NSUrl GetUrlForItem (string persistentIdentifier); [NoMac] - [Deprecated (PlatformName.iOS, 13, 0)] // Undocumented replacement [Export ("persistentIdentifierForItemAtURL:")] string GetPersistentIdentifier (NSUrl itemUrl); [NoMac] - [Deprecated (PlatformName.iOS, 13, 0)] // Undocumented replacement [Export ("providePlaceholderAtURL:completionHandler:")] [Async] void ProvidePlaceholderAtUrl (NSUrl url, [NullAllowed] Action completionHandler); [NoMac] - [Deprecated (PlatformName.iOS, 13, 0)] // Undocumented replacement [Export ("startProvidingItemAtURL:completionHandler:")] [Async] void StartProvidingItemAtUrl (NSUrl url, [NullAllowed] Action completionHandler); [NoMac] - [Deprecated (PlatformName.iOS, 13, 0)] // Undocumented replacement [Export ("itemChangedAtURL:")] void ItemChangedAtUrl (NSUrl url); [NoMac] - [Deprecated (PlatformName.iOS, 13, 0)] // Undocumented replacement [Export ("stopProvidingItemAtURL:")] void StopProvidingItemAtUrl (NSUrl url); @@ -164,22 +159,22 @@ namespace FileProvider { [Export ("setFavoriteRank:forItemIdentifier:completionHandler:")] void SetFavoriteRank ([NullAllowed] NSNumber favoriteRank, string itemIdentifier, Action completionHandler); - [iOS (13,0)] + [NoiOS] [Async] [Export ("performActionWithIdentifier:onItemsWithIdentifiers:completionHandler:")] NSProgress PerformAction (NSString actionIdentifier, NSString[] itemIdentifiers, Action completionHandler); - [iOS (13,0)] + [NoiOS] [Async (ResultTypeName = "NSFileProviderExtensionFetchResult")] [Export ("fetchContentsForItemWithIdentifier:version:completionHandler:")] NSProgress FetchContents (NSString itemIdentifier, [NullAllowed] NSFileProviderItemVersion requestedVersion, NSFileProviderExtensionFetchHandler completionHandler); - [iOS (13,0)] + [NoiOS] [Async (ResultTypeName = "NSFileProviderExtensionFetchResult")] [Export ("fetchContentsForItemWithIdentifier:version:usingExistingContentsAtURL:existingVersion:completionHandler:")] NSProgress FetchContents (NSString itemIdentifier, [NullAllowed] NSFileProviderItemVersion requestedVersion, NSUrl existingContents, NSFileProviderItemVersion existingVersion, NSFileProviderExtensionFetchHandler completionHandler); - [iOS (13,0)] + [NoiOS] [Async] [Export ("itemChanged:baseVersion:changedFields:contents:completionHandler:")] void ItemChanged (INSFileProviderItem item, NSFileProviderItemVersion version, NSFileProviderItemField changedFields, [NullAllowed] NSUrl newContents, Action completionHandler); @@ -190,7 +185,7 @@ namespace FileProvider { [return: NullAllowed] INSFileProviderEnumerator GetEnumerator (string containerItemIdentifier, out NSError error); - [iOS (13,0)] + [NoiOS] [Export ("enumeratorForSearchQuery:error:")] [return: NullAllowed] INSFileProviderEnumerator GetEnumerator (NSFileProviderSearchQuery searchQuery, [NullAllowed] out NSError error); @@ -217,35 +212,35 @@ namespace FileProvider { NSFileProviderDomain Domain { get; } #region CreateItem (NSFileProviderExtension) - [iOS (13,0)] + [NoiOS] [Export ("createItemBasedOnTemplate:fields:contents:options:completionHandler:")] [Async] void CreateItem (INSFileProviderItem itemTemplate, NSFileProviderItemField fields, [NullAllowed] NSUrl url, NSFileProviderCreateItemOptions options, Action completionHandler); #endregion #region DeleteItem (NSFileProviderExtension) - [iOS (13,0)] + [NoiOS] [Export ("deleteItemWithIdentifier:baseVersion:options:completionHandler:")] [Async] void DeleteItem (NSString itemIdentifier, NSFileProviderItemVersion version, NSFileProviderDeleteItemOptions options, Action completionHandler); #endregion #region Import (NSFileProviderExtension) - [iOS (13,0)] + [NoiOS] [Export ("importDidFinishWithCompletionHandler:")] [Async] void ImportDidFinish (Action completionHandler); #endregion #region MaterializedSet (NSFileProviderExtension) - [iOS (13,0)] + [NoiOS] [Export ("materializedItemsDidChangeWithCompletionHandler:")] [Async] void MaterializedItemsDidChange (Action completionHandler); #endregion #region Request (NSFileProviderExtension) - [iOS (13,0)] + [NoiOS] [NullAllowed, Export ("currentRequest")] NSFileProviderRequest CurrentRequest { get; } #endregion @@ -268,7 +263,9 @@ namespace FileProvider { InsufficientQuota = -1003, ServerUnreachable = -1004, NoSuchItem = -1005, + [NoiOS] VersionOutOfDate = -1006, + [NoiOS] DirectoryNotEmpty = -1007, } @@ -285,7 +282,7 @@ namespace FileProvider { [Field ("NSFileProviderErrorNonExistentItemIdentifierKey")] NSString NonExistentItemIdentifierKey { get; } - [iOS (13,0)] + [NoiOS] [Field ("NSFileProviderErrorItemKey")] NSString ItemKey { get; } } @@ -367,7 +364,7 @@ namespace FileProvider { [Export ("pathRelativeToDocumentStorage")] string PathRelativeToDocumentStorage { get; } - [iOS (13,0)] + [NoiOS] [Export ("disconnected")] bool Disconnected { [Bind ("isDisconnected")] get; set; } } @@ -436,10 +433,6 @@ namespace FileProvider { [Export ("currentSyncAnchorWithCompletionHandler:")] void CurrentSyncAnchor (Action completionHandler); - - [NoiOS] - [Export ("didPresentEnumeratorInWindow:frontmost:")] - void DidPresentEnumerator (uint window, bool frontmost); } interface INSFileProviderItem { } @@ -546,20 +539,20 @@ namespace FileProvider { [Export ("userInfo")] NSDictionary GetUserInfo (); - [iOS (13,0)] + [NoiOS] [Export ("excludedFromSync")] bool ExcludedFromSync { [Bind ("isExcludedFromSync")] get; } - [iOS (13,0)] + [NoiOS] [Export ("flags", ArgumentSemantic.Strong)] [NullAllowed] INSFileProviderItemFlags Flags { get; } - [iOS (13,0)] + [NoiOS] [NullAllowed, Export ("extendedAttributes", ArgumentSemantic.Strong)] NSDictionary ExtendedAttributes { get; } - [iOS (13,0)] + [NoiOS] [NullAllowed, Export ("itemVersion", ArgumentSemantic.Strong)] NSFileProviderItemVersion ItemVersion { get; } } @@ -622,57 +615,47 @@ namespace FileProvider { [return: NullAllowed] NSFileProviderManager FromDomain (NSFileProviderDomain domain); - [iOS (13,0)] + [NoiOS] [Static] [Async (ResultTypeName = "NSFileProviderGetIdentifierResult")] [Export ("getIdentifierForUserVisibleFileAtURL:completionHandler:")] void GetIdentifierForUserVisibleFile (NSUrl url, NSFileProviderGetIdentifierHandler completionHandler); - [iOS (13,0)] + [NoiOS] [Async] [Export ("getUserVisibleURLForItemIdentifier:completionHandler:")] void GetUserVisibleUrl (NSString itemIdentifier, Action completionHandler); #region Import (NSFileProviderManager) - [iOS (13,0)] + [NoiOS] [Static] [Async] [Export ("importDomain:fromDirectoryAtURL:completionHandler:")] void Import (NSFileProviderDomain domain, NSUrl url, Action completionHandler); - [iOS (13,0)] + [NoiOS] [Async] [Export ("reimportItemsBelowItemWithIdentifier:completionHandler:")] void ReimportItemsBelowItem (NSString itemIdentifier, Action completionHandler); #endregion #region MaterializedSet (NSFileProviderManager) - [iOS (13,0)] + [NoiOS] [Export ("enumeratorForMaterializedItems")] INSFileProviderEnumerator GetMaterializedItemsEnumerator (); #endregion #region DownloadAndEviction (NSFileProviderManager) - [iOS (13,0)] + [NoiOS] [Export ("evictItemWithIdentifier:completionHandler:")] [Async] void EvictItem (NSString itemIdentifier, Action completionHandler); - [iOS (13,0)] + [NoiOS] [Export ("setDownloadPolicy:forItemWithIdentifier:completionHandler:")] [Async] void SetDownloadPolicy (NSFileProviderDownloadPolicy downloadPolicy, NSString itemIdentifier, Action completionHandler); #endregion - -#region Presence (NSFileProviderManager) - [NoiOS] - [Export ("presenceAuthorizationStatus", ArgumentSemantic.Assign)] - NSFileProviderPresenceAuthorizationStatus PresenceAuthorizationStatus { get; } - - [NoiOS] - [Export ("requestPresenceAuthorization")] - void RequestPresenceAuthorization (); -#endregion } // typedef NSString *NSFileProviderDomainIdentifier NS_EXTENSIBLE_STRING_ENUM @@ -695,7 +678,7 @@ namespace FileProvider { NSXpcListenerEndpoint MakeListenerEndpoint (out NSError error); } - [iOS (13,0)] + [NoiOS] [Mac (10,15)] [BaseType (typeof (NSObject))] [DisableDefaultCtor] // the `init*` and properties don't allow null @@ -711,20 +694,16 @@ namespace FileProvider { NSData MetadataVersion { get; } } - [iOS (13,0)] + [NoiOS] [Mac (10,15)] [BaseType (typeof (NSObject))] interface NSFileProviderRequest { [Export ("requestingApplicationIdentifier", ArgumentSemantic.Strong)] NSUuid RequestingApplicationIdentifier { get; } - - [NoiOS] - [NullAllowed, Export ("requestingExecutable", ArgumentSemantic.Copy)] - NSUrl RequestingExecutable { get; } } - [iOS (13,0)] + [NoiOS] [Mac (10,15)] [BaseType (typeof (NSObject))] [DisableDefaultCtor] @@ -746,7 +725,7 @@ namespace FileProvider { NSString SearchContainerItemIdentifier { get; } } - [iOS (13,0)] + [NoiOS] [Mac (10,15)] [Flags] [Native] @@ -755,7 +734,7 @@ namespace FileProvider { ItemMayAlreadyExist = 1, } - [iOS (13,0)] + [NoiOS] [Mac (10,15)] [Flags] [Native] @@ -764,7 +743,7 @@ namespace FileProvider { Recursive = 1, } - [iOS (13,0)] + [NoiOS] [Mac (10,15)] [Flags] [Native] @@ -774,7 +753,7 @@ namespace FileProvider { KeepDownloaded = 2, } - [iOS (13,0)] + [NoiOS] [Mac (10,15)] [Flags] [Native] @@ -792,21 +771,12 @@ namespace FileProvider { ExtendedAttributes = 1 << 10, } - [iOS (13,0)] - [Mac (10,15)] - [Native] - enum NSFileProviderPresenceAuthorizationStatus : ulong { - NotDetermined, - Restricted, - Denied, - Allowed, - } - [iOS (13,0)] [Mac (10,15)] [Protocol] interface NSFileProviderItemDecorating : NSFileProviderItem { + [NoiOS] [Abstract] [NullAllowed, Export ("decorations", ArgumentSemantic.Strong)] string[] Decorations { get; } diff --git a/src/foundation.cs b/src/foundation.cs index d0016e43bd..7a3ac0d57e 100644 --- a/src/foundation.cs +++ b/src/foundation.cs @@ -4149,7 +4149,7 @@ namespace Foundation [Export ("fileProviderErrorForNonExistentItemWithIdentifier:")] NSError GetFileProviderError (string nonExistentItemIdentifier); - [iOS (13,0)] + [NoiOS] [Mac (10,15)] [Static] [Export ("fileProviderErrorForOutOfDateItem:")] diff --git a/tests/xtro-sharpie/iOS-FileProvider.todo b/tests/xtro-sharpie/iOS-FileProvider.todo deleted file mode 100644 index 1b016478e7..0000000000 --- a/tests/xtro-sharpie/iOS-FileProvider.todo +++ /dev/null @@ -1,14 +0,0 @@ -!extra-protocol-member! unexpected selector NSFileProviderItem::extendedAttributes found -!extra-protocol-member! unexpected selector NSFileProviderItem::flags found -!extra-protocol-member! unexpected selector NSFileProviderItem::isExcludedFromSync found -!extra-protocol-member! unexpected selector NSFileProviderItem::itemVersion found -!extra-protocol-member! unexpected selector NSFileProviderItemDecorating::decorations found -!unknown-field! NSFileProviderErrorItemKey bound -!unknown-native-enum! NSFileProviderCreateItemOptions bound -!unknown-native-enum! NSFileProviderDeleteItemOptions bound -!unknown-native-enum! NSFileProviderDownloadPolicy bound -!unknown-native-enum! NSFileProviderItemField bound -!unknown-native-enum! NSFileProviderPresenceAuthorizationStatus bound -!unknown-type! NSFileProviderItemVersion bound -!unknown-type! NSFileProviderRequest bound -!unknown-type! NSFileProviderSearchQuery bound diff --git a/tests/xtro-sharpie/macOS-FileProvider.todo b/tests/xtro-sharpie/macOS-FileProvider.todo deleted file mode 100644 index fb4a7ad907..0000000000 --- a/tests/xtro-sharpie/macOS-FileProvider.todo +++ /dev/null @@ -1,2 +0,0 @@ -!extra-protocol-member! unexpected selector NSFileProviderEnumerator::didPresentEnumeratorInWindow:frontmost: found -!unknown-native-enum! NSFileProviderPresenceAuthorizationStatus bound