From 025cb303676b4c4ce77fff1e55a443856adc97fe Mon Sep 17 00:00:00 2001
From: Manuel de la Pena <mandel@microsoft.com>
Date: Fri, 25 Nov 2016 18:03:17 +0100
Subject: [PATCH 1/2] [AVKit] Add missing enum for Xcode 8.2 beta 1.

---
 src/AVKit/Enums.cs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/AVKit/Enums.cs b/src/AVKit/Enums.cs
index 068d92beb825..da5e7acb4a28 100644
--- a/src/AVKit/Enums.cs
+++ b/src/AVKit/Enums.cs
@@ -1,4 +1,5 @@
 using XamCore.ObjCRuntime;
+using XamCore.Foundation;
 
 namespace XamCore.AVKit {
 
@@ -24,4 +25,17 @@ public enum AVKitError : nint {
 		PictureInPictureStartFailed = -1001
 	}
 #endif
+
+#if TVOS
+	// this enum only exists for TVOS
+	[TV (10,1)]
+	public enum AVKitMetadataIdentifier : nint {
+		[Field ("AVKitMetadataIdentifierExternalContentIdentifier")]
+		ExternalContentIdentifier,
+		[Field ("AVKitMetadataIdentifierExternalUserProfileIdentifier")]
+		ExternalUserProfileIdentifier,
+		[Field ("AVKitMetadataIdentifierPlaybackProgress")]
+		PlaybackProgress,
+	}
+#endif
 }	

From 97c96163c6c0026fcec27cd17132bb1f6b70bfe4 Mon Sep 17 00:00:00 2001
From: Manuel de la Pena <mandel@microsoft.com>
Date: Fri, 25 Nov 2016 19:06:16 +0100
Subject: [PATCH 2/2] As per review, move away from the enum implementation,
 add a static class with the valid strings.

---
 src/AVKit/Enums.cs | 12 ------------
 src/avkit.cs       | 13 +++++++++++++
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/AVKit/Enums.cs b/src/AVKit/Enums.cs
index da5e7acb4a28..bb99b7419123 100644
--- a/src/AVKit/Enums.cs
+++ b/src/AVKit/Enums.cs
@@ -26,16 +26,4 @@ public enum AVKitError : nint {
 	}
 #endif
 
-#if TVOS
-	// this enum only exists for TVOS
-	[TV (10,1)]
-	public enum AVKitMetadataIdentifier : nint {
-		[Field ("AVKitMetadataIdentifierExternalContentIdentifier")]
-		ExternalContentIdentifier,
-		[Field ("AVKitMetadataIdentifierExternalUserProfileIdentifier")]
-		ExternalUserProfileIdentifier,
-		[Field ("AVKitMetadataIdentifierPlaybackProgress")]
-		PlaybackProgress,
-	}
-#endif
 }	
diff --git a/src/avkit.cs b/src/avkit.cs
index fd61384d4351..b189fc9d4096 100644
--- a/src/avkit.cs
+++ b/src/avkit.cs
@@ -349,5 +349,18 @@ interface AVContentProposalViewController
 		[Export ("dismissContentProposalForAction:animated:completion:")]
 		void DismissContentProposal (AVContentProposalAction action, bool animated, [NullAllowed] Action block);
 	}
+
+	[Static]
+	[NoiOS, TV (10,1), NoWatch, NoMac]
+	interface AVKitMetadataIdentifier {
+
+		[Field ("AVKitMetadataIdentifierExternalContentIdentifier")]
+		NSString ExternalContentIdentifier { get; }
+		[Field ("AVKitMetadataIdentifierExternalUserProfileIdentifier")]
+		NSString ExternalUserProfileIdentifier { get; }
+		[Field ("AVKitMetadataIdentifierPlaybackProgress")]
+		NSString PlaybackProgress { get; }
+	}
+
 #endif
 }