From afd8d23da59aff61c2cadd3fefc35292ec0ffc17 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 14 Dec 2023 17:20:35 +0100
Subject: [PATCH] [msbuild] Merge the CreateDebugSettings[TaskBase] classes.
 (#19630)

---
 .../Tasks/CreateDebugSettings.cs              | 20 -------------------
 .../Tasks/CreateDebugSettingsTaskBase.cs      | 12 ++++++++++-
 2 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 msbuild/Xamarin.MacDev.Tasks/Tasks/CreateDebugSettings.cs

diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateDebugSettings.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateDebugSettings.cs
deleted file mode 100644
index ee46e5e0fd..0000000000
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateDebugSettings.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Microsoft.Build.Framework;
-using Xamarin.Messaging.Build.Client;
-
-namespace Xamarin.MacDev.Tasks {
-	public class CreateDebugSettings : CreateDebugSettingsTaskBase, ICancelableTask {
-		public override bool Execute ()
-		{
-			if (ShouldExecuteRemotely ())
-				return new TaskRunner (SessionId, BuildEngine4).RunAsync (this).Result;
-
-			return base.Execute ();
-		}
-
-		public void Cancel ()
-		{
-			if (ShouldExecuteRemotely ())
-				BuildConnection.CancelAsync (BuildEngine4).Wait ();
-		}
-	}
-}
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateDebugSettingsTaskBase.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateDebugSettingsTaskBase.cs
index bb7b80e3c6..93b7e7ce12 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateDebugSettingsTaskBase.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateDebugSettingsTaskBase.cs
@@ -8,12 +8,13 @@ using Microsoft.Build.Utilities;
 using Xamarin.MacDev.Tasks;
 using Xamarin.MacDev;
 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 CreateDebugSettingsTaskBase : XamarinTask {
+	public class CreateDebugSettings : XamarinTask, ICancelableTask {
 		#region Inputs
 
 		[Required]
@@ -26,6 +27,9 @@ namespace Xamarin.MacDev.Tasks {
 
 		public override bool Execute ()
 		{
+			if (ShouldExecuteRemotely ())
+				return new TaskRunner (SessionId, BuildEngine4).RunAsync (this).Result;
+
 			PDictionary plist;
 
 			var path = Path.Combine (AppBundleDir, "Settings.bundle", "Root.plist");
@@ -82,5 +86,11 @@ namespace Xamarin.MacDev.Tasks {
 
 			return !Log.HasLoggedErrors;
 		}
+
+		public void Cancel ()
+		{
+			if (ShouldExecuteRemotely ())
+				BuildConnection.CancelAsync (BuildEngine4).Wait ();
+		}
 	}
 }