29 files changed, 242 insertions, 82 deletions

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index b27b5ca8..7cd6767f 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,7 +5,8 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
-    <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath>
+    <BaseOutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</BaseOutputPath>
+    <OutputPath>$(BaseOutputPath)</OutputPath>
 
     <Authors>WiX Toolset Team</Authors>
     <Company>WiX Toolset</Company>
diff --git a/src/WixToolset.BuildTasks/DoIt.cs b/src/WixToolset.BuildTasks/DoIt.cs
index d3bd7a80..924bf92f 100644
--- a/src/WixToolset.BuildTasks/DoIt.cs
+++ b/src/WixToolset.BuildTasks/DoIt.cs
@@ -9,6 +9,7 @@ namespace WixToolset.BuildTasks
     using Microsoft.Build.Utilities;
     using WixToolset.Core;
     using WixToolset.Data;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// An MSBuild task to run the WiX compiler.
@@ -164,10 +165,30 @@ namespace WixToolset.BuildTasks
 
             this.Log.LogMessage(MessageImportance.Normal, "wix.exe " + commandLineString);
 
-            var command = CommandLine.ParseStandardCommandLine(commandLineString);
+            var serviceProvider = new WixToolsetServiceProvider();
+
+            var context = serviceProvider.GetService<ICommandLineContext>();
+            context.Messaging = Messaging.Instance;
+            context.ExtensionManager = this.CreateExtensionManagerWithStandardBackends(serviceProvider);
+            context.Arguments = commandLineString;
+
+            var commandLine = serviceProvider.GetService<ICommandLine>();
+            var command = commandLine.ParseStandardCommandLine(context);
             command?.Execute();
         }
 
+        private IExtensionManager CreateExtensionManagerWithStandardBackends(IServiceProvider serviceProvider)
+        {
+            var extensionManager = serviceProvider.GetService<IExtensionManager>();
+
+            foreach (var type in new[] { typeof(WixToolset.Core.Burn.StandardBackend), typeof(WixToolset.Core.WindowsInstaller.StandardBackend) })
+            {
+                extensionManager.Add(type.Assembly);
+            }
+
+            return extensionManager;
+        }
+
         private void DisplayMessage(object sender, DisplayEventArgs e)
         {
             this.Log.LogMessageFromText(e.Message, MessageImportance.Normal);
diff --git a/src/WixToolset.Core.Burn/BackendFactory.cs b/src/WixToolset.Core.Burn/BackendFactory.cs
index 042fa254..a69c47b5 100644
--- a/src/WixToolset.Core.Burn/BackendFactory.cs
+++ b/src/WixToolset.Core.Burn/BackendFactory.cs
@@ -5,6 +5,7 @@ namespace WixToolset.Core.Burn
     using System;
     using System.IO;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     internal class BackendFactory : IBackendFactory
     {
diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index 212b1e81..3934491b 100644
--- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -16,6 +16,7 @@ namespace WixToolset.Core.Burn
     using WixToolset.Data.Bind;
     using WixToolset.Data.Rows;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     // TODO: (4.0) Refactor so that these don't need to be copied.
     // Copied verbatim from ext\UtilExtension\wixext\UtilCompiler.cs
diff --git a/src/WixToolset.Core.Burn/BundleBackend.cs b/src/WixToolset.Core.Burn/BundleBackend.cs
index ef4d362c..0c7f2e8b 100644
--- a/src/WixToolset.Core.Burn/BundleBackend.cs
+++ b/src/WixToolset.Core.Burn/BundleBackend.cs
@@ -9,6 +9,7 @@ namespace WixToolset.Core.Burn
     using WixToolset.Data;
     using WixToolset.Data.Bind;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     internal class BundleBackend : IBackend
     {
diff --git a/src/WixToolset.Core.Burn/StandardBackend.cs b/src/WixToolset.Core.Burn/StandardBackend.cs
new file mode 100644
index 00000000..2ab30776
--- /dev/null
+++ b/src/WixToolset.Core.Burn/StandardBackend.cs
@@ -0,0 +1,12 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Core.Burn
+{
+    /// <summary>
+    /// Denotes this assembly contains a backend that is considered
+    /// a standard part of the WiX Toolset.
+    /// </summary>
+    public static class StandardBackend
+    {
+    }
+}
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 2e2c5417..21fbb022 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -16,6 +16,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using WixToolset.Data.Bind;
     using WixToolset.Data.Rows;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
     using WixToolset.Msi;
 
     /// <summary>
diff --git a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
index 716ea000..bf7b4579 100644
--- a/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MsiBackend.cs
@@ -8,6 +8,7 @@ namespace WixToolset.Core.WindowsInstaller
     using WixToolset.Data;
     using WixToolset.Data.Bind;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     internal class MsiBackend : IBackend
     {
diff --git a/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs b/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
index 268213d7..69d7ada0 100644
--- a/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MsmBackend.cs
@@ -7,6 +7,7 @@ namespace WixToolset.Core.WindowsInstaller
     using WixToolset.Data;
     using WixToolset.Data.Bind;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     internal class MsmBackend : IBackend
     {
diff --git a/src/WixToolset.Core.WindowsInstaller/MspBackend.cs b/src/WixToolset.Core.WindowsInstaller/MspBackend.cs
index 4b13258b..ea16a570 100644
--- a/src/WixToolset.Core.WindowsInstaller/MspBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MspBackend.cs
@@ -10,6 +10,7 @@ namespace WixToolset.Core.WindowsInstaller
     using WixToolset.Data;
     using WixToolset.Data.Bind;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
     using WixToolset.Msi;
     using WixToolset.Ole32;
 
diff --git a/src/WixToolset.Core.WindowsInstaller/MstBackend.cs b/src/WixToolset.Core.WindowsInstaller/MstBackend.cs
index 2cb7da89..66bc57ae 100644
--- a/src/WixToolset.Core.WindowsInstaller/MstBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MstBackend.cs
@@ -8,6 +8,7 @@ namespace WixToolset.Core.WindowsInstaller
     using WixToolset.Data;
     using WixToolset.Data.Bind;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     internal class MstBackend : IBackend
     {
diff --git a/src/WixToolset.Core.WindowsInstaller/StandardBackend.cs b/src/WixToolset.Core.WindowsInstaller/StandardBackend.cs
new file mode 100644
index 00000000..f1ae2017
--- /dev/null
+++ b/src/WixToolset.Core.WindowsInstaller/StandardBackend.cs
@@ -0,0 +1,12 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Core.WindowsInstaller
+{
+    /// <summary>
+    /// Denotes this assembly contains a backend that is considered
+    /// a standard part of the WiX Toolset.
+    /// </summary>
+    public static class StandardBackend
+    {
+    }
+}
diff --git a/src/WixToolset.Core.WindowsInstaller/Validator.cs b/src/WixToolset.Core.WindowsInstaller/Validator.cs
index db66f600..652a8a07 100644
--- a/src/WixToolset.Core.WindowsInstaller/Validator.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Validator.cs
@@ -16,6 +16,7 @@ namespace WixToolset.Core.WindowsInstaller
     using WixToolset.Msi;
     using System.Linq;
     using System.Reflection;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Runs internal consistency evaluators (ICEs) from cub files against a database.
diff --git a/src/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendFactory.cs b/src/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendFactory.cs
index b66a4617..a7f58ed4 100644
--- a/src/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendFactory.cs
+++ b/src/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendFactory.cs
@@ -5,6 +5,7 @@ namespace WixToolset.Core.WindowsInstaller
     using System;
     using System.IO;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     internal class WindowsInstallerBackendFactory : IBackendFactory
     {
diff --git a/src/WixToolset.Core/BindContext.cs b/src/WixToolset.Core/BindContext.cs
index 499f3245..7b1a1877 100644
--- a/src/WixToolset.Core/BindContext.cs
+++ b/src/WixToolset.Core/BindContext.cs
@@ -2,12 +2,21 @@
 
 namespace WixToolset.Core
 {
+    using System;
     using System.Collections.Generic;
     using WixToolset.Data;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     public class BindContext : IBindContext
     {
+        internal BindContext(IServiceProvider serviceProvider)
+        {
+            this.ServiceProvider = serviceProvider;
+        }
+
+        public IServiceProvider ServiceProvider { get; }
+
         public Messaging Messaging { get; set; }
 
         public IEnumerable<BindPath> BindPaths { get; set; }
diff --git a/src/WixToolset.Core/Binder.cs b/src/WixToolset.Core/Binder.cs
index 43c15634..34bf0dee 100644
--- a/src/WixToolset.Core/Binder.cs
+++ b/src/WixToolset.Core/Binder.cs
@@ -16,6 +16,7 @@ namespace WixToolset.Core
     using WixToolset.Data.Bind;
     using WixToolset.Data.Rows;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Binder of the WiX toolset.
@@ -42,14 +43,14 @@ namespace WixToolset.Core
             //this.SuppressIces = new List<string>();
         }
 
-        public Binder(BindContext context)
+        public Binder(IBindContext context)
         {
             this.Context = context;
 
             this.TableDefinitions = WindowsInstallerStandard.GetTableDefinitions();
         }
 
-        private BindContext Context { get; }
+        private IBindContext Context { get; }
 
         private TableDefinitionCollection TableDefinitions { get; }
 
diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index b3909451..4a1fc1ed 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -9,11 +9,13 @@ namespace WixToolset.Core
     using WixToolset.Data;
     using WixToolset.Data.Rows;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     internal class BuildCommand : ICommandLineCommand
     {
-        public BuildCommand(ExtensionManager extensions, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables, IEnumerable<string> locFiles, IEnumerable<string> libraryFiles, string outputPath, OutputType outputType, string cabCachePath, IEnumerable<string> cultures, bool bindFiles, IEnumerable<BindPath> bindPaths, string intermediateFolder, string contentsFile, string outputsFile, string builtOutputsFile, string wixProjectFile)
+        public BuildCommand(IServiceProvider serviceProvider, IExtensionManager extensions, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables, IEnumerable<string> locFiles, IEnumerable<string> libraryFiles, string outputPath, OutputType outputType, string cabCachePath, IEnumerable<string> cultures, bool bindFiles, IEnumerable<BindPath> bindPaths, string intermediateFolder, string contentsFile, string outputsFile, string builtOutputsFile, string wixProjectFile)
         {
+            this.ServiceProvider = serviceProvider;
             this.ExtensionManager = extensions;
             this.LocFiles = locFiles;
             this.LibraryFiles = libraryFiles;
@@ -34,7 +36,9 @@ namespace WixToolset.Core
             this.WixProjectFile = wixProjectFile;
         }
 
-        public ExtensionManager ExtensionManager { get; }
+        public IServiceProvider ServiceProvider { get; }
+
+        public IExtensionManager ExtensionManager { get; }
 
         public IEnumerable<string> LocFiles { get; }
 
@@ -173,7 +177,7 @@ namespace WixToolset.Core
                 intermediateFolder = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
             }
 
-            var context = new BindContext();
+            var context = this.ServiceProvider.GetService<IBindContext>();
             context.Messaging = Messaging.Instance;
             context.ExtensionManager = this.ExtensionManager;
             context.BindPaths = this.BindPaths ?? Array.Empty<BindPath>();
diff --git a/src/WixToolset.Core/CommandLine/CommandLine.cs b/src/WixToolset.Core/CommandLine/CommandLine.cs
index 2f203ecb..b0594348 100644
--- a/src/WixToolset.Core/CommandLine/CommandLine.cs
+++ b/src/WixToolset.Core/CommandLine/CommandLine.cs
@@ -6,11 +6,11 @@ namespace WixToolset.Core
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
-    using System.Reflection;
     using System.Text;
     using System.Text.RegularExpressions;
     using WixToolset.Data;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     internal enum Commands
     {
@@ -22,12 +22,14 @@ namespace WixToolset.Core
         Bind,
     }
 
-    public class CommandLine
+    internal class CommandLine : ICommandLine
     {
-        private CommandLine()
+        public CommandLine()
         {
         }
 
+        private IServiceProvider ServiceProvider { get; set; }
+
         public static string ExpectedArgument { get; } = "expected argument";
 
         public string ActiveCommand { get; private set; }
@@ -36,20 +38,29 @@ namespace WixToolset.Core
 
         public Queue<string> RemainingArguments { get; } = new Queue<string>();
 
-        public ExtensionManager ExtensionManager { get; } = new ExtensionManager();
+        public IExtensionManager ExtensionManager { get; private set; }
 
         public string ErrorArgument { get; set; }
 
         public bool ShowHelp { get; set; }
 
-        public static ICommandLineCommand ParseStandardCommandLine(string commandLineString)
+        public ICommandLineCommand ParseStandardCommandLine(ICommandLineContext context)
         {
-            var args = CommandLine.ParseArgumentsToArray(commandLineString).ToArray();
+            this.ServiceProvider = context.ServiceProvider;
+
+            this.ExtensionManager = context.ExtensionManager ?? this.ServiceProvider.GetService<IExtensionManager>();
+
+            var args = context.ParsedArguments ?? Array.Empty<string>();
+
+            if (!String.IsNullOrEmpty(context.Arguments))
+            {
+                args = CommandLine.ParseArgumentsToArray(context.Arguments).Union(args).ToArray();
+            }
 
-            return ParseStandardCommandLine(args);
+            return this.ParseStandardCommandLine(args);
         }
 
-        public static ICommandLineCommand ParseStandardCommandLine(string[] args)
+        private ICommandLineCommand ParseStandardCommandLine(string[] args)
         {
             var next = String.Empty;
 
@@ -79,7 +90,7 @@ namespace WixToolset.Core
             var builtOutputsFile = String.Empty;
             var wixProjectFile = String.Empty;
 
-            var cli = CommandLine.Parse(args, (cmdline, arg) => Enum.TryParse(arg, true, out command), (cmdline, arg) =>
+            this.Parse(args, (cmdline, arg) => Enum.TryParse(arg, true, out command), (cmdline, arg) =>
             {
                 if (cmdline.IsSwitch(arg))
                 {
@@ -103,7 +114,7 @@ namespace WixToolset.Core
                         case "cc":
                             cmdline.GetNextArgumentOrError(ref cabCachePath);
                             return true;
-                            
+
                         case "cultures":
                             cmdline.GetNextArgumentOrError(cultures);
                             return true;
@@ -187,7 +198,7 @@ namespace WixToolset.Core
                 AppCommon.DisplayToolHeader();
             }
 
-            if (cli.ShowHelp)
+            if (this.ShowHelp)
             {
                 return new HelpCommand(command);
             }
@@ -196,14 +207,11 @@ namespace WixToolset.Core
             {
                 case Commands.Build:
                     {
-                        LoadStandardBackends(cli.ExtensionManager);
-
                         var sourceFiles = GatherSourceFiles(files, outputFolder);
                         var variables = GatherPreprocessorVariables(defines);
                         var bindPathList = GatherBindPaths(bindPaths);
-                        var extensions = cli.ExtensionManager;
                         var type = CalculateOutputType(outputType, outputFile);
-                        return new BuildCommand(extensions, sourceFiles, variables, locFiles, libraryFiles, outputFile, type, cabCachePath, cultures, bindFiles, bindPathList, intermediateFolder, contentsFile, outputsFile, builtOutputsFile, wixProjectFile);
+                        return new BuildCommand(this.ServiceProvider, this.ExtensionManager, sourceFiles, variables, locFiles, libraryFiles, outputFile, type, cabCachePath, cultures, bindFiles, bindPathList, intermediateFolder, contentsFile, outputsFile, builtOutputsFile, wixProjectFile);
                     }
 
                 case Commands.Compile:
@@ -217,18 +225,6 @@ namespace WixToolset.Core
             return null;
         }
 
-        private static void LoadStandardBackends(ExtensionManager extensionManager)
-        {
-            var folder = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath);
-
-            foreach (var backendAssemblyName in new[] { "WixToolset.Core.Burn.dll", "WixToolset.Core.WindowsInstaller.dll" })
-            {
-                var path = Path.Combine(folder, backendAssemblyName);
-
-                extensionManager.Load(path);
-            }
-        }
-
         private static OutputType CalculateOutputType(string outputType, string outputFile)
         {
             if (String.IsNullOrEmpty(outputType))
@@ -269,6 +265,7 @@ namespace WixToolset.Core
             return OutputType.Unknown;
         }
 
+#if UNUSED
         private static CommandLine Parse(string commandLineString, Func<CommandLine, string, bool> parseArgument)
         {
             var arguments = CommandLine.ParseArgumentsToArray(commandLineString).ToArray();
@@ -280,18 +277,17 @@ namespace WixToolset.Core
         {
             return CommandLine.Parse(commandLineArguments, null, parseArgument);
         }
+#endif
 
-        private static CommandLine Parse(string[] commandLineArguments, Func<CommandLine, string, bool> parseCommand, Func<CommandLine, string, bool> parseArgument)
+        private ICommandLine Parse(string[] commandLineArguments, Func<CommandLine, string, bool> parseCommand, Func<CommandLine, string, bool> parseArgument)
         {
-            var cmdline = new CommandLine();
-
-            cmdline.FlattenArgumentsWithResponseFilesIntoOriginalArguments(commandLineArguments);
+            this.FlattenArgumentsWithResponseFilesIntoOriginalArguments(commandLineArguments);
 
-            cmdline.QueueArgumentsAndLoadExtensions(cmdline.OriginalArguments);
+            this.QueueArgumentsAndLoadExtensions(this.OriginalArguments);
 
-            cmdline.ProcessRemainingArguments(parseArgument, parseCommand);
+            this.ProcessRemainingArguments(parseArgument, parseCommand);
 
-            return cmdline;
+            return this;
         }
 
         private static IEnumerable<SourceFile> GatherSourceFiles(IEnumerable<string> sourceFiles, string intermediateDirectory)
diff --git a/src/WixToolset.Core/CommandLine/CommandLineContext.cs b/src/WixToolset.Core/CommandLine/CommandLineContext.cs
new file mode 100644
index 00000000..96c149be
--- /dev/null
+++ b/src/WixToolset.Core/CommandLine/CommandLineContext.cs
@@ -0,0 +1,26 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Core
+{
+    using System;
+    using WixToolset.Data;
+    using WixToolset.Extensibility.Services;
+
+    internal class CommandLineContext : ICommandLineContext
+    {
+        public CommandLineContext(IServiceProvider serviceProvider)
+        {
+            this.ServiceProvider = serviceProvider;
+        }
+
+        public IServiceProvider ServiceProvider { get; }
+
+        public Messaging Messaging { get; set; }
+
+        public IExtensionManager ExtensionManager { get; set; }
+
+        public string Arguments { get; set; }
+
+        public string[] ParsedArguments { get; set; }
+    }
+}
diff --git a/src/WixToolset.Core/CommandLine/CompileCommand.cs b/src/WixToolset.Core/CommandLine/CompileCommand.cs
index bbcc8270..855e7c6a 100644
--- a/src/WixToolset.Core/CommandLine/CompileCommand.cs
+++ b/src/WixToolset.Core/CommandLine/CompileCommand.cs
@@ -2,9 +2,8 @@
 
 namespace WixToolset.Core
 {
-    using System;
     using System.Collections.Generic;
-    using WixToolset.Data;
+    using WixToolset.Extensibility.Services;
 
     internal class CompileCommand : ICommandLineCommand
     {
diff --git a/src/WixToolset.Core/CommandLine/HelpCommand.cs b/src/WixToolset.Core/CommandLine/HelpCommand.cs
index e57ad132..2a2eab24 100644
--- a/src/WixToolset.Core/CommandLine/HelpCommand.cs
+++ b/src/WixToolset.Core/CommandLine/HelpCommand.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.Core
 {
     using System;
+    using WixToolset.Extensibility.Services;
 
     internal class HelpCommand : ICommandLineCommand
     {
diff --git a/src/WixToolset.Core/CommandLine/ICommandLineCommand.cs b/src/WixToolset.Core/CommandLine/ICommandLineCommand.cs
deleted file mode 100644
index f1471355..00000000
--- a/src/WixToolset.Core/CommandLine/ICommandLineCommand.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-
-namespace WixToolset.Core
-{
-    public interface ICommandLineCommand
-    {
-        int Execute();
-    }
-}
diff --git a/src/WixToolset.Core/CommandLine/VersionCommand.cs b/src/WixToolset.Core/CommandLine/VersionCommand.cs
index d13e07a3..12941bdc 100644
--- a/src/WixToolset.Core/CommandLine/VersionCommand.cs
+++ b/src/WixToolset.Core/CommandLine/VersionCommand.cs
@@ -1,9 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-using System;
-
 namespace WixToolset.Core
 {
+    using System;
+    using WixToolset.Extensibility.Services;
+
     internal class VersionCommand : ICommandLineCommand
     {
         public int Execute()
diff --git a/src/WixToolset.Core/ExtensionManager.cs b/src/WixToolset.Core/ExtensionManager.cs
index 7e40571b..b9038c6a 100644
--- a/src/WixToolset.Core/ExtensionManager.cs
+++ b/src/WixToolset.Core/ExtensionManager.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset
+namespace WixToolset.Core
 {
     using System;
     using System.Collections.Generic;
@@ -8,13 +8,24 @@ namespace WixToolset
     using System.Linq;
     using System.Reflection;
     using WixToolset.Data;
-    using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
 
     public class ExtensionManager : IExtensionManager
     {
         private List<Assembly> extensionAssemblies = new List<Assembly>();
 
         /// <summary>
+        /// Adds an assembly.
+        /// </summary>
+        /// <param name="assembly">Assembly to add to the extension manager.</param>
+        /// <returns>The assembly added.</returns>
+        public Assembly Add(Assembly assembly)
+        {
+            this.extensionAssemblies.Add(assembly);
+            return assembly;
+        }
+
+        /// <summary>
         /// Loads an assembly from a type description string.
         /// </summary>
         /// <param name="extension">The assembly type description string.</param>
@@ -57,8 +68,7 @@ namespace WixToolset
                 assembly = ExtensionManager.ExtensionLoadFrom(assemblyName);
             }
 
-            this.extensionAssemblies.Add(assembly);
-            return assembly;
+            return this.Add(assembly);
         }
 
         /// <summary>
diff --git a/src/WixToolset.Core/IncribeContext.cs b/src/WixToolset.Core/IncribeContext.cs
index 604ba5d1..15dd3664 100644
--- a/src/WixToolset.Core/IncribeContext.cs
+++ b/src/WixToolset.Core/IncribeContext.cs
@@ -2,11 +2,19 @@
 
 namespace WixToolset.Core
 {
+    using System;
     using WixToolset.Data;
     using WixToolset.Extensibility;
 
     internal class InscribeContext : IInscribeContext
     {
+        public InscribeContext(IServiceProvider serviceProvider)
+        {
+            this.ServiceProvider = serviceProvider;
+        }
+
+        public IServiceProvider ServiceProvider { get; }
+
         public Messaging Messaging { get; } = Messaging.Instance;
 
         public string IntermediateFolder { get; set; }
diff --git a/src/WixToolset.Core/WixToolsetServiceProvider.cs b/src/WixToolset.Core/WixToolsetServiceProvider.cs
new file mode 100644
index 00000000..c073c32b
--- /dev/null
+++ b/src/WixToolset.Core/WixToolsetServiceProvider.cs
@@ -0,0 +1,47 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Core
+{
+    using System;
+    using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Services;
+
+    public class WixToolsetServiceProvider : IServiceProvider
+    {
+        private ExtensionManager extensionManager;
+
+        public object GetService(Type serviceType)
+        {
+            if (serviceType == null) throw new ArgumentNullException(nameof(serviceType));
+
+            // Transients.
+            if (serviceType == typeof(IBindContext))
+            {
+                return new BindContext(this);
+            }
+
+            if (serviceType == typeof(IInscribeContext))
+            {
+                return new InscribeContext(this);
+            }
+
+            if (serviceType == typeof(ICommandLineContext))
+            {
+                return new CommandLineContext(this);
+            }
+
+            if (serviceType == typeof(ICommandLine))
+            {
+                return new CommandLine();
+            }
+
+            // Singletons.
+            if (serviceType == typeof(IExtensionManager))
+            {
+                return extensionManager = extensionManager ?? new ExtensionManager();
+            }
+
+            throw new ArgumentException($"Unknown service type: {serviceType.Name}", nameof(serviceType));
+        }
+    }
+}
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs b/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs
index bc2786e9..daa3da42 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/ProgramFixture.cs
@@ -20,7 +20,7 @@ namespace WixToolsetTest.CoreIntegrationFixture
                 var intermediateFolder = fs.GetFolder();
 
                 var program = new Program();
-                var result = program.Run(new[] { "build", "Package.wxs", "PackageComponents.wxs", "-loc", "Package.en-us.wxl", "-bindpath", "data", "-intermediateFolder", intermediateFolder, "-o", $@"{intermediateFolder}\bin\test.msi" });
+                var result = program.Run(new WixToolsetServiceProvider(), new[] { "build", "Package.wxs", "PackageComponents.wxs", "-loc", "Package.en-us.wxl", "-bindpath", "data", "-intermediateFolder", intermediateFolder, "-o", $@"{intermediateFolder}\bin\test.msi" });
 
                 Assert.Equal(0, result);
                 Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.msi")));
diff --git a/src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj b/src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj
index 86482a19..bce6e6b2 100644
--- a/src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj
+++ b/src/test/WixToolsetTest.CoreIntegrationFixture/WixToolsetTest.CoreIntegrationFixture.csproj
@@ -12,25 +12,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="TestData\SingleFile\data\test.txt" />
-    <None Remove="TestData\SingleFile\Package.en-us.wxl" />
-    <None Remove="TestData\SingleFile\Package.wxs" />
-    <None Remove="TestData\SingleFile\PackageComponents.wxs" />
+    <Content Include="TestData\SingleFile\data\test.txt" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\SingleFile\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\SingleFile\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="TestData\SingleFile\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="TestData\SingleFile\data\test.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\SingleFile\Package.en-us.wxl">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\SingleFile\Package.wxs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="TestData\SingleFile\PackageComponents.wxs">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <ProjectReference Include="..\..\wix\wix.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -38,8 +27,4 @@
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
   </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\wix\wix.csproj" />
-  </ItemGroup>
 </Project>
diff --git a/src/wix/Program.cs b/src/wix/Program.cs
index 03b11c78..bebd80d5 100644
--- a/src/wix/Program.cs
+++ b/src/wix/Program.cs
@@ -4,6 +4,7 @@ namespace WixToolset.Core
 {
     using System;
     using WixToolset.Data;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Wix Toolset Command-Line Interface.
@@ -21,16 +22,41 @@ namespace WixToolset.Core
             Messaging.Instance.InitializeAppName("WIX", "wix.exe");
             Messaging.Instance.Display += DisplayMessage;
 
+            var serviceProvider = new WixToolsetServiceProvider();
             var program = new Program();
-            return program.Run(args);
+            return program.Run(serviceProvider, args);
         }
 
-        public int Run(string[] args)
+        /// <summary>
+        /// Executes the wix command-line interface.
+        /// </summary>
+        /// <param name="serviceProvider">Service provider to use throughout this execution.</param>
+        /// <param name="args">Command-line arguments to execute.</param>
+        /// <returns>Returns the application error code.</returns>
+        public int Run(IServiceProvider serviceProvider, string[] args)
         {
-            var command = CommandLine.ParseStandardCommandLine(args);
+            var context = serviceProvider.GetService<ICommandLineContext>();
+            context.Messaging = Messaging.Instance;
+            context.ExtensionManager = CreateExtensionManagerWithStandardBackends(serviceProvider);
+            context.ParsedArguments = args;
+
+            var commandLine = serviceProvider.GetService<ICommandLine>();
+            var command = commandLine.ParseStandardCommandLine(context);
             return command?.Execute() ?? 1;
         }
 
+        private static IExtensionManager CreateExtensionManagerWithStandardBackends(IServiceProvider serviceProvider)
+        {
+            var extensionManager = serviceProvider.GetService<IExtensionManager>();
+
+            foreach (var type in new[] { typeof(WixToolset.Core.Burn.StandardBackend), typeof(WixToolset.Core.WindowsInstaller.StandardBackend) })
+            {
+                extensionManager.Add(type.Assembly);
+            }
+
+            return extensionManager;
+        }
+
         private static void DisplayMessage(object sender, DisplayEventArgs e)
         {
             switch (e.Level)