aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.BuildTasks/WixBuild.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.BuildTasks/WixBuild.cs')
-rw-r--r--src/WixToolset.BuildTasks/WixBuild.cs10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/WixToolset.BuildTasks/WixBuild.cs b/src/WixToolset.BuildTasks/WixBuild.cs
index b8fb4136..c15bc2f7 100644
--- a/src/WixToolset.BuildTasks/WixBuild.cs
+++ b/src/WixToolset.BuildTasks/WixBuild.cs
@@ -4,10 +4,7 @@ namespace WixToolset.BuildTasks
4{ 4{
5 using System; 5 using System;
6 using System.Collections.Generic; 6 using System.Collections.Generic;
7 using System.Runtime.InteropServices;
8 using Microsoft.Build.Framework; 7 using Microsoft.Build.Framework;
9 using Microsoft.Build.Utilities;
10 using WixToolset.Core;
11 using WixToolset.Data; 8 using WixToolset.Data;
12 using WixToolset.Extensibility; 9 using WixToolset.Extensibility;
13 using WixToolset.Extensibility.Data; 10 using WixToolset.Extensibility.Data;
@@ -80,11 +77,10 @@ namespace WixToolset.BuildTasks
80 public string AdditionalCub { get; set; } 77 public string AdditionalCub { get; set; }
81 78
82 protected override string TaskShortName => "WIX"; 79 protected override string TaskShortName => "WIX";
80 protected override string ToolName => "wix.exe";
83 81
84 protected override void ExecuteCore(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string commandLineString) 82 protected override int ExecuteCore(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string commandLineString)
85 { 83 {
86 this.Log.LogMessage(MessageImportance.Normal, "wix.exe " + commandLineString);
87
88 var messaging = serviceProvider.GetService<IMessaging>(); 84 var messaging = serviceProvider.GetService<IMessaging>();
89 messaging.SetListener(listener); 85 messaging.SetListener(listener);
90 86
@@ -95,7 +91,7 @@ namespace WixToolset.BuildTasks
95 commandLine.ExtensionManager = this.CreateExtensionManagerWithStandardBackends(serviceProvider, messaging, arguments.Extensions); 91 commandLine.ExtensionManager = this.CreateExtensionManagerWithStandardBackends(serviceProvider, messaging, arguments.Extensions);
96 commandLine.Arguments = arguments; 92 commandLine.Arguments = arguments;
97 var command = commandLine.ParseStandardCommandLine(); 93 var command = commandLine.ParseStandardCommandLine();
98 command?.Execute(); 94 return command?.Execute() ?? -1;
99 } 95 }
100 96
101 protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder) 97 protected override void BuildCommandLine(WixCommandLineBuilder commandLineBuilder)