diff options
Diffstat (limited to 'src/WixToolset.Core/CommandLine/BuildCommand.cs')
-rw-r--r-- | src/WixToolset.Core/CommandLine/BuildCommand.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs index 8602c514..04a55264 100644 --- a/src/WixToolset.Core/CommandLine/BuildCommand.cs +++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs | |||
@@ -88,7 +88,7 @@ namespace WixToolset.Core.CommandLine | |||
88 | 88 | ||
89 | var filterCultures = this.commandLine.CalculateFilterCultures(); | 89 | var filterCultures = this.commandLine.CalculateFilterCultures(); |
90 | 90 | ||
91 | var creator = this.ServiceProvider.GetService<ITupleDefinitionCreator>(); | 91 | var creator = this.ServiceProvider.GetService<ISymbolDefinitionCreator>(); |
92 | 92 | ||
93 | this.EvaluateSourceFiles(sourceFiles, creator, out var codeFiles, out var wixipl); | 93 | this.EvaluateSourceFiles(sourceFiles, creator, out var codeFiles, out var wixipl); |
94 | 94 | ||
@@ -174,7 +174,7 @@ namespace WixToolset.Core.CommandLine | |||
174 | return this.commandLine.TryParseArgument(argument, parser); | 174 | return this.commandLine.TryParseArgument(argument, parser); |
175 | } | 175 | } |
176 | 176 | ||
177 | private void EvaluateSourceFiles(IEnumerable<SourceFile> sourceFiles, ITupleDefinitionCreator creator, out List<SourceFile> codeFiles, out Intermediate wixipl) | 177 | private void EvaluateSourceFiles(IEnumerable<SourceFile> sourceFiles, ISymbolDefinitionCreator creator, out List<SourceFile> codeFiles, out Intermediate wixipl) |
178 | { | 178 | { |
179 | codeFiles = new List<SourceFile>(); | 179 | codeFiles = new List<SourceFile>(); |
180 | 180 | ||
@@ -278,7 +278,7 @@ namespace WixToolset.Core.CommandLine | |||
278 | return library; | 278 | return library; |
279 | } | 279 | } |
280 | 280 | ||
281 | private Intermediate LinkPhase(IEnumerable<Intermediate> intermediates, IEnumerable<string> libraryFiles, ITupleDefinitionCreator creator, CancellationToken cancellationToken) | 281 | private Intermediate LinkPhase(IEnumerable<Intermediate> intermediates, IEnumerable<string> libraryFiles, ISymbolDefinitionCreator creator, CancellationToken cancellationToken) |
282 | { | 282 | { |
283 | var libraries = this.LoadLibraries(libraryFiles, creator); | 283 | var libraries = this.LoadLibraries(libraryFiles, creator); |
284 | 284 | ||
@@ -292,7 +292,7 @@ namespace WixToolset.Core.CommandLine | |||
292 | context.ExtensionData = this.ExtensionManager.GetServices<IExtensionData>(); | 292 | context.ExtensionData = this.ExtensionManager.GetServices<IExtensionData>(); |
293 | context.ExpectedOutputType = this.OutputType; | 293 | context.ExpectedOutputType = this.OutputType; |
294 | context.Intermediates = intermediates.Concat(libraries).ToList(); | 294 | context.Intermediates = intermediates.Concat(libraries).ToList(); |
295 | context.TupleDefinitionCreator = creator; | 295 | context.SymbolDefinitionCreator = creator; |
296 | context.CancellationToken = cancellationToken; | 296 | context.CancellationToken = cancellationToken; |
297 | 297 | ||
298 | var linker = this.ServiceProvider.GetService<ILinker>(); | 298 | var linker = this.ServiceProvider.GetService<ILinker>(); |
@@ -382,7 +382,7 @@ namespace WixToolset.Core.CommandLine | |||
382 | } | 382 | } |
383 | } | 383 | } |
384 | 384 | ||
385 | private IEnumerable<Intermediate> LoadLibraries(IEnumerable<string> libraryFiles, ITupleDefinitionCreator creator) | 385 | private IEnumerable<Intermediate> LoadLibraries(IEnumerable<string> libraryFiles, ISymbolDefinitionCreator creator) |
386 | { | 386 | { |
387 | try | 387 | try |
388 | { | 388 | { |