[msbuild] Merge the CreatePkgInfo[TaskBase] classes. (#19642)

msbuild/Xamarin.MacDev.Tasks/Tasks/CreatePkgInfo.cs

@@ -1,20 +0,0 @@
-using Microsoft.Build.Framework;
-using Xamarin.Messaging.Build.Client;
-
-namespace Xamarin.MacDev.Tasks {
-	public class CreatePkgInfo : CreatePkgInfoTaskBase, 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 ();
-		}
-	}
-}

msbuild/Xamarin.MacDev.Tasks/Tasks/CreatePkgInfoTaskBase.cs

@@ -4,11 +4,13 @@ using System.IO;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
+using Xamarin.Messaging.Build.Client;
+
 // Disable until we get around to enable + fix any issues.
 #nullable disable
 
 namespace Xamarin.MacDev.Tasks {
-	public abstract class CreatePkgInfoTaskBase : XamarinTask {
+	public class CreatePkgInfo : XamarinTask, ICancelableTask {
 		static readonly byte [] PkgInfoData = { 0X41, 0X50, 0X50, 0X4C, 0x3f, 0x3f, 0x3f, 0x3f };
 		#region Inputs
 
@@ -19,6 +21,9 @@ namespace Xamarin.MacDev.Tasks {
 
 		public override bool Execute ()
 		{
+			if (ShouldExecuteRemotely ())
+				return new TaskRunner (SessionId, BuildEngine4).RunAsync (this).Result;
+
 			if (!File.Exists (OutputPath)) {
 				Directory.CreateDirectory (Path.GetDirectoryName (OutputPath));
 
@@ -29,5 +34,11 @@ namespace Xamarin.MacDev.Tasks {
 
 			return true;
 		}
+
+		public void Cancel ()
+		{
+			if (ShouldExecuteRemotely ())
+				BuildConnection.CancelAsync (BuildEngine4).Wait ();
+		}
 	}
 }