diff options
Diffstat (limited to 'src/WixToolset.BuildTasks/WixBuild_InProc.cs')
| -rw-r--r-- | src/WixToolset.BuildTasks/WixBuild_InProc.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/WixToolset.BuildTasks/WixBuild_InProc.cs b/src/WixToolset.BuildTasks/WixBuild_InProc.cs index 49148c8a..59a42431 100644 --- a/src/WixToolset.BuildTasks/WixBuild_InProc.cs +++ b/src/WixToolset.BuildTasks/WixBuild_InProc.cs | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | #if !NETCOREAPP | 3 | #if !NETCOREAPP |
| 4 | namespace WixToolset.BuildTasks | 4 | namespace WixToolset.BuildTasks |
| 5 | { | 5 | { |
| 6 | using System.Threading; | ||
| 7 | using System.Threading.Tasks; | ||
| 6 | using WixToolset.Data; | 8 | using WixToolset.Data; |
| 7 | using WixToolset.Extensibility; | 9 | using WixToolset.Extensibility; |
| 8 | using WixToolset.Extensibility.Data; | 10 | using WixToolset.Extensibility.Data; |
| @@ -12,10 +14,9 @@ namespace WixToolset.BuildTasks | |||
| 12 | { | 14 | { |
| 13 | protected override string TaskShortName => "WIX"; | 15 | protected override string TaskShortName => "WIX"; |
| 14 | 16 | ||
| 15 | protected override int ExecuteCore(IWixToolsetServiceProvider serviceProvider, IMessageListener listener, string commandLineString) | 17 | protected override Task<int> ExecuteCoreAsync(IWixToolsetCoreServiceProvider serviceProvider, string commandLineString, CancellationToken cancellationToken) |
| 16 | { | 18 | { |
| 17 | var messaging = serviceProvider.GetService<IMessaging>(); | 19 | var messaging = serviceProvider.GetService<IMessaging>(); |
| 18 | messaging.SetListener(listener); | ||
| 19 | 20 | ||
| 20 | var arguments = serviceProvider.GetService<ICommandLineArguments>(); | 21 | var arguments = serviceProvider.GetService<ICommandLineArguments>(); |
| 21 | arguments.Populate(commandLineString); | 22 | arguments.Populate(commandLineString); |
| @@ -24,7 +25,7 @@ namespace WixToolset.BuildTasks | |||
| 24 | commandLine.ExtensionManager = this.CreateExtensionManagerWithStandardBackends(serviceProvider, messaging, arguments.Extensions); | 25 | commandLine.ExtensionManager = this.CreateExtensionManagerWithStandardBackends(serviceProvider, messaging, arguments.Extensions); |
| 25 | commandLine.Arguments = arguments; | 26 | commandLine.Arguments = arguments; |
| 26 | var command = commandLine.ParseStandardCommandLine(); | 27 | var command = commandLine.ParseStandardCommandLine(); |
| 27 | return command?.Execute() ?? -1; | 28 | return command?.ExecuteAsync(cancellationToken) ?? Task.FromResult(1); |
| 28 | } | 29 | } |
| 29 | 30 | ||
| 30 | private IExtensionManager CreateExtensionManagerWithStandardBackends(IWixToolsetServiceProvider serviceProvider, IMessaging messaging, string[] extensions) | 31 | private IExtensionManager CreateExtensionManagerWithStandardBackends(IWixToolsetServiceProvider serviceProvider, IMessaging messaging, string[] extensions) |
