@joebigelow / wix / commits / 83b04241

IExtensionManager.Create renamed to IExtensionManager.GetServices

Rob Mensching committed May 12, 2019 at 15:56 UTC 83b04241472fdc93b0a3a7511479a1182ad5f4c0

12 files changed +23 -23

src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs

+1 -1

@@ -76,7 +76,7 @@ namespace WixToolset.Core.Burn

77 var extensionManager = context.ServiceProvider.GetService<IExtensionManager>();

79 - this.BackendExtensions = extensionManager.Create<IBurnBackendExtension>();

79 + this.BackendExtensions = extensionManager.GetServices<IBurnBackendExtension>();

80 }

82 public CompressionLevel DefaultCompressionLevel { private get; set; }

src/WixToolset.Core.WindowsInstaller/MsiBackend.cs

+2 -2

@@ -17,7 +17,7 @@ namespace WixToolset.Core.WindowsInstaller

17 {

18 var extensionManager = context.ServiceProvider.GetService<IExtensionManager>();

20 - var backendExtensions = extensionManager.Create<IWindowsInstallerBackendBinderExtension>();

20 + var backendExtensions = extensionManager.GetServices<IWindowsInstallerBackendBinderExtension>();

22 foreach (var extension in backendExtensions)

23 {

@@ -44,7 +44,7 @@ namespace WixToolset.Core.WindowsInstaller

44 {

45 var extensionManager = context.ServiceProvider.GetService<IExtensionManager>();

47 - var backendExtensions = extensionManager.Create<IWindowsInstallerBackendDecompilerExtension>();

47 + var backendExtensions = extensionManager.GetServices<IWindowsInstallerBackendDecompilerExtension>();

49 foreach (var extension in backendExtensions)

50 {

src/WixToolset.Core.WindowsInstaller/MsmBackend.cs

+2 -2

@@ -16,7 +16,7 @@ namespace WixToolset.Core.WindowsInstaller

16 {

17 var extensionManager = context.ServiceProvider.GetService<IExtensionManager>();

19 - var backendExtensions = extensionManager.Create<IWindowsInstallerBackendBinderExtension>();

19 + var backendExtensions = extensionManager.GetServices<IWindowsInstallerBackendBinderExtension>();

21 foreach (var extension in backendExtensions)

22 {

@@ -49,7 +49,7 @@ namespace WixToolset.Core.WindowsInstaller

49 {

50 var extensionManager = context.ServiceProvider.GetService<IExtensionManager>();

52 - var backendExtensions = extensionManager.Create<IWindowsInstallerBackendDecompilerExtension>();

52 + var backendExtensions = extensionManager.GetServices<IWindowsInstallerBackendDecompilerExtension>();

54 foreach (var extension in backendExtensions)

55 {

src/WixToolset.Core/Binder.cs

+1 -1

@@ -56,7 +56,7 @@ namespace WixToolset.Core

56 {

57 var extensionManager = context.ServiceProvider.GetService<IExtensionManager>();

59 - var backendFactories = extensionManager.Create<IBackendFactory>();

59 + var backendFactories = extensionManager.GetServices<IBackendFactory>();

61 var entrySection = context.IntermediateRepresentation.Sections[0];

src/WixToolset.Core/CommandLine/BuildCommand.cs

+9 -9

@@ -187,7 +187,7 @@ namespace WixToolset.Core.CommandLine

187 }

188

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;

192 context.Platform = this.Platform;

193 context.Source = document;

@@ -219,7 +219,7 @@ namespace WixToolset.Core.CommandLine

219 var context = this.ServiceProvider.GetService<ILibraryContext>();

220 context.BindFiles = bindFiles;

221 context.BindPaths = bindPaths;

222 - context.Extensions = this.ExtensionManager.Create<ILibrarianExtension>();

222 + context.Extensions = this.ExtensionManager.GetServices<ILibrarianExtension>();

223 context.Localizations = localizations;

224 context.Intermediates = intermediates;

225

@@ -247,8 +247,8 @@ namespace WixToolset.Core.CommandLine

247 }

248

249 var context = this.ServiceProvider.GetService<ILinkContext>();

250 - context.Extensions = this.ExtensionManager.Create<ILinkerExtension>();

251 - context.ExtensionData = this.ExtensionManager.Create<IExtensionData>();

250 + context.Extensions = this.ExtensionManager.GetServices<ILinkerExtension>();

251 + context.ExtensionData = this.ExtensionManager.GetServices<IExtensionData>();

252 context.ExpectedOutputType = this.OutputType;

253 context.Intermediates = intermediates.Concat(libraries).ToList();

254 context.TupleDefinitionCreator = creator;

@@ -269,8 +269,8 @@ namespace WixToolset.Core.CommandLine

269 {

270 var context = this.ServiceProvider.GetService<IResolveContext>();

271 context.BindPaths = bindPaths;

272 - context.Extensions = this.ExtensionManager.Create<IResolverExtension>();

273 - context.ExtensionData = this.ExtensionManager.Create<IExtensionData>();

272 + context.Extensions = this.ExtensionManager.GetServices<IResolverExtension>();

273 + context.ExtensionData = this.ExtensionManager.GetServices<IExtensionData>();

274 context.FilterCultures = filterCultures;

275 context.IntermediateFolder = intermediateFolder;

276 context.IntermediateRepresentation = output;

@@ -295,7 +295,7 @@ namespace WixToolset.Core.CommandLine

295 //context.DefaultCompressionLevel = this.DefaultCompressionLevel;

296 context.DelayedFields = resolveResult.DelayedFields;

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

300 context.IntermediateFolder = intermediateFolder;

301 context.IntermediateRepresentation = resolveResult.IntermediateRepresentation;

@@ -315,7 +315,7 @@ namespace WixToolset.Core.CommandLine

315

316 {

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;

320 context.FileTransfers = bindResult.FileTransfers;

321 context.IntermediateFolder = intermediateFolder;

@@ -371,7 +371,7 @@ namespace WixToolset.Core.CommandLine

371 private XDocument Preprocess(IDictionary<string, string> preprocessorVariables, string sourcePath)

372 {

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;

376 context.IncludeSearchPaths = this.IncludeSearchPaths;

377 context.SourcePath = sourcePath;

src/WixToolset.Core/CommandLine/CommandLine.cs

+1 -1

@@ -89,7 +89,7 @@ namespace WixToolset.Core.CommandLine

90 private ICommandLineCommand Parse(ICommandLineContext context)

91 {

92 - var extensions = this.ExtensionManager.Create<IExtensionCommandLine>();

92 + var extensions = this.ExtensionManager.GetServices<IExtensionCommandLine>();

94 foreach (var extension in extensions)

95 {

src/WixToolset.Core/CommandLine/CompileCommand.cs

+2 -2

@@ -57,7 +57,7 @@ namespace WixToolset.Core.CommandLine

57 foreach (var sourceFile in this.SourceFiles)

58 {

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;

62 context.IncludeSearchPaths = this.IncludeSearchPaths;

63 context.SourcePath = sourceFile.SourcePath;

@@ -80,7 +80,7 @@ namespace WixToolset.Core.CommandLine

80 }

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;

85 compileContext.Platform = this.Platform;

86 compileContext.Source = result?.Document;

src/WixToolset.Core/CommandLine/DecompileCommand.cs

+1 -1

@@ -38,7 +38,7 @@ namespace WixToolset.Core.CommandLine

38 }

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;

43 context.DecompileType = this.commandLine.CalculateDecompileType();

44 context.IntermediateFolder = this.commandLine.CalculateIntermedateFolder();

src/WixToolset.Core/Decompiler.cs

+1 -1

@@ -49,7 +49,7 @@ namespace WixToolset.Core

49 {

50 var extensionManager = context.ServiceProvider.GetService<IExtensionManager>();

52 - var backendFactories = extensionManager.Create<IBackendFactory>();

52 + var backendFactories = extensionManager.GetServices<IBackendFactory>();

54 foreach (var factory in backendFactories)

55 {

src/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs

+1 -1

@@ -84,7 +84,7 @@ namespace WixToolset.Core.ExtensibilityServices

84 }

85 }

87 - public IEnumerable<T> Create<T>() where T : class

87 + public IEnumerable<T> GetServices<T>() where T : class

88 {

89 if (!this.loadedExtensionsByType.TryGetValue(typeof(T), out var extensions))

90 {

src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs

+1 -1

@@ -465,7 +465,7 @@ namespace WixToolset.Core.ExtensibilityServices

465

466 var extensionManager = this.ServiceProvider.GetService<IExtensionManager>();

467

468 - var extensions = extensionManager.Create<IPreprocessorExtension>();

468 + var extensions = extensionManager.GetServices<IPreprocessorExtension>();

469

470 foreach (var extension in extensions)

471 {

src/WixToolset.Core/ExtensibilityServices/TupleDefinitionCreator.cs

+1 -1

@@ -64,7 +64,7 @@ namespace WixToolset.Core.ExtensibilityServices

64 {

65 var extensionManager = (IExtensionManager)this.ServiceProvider.GetService(typeof(IExtensionManager));

67 - this.ExtensionData = extensionManager.Create<IExtensionData>();

67 + this.ExtensionData = extensionManager.GetServices<IExtensionData>();

68 }

69 }

70 }