From 83b04241472fdc93b0a3a7511479a1182ad5f4c0 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 12 May 2019 15:56:22 -0700
Subject: IExtensionManager.Create renamed to IExtensionManager.GetServices

---
 src/WixToolset.Core/CommandLine/BuildCommand.cs     | 18 +++++++++---------
 src/WixToolset.Core/CommandLine/CommandLine.cs      |  2 +-
 src/WixToolset.Core/CommandLine/CompileCommand.cs   |  4 ++--
 src/WixToolset.Core/CommandLine/DecompileCommand.cs |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/WixToolset.Core/CommandLine')

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
                 }
 
                 var context = this.ServiceProvider.GetService<ICompileContext>();
-                context.Extensions = this.ExtensionManager.Create<ICompilerExtension>();
+                context.Extensions = this.ExtensionManager.GetServices<ICompilerExtension>();
                 context.OutputPath = sourceFile.OutputPath;
                 context.Platform = this.Platform;
                 context.Source = document;
@@ -219,7 +219,7 @@ namespace WixToolset.Core.CommandLine
             var context = this.ServiceProvider.GetService<ILibraryContext>();
             context.BindFiles = bindFiles;
             context.BindPaths = bindPaths;
-            context.Extensions = this.ExtensionManager.Create<ILibrarianExtension>();
+            context.Extensions = this.ExtensionManager.GetServices<ILibrarianExtension>();
             context.Localizations = localizations;
             context.Intermediates = intermediates;
 
@@ -247,8 +247,8 @@ namespace WixToolset.Core.CommandLine
             }
 
             var context = this.ServiceProvider.GetService<ILinkContext>();
-            context.Extensions = this.ExtensionManager.Create<ILinkerExtension>();
-            context.ExtensionData = this.ExtensionManager.Create<IExtensionData>();
+            context.Extensions = this.ExtensionManager.GetServices<ILinkerExtension>();
+            context.ExtensionData = this.ExtensionManager.GetServices<IExtensionData>();
             context.ExpectedOutputType = this.OutputType;
             context.Intermediates = intermediates.Concat(libraries).ToList();
             context.TupleDefinitionCreator = creator;
@@ -269,8 +269,8 @@ namespace WixToolset.Core.CommandLine
             {
                 var context = this.ServiceProvider.GetService<IResolveContext>();
                 context.BindPaths = bindPaths;
-                context.Extensions = this.ExtensionManager.Create<IResolverExtension>();
-                context.ExtensionData = this.ExtensionManager.Create<IExtensionData>();
+                context.Extensions = this.ExtensionManager.GetServices<IResolverExtension>();
+                context.ExtensionData = this.ExtensionManager.GetServices<IExtensionData>();
                 context.FilterCultures = filterCultures;
                 context.IntermediateFolder = intermediateFolder;
                 context.IntermediateRepresentation = output;
@@ -295,7 +295,7 @@ namespace WixToolset.Core.CommandLine
                 //context.DefaultCompressionLevel = this.DefaultCompressionLevel;
                 context.DelayedFields = resolveResult.DelayedFields;
                 context.ExpectedEmbeddedFiles = resolveResult.ExpectedEmbeddedFiles;
-                context.Extensions = this.ExtensionManager.Create<IBinderExtension>();
+                context.Extensions = this.ExtensionManager.GetServices<IBinderExtension>();
                 context.Ices = Array.Empty<string>(); // TODO: set this correctly
                 context.IntermediateFolder = intermediateFolder;
                 context.IntermediateRepresentation = resolveResult.IntermediateRepresentation;
@@ -315,7 +315,7 @@ namespace WixToolset.Core.CommandLine
 
             {
                 var context = this.ServiceProvider.GetService<ILayoutContext>();
-                context.Extensions = this.ExtensionManager.Create<ILayoutExtension>();
+                context.Extensions = this.ExtensionManager.GetServices<ILayoutExtension>();
                 context.TrackedFiles = bindResult.TrackedFiles;
                 context.FileTransfers = bindResult.FileTransfers;
                 context.IntermediateFolder = intermediateFolder;
@@ -371,7 +371,7 @@ namespace WixToolset.Core.CommandLine
         private XDocument Preprocess(IDictionary<string, string> preprocessorVariables, string sourcePath)
         {
             var context = this.ServiceProvider.GetService<IPreprocessContext>();
-            context.Extensions = this.ExtensionManager.Create<IPreprocessorExtension>();
+            context.Extensions = this.ExtensionManager.GetServices<IPreprocessorExtension>();
             context.Platform = this.Platform;
             context.IncludeSearchPaths = this.IncludeSearchPaths;
             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
 
         private ICommandLineCommand Parse(ICommandLineContext context)
         {
-            var extensions = this.ExtensionManager.Create<IExtensionCommandLine>();
+            var extensions = this.ExtensionManager.GetServices<IExtensionCommandLine>();
 
             foreach (var extension in extensions)
             {
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
             foreach (var sourceFile in this.SourceFiles)
             {
                 var context = this.ServiceProvider.GetService<IPreprocessContext>();
-                context.Extensions = this.ExtensionManager.Create<IPreprocessorExtension>();
+                context.Extensions = this.ExtensionManager.GetServices<IPreprocessorExtension>();
                 context.Platform = this.Platform;
                 context.IncludeSearchPaths = this.IncludeSearchPaths;
                 context.SourcePath = sourceFile.SourcePath;
@@ -80,7 +80,7 @@ namespace WixToolset.Core.CommandLine
                 }
 
                 var compileContext = this.ServiceProvider.GetService<ICompileContext>();
-                compileContext.Extensions = this.ExtensionManager.Create<ICompilerExtension>();
+                compileContext.Extensions = this.ExtensionManager.GetServices<ICompilerExtension>();
                 compileContext.OutputPath = sourceFile.OutputPath;
                 compileContext.Platform = this.Platform;
                 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
             }
 
             var context = this.ServiceProvider.GetService<IDecompileContext>();
-            context.Extensions = this.ServiceProvider.GetService<IExtensionManager>().Create<IDecompilerExtension>();
+            context.Extensions = this.ServiceProvider.GetService<IExtensionManager>().GetServices<IDecompilerExtension>();
             context.DecompilePath = this.commandLine.DecompileFilePath;
             context.DecompileType = this.commandLine.CalculateDecompileType();
             context.IntermediateFolder = this.commandLine.CalculateIntermedateFolder();
-- 
cgit v1.2.3-55-g6feb