Fix up defaults for MsbuildMessageListener
Rob Mensching committed
Jul 13, 2018 at 15:14 UTC
cb634e2e83d1aa44652a4bf5383fdd3e9ce7f2fc
1 file changed
+5
-14
src/WixToolset.BuildTasks/DoIt.cs
+5
-14
@@ -17,15 +17,6 @@ namespace WixToolset.BuildTasks
17
/// </summary>
18
public sealed class DoIt : Task
19
{
20
- public DoIt() : this(null)
21
- {
22
- }
23
-
24
- public DoIt(IMessageListener listener)
25
- {
26
- this.Listener = listener ?? new MsbuildMessageListener(this.Log, "WIX", "wix.exe");
27
- }
28
-
20
public string AdditionalOptions { get; set; }
21
22
public string[] Cultures { get; set; }
@@ -115,8 +106,6 @@ namespace WixToolset.BuildTasks
106
public string[] SuppressIces { get; set; }
107
public string AdditionalCub { get; set; }
108
118
- private IMessageListener Listener { get; }
119
-
109
public override bool Execute()
110
{
111
try
@@ -138,6 +127,8 @@ namespace WixToolset.BuildTasks
127
128
private void ExecuteCore()
129
{
130
+ var listener = new MsbuildMessageListener(this.Log, "WIX", this.BuildEngine.ProjectFileOfTaskNode);
131
+
132
var commandLineBuilder = new WixCommandLineBuilder();
133
134
commandLineBuilder.AppendTextUnquoted("build");
@@ -172,7 +163,7 @@ namespace WixToolset.BuildTasks
163
var serviceProvider = new WixToolsetServiceProvider();
164
165
var messaging = serviceProvider.GetService<IMessaging>();
175
- messaging.SetListener(this.Listener);
166
+ messaging.SetListener(listener);
167
168
var arguments = serviceProvider.GetService<ICommandLineArguments>();
169
arguments.Populate(commandLineString);
@@ -302,11 +293,11 @@ namespace WixToolset.BuildTasks
293
294
private class MsbuildMessageListener : IMessageListener
295
{
305
- public MsbuildMessageListener(TaskLoggingHelper logger, string longName, string shortName)
296
+ public MsbuildMessageListener(TaskLoggingHelper logger, string shortName, string longName)
297
{
298
this.Logger = logger;
308
- this.LongAppName = longName;
299
this.ShortAppName = shortName;
300
+ this.LongAppName = longName;
301
}
302
303
public string ShortAppName { get; }