From 7e8650a931f5da7d5ffb9fa57b6a6d1eb19846eb Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 27 Jan 2022 10:45:50 +0100
Subject: [PATCH] [ARKit] Adopt XAMCORE_4_0 changes in .NET. (#13886)

For ARKit this just means removing obsolete/deprecated API.
---
 src/ARKit/ARCompat.cs                             |  2 +-
 src/arkit.cs                                      | 12 ++++++------
 tests/monotouch-test/ARKit/ARConfigurationTest.cs |  2 ++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/ARKit/ARCompat.cs b/src/ARKit/ARCompat.cs
index 79f720d9cd..30c14afe91 100644
--- a/src/ARKit/ARCompat.cs
+++ b/src/ARKit/ARCompat.cs
@@ -15,7 +15,7 @@ using Vector3 = global::OpenTK.NVector3;
 
 namespace ARKit {
 
-#if !XAMCORE_4_0 && IOS
+#if !NET && IOS
 	public partial class ARFaceGeometry {
 
 		[Obsolete ("Use the 'GetVertices' method instead.")]
diff --git a/src/arkit.cs b/src/arkit.cs
index e46d68e370..70ea963d59 100644
--- a/src/arkit.cs
+++ b/src/arkit.cs
@@ -74,7 +74,7 @@ namespace ARKit {
 		InvalidReferenceObject = 301,
 		InvalidWorldMap = 302,
 		InvalidConfiguration = 303,
-		#if !XAMCORE_4_0
+		#if !NET
 		[Obsolete ("Please use the 'InvalidCollaborationData' value instead.")]
 		CollaborationDataUnavailable = InvalidCollaborationData,
 		#endif
@@ -400,7 +400,7 @@ namespace ARKit {
 			get;
 		}
 
-#if !XAMCORE_4_0
+#if !NET
 		[Obsolete ("Use 'Project' instead.")]
 		[Wrap ("Project (point, orientation, viewportSize)", IsVirtual = true)]
 		CGPoint GetProjectPoint (Vector3 point, UIInterfaceOrientation orientation, CGSize viewportSize);
@@ -973,7 +973,7 @@ namespace ARKit {
 		[Export ("isSupported")]
 		bool IsSupported { get; }
 
-#if !XAMCORE_4_0
+#if !NET
 		// even if static - it's abstract
 		[iOS (11,3)]
 		[Static]
@@ -1450,7 +1450,7 @@ namespace ARKit {
 		[Export ("initWithAnchor:")]
 		NativeHandle Constructor (ARAnchor anchor);
 
-#if !XAMCORE_4_0
+#if !NET
 		[Obsolete ("Constructor marked as unavailable.")]
 		[Export ("init")]
 		NativeHandle Constructor ();
@@ -1527,7 +1527,7 @@ namespace ARKit {
 	[BaseType (typeof(SCNGeometry))]
 	[DisableDefaultCtor]
 	interface ARSCNFaceGeometry {
-#if !XAMCORE_4_0
+#if !NET
 		[Obsolete ("Use the 'Create' static constructor instead.")]
 		[Static]
 		[Wrap ("Create (device)")]
@@ -1540,7 +1540,7 @@ namespace ARKit {
 		[return: NullAllowed]
 		ARSCNFaceGeometry Create (IMTLDevice device);
 
-#if !XAMCORE_4_0
+#if !NET
 		[Obsolete ("Use the 'Create' static constructor instead.")]
 		[Static]
 		[Wrap ("Create (device, fillMesh)")]
diff --git a/tests/monotouch-test/ARKit/ARConfigurationTest.cs b/tests/monotouch-test/ARKit/ARConfigurationTest.cs
index c45758fe5c..3d8146c0fc 100644
--- a/tests/monotouch-test/ARKit/ARConfigurationTest.cs
+++ b/tests/monotouch-test/ARKit/ARConfigurationTest.cs
@@ -22,12 +22,14 @@ namespace MonoTouchFixtures.ARKit {
 			TestRuntime.AssertSystemVersion (ApplePlatform.MacCatalyst, 14, 0, throwIfOtherPlatform: false);
 		}
 
+#if !NET
 		[Test]
 		public void SupportedVideoFormats ()
 		{
 			var svf = ARConfiguration.SupportedVideoFormats;
 			Assert.That (svf, Is.Empty, "empty");
 		}
+#endif
 
 		[Test]
 		public void GetSupportedVideoFormats_9_3 ()