From 82a26a321bae36e38743f50f38887387a392ce24 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 1 Jun 2020 21:58:44 +1000 Subject: Add ability for net461 tasks to run the tool out of proc. --- src/WixToolset.BuildTasks/HeatTask.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/WixToolset.BuildTasks/HeatTask.cs') diff --git a/src/WixToolset.BuildTasks/HeatTask.cs b/src/WixToolset.BuildTasks/HeatTask.cs index 586f02f7..5feed26d 100644 --- a/src/WixToolset.BuildTasks/HeatTask.cs +++ b/src/WixToolset.BuildTasks/HeatTask.cs @@ -59,7 +59,8 @@ namespace WixToolset.BuildTasks set { this.transforms = value; } } - protected override string TaskShortName => "HEAT"; + protected sealed override string TaskShortName => "HEAT"; + protected sealed override string ToolName => "heat.exe"; /// /// Gets the name of the heat operation performed by the task. @@ -71,10 +72,8 @@ namespace WixToolset.BuildTasks get; } - protected override void ExecuteCore(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string commandLineString) + protected sealed override int ExecuteCore(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string commandLineString) { - this.Log.LogMessage(MessageImportance.Normal, "heat.exe " + commandLineString); - var messaging = serviceProvider.GetService(); messaging.SetListener(listener); @@ -83,7 +82,7 @@ namespace WixToolset.BuildTasks var commandLine = HeatCommandLineFactory.CreateCommandLine(serviceProvider, true); var command = commandLine.ParseStandardCommandLine(arguments); - command?.Execute(); + return command?.Execute() ?? -1; } /// -- cgit v1.2.3-55-g6feb