[msbuild] Merge the Metal[TaskBase] classes. (#19753)
This commit is contained in:
Родитель
5b1fc67694
Коммит
ebd0b2dfda
|
@ -1,21 +0,0 @@
|
|||
using Xamarin.Messaging.Build.Client;
|
||||
|
||||
namespace Xamarin.MacDev.Tasks {
|
||||
public class Metal : MetalTaskBase {
|
||||
public override bool Execute ()
|
||||
{
|
||||
if (ShouldExecuteRemotely ())
|
||||
return new TaskRunner (SessionId, BuildEngine4).RunAsync (this).Result;
|
||||
|
||||
return base.Execute ();
|
||||
}
|
||||
|
||||
public override void Cancel ()
|
||||
{
|
||||
if (ShouldExecuteRemotely ())
|
||||
BuildConnection.CancelAsync (BuildEngine4).Wait ();
|
||||
|
||||
base.Cancel ();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -9,12 +9,13 @@ using Xamarin.MacDev;
|
|||
using Xamarin.MacDev.Tasks;
|
||||
using Xamarin.Utils;
|
||||
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 MetalTaskBase : XamarinToolTask {
|
||||
public class Metal : XamarinToolTask {
|
||||
#region Inputs
|
||||
|
||||
[Required]
|
||||
|
@ -85,6 +86,9 @@ namespace Xamarin.MacDev.Tasks {
|
|||
|
||||
public override bool Execute ()
|
||||
{
|
||||
if (ShouldExecuteRemotely ())
|
||||
return new TaskRunner (SessionId, BuildEngine4).RunAsync (this).Result;
|
||||
|
||||
if (AppleSdkSettings.XcodeVersion.Major >= 11)
|
||||
EnvironmentVariables = EnvironmentVariables.CopyAndAdd ($"SDKROOT={SdkRoot}");
|
||||
return base.Execute ();
|
||||
|
@ -133,5 +137,13 @@ namespace Xamarin.MacDev.Tasks {
|
|||
// TODO: do proper parsing of error messages and such
|
||||
Log.LogMessage (messageImportance, "{0}", singleLine);
|
||||
}
|
||||
|
||||
public override void Cancel ()
|
||||
{
|
||||
if (ShouldExecuteRemotely ())
|
||||
BuildConnection.CancelAsync (BuildEngine4).Wait ();
|
||||
|
||||
base.Cancel ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче