[msbuild] Merge the ValidateAppBundle[TaskBase] classes. (#19907)

xamarin · Jan 26, 2024 · e90ef18 · e90ef18
1 parent 75edf84
commit e90ef18
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/msbuild/Xamarin.iOS.Tasks/Tasks/ValidateAppBundleTask.cs b/msbuild/Xamarin.iOS.Tasks/Tasks/ValidateAppBundleTask.cs
diff --git a/msbuild/Xamarin.iOS.Tasks/Tasks/ValidateAppBundleTaskBase.cs b/msbuild/Xamarin.iOS.Tasks/Tasks/ValidateAppBundleTaskBase.cs
@@ -8,13 +8,14 @@
 using Xamarin.MacDev;
 using Xamarin.MacDev.Tasks;
 using Xamarin.Utils;
+using Xamarin.Messaging.Build.Client;
 using Xamarin.Localization.MSBuild;
 
 // Disable until we get around to enable + fix any issues.
 #nullable disable
 
 namespace Xamarin.iOS.Tasks {
-	public abstract class ValidateAppBundleTaskBase : XamarinTask {
+	public class ValidateAppBundleTask : XamarinTask, ICancelableTask {
 		#region Inputs
 
 		[Required]
@@ -287,6 +288,9 @@ void ValidateWatchExtension (string path, string watchAppBundleIdentifier, strin
 
 		public override bool Execute ()
 		{
+			if (ShouldExecuteRemotely ())
+				return new TaskRunner (SessionId, BuildEngine4).RunAsync (this).Result;
+
 			var mainInfoPath = PlatformFrameworkHelper.GetAppManifestPath (Platform, AppBundlePath);
 			if (!File.Exists (mainInfoPath)) {
 				Log.LogError (7040, AppBundlePath, MSBStrings.E7040, AppBundlePath);
@@ -377,5 +381,11 @@ public override bool Execute ()
 
 			return !Log.HasLoggedErrors;
 		}
+
+		public void Cancel ()
+		{
+			if (ShouldExecuteRemotely ())
+				BuildConnection.CancelAsync (BuildEngine4).Wait ();
+		}
 	}
 }