diff options
author | Rob Mensching <rob@firegiant.com> | 2017-12-06 11:39:26 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2017-12-06 11:40:03 -0800 |
commit | 5ba862bfa618c89a563d555e8ce7b44a904df406 (patch) | |
tree | cc2655422be3eec1f200efcbc0e562349c229274 /src/WixToolset.Core/CommandLine/BuildCommand.cs | |
parent | e53afb01c6e01bb9e6521fa77d31e575abc73f9c (diff) | |
download | wix-5ba862bfa618c89a563d555e8ce7b44a904df406.tar.gz wix-5ba862bfa618c89a563d555e8ce7b44a904df406.tar.bz2 wix-5ba862bfa618c89a563d555e8ce7b44a904df406.zip |
Add support for loading Intermediates from extensions
Diffstat (limited to 'src/WixToolset.Core/CommandLine/BuildCommand.cs')
-rw-r--r-- | src/WixToolset.Core/CommandLine/BuildCommand.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs index 79bacd22..7a63b869 100644 --- a/src/WixToolset.Core/CommandLine/BuildCommand.cs +++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs | |||
@@ -168,8 +168,10 @@ namespace WixToolset.Core | |||
168 | var context = this.ServiceProvider.GetService<ILinkContext>(); | 168 | var context = this.ServiceProvider.GetService<ILinkContext>(); |
169 | context.Messaging = Messaging.Instance; | 169 | context.Messaging = Messaging.Instance; |
170 | context.Extensions = this.ExtensionManager.Create<ILinkerExtension>(); | 170 | context.Extensions = this.ExtensionManager.Create<ILinkerExtension>(); |
171 | context.Intermediates = intermediates.Union(libraries).ToList(); | 171 | context.ExtensionData = this.ExtensionManager.Create<IExtensionData>(); |
172 | context.ExpectedOutputType = this.OutputType; | 172 | context.ExpectedOutputType = this.OutputType; |
173 | context.Intermediates = intermediates.Union(libraries).ToList(); | ||
174 | context.TupleDefinitionCreator = creator; | ||
173 | 175 | ||
174 | var linker = new Linker(); | 176 | var linker = new Linker(); |
175 | var output = linker.Link(context); | 177 | var output = linker.Link(context); |