From 09905e80211dec4250a8e9a3701808b9aa457f73 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 28 Sep 2021 17:38:51 +0200 Subject: [PATCH] [msbuild] Share the ALToolUpload and ALToolValidate task implementations between iOS and macOS. (#12852) --- .../Tasks/ALToolUploadTaskBase.cs | 16 ---------------- .../Tasks/ALToolValidateTaskBase.cs | 16 ---------------- msbuild/Xamarin.Mac.Tasks/Tasks/ALToolUpload.cs | 6 ------ .../Xamarin.Mac.Tasks/Tasks/ALToolValidate.cs | 6 ------ .../Tasks/AlToolTaskBase.cs | 3 +++ .../Tasks/ALToolUpload.cs | 6 ++++-- .../Tasks/ALToolValidate.cs | 7 +++++-- msbuild/Xamarin.Shared/Xamarin.Shared.targets | 4 ++-- .../Tasks/ALToolUploadTaskBase.cs | 16 ---------------- .../Tasks/ALToolValidateTaskBase.cs | 16 ---------------- 10 files changed, 14 insertions(+), 82 deletions(-) delete mode 100644 msbuild/Xamarin.Mac.Tasks.Core/Tasks/ALToolUploadTaskBase.cs delete mode 100644 msbuild/Xamarin.Mac.Tasks.Core/Tasks/ALToolValidateTaskBase.cs delete mode 100644 msbuild/Xamarin.Mac.Tasks/Tasks/ALToolUpload.cs delete mode 100644 msbuild/Xamarin.Mac.Tasks/Tasks/ALToolValidate.cs rename msbuild/{Xamarin.iOS.Tasks => Xamarin.MacDev.Tasks}/Tasks/ALToolUpload.cs (73%) rename msbuild/{Xamarin.iOS.Tasks => Xamarin.MacDev.Tasks}/Tasks/ALToolValidate.cs (67%) delete mode 100644 msbuild/Xamarin.iOS.Tasks.Core/Tasks/ALToolUploadTaskBase.cs delete mode 100644 msbuild/Xamarin.iOS.Tasks.Core/Tasks/ALToolValidateTaskBase.cs diff --git a/msbuild/Xamarin.Mac.Tasks.Core/Tasks/ALToolUploadTaskBase.cs b/msbuild/Xamarin.Mac.Tasks.Core/Tasks/ALToolUploadTaskBase.cs deleted file mode 100644 index 2168373a1b..0000000000 --- a/msbuild/Xamarin.Mac.Tasks.Core/Tasks/ALToolUploadTaskBase.cs +++ /dev/null @@ -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 (); - } - } -} diff --git a/msbuild/Xamarin.Mac.Tasks.Core/Tasks/ALToolValidateTaskBase.cs b/msbuild/Xamarin.Mac.Tasks.Core/Tasks/ALToolValidateTaskBase.cs deleted file mode 100644 index 3f819c7c87..0000000000 --- a/msbuild/Xamarin.Mac.Tasks.Core/Tasks/ALToolValidateTaskBase.cs +++ /dev/null @@ -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 (); - } - } -} diff --git a/msbuild/Xamarin.Mac.Tasks/Tasks/ALToolUpload.cs b/msbuild/Xamarin.Mac.Tasks/Tasks/ALToolUpload.cs deleted file mode 100644 index 4b615f8441..0000000000 --- a/msbuild/Xamarin.Mac.Tasks/Tasks/ALToolUpload.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Xamarin.Mac.Tasks -{ - public class ALToolUpload : ALToolUploadTaskBase - { - } -} diff --git a/msbuild/Xamarin.Mac.Tasks/Tasks/ALToolValidate.cs b/msbuild/Xamarin.Mac.Tasks/Tasks/ALToolValidate.cs deleted file mode 100644 index b4f534ca8e..0000000000 --- a/msbuild/Xamarin.Mac.Tasks/Tasks/ALToolValidate.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Xamarin.Mac.Tasks -{ - public class ALToolValidate : ALToolValidateTaskBase - { - } -} diff --git a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/AlToolTaskBase.cs b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/AlToolTaskBase.cs index 90efcfadf3..94fe250719 100644 --- a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/AlToolTaskBase.cs +++ b/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"); diff --git a/msbuild/Xamarin.iOS.Tasks/Tasks/ALToolUpload.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/ALToolUpload.cs similarity index 73% rename from msbuild/Xamarin.iOS.Tasks/Tasks/ALToolUpload.cs rename to msbuild/Xamarin.MacDev.Tasks/Tasks/ALToolUpload.cs index 00a3d46a3c..e47f8f79e2 100644 --- a/msbuild/Xamarin.iOS.Tasks/Tasks/ALToolUpload.cs +++ b/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()) diff --git a/msbuild/Xamarin.iOS.Tasks/Tasks/ALToolValidate.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/ALToolValidate.cs similarity index 67% rename from msbuild/Xamarin.iOS.Tasks/Tasks/ALToolValidate.cs rename to msbuild/Xamarin.MacDev.Tasks/Tasks/ALToolValidate.cs index 59feed9f83..0e28a5ce62 100644 --- a/msbuild/Xamarin.iOS.Tasks/Tasks/ALToolValidate.cs +++ b/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 ()) diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets index c7117a8b40..92e13cf9a6 100644 --- a/msbuild/Xamarin.Shared/Xamarin.Shared.targets +++ b/msbuild/Xamarin.Shared/Xamarin.Shared.targets @@ -34,8 +34,6 @@ Copyright (C) 2018 Microsoft. All rights reserved. - - @@ -82,6 +80,8 @@ Copyright (C) 2018 Microsoft. All rights reserved. + + diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Tasks/ALToolUploadTaskBase.cs b/msbuild/Xamarin.iOS.Tasks.Core/Tasks/ALToolUploadTaskBase.cs deleted file mode 100644 index a91a232cc6..0000000000 --- a/msbuild/Xamarin.iOS.Tasks.Core/Tasks/ALToolUploadTaskBase.cs +++ /dev/null @@ -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 (); - } - } -} diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Tasks/ALToolValidateTaskBase.cs b/msbuild/Xamarin.iOS.Tasks.Core/Tasks/ALToolValidateTaskBase.cs deleted file mode 100644 index b6a521369a..0000000000 --- a/msbuild/Xamarin.iOS.Tasks.Core/Tasks/ALToolValidateTaskBase.cs +++ /dev/null @@ -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 (); - } - } -}