[msbuild] Merge the CreateDebugSettings[TaskBase] classes. (#19630)
This commit is contained in:
Родитель
1dff5d1154
Коммит
afd8d23da5
|
@ -1,20 +0,0 @@
|
|||
using Microsoft.Build.Framework;
|
||||
using Xamarin.Messaging.Build.Client;
|
||||
|
||||
namespace Xamarin.MacDev.Tasks {
|
||||
public class CreateDebugSettings : CreateDebugSettingsTaskBase, 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 ();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -8,12 +8,13 @@ using Microsoft.Build.Utilities;
|
|||
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 @@ namespace Xamarin.MacDev.Tasks {
|
|||
|
||||
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 @@ namespace Xamarin.MacDev.Tasks {
|
|||
|
||||
return !Log.HasLoggedErrors;
|
||||
}
|
||||
|
||||
public void Cancel ()
|
||||
{
|
||||
if (ShouldExecuteRemotely ())
|
||||
BuildConnection.CancelAsync (BuildEngine4).Wait ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче