[src] API tweaks for Mac Catalyst

src/MediaPlayer/MediaPlayer.cs

@@ -345,6 +345,7 @@ namespace MediaPlayer {
 	[Watch (5,0)]
 	[iOS (11, 0)]
 	[TV (11, 0)]
+	[MacCatalyst (13, 0)]
 	[Native]
 	public enum MPNowPlayingPlaybackState : ulong
 	{

src/Metal/MTLEnums.cs

@@ -1089,16 +1089,16 @@ namespace Metal {
 		DepthResolvedSample = 1,
 	}
 
-	[Unavailable (PlatformName.MacCatalyst)]
+
 	[Flags, Mac (11,0), NoTV, iOS (13,0)]
-	[Native, Advice ("This API is not available when using UIKit on macOS.")]
+	[Native]
 	public enum MTLSparseTextureRegionAlignmentMode : ulong {
 		Outward = 0x0,
 		Inward = 0x1,
 	}
 
-	[Unavailable (PlatformName.MacCatalyst)]
 	[Flags, Mac (11,0), NoTV, iOS (13,0)]
+	[MacCatalyst (14, 0)]
 	[Native, Advice ("This API is not available when using UIKit on macOS.")]
 	public enum MTLSparseTextureMappingMode : ulong {
 		Map = 0x0,

src/VideoSubscriberAccount/VSAccountMetadataRequest.cs

@@ -1,3 +1,4 @@
+#if !__MACCATALYST__
 using System;
 using System.Threading.Tasks;
 using ObjCRuntime;

src/VideoSubscriberAccount/VSAccountProviderAuthenticationScheme.cs

@@ -1,3 +1,4 @@
+#if !__MACCATALYST__
 using System;
 using System.Threading.Tasks;
 using Foundation;
@@ -31,3 +32,4 @@ namespace VideoSubscriberAccount {
 		}
 	}
 }
+#endif // !__MACCATALYST__

src/fileprovider.cs

@@ -15,7 +15,7 @@ using CoreGraphics;
 using Foundation;
 using UniformTypeIdentifiers;
 
-#if IOS && !XAMCORE_4_0
+#if IOS && !XAMCORE_4_0 && !__MACCATALYST__
 using FileProvider;
 
 // This is the original (iOS 8) location of `NSFileProviderExtension`
@@ -215,7 +215,7 @@ namespace FileProvider {
 
 	[iOS (11,0)]
 	[Mac (11,0)]
-	[Unavailable (PlatformName.MacCatalyst)][Advice ("This API is not available when using Catalyst on macOS.")]
+	[MacCatalyst (13, 0)]
 	[Static]
 	interface NSFileProviderItemIdentifier {
 
@@ -232,7 +232,7 @@ namespace FileProvider {
 
 	[iOS (11,0)]
 	[Mac (10,15)]
-	[Unavailable (PlatformName.MacCatalyst)][Advice ("This API is not available when using Catalyst on macOS.")]
+	[MacCatalyst (13, 0)]
 	[Native]
 	[Flags]
 	enum NSFileProviderItemCapabilities : ulong {
@@ -258,7 +258,7 @@ namespace FileProvider {
 
 	[iOS (11,0)]
 	[Mac (11,0)]
-	[Unavailable (PlatformName.MacCatalyst)][Advice ("This API is not available when using Catalyst on macOS.")]
+	[MacCatalyst (13, 0)]
 	[Static]
 	interface NSFileProviderPage {
 
@@ -326,7 +326,7 @@ namespace FileProvider {
 
 	[iOS (11,0)]
 	[Mac (10,15)]
-	[Unavailable (PlatformName.MacCatalyst)][Advice ("This API is not available when using Catalyst on macOS.")]
+	[MacCatalyst (13, 0)]
 	[Protocol]
 	interface NSFileProviderEnumerationObserver {
 
@@ -352,7 +352,7 @@ namespace FileProvider {
 
 	[iOS (11,0)]
 	[Mac (10,15)]
-	[Unavailable (PlatformName.MacCatalyst)][Advice ("This API is not available when using Catalyst on macOS.")]
+	[MacCatalyst (13, 0)]
 	[Protocol]
 	interface NSFileProviderChangeObserver {
 
@@ -382,7 +382,7 @@ namespace FileProvider {
 
 	[iOS (11,0)]
 	[Mac (10,15)]
-	[Unavailable (PlatformName.MacCatalyst)][Advice ("This API is not available when using Catalyst on macOS.")]
+	[MacCatalyst (13, 0)]
 	[Protocol]
 	interface NSFileProviderEnumerator {
 
@@ -405,7 +405,7 @@ namespace FileProvider {
 
 	[iOS (11,0)]
 	[Mac (10,15)]
-	[Unavailable (PlatformName.MacCatalyst)][Advice ("This API is not available when using Catalyst on macOS.")]
+	[MacCatalyst (13, 0)]
 	[Protocol]
 	interface NSFileProviderItem {
 

src/metal.cs

@@ -1401,13 +1401,11 @@ namespace Metal {
 
 		[Introduced (PlatformName.MacCatalyst, 14, 0)]
 		[Mac (11,0), NoTV, iOS (13,0)]
-		[Advice ("This API is not available when using UIKit on macOS.")]
 		[Export ("convertSparseTileRegions:toPixelRegions:withTileSize:numRegions:")]
 		void ConvertSparseTileRegions (IntPtr tileRegions, IntPtr pixelRegions, MTLSize tileSize, nuint numRegions);
 
 		[Introduced (PlatformName.MacCatalyst, 14, 0)]
 		[Mac (11,0), NoTV, iOS (13,0)]
-		[Advice ("This API is not available when using UIKit on macOS.")]
 		[Export ("convertSparsePixelRegions:toTileRegions:withTileSize:alignmentMode:numRegions:")]
 		void ConvertSparsePixelRegions (IntPtr pixelRegions, IntPtr tileRegions, MTLSize tileSize, MTLSparseTextureRegionAlignmentMode mode, nuint numRegions);
 

src/scenekit.cs

@@ -3444,7 +3444,7 @@ namespace SceneKit {
 		[Deprecated (PlatformName.MacOSX, 10, 14, message: "Please use Metal instead of OpenGL API.")]
 		[Export ("pixelFormat", ArgumentSemantic.Retain)]
 		NSOpenGLPixelFormat PixelFormat { get; set;  }
-#elif !WATCH
+#elif !WATCH && !__MACCATALYST__
 		[Deprecated (PlatformName.iOS, 12, 0, message: "Please use Metal instead of OpenGL API.")]
 		[Deprecated (PlatformName.TvOS, 12, 0, message: "Please use Metal instead of OpenGL API.")]
 		[Export ("eaglContext", ArgumentSemantic.Retain)]