From 63ad08ed4443b659d2c58cc49dec4c4dbe478bf7 Mon Sep 17 00:00:00 2001
From: Sebastien Pouliot <sebastien.pouliot@gmail.com>
Date: Mon, 17 May 2021 15:56:18 -0400
Subject: [PATCH] [src] Fix some breaking changes detected when bumping APIDIFF
 (#11567)

They were not visible (or handled differently in `main`) but
become _small_ breaking changes once we released xcode12.5 support.
---
 src/AudioUnit/AUEnums.cs      |  2 ++
 src/UIKit/UIEnums.cs          |  4 ++--
 src/authenticationservices.cs | 13 +++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/AudioUnit/AUEnums.cs b/src/AudioUnit/AUEnums.cs
index 28e07a6649..470f2101c5 100644
--- a/src/AudioUnit/AUEnums.cs
+++ b/src/AudioUnit/AUEnums.cs
@@ -268,6 +268,8 @@ namespace AudioUnit
 		ParametersForOverview = 57,
 		[iOS (10,0), Mac (10,12)]
 		SupportsMpe = 58,
+		[iOS (14,5), TV (14,5), Mac (11,3)]
+		LoadedOutOfProcess = 62,
 
 #if MONOMAC
 		FastDispatch = 5,
diff --git a/src/UIKit/UIEnums.cs b/src/UIKit/UIEnums.cs
index 95101b3e75..7a77e5ea8e 100644
--- a/src/UIKit/UIEnums.cs
+++ b/src/UIKit/UIEnums.cs
@@ -2468,11 +2468,11 @@ namespace UIKit {
 		[Field ("UIWindowSceneSessionRoleExternalDisplay")]
 		ExternalDisplay,
 
-#if HAS_CARPLAY
 		[NoTV][NoWatch]
+#if HAS_CARPLAY
 		[Field ("CPTemplateApplicationSceneSessionRoleApplication", "CarPlay")]
-		CarTemplateApplication,
 #endif
+		CarTemplateApplication,
 	}
 
 	[iOS (13,0), TV (13,0), NoWatch]
diff --git a/src/authenticationservices.cs b/src/authenticationservices.cs
index 72e704b1b7..75ca8a47a7 100644
--- a/src/authenticationservices.cs
+++ b/src/authenticationservices.cs
@@ -49,14 +49,15 @@ namespace AuthenticationServices {
 	}
 
 	[Partial]
-#if TVOS || WATCH
-	// The associated enum is not generated (which is normal)
-	// without this define the attributes would be duplicated
-	// on other platforms (where the enum exists)
-	[NoTV][NoWatch]
-#endif
 	interface ASExtensionErrorCodeExtensions {
 
+#if TVOS || WATCH
+		// Type `ASExtensionErrorCode` is already decorated, so it becomes a duplicate (after code gen)
+		// on those platforms and intro tests complains (on other platforms, e.g. iOS, Catalyst)
+		// OTOH if we don't add them here then we'll get the extra, not really usable, extension type
+		// on tvOS and watchOS (which is incorrect)
+		[NoTV][NoWatch]
+#endif
 		[NoMac, iOS (14,0)]
 		[Field ("ASExtensionLocalizedFailureReasonErrorKey")]
 		NSString LocalizedFailureReasonErrorKey { get; }