[msbuild] Share the ALToolUpload and ALToolValidate task implementations between iOS and macOS. (#12852)

msbuild/Xamarin.Mac.Tasks.Core/Tasks/ALToolUploadTaskBase.cs

@@ -1,16 +0,0 @@
-using System.Text;
-
-namespace Xamarin.Mac.Tasks
-{
-	public abstract class ALToolUploadTaskBase : MacDev.Tasks.ALToolTaskBase
-	{
-		protected override string GenerateCommandLineCommands ()
-		{
-			var sb = new StringBuilder ();
-			sb.Append ("--upload-app ");
-			sb.Append (base.GenerateCommandLineCommands ());
-
-			return sb.ToString ();
-		}
-	}
-}

msbuild/Xamarin.Mac.Tasks.Core/Tasks/ALToolValidateTaskBase.cs

@@ -1,16 +0,0 @@
-using System.Text;
-
-namespace Xamarin.Mac.Tasks
-{
-	public abstract class ALToolValidateTaskBase : MacDev.Tasks.ALToolTaskBase
-	{
-		protected override string GenerateCommandLineCommands ()
-		{
-			var sb = new StringBuilder ();
-			sb.Append ("--validate-app ");
-			sb.Append (base.GenerateCommandLineCommands ());
-
-			return sb.ToString ();
-		}
-	}
-}

msbuild/Xamarin.Mac.Tasks/Tasks/ALToolUpload.cs

@@ -1,6 +0,0 @@
-namespace Xamarin.Mac.Tasks
-{
-	public class ALToolUpload : ALToolUploadTaskBase
-	{
-	}
-}

msbuild/Xamarin.Mac.Tasks/Tasks/ALToolValidate.cs

@@ -1,6 +0,0 @@
-namespace Xamarin.Mac.Tasks
-{
-	public class ALToolValidate : ALToolValidateTaskBase
-	{
-	}
-}

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/AlToolTaskBase.cs

@@ -40,6 +40,8 @@ namespace Xamarin.MacDev.Tasks
 			get { return Path.Combine (SdkDevPath, "usr", "bin"); }
 		}
 
+		protected abstract string ALToolAction { get; }
+
 		public override bool Execute ()
 		{
 			toolOutput = new StringBuilder ();
@@ -65,6 +67,7 @@ namespace Xamarin.MacDev.Tasks
 		{
 			var args = new CommandLineArgumentBuilder ();
 
+			args.Add (ALToolAction);
 			args.Add ("--file");
 			args.AddQuoted (FilePath);
 			args.Add ("--type");

msbuild/Xamarin.MacDev.Tasks/Tasks/ALToolUpload.cs

@@ -1,10 +1,12 @@
 using Microsoft.Build.Framework;
 using Xamarin.Messaging.Build.Client;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
-	public class ALToolUpload : ALToolUploadTaskBase, ICancelableTask
+	public class ALToolUpload : ALToolTaskBase, ICancelableTask
 	{
+		protected override string ALToolAction => "--upload-app";
+
 		public override bool Execute ()
 		{
 			if (ShouldExecuteRemotely())

msbuild/Xamarin.MacDev.Tasks/Tasks/ALToolValidate.cs

@@ -1,9 +1,12 @@
+using Microsoft.Build.Framework;
 using Xamarin.Messaging.Build.Client;
 
-namespace Xamarin.iOS.Tasks
+namespace Xamarin.MacDev.Tasks
 {
-	public class ALToolValidate : ALToolValidateTaskBase
+	public class ALToolValidate : ALToolTaskBase, ICancelableTask
 	{
+		protected override string ALToolAction => "--validate-app";
+
 		public override bool Execute ()
 		{
 			if (ShouldExecuteRemotely ())

msbuild/Xamarin.Shared/Xamarin.Shared.targets

@@ -34,8 +34,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 	<UsingTask TaskName="Microsoft.Build.Tasks.WriteLinesToFile" AssemblyFile="$(_TaskAssemblyName)" />
 
 	<!-- Xamarin.iOS-specific tasks. Some of these are duplicated with the Xamarin.Mac ones below, and should eventually be re-namespaced to be in Xamarin.MacDev -->
-	<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.ALToolUpload" AssemblyFile="$(_TaskAssemblyName)" />
-	<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.ALToolValidate" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.BTouch" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CodesignVerify" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CollectAssetPacks" AssemblyFile="$(_TaskAssemblyName)" />
@@ -82,6 +80,8 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 
 	<!-- Tasks shared between Xamarin.iOS and Xamarin.Mac -->
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.ACTool" AssemblyFile="$(_TaskAssemblyName)" />
+	<UsingTask TaskName="Xamarin.MacDev.Tasks.ALToolUpload" AssemblyFile="$(_TaskAssemblyName)" />
+	<UsingTask TaskName="Xamarin.MacDev.Tasks.ALToolValidate" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.Archive" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.ArTool" AssemblyFile="$(_TaskAssemblyName)" />
 	<UsingTask TaskName="Xamarin.MacDev.Tasks.AOTCompile" AssemblyFile="$(_TaskAssemblyName)" />

msbuild/Xamarin.iOS.Tasks.Core/Tasks/ALToolUploadTaskBase.cs

@@ -1,16 +0,0 @@
-using System.Text;
-
-namespace Xamarin.iOS.Tasks
-{
-	public abstract class ALToolUploadTaskBase : MacDev.Tasks.ALToolTaskBase
-	{
-		protected override string GenerateCommandLineCommands ()
-		{
-			var sb = new StringBuilder ();
-			sb.Append ("--upload-app ");
-			sb.Append (base.GenerateCommandLineCommands ());
-
-			return sb.ToString ();
-		}
-	}
-}

msbuild/Xamarin.iOS.Tasks.Core/Tasks/ALToolValidateTaskBase.cs

@@ -1,16 +0,0 @@
-using System.Text;
-
-namespace Xamarin.iOS.Tasks
-{
-	public abstract class ALToolValidateTaskBase : MacDev.Tasks.ALToolTaskBase
-	{
-		protected override string GenerateCommandLineCommands ()
-		{
-			var sb = new StringBuilder ();
-			sb.Append ("--validate-app ");
-			sb.Append (base.GenerateCommandLineCommands ());
-
-			return sb.ToString ();
-		}
-	}
-}