diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-01 21:58:44 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-03 14:24:34 +1000 |
| commit | 82a26a321bae36e38743f50f38887387a392ce24 (patch) | |
| tree | d5a562d5f370b674815711eb29d4415405f28d93 /src/WixToolset.BuildTasks/HeatTask.cs | |
| parent | 2ba71ab83ea951a01344e2851a1f411affc42f38 (diff) | |
| download | wix-82a26a321bae36e38743f50f38887387a392ce24.tar.gz wix-82a26a321bae36e38743f50f38887387a392ce24.tar.bz2 wix-82a26a321bae36e38743f50f38887387a392ce24.zip | |
Add ability for net461 tasks to run the tool out of proc.
Diffstat (limited to 'src/WixToolset.BuildTasks/HeatTask.cs')
| -rw-r--r-- | src/WixToolset.BuildTasks/HeatTask.cs | 9 |
1 files changed, 4 insertions, 5 deletions
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 | |||
| 59 | set { this.transforms = value; } | 59 | set { this.transforms = value; } |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | protected override string TaskShortName => "HEAT"; | 62 | protected sealed override string TaskShortName => "HEAT"; |
| 63 | protected sealed override string ToolName => "heat.exe"; | ||
| 63 | 64 | ||
| 64 | /// <summary> | 65 | /// <summary> |
| 65 | /// Gets the name of the heat operation performed by the task. | 66 | /// Gets the name of the heat operation performed by the task. |
| @@ -71,10 +72,8 @@ namespace WixToolset.BuildTasks | |||
| 71 | get; | 72 | get; |
| 72 | } | 73 | } |
| 73 | 74 | ||
| 74 | protected override void ExecuteCore(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string commandLineString) | 75 | protected sealed override int ExecuteCore(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string commandLineString) |
| 75 | { | 76 | { |
| 76 | this.Log.LogMessage(MessageImportance.Normal, "heat.exe " + commandLineString); | ||
| 77 | |||
| 78 | var messaging = serviceProvider.GetService<IMessaging>(); | 77 | var messaging = serviceProvider.GetService<IMessaging>(); |
| 79 | messaging.SetListener(listener); | 78 | messaging.SetListener(listener); |
| 80 | 79 | ||
| @@ -83,7 +82,7 @@ namespace WixToolset.BuildTasks | |||
| 83 | 82 | ||
| 84 | var commandLine = HeatCommandLineFactory.CreateCommandLine(serviceProvider, true); | 83 | var commandLine = HeatCommandLineFactory.CreateCommandLine(serviceProvider, true); |
| 85 | var command = commandLine.ParseStandardCommandLine(arguments); | 84 | var command = commandLine.ParseStandardCommandLine(arguments); |
| 86 | command?.Execute(); | 85 | return command?.Execute() ?? -1; |
| 87 | } | 86 | } |
| 88 | 87 | ||
| 89 | /// <summary> | 88 | /// <summary> |
