From cce2510e3ee6f915c66c8c642c16fbf0c4640fc5 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 6 Dec 2023 20:57:44 +0100
Subject: [PATCH] [msbuild] Merge the CompileSceneKitAssets[TaskBase] classes.
 (#19573)

---
 .../Tasks/CompileSceneKitAssets.cs            | 33 -------------------
 .../Tasks/CompileSceneKitAssetsTaskBase.cs    | 26 ++++++++++++++-
 2 files changed, 25 insertions(+), 34 deletions(-)
 delete mode 100644 msbuild/Xamarin.MacDev.Tasks/Tasks/CompileSceneKitAssets.cs

diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/CompileSceneKitAssets.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/CompileSceneKitAssets.cs
deleted file mode 100644
index c958714f81..0000000000
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/CompileSceneKitAssets.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using Microsoft.Build.Framework;
-using Xamarin.Messaging.Build.Client;
-
-namespace Xamarin.MacDev.Tasks {
-	public class CompileSceneKitAssets : CompileSceneKitAssetsTaskBase, ICancelableTask {
-		public override bool Execute ()
-		{
-			if (!ShouldExecuteRemotely ())
-				return base.Execute ();
-
-			var taskRunner = new TaskRunner (SessionId, BuildEngine4);
-
-			taskRunner.FixReferencedItems (SceneKitAssets);
-
-			FixUpRootedPaths (SceneKitAssets);
-
-			return taskRunner.RunAsync (this).Result;
-		}
-
-		public void Cancel ()
-		{
-			if (ShouldExecuteRemotely ())
-				BuildConnection.CancelAsync (BuildEngine4).Wait ();
-		}
-
-		void FixUpRootedPaths (ITaskItem [] sceneKitAssets)
-		{
-			foreach (var item in sceneKitAssets) {
-				item.ItemSpec = item.ItemSpec.Replace (":", "");
-			}
-		}
-	}
-}
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/CompileSceneKitAssetsTaskBase.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/CompileSceneKitAssetsTaskBase.cs
index d663aecc31..fd4f5172e7 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/CompileSceneKitAssetsTaskBase.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/CompileSceneKitAssetsTaskBase.cs
@@ -10,12 +10,13 @@ using TaskItem = Microsoft.Build.Utilities.TaskItem;
 using Xamarin.MacDev;
 using Xamarin.Utils;
 using Xamarin.Localization.MSBuild;
+using Xamarin.Messaging.Build.Client;
 
 // Disable until we get around to enable + fix any issues.
 #nullable disable
 
 namespace Xamarin.MacDev.Tasks {
-	public abstract class CompileSceneKitAssetsTaskBase : XamarinTask {
+	public class CompileSceneKitAssets : XamarinTask, ICancelableTask {
 		string toolExe;
 
 		#region Inputs
@@ -119,6 +120,16 @@ namespace Xamarin.MacDev.Tasks {
 
 		public override bool Execute ()
 		{
+			if (ShouldExecuteRemotely ()) {
+				var taskRunner = new TaskRunner (SessionId, BuildEngine4);
+
+				taskRunner.FixReferencedItems (SceneKitAssets);
+
+				FixUpRootedPaths (SceneKitAssets);
+
+				return taskRunner.RunAsync (this).Result;
+			}
+
 			var prefixes = BundleResource.SplitResourcePrefixes (ResourcePrefix);
 			var intermediate = Path.Combine (IntermediateOutputPath, ToolName, AppBundleName);
 			var bundleResources = new List<ITaskItem> ();
@@ -202,5 +213,18 @@ namespace Xamarin.MacDev.Tasks {
 
 			return !Log.HasLoggedErrors;
 		}
+
+		public void Cancel ()
+		{
+			if (ShouldExecuteRemotely ())
+				BuildConnection.CancelAsync (BuildEngine4).Wait ();
+		}
+
+		void FixUpRootedPaths (ITaskItem [] sceneKitAssets)
+		{
+			foreach (var item in sceneKitAssets) {
+				item.ItemSpec = item.ItemSpec.Replace (":", "");
+			}
+		}
 	}
 }