diff options
Diffstat (limited to 'src/WixToolset.Core/CommandLine')
4 files changed, 13 insertions, 13 deletions
diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs index 7e6ddd64..bfee2478 100644 --- a/src/WixToolset.Core/CommandLine/BuildCommand.cs +++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs | |||
@@ -187,7 +187,7 @@ namespace WixToolset.Core.CommandLine | |||
187 | } | 187 | } |
188 | 188 | ||
189 | var context = this.ServiceProvider.GetService<ICompileContext>(); | 189 | var context = this.ServiceProvider.GetService<ICompileContext>(); |
190 | context.Extensions = this.ExtensionManager.Create<ICompilerExtension>(); | 190 | context.Extensions = this.ExtensionManager.GetServices<ICompilerExtension>(); |
191 | context.OutputPath = sourceFile.OutputPath; | 191 | context.OutputPath = sourceFile.OutputPath; |
192 | context.Platform = this.Platform; | 192 | context.Platform = this.Platform; |
193 | context.Source = document; | 193 | context.Source = document; |
@@ -219,7 +219,7 @@ namespace WixToolset.Core.CommandLine | |||
219 | var context = this.ServiceProvider.GetService<ILibraryContext>(); | 219 | var context = this.ServiceProvider.GetService<ILibraryContext>(); |
220 | context.BindFiles = bindFiles; | 220 | context.BindFiles = bindFiles; |
221 | context.BindPaths = bindPaths; | 221 | context.BindPaths = bindPaths; |
222 | context.Extensions = this.ExtensionManager.Create<ILibrarianExtension>(); | 222 | context.Extensions = this.ExtensionManager.GetServices<ILibrarianExtension>(); |
223 | context.Localizations = localizations; | 223 | context.Localizations = localizations; |
224 | context.Intermediates = intermediates; | 224 | context.Intermediates = intermediates; |
225 | 225 | ||
@@ -247,8 +247,8 @@ namespace WixToolset.Core.CommandLine | |||
247 | } | 247 | } |
248 | 248 | ||
249 | var context = this.ServiceProvider.GetService<ILinkContext>(); | 249 | var context = this.ServiceProvider.GetService<ILinkContext>(); |
250 | context.Extensions = this.ExtensionManager.Create<ILinkerExtension>(); | 250 | context.Extensions = this.ExtensionManager.GetServices<ILinkerExtension>(); |
251 | context.ExtensionData = this.ExtensionManager.Create<IExtensionData>(); | 251 | context.ExtensionData = this.ExtensionManager.GetServices<IExtensionData>(); |
252 | context.ExpectedOutputType = this.OutputType; | 252 | context.ExpectedOutputType = this.OutputType; |
253 | context.Intermediates = intermediates.Concat(libraries).ToList(); | 253 | context.Intermediates = intermediates.Concat(libraries).ToList(); |
254 | context.TupleDefinitionCreator = creator; | 254 | context.TupleDefinitionCreator = creator; |
@@ -269,8 +269,8 @@ namespace WixToolset.Core.CommandLine | |||
269 | { | 269 | { |
270 | var context = this.ServiceProvider.GetService<IResolveContext>(); | 270 | var context = this.ServiceProvider.GetService<IResolveContext>(); |
271 | context.BindPaths = bindPaths; | 271 | context.BindPaths = bindPaths; |
272 | context.Extensions = this.ExtensionManager.Create<IResolverExtension>(); | 272 | context.Extensions = this.ExtensionManager.GetServices<IResolverExtension>(); |
273 | context.ExtensionData = this.ExtensionManager.Create<IExtensionData>(); | 273 | context.ExtensionData = this.ExtensionManager.GetServices<IExtensionData>(); |
274 | context.FilterCultures = filterCultures; | 274 | context.FilterCultures = filterCultures; |
275 | context.IntermediateFolder = intermediateFolder; | 275 | context.IntermediateFolder = intermediateFolder; |
276 | context.IntermediateRepresentation = output; | 276 | context.IntermediateRepresentation = output; |
@@ -295,7 +295,7 @@ namespace WixToolset.Core.CommandLine | |||
295 | //context.DefaultCompressionLevel = this.DefaultCompressionLevel; | 295 | //context.DefaultCompressionLevel = this.DefaultCompressionLevel; |
296 | context.DelayedFields = resolveResult.DelayedFields; | 296 | context.DelayedFields = resolveResult.DelayedFields; |
297 | context.ExpectedEmbeddedFiles = resolveResult.ExpectedEmbeddedFiles; | 297 | context.ExpectedEmbeddedFiles = resolveResult.ExpectedEmbeddedFiles; |
298 | context.Extensions = this.ExtensionManager.Create<IBinderExtension>(); | 298 | context.Extensions = this.ExtensionManager.GetServices<IBinderExtension>(); |
299 | context.Ices = Array.Empty<string>(); // TODO: set this correctly | 299 | context.Ices = Array.Empty<string>(); // TODO: set this correctly |
300 | context.IntermediateFolder = intermediateFolder; | 300 | context.IntermediateFolder = intermediateFolder; |
301 | context.IntermediateRepresentation = resolveResult.IntermediateRepresentation; | 301 | context.IntermediateRepresentation = resolveResult.IntermediateRepresentation; |
@@ -315,7 +315,7 @@ namespace WixToolset.Core.CommandLine | |||
315 | 315 | ||
316 | { | 316 | { |
317 | var context = this.ServiceProvider.GetService<ILayoutContext>(); | 317 | var context = this.ServiceProvider.GetService<ILayoutContext>(); |
318 | context.Extensions = this.ExtensionManager.Create<ILayoutExtension>(); | 318 | context.Extensions = this.ExtensionManager.GetServices<ILayoutExtension>(); |
319 | context.TrackedFiles = bindResult.TrackedFiles; | 319 | context.TrackedFiles = bindResult.TrackedFiles; |
320 | context.FileTransfers = bindResult.FileTransfers; | 320 | context.FileTransfers = bindResult.FileTransfers; |
321 | context.IntermediateFolder = intermediateFolder; | 321 | context.IntermediateFolder = intermediateFolder; |
@@ -371,7 +371,7 @@ namespace WixToolset.Core.CommandLine | |||
371 | private XDocument Preprocess(IDictionary<string, string> preprocessorVariables, string sourcePath) | 371 | private XDocument Preprocess(IDictionary<string, string> preprocessorVariables, string sourcePath) |
372 | { | 372 | { |
373 | var context = this.ServiceProvider.GetService<IPreprocessContext>(); | 373 | var context = this.ServiceProvider.GetService<IPreprocessContext>(); |
374 | context.Extensions = this.ExtensionManager.Create<IPreprocessorExtension>(); | 374 | context.Extensions = this.ExtensionManager.GetServices<IPreprocessorExtension>(); |
375 | context.Platform = this.Platform; | 375 | context.Platform = this.Platform; |
376 | context.IncludeSearchPaths = this.IncludeSearchPaths; | 376 | context.IncludeSearchPaths = this.IncludeSearchPaths; |
377 | context.SourcePath = sourcePath; | 377 | context.SourcePath = sourcePath; |
diff --git a/src/WixToolset.Core/CommandLine/CommandLine.cs b/src/WixToolset.Core/CommandLine/CommandLine.cs index 9aefc50a..8e359e14 100644 --- a/src/WixToolset.Core/CommandLine/CommandLine.cs +++ b/src/WixToolset.Core/CommandLine/CommandLine.cs | |||
@@ -89,7 +89,7 @@ namespace WixToolset.Core.CommandLine | |||
89 | 89 | ||
90 | private ICommandLineCommand Parse(ICommandLineContext context) | 90 | private ICommandLineCommand Parse(ICommandLineContext context) |
91 | { | 91 | { |
92 | var extensions = this.ExtensionManager.Create<IExtensionCommandLine>(); | 92 | var extensions = this.ExtensionManager.GetServices<IExtensionCommandLine>(); |
93 | 93 | ||
94 | foreach (var extension in extensions) | 94 | foreach (var extension in extensions) |
95 | { | 95 | { |
diff --git a/src/WixToolset.Core/CommandLine/CompileCommand.cs b/src/WixToolset.Core/CommandLine/CompileCommand.cs index bc37ee8c..0a354a8f 100644 --- a/src/WixToolset.Core/CommandLine/CompileCommand.cs +++ b/src/WixToolset.Core/CommandLine/CompileCommand.cs | |||
@@ -57,7 +57,7 @@ namespace WixToolset.Core.CommandLine | |||
57 | foreach (var sourceFile in this.SourceFiles) | 57 | foreach (var sourceFile in this.SourceFiles) |
58 | { | 58 | { |
59 | var context = this.ServiceProvider.GetService<IPreprocessContext>(); | 59 | var context = this.ServiceProvider.GetService<IPreprocessContext>(); |
60 | context.Extensions = this.ExtensionManager.Create<IPreprocessorExtension>(); | 60 | context.Extensions = this.ExtensionManager.GetServices<IPreprocessorExtension>(); |
61 | context.Platform = this.Platform; | 61 | context.Platform = this.Platform; |
62 | context.IncludeSearchPaths = this.IncludeSearchPaths; | 62 | context.IncludeSearchPaths = this.IncludeSearchPaths; |
63 | context.SourcePath = sourceFile.SourcePath; | 63 | context.SourcePath = sourceFile.SourcePath; |
@@ -80,7 +80,7 @@ namespace WixToolset.Core.CommandLine | |||
80 | } | 80 | } |
81 | 81 | ||
82 | var compileContext = this.ServiceProvider.GetService<ICompileContext>(); | 82 | var compileContext = this.ServiceProvider.GetService<ICompileContext>(); |
83 | compileContext.Extensions = this.ExtensionManager.Create<ICompilerExtension>(); | 83 | compileContext.Extensions = this.ExtensionManager.GetServices<ICompilerExtension>(); |
84 | compileContext.OutputPath = sourceFile.OutputPath; | 84 | compileContext.OutputPath = sourceFile.OutputPath; |
85 | compileContext.Platform = this.Platform; | 85 | compileContext.Platform = this.Platform; |
86 | compileContext.Source = result?.Document; | 86 | compileContext.Source = result?.Document; |
diff --git a/src/WixToolset.Core/CommandLine/DecompileCommand.cs b/src/WixToolset.Core/CommandLine/DecompileCommand.cs index 3aa750c8..fbba3d9f 100644 --- a/src/WixToolset.Core/CommandLine/DecompileCommand.cs +++ b/src/WixToolset.Core/CommandLine/DecompileCommand.cs | |||
@@ -38,7 +38,7 @@ namespace WixToolset.Core.CommandLine | |||
38 | } | 38 | } |
39 | 39 | ||
40 | var context = this.ServiceProvider.GetService<IDecompileContext>(); | 40 | var context = this.ServiceProvider.GetService<IDecompileContext>(); |
41 | context.Extensions = this.ServiceProvider.GetService<IExtensionManager>().Create<IDecompilerExtension>(); | 41 | context.Extensions = this.ServiceProvider.GetService<IExtensionManager>().GetServices<IDecompilerExtension>(); |
42 | context.DecompilePath = this.commandLine.DecompileFilePath; | 42 | context.DecompilePath = this.commandLine.DecompileFilePath; |
43 | context.DecompileType = this.commandLine.CalculateDecompileType(); | 43 | context.DecompileType = this.commandLine.CalculateDecompileType(); |
44 | context.IntermediateFolder = this.commandLine.CalculateIntermedateFolder(); | 44 | context.IntermediateFolder = this.commandLine.CalculateIntermedateFolder(); |