diff options
-rw-r--r-- | src/wix/heat/Program.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/wix/heat/Program.cs b/src/wix/heat/Program.cs index d0bcf19f..0b602f76 100644 --- a/src/wix/heat/Program.cs +++ b/src/wix/heat/Program.cs | |||
@@ -13,6 +13,7 @@ namespace WixToolset.Tools.Heat | |||
13 | using WixToolset.Extensibility.Data; | 13 | using WixToolset.Extensibility.Data; |
14 | using WixToolset.Extensibility.Services; | 14 | using WixToolset.Extensibility.Services; |
15 | using WixToolset.Harvesters; | 15 | using WixToolset.Harvesters; |
16 | using WixToolset.Harvesters.Extensibility; | ||
16 | using WixToolset.Tools.Core; | 17 | using WixToolset.Tools.Core; |
17 | 18 | ||
18 | /// <summary> | 19 | /// <summary> |
@@ -70,7 +71,14 @@ namespace WixToolset.Tools.Heat | |||
70 | var arguments = serviceProvider.GetService<ICommandLineArguments>(); | 71 | var arguments = serviceProvider.GetService<ICommandLineArguments>(); |
71 | arguments.Populate(args); | 72 | arguments.Populate(args); |
72 | 73 | ||
73 | var commandLine = HeatCommandLineFactory.CreateCommandLine(serviceProvider); | 74 | var extensionManager = serviceProvider.GetService<IExtensionManager>(); |
75 | foreach (var extension in arguments.Extensions) | ||
76 | { | ||
77 | extensionManager.Load(extension); | ||
78 | } | ||
79 | var heatExtensions = extensionManager.GetServices<IHeatExtension>(); | ||
80 | |||
81 | var commandLine = HeatCommandLineFactory.CreateCommandLine(serviceProvider, heatExtensions); | ||
74 | var command = commandLine.ParseStandardCommandLine(arguments); | 82 | var command = commandLine.ParseStandardCommandLine(arguments); |
75 | return command?.ExecuteAsync(CancellationToken.None) ?? Task.FromResult(1); | 83 | return command?.ExecuteAsync(CancellationToken.None) ?? Task.FromResult(1); |
76 | } | 84 | } |