[Metal/SpriteKit] Fix availability attributes on a few API. (#5033)

xamarin · Oct 24, 2018 · 74576fa · 74576fa · xamarin-release-manager · Oct 24, 2018
1 parent 9688c42
commit 74576fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/metal.cs b/src/metal.cs
@@ -2081,7 +2081,8 @@ partial interface MTLRenderCommandEncoder : MTLCommandEncoder {
 		[Abstract, Export ("setCullMode:")]
 		void SetCullMode (MTLCullMode cullMode);
 
-		[Mac (10,11, onlyOn64 : true), TV (11,0), iOS (11,0), NoWatch]
+		[iOS (9,0)] // Current headers claim this member was introduced in iOS 11, but it also shows up in Xcode 7's header (as introduced in iOS 9)
+		[Mac (10,11, onlyOn64 : true), TV (11,0), NoWatch]
 #if XAMCORE_4_0
 		// Apple added a new required member in iOS 9, but that breaks our binary compat, so we can't do that in our existing code.
 		[Abstract]

diff --git a/src/spritekit.cs b/src/spritekit.cs
@@ -158,10 +158,12 @@ partial interface SKNode : NSSecureCoding, NSCopying {
 		[return: NullAllowed]
 		SKNode Create (string filename, IntPtr classesPtr, out NSError error);
 
-#if MONOMAC || WATCH
 		[Export ("frame")]
-		CGRect Frame { get; }
+#if !(MONOMAC || WATCH)
+		// For iOS+tvOS we also get this property from the UIFocusItem protocol, but we redefine it here to get the right availability attributes.
+		new
 #endif
+		CGRect Frame { get; }
 
 		[Export ("calculateAccumulatedFrame")]
 		CGRect CalculateAccumulatedFrame ();