[msbuild] Merge the CreateDebugSettings[TaskBase] classes. (#19630)

xamarin · Dec 14, 2023 · afd8d23 · afd8d23
1 parent 1dff5d1
commit afd8d23
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateDebugSettings.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateDebugSettings.cs
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateDebugSettingsTaskBase.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateDebugSettingsTaskBase.cs
@@ -8,12 +8,13 @@
 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 @@ public abstract class CreateDebugSettingsTaskBase : XamarinTask {
 
 		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 @@ public override bool Execute ()
 
 			return !Log.HasLoggedErrors;
 		}
+
+		public void Cancel ()
+		{
+			if (ShouldExecuteRemotely ())
+				BuildConnection.CancelAsync (BuildEngine4).Wait ();
+		}
 	}
 }