45 files changed, 98 insertions, 109 deletions

diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index 34c72346..7b5a3174 100644
--- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -45,7 +45,7 @@ namespace WixToolset.Core.Burn
             this.BackendExtensions = backedExtensions;
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
index dc1a1913..c8867eb7 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
@@ -23,7 +23,7 @@ namespace WixToolset.Core.Burn.Bundles
     {
         private const string PropertySqlFormat = "SELECT `Value` FROM `Property` WHERE `Property` = '{0}'";
 
-        public ProcessMsiPackageCommand(IWixToolsetServiceProvider serviceProvider, IEnumerable<IBurnBackendBinderExtension> backendExtensions, IntermediateSection section, PackageFacade facade, Dictionary<string, WixBundlePayloadSymbol> payloadSymbols)
+        public ProcessMsiPackageCommand(IServiceProvider serviceProvider, IEnumerable<IBurnBackendBinderExtension> backendExtensions, IntermediateSection section, PackageFacade facade, Dictionary<string, WixBundlePayloadSymbol> payloadSymbols)
         {
             this.Messaging = serviceProvider.GetService<IMessaging>();
             this.BackendHelper = serviceProvider.GetService<IBackendHelper>();
diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
index dea5b336..adbb41b1 100644
--- a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs
@@ -15,7 +15,7 @@ namespace WixToolset.Core.Burn.Bundles
 
     internal class ProcessPayloadsCommand
     {
-        public ProcessPayloadsCommand(IWixToolsetServiceProvider serviceProvider, IBackendHelper backendHelper, IPayloadHarvester payloadHarvester, IEnumerable<WixBundlePayloadSymbol> payloads, PackagingType defaultPackaging, string layoutDirectory)
+        public ProcessPayloadsCommand(IServiceProvider serviceProvider, IBackendHelper backendHelper, IPayloadHarvester payloadHarvester, IEnumerable<WixBundlePayloadSymbol> payloads, PackagingType defaultPackaging, string layoutDirectory)
         {
             this.Messaging = serviceProvider.GetService<IMessaging>();
 
diff --git a/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs b/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs
index 5502b43b..a4f37d10 100644
--- a/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs
+++ b/src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs
@@ -25,7 +25,7 @@ namespace WixToolset.Core.Burn.ExtensibilityServices
 
         private Dictionary<string, ManifestData> BundleExtensionDataById { get; } = new Dictionary<string, ManifestData>();
 
-        public BurnBackendHelper(IWixToolsetServiceProvider serviceProvider)
+        public BurnBackendHelper(IServiceProvider serviceProvider)
         {
             this.backendHelper = serviceProvider.GetService<IBackendHelper>();
         }
diff --git a/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerCommand.cs b/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerCommand.cs
index 67c1504b..94ee4f22 100644
--- a/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerCommand.cs
+++ b/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerCommand.cs
@@ -22,7 +22,7 @@ namespace WixToolset.Core.ExtensionCache
             List
         }
 
-        public ExtensionCacheManagerCommand(IWixToolsetServiceProvider serviceProvider)
+        public ExtensionCacheManagerCommand(IServiceProvider serviceProvider)
         {
             this.Messaging = serviceProvider.GetService<IMessaging>();
             this.ExtensionReferences = new List<string>();
diff --git a/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionCommandLine.cs b/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionCommandLine.cs
index a27e2a1f..76587830 100644
--- a/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionCommandLine.cs
+++ b/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionCommandLine.cs
@@ -14,12 +14,12 @@ namespace WixToolset.Core.ExtensionCache
     /// </summary>
     internal class ExtensionCacheManagerExtensionCommandLine : BaseExtensionCommandLine
     {
-        public ExtensionCacheManagerExtensionCommandLine(IWixToolsetServiceProvider serviceProvider)
+        public ExtensionCacheManagerExtensionCommandLine(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         public override IEnumerable<ExtensionCommandLineSwitch> CommandLineSwitches => new ExtensionCommandLineSwitch[]
         {
diff --git a/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionFactory.cs b/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionFactory.cs
index 44fc4b86..c38e5c70 100644
--- a/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionFactory.cs
+++ b/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionFactory.cs
@@ -8,12 +8,12 @@ namespace WixToolset.Core.ExtensionCache
 
     internal class ExtensionCacheManagerExtensionFactory : IExtensionFactory
     {
-        public ExtensionCacheManagerExtensionFactory(IWixToolsetServiceProvider serviceProvider)
+        public ExtensionCacheManagerExtensionFactory(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         public bool TryCreateExtension(Type extensionType, out object extension)
         {
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index b6244a6e..df1c824a 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -55,7 +55,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             this.BackendExtensions = backendExtension;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs
index e47e5b64..875b46c2 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs
@@ -14,7 +14,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
     internal class CabinetResolver
     {
-        public CabinetResolver(IWixToolsetServiceProvider serviceProvider, string cabCachePath, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtensions)
+        public CabinetResolver(IServiceProvider serviceProvider, string cabCachePath, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtensions)
         {
             this.ServiceProvider = serviceProvider;
 
@@ -23,7 +23,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             this.BackendExtensions = backendExtensions;
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private string CabCachePath { get; }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
index 43afd718..d4faabeb 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
@@ -31,7 +31,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
         private Dictionary<string, string> lastCabinetAddedToMediaTable; // Key is First Cabinet Name, Value is Last Cabinet Added in the Split Sequence
 
-        public CreateCabinetsCommand(IWixToolsetServiceProvider serviceProvider, IBackendHelper backendHelper, WixMediaTemplateSymbol mediaTemplate)
+        public CreateCabinetsCommand(IServiceProvider serviceProvider, IBackendHelper backendHelper, WixMediaTemplateSymbol mediaTemplate)
         {
             this.fileTransfers = new List<IFileTransfer>();
 
@@ -46,7 +46,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             this.MediaTemplate = mediaTemplate;
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IBackendHelper BackendHelper { get; }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs b/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs
index 18060ca7..ca1cd0e3 100644
--- a/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs
+++ b/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs
@@ -16,7 +16,7 @@ namespace WixToolset.Core.WindowsInstaller.ExtensibilityServices
     {
         private readonly IBackendHelper backendHelper;
 
-        public WindowsInstallerBackendHelper(IWixToolsetServiceProvider serviceProvider)
+        public WindowsInstallerBackendHelper(IServiceProvider serviceProvider)
         {
             this.backendHelper = serviceProvider.GetService<IBackendHelper>();
         }
diff --git a/src/WixToolset.Core/BindContext.cs b/src/WixToolset.Core/BindContext.cs
index 47375fb0..6b0a09a2 100644
--- a/src/WixToolset.Core/BindContext.cs
+++ b/src/WixToolset.Core/BindContext.cs
@@ -2,21 +2,21 @@
 
 namespace WixToolset.Core
 {
+    using System;
     using System.Collections.Generic;
     using System.Threading;
     using WixToolset.Data;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
-    using WixToolset.Extensibility.Services;
 
     internal class BindContext : IBindContext
     {
-        internal BindContext(IWixToolsetServiceProvider serviceProvider)
+        internal BindContext(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         public IEnumerable<BindPath> BindPaths { get; set; }
 
diff --git a/src/WixToolset.Core/Binder.cs b/src/WixToolset.Core/Binder.cs
index faaa3ec0..090b5d32 100644
--- a/src/WixToolset.Core/Binder.cs
+++ b/src/WixToolset.Core/Binder.cs
@@ -17,12 +17,12 @@ namespace WixToolset.Core
     /// </summary>
     internal class Binder : IBinder
     {
-        internal Binder(IWixToolsetServiceProvider serviceProvider)
+        internal Binder(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         public IBindResult Bind(IBindContext context)
         {
diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index b687e07b..baca91ba 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -18,7 +18,7 @@ namespace WixToolset.Core.CommandLine
     {
         private readonly CommandLine commandLine;
 
-        public BuildCommand(IWixToolsetServiceProvider serviceProvider)
+        public BuildCommand(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
             this.Messaging = serviceProvider.GetService<IMessaging>();
@@ -30,7 +30,7 @@ namespace WixToolset.Core.CommandLine
 
         public bool StopParsing => this.commandLine.ShowHelp;
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
@@ -541,13 +541,13 @@ namespace WixToolset.Core.CommandLine
 
             public string BuiltOutputsFile { get; private set; }
 
-            public CommandLine(IWixToolsetServiceProvider serviceProvider, IMessaging messaging)
+            public CommandLine(IServiceProvider serviceProvider, IMessaging messaging)
             {
                 this.ServiceProvider = serviceProvider;
                 this.Messaging = messaging;
             }
 
-            private IWixToolsetServiceProvider ServiceProvider { get; }
+            private IServiceProvider ServiceProvider { get; }
 
             private IMessaging Messaging { get; }
 
diff --git a/src/WixToolset.Core/CommandLine/CommandLine.cs b/src/WixToolset.Core/CommandLine/CommandLine.cs
index 7371628b..b87b6a5d 100644
--- a/src/WixToolset.Core/CommandLine/CommandLine.cs
+++ b/src/WixToolset.Core/CommandLine/CommandLine.cs
@@ -21,9 +21,9 @@ namespace WixToolset.Core.CommandLine
 
     internal class CommandLine : ICommandLine
     {
-        public CommandLine(IWixToolsetServiceProvider serviceProvider) => this.ServiceProvider = serviceProvider;
+        public CommandLine(IServiceProvider serviceProvider) => this.ServiceProvider = serviceProvider;
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         public ICommandLineCommand CreateCommand(string[] args)
         {
diff --git a/src/WixToolset.Core/CommandLine/CommandLineArguments.cs b/src/WixToolset.Core/CommandLine/CommandLineArguments.cs
index 456e19d7..40b8b320 100644
--- a/src/WixToolset.Core/CommandLine/CommandLineArguments.cs
+++ b/src/WixToolset.Core/CommandLine/CommandLineArguments.cs
@@ -12,7 +12,7 @@ namespace WixToolset.Core.CommandLine
 
     internal class CommandLineArguments : ICommandLineArguments
     {
-        public CommandLineArguments(IWixToolsetServiceProvider serviceProvider)
+        public CommandLineArguments(IServiceProvider serviceProvider)
         {
             this.Messaging = serviceProvider.GetService<IMessaging>();
         }
diff --git a/src/WixToolset.Core/CommandLine/CommandLineContext.cs b/src/WixToolset.Core/CommandLine/CommandLineContext.cs
index 6bf05590..8d5cf120 100644
--- a/src/WixToolset.Core/CommandLine/CommandLineContext.cs
+++ b/src/WixToolset.Core/CommandLine/CommandLineContext.cs
@@ -8,12 +8,12 @@ namespace WixToolset.Core.CommandLine
 
     internal class CommandLineContext : ICommandLineContext
     {
-        public CommandLineContext(IWixToolsetServiceProvider serviceProvider)
+        public CommandLineContext(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         public IExtensionManager ExtensionManager { get; set; }
 
diff --git a/src/WixToolset.Core/CommandLine/CompileCommand.cs b/src/WixToolset.Core/CommandLine/CompileCommand.cs
index f6f9c623..54d1b6f1 100644
--- a/src/WixToolset.Core/CommandLine/CompileCommand.cs
+++ b/src/WixToolset.Core/CommandLine/CompileCommand.cs
@@ -13,14 +13,14 @@ namespace WixToolset.Core.CommandLine
 
     internal class CompileCommand : ICommandLineCommand
     {
-        public CompileCommand(IWixToolsetServiceProvider serviceProvider)
+        public CompileCommand(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
             this.Messaging = serviceProvider.GetService<IMessaging>();
             this.ExtensionManager = serviceProvider.GetService<IExtensionManager>();
         }
 
-        public CompileCommand(IWixToolsetServiceProvider serviceProvider, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables, Platform platform)
+        public CompileCommand(IServiceProvider serviceProvider, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables, Platform platform)
         {
             this.ServiceProvider = serviceProvider;
             this.Messaging = serviceProvider.GetService<IMessaging>();
@@ -30,7 +30,7 @@ namespace WixToolset.Core.CommandLine
             this.Platform = platform;
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         public IMessaging Messaging { get; }
 
diff --git a/src/WixToolset.Core/CommandLine/DecompileCommand.cs b/src/WixToolset.Core/CommandLine/DecompileCommand.cs
index 53d0c309..fc0ab0c9 100644
--- a/src/WixToolset.Core/CommandLine/DecompileCommand.cs
+++ b/src/WixToolset.Core/CommandLine/DecompileCommand.cs
@@ -16,7 +16,7 @@ namespace WixToolset.Core.CommandLine
     {
         private readonly CommandLine commandLine;
 
-        public DecompileCommand(IWixToolsetServiceProvider serviceProvider)
+        public DecompileCommand(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
             this.Messaging = serviceProvider.GetService<IMessaging>();
@@ -27,7 +27,7 @@ namespace WixToolset.Core.CommandLine
 
         public bool StopParsing => this.commandLine.ShowHelp;
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         public IMessaging Messaging { get; }
 
diff --git a/src/WixToolset.Core/CompileContext.cs b/src/WixToolset.Core/CompileContext.cs
index e781b692..2aeb3998 100644
--- a/src/WixToolset.Core/CompileContext.cs
+++ b/src/WixToolset.Core/CompileContext.cs
@@ -2,22 +2,22 @@
 
 namespace WixToolset.Core
 {
+    using System;
     using System.Collections.Generic;
     using System.Threading;
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
-    using WixToolset.Extensibility.Services;
 
     internal class CompileContext : ICompileContext
     {
-        internal CompileContext(IWixToolsetServiceProvider serviceProvider)
+        internal CompileContext(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         public string CompilationId { get; set; }
 
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index 2aa25141..22f0df8f 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -57,7 +57,7 @@ namespace WixToolset.Core
             Icon,
         }
 
-        internal Compiler(IWixToolsetServiceProvider serviceProvider)
+        internal Compiler(IServiceProvider serviceProvider)
         {
             this.Messaging = serviceProvider.GetService<IMessaging>();
         }
@@ -4298,9 +4298,9 @@ namespace WixToolset.Core
                 }
             }
             else if ("TARGETDIR".Equals(id.Id, StringComparison.Ordinal) && !("SourceDir".Equals(name, StringComparison.Ordinal) && shortName == null && shortSourceName == null && sourceName == null))
-            {
-                this.Core.Write(ErrorMessages.IllegalTargetDirDefaultDir(sourceLineNumbers, name));
-            }
+                {
+                    this.Core.Write(ErrorMessages.IllegalTargetDirDefaultDir(sourceLineNumbers, name));
+                }
 
             // Update the file source path appropriately.
             if (fileSourceAttribSet)
diff --git a/src/WixToolset.Core/DecompileContext.cs b/src/WixToolset.Core/DecompileContext.cs
index fb59cd08..056785d6 100644
--- a/src/WixToolset.Core/DecompileContext.cs
+++ b/src/WixToolset.Core/DecompileContext.cs
@@ -11,12 +11,12 @@ namespace WixToolset.Core
 
     internal class DecompileContext : IDecompileContext
     {
-        internal DecompileContext(IWixToolsetServiceProvider serviceProvider)
+        internal DecompileContext(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         public string DecompilePath { get; set; }
 
diff --git a/src/WixToolset.Core/Decompiler.cs b/src/WixToolset.Core/Decompiler.cs
index e146362f..859f582b 100644
--- a/src/WixToolset.Core/Decompiler.cs
+++ b/src/WixToolset.Core/Decompiler.cs
@@ -12,12 +12,12 @@ namespace WixToolset.Core
     /// </summary>
     internal class Decompiler : IDecompiler
     {
-        internal Decompiler(IWixToolsetServiceProvider serviceProvider)
+        internal Decompiler(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         public IDecompileResult Decompile(IDecompileContext context)
         {
diff --git a/src/WixToolset.Core/ExtensibilityServices/BackendHelper.cs b/src/WixToolset.Core/ExtensibilityServices/BackendHelper.cs
index 3dcc0ce9..539cec78 100644
--- a/src/WixToolset.Core/ExtensibilityServices/BackendHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/BackendHelper.cs
@@ -16,7 +16,7 @@ namespace WixToolset.Core.ExtensibilityServices
     {
         private static readonly string[] ReservedFileNames = { "CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9" };
 
-        public BackendHelper(IWixToolsetServiceProvider serviceProvider)
+        public BackendHelper(IServiceProvider serviceProvider)
         {
             this.Messaging = serviceProvider.GetService<IMessaging>();
         }
diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
index 3c040b35..8e9f48c4 100644
--- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
@@ -18,14 +18,14 @@ namespace WixToolset.Core.ExtensibilityServices
     {
         private static readonly char[] InlineDirectorySeparators = new char[] { ':', '\\', '/' };
 
-        public ParseHelper(IWixToolsetServiceProvider serviceProvider)
+        public ParseHelper(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
 
             this.Messaging = serviceProvider.GetService<IMessaging>();
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
diff --git a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
index 041c7d5d..b0c87bcf 100644
--- a/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
@@ -17,14 +17,14 @@ namespace WixToolset.Core.ExtensibilityServices
         private static readonly char[] VariableSplitter = new char[] { '.' };
         private static readonly char[] ArgumentSplitter = new char[] { ',' };
 
-        public PreprocessHelper(IWixToolsetServiceProvider serviceProvider)
+        public PreprocessHelper(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
 
             this.Messaging = this.ServiceProvider.GetService<IMessaging>();
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
@@ -133,7 +133,7 @@ namespace WixToolset.Core.ExtensibilityServices
                     }
 
                 default:
-                    var extensionsByPrefix = this.GetExtensionsByPrefix(context);
+                    var extensionsByPrefix = this.GetExtensionsByPrefix();
                     if (extensionsByPrefix.TryGetValue(prefix, out var extension))
                     {
                         try
@@ -259,7 +259,7 @@ namespace WixToolset.Core.ExtensibilityServices
                     return context.Variables.TryGetValue(name, out var result) ? result : null;
 
                 default:
-                    var extensionsByPrefix = this.GetExtensionsByPrefix(context);
+                    var extensionsByPrefix = this.GetExtensionsByPrefix();
                     if (extensionsByPrefix.TryGetValue(prefix, out var extension))
                     {
                         try
@@ -309,7 +309,7 @@ namespace WixToolset.Core.ExtensibilityServices
                     break;
 
                 default:
-                    var extensionsByPrefix = this.GetExtensionsByPrefix(context);
+                    var extensionsByPrefix = this.GetExtensionsByPrefix();
                     if (extensionsByPrefix.TryGetValue(prefix, out var extension))
                     {
                         if (!extension.ProcessPragma(prefix, pragma, args, parent))
@@ -468,7 +468,7 @@ namespace WixToolset.Core.ExtensibilityServices
             }
         }
 
-        private Dictionary<string, IPreprocessorExtension> GetExtensionsByPrefix(IPreprocessContext context)
+        private Dictionary<string, IPreprocessorExtension> GetExtensionsByPrefix()
         {
             if (this.ExtensionsByPrefix == null)
             {
diff --git a/src/WixToolset.Core/ExtensibilityServices/SymbolDefinitionCreator.cs b/src/WixToolset.Core/ExtensibilityServices/SymbolDefinitionCreator.cs
index 2bff21d6..a2486130 100644
--- a/src/WixToolset.Core/ExtensibilityServices/SymbolDefinitionCreator.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/SymbolDefinitionCreator.cs
@@ -10,12 +10,12 @@ namespace WixToolset.Core.ExtensibilityServices
 
     internal class SymbolDefinitionCreator : ISymbolDefinitionCreator
     {
-        public SymbolDefinitionCreator(IWixToolsetServiceProvider serviceProvider)
+        public SymbolDefinitionCreator(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IEnumerable<IExtensionData> ExtensionData { get; set; }
 
diff --git a/src/WixToolset.Core/IncribeContext.cs b/src/WixToolset.Core/IncribeContext.cs
index 8db4daef..9d7055ab 100644
--- a/src/WixToolset.Core/IncribeContext.cs
+++ b/src/WixToolset.Core/IncribeContext.cs
@@ -8,12 +8,12 @@ namespace WixToolset.Core
 
     internal class InscribeContext : IInscribeContext
     {
-        public InscribeContext(IWixToolsetServiceProvider serviceProvider)
+        public InscribeContext(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         public string IntermediateFolder { get; set; }
 
diff --git a/src/WixToolset.Core/LayoutContext.cs b/src/WixToolset.Core/LayoutContext.cs
index 7bbae0c0..e4c8db7c 100644
--- a/src/WixToolset.Core/LayoutContext.cs
+++ b/src/WixToolset.Core/LayoutContext.cs
@@ -2,20 +2,20 @@
 
 namespace WixToolset.Core
 {
+    using System;
     using System.Collections.Generic;
     using System.Threading;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
-    using WixToolset.Extensibility.Services;
 
     internal class LayoutContext : ILayoutContext
     {
-        internal LayoutContext(IWixToolsetServiceProvider serviceProvider)
+        internal LayoutContext(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         public IEnumerable<ILayoutExtension> Extensions { get; set; }
 
diff --git a/src/WixToolset.Core/LayoutCreator.cs b/src/WixToolset.Core/LayoutCreator.cs
index 0da18ab5..b31c4e16 100644
--- a/src/WixToolset.Core/LayoutCreator.cs
+++ b/src/WixToolset.Core/LayoutCreator.cs
@@ -16,14 +16,14 @@ namespace WixToolset.Core
     /// </summary>
     internal class LayoutCreator : ILayoutCreator
     {
-        internal LayoutCreator(IWixToolsetServiceProvider serviceProvider)
+        internal LayoutCreator(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
 
             this.Messaging = serviceProvider.GetService<IMessaging>();
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
diff --git a/src/WixToolset.Core/Librarian.cs b/src/WixToolset.Core/Librarian.cs
index 6dc8611d..059a478b 100644
--- a/src/WixToolset.Core/Librarian.cs
+++ b/src/WixToolset.Core/Librarian.cs
@@ -16,14 +16,14 @@ namespace WixToolset.Core
     /// </summary>
     internal class Librarian : ILibrarian
     {
-        internal Librarian(IWixToolsetServiceProvider serviceProvider)
+        internal Librarian(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
 
             this.Messaging = this.ServiceProvider.GetService<IMessaging>();
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
diff --git a/src/WixToolset.Core/LibraryContext.cs b/src/WixToolset.Core/LibraryContext.cs
index 9fd76cf5..62d4e70c 100644
--- a/src/WixToolset.Core/LibraryContext.cs
+++ b/src/WixToolset.Core/LibraryContext.cs
@@ -2,6 +2,7 @@
 
 namespace WixToolset.Core
 {
+    using System;
     using System.Collections.Generic;
     using System.Threading;
     using WixToolset.Data;
@@ -11,12 +12,12 @@ namespace WixToolset.Core
 
     internal class LibraryContext : ILibraryContext
     {
-        internal LibraryContext(IWixToolsetServiceProvider serviceProvider)
+        internal LibraryContext(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         public IMessaging Messaging { get; set; }
 
diff --git a/src/WixToolset.Core/LinkContext.cs b/src/WixToolset.Core/LinkContext.cs
index 2f5ecf59..528d0f0f 100644
--- a/src/WixToolset.Core/LinkContext.cs
+++ b/src/WixToolset.Core/LinkContext.cs
@@ -2,6 +2,7 @@
 
 namespace WixToolset.Core
 {
+    using System;
     using System.Collections.Generic;
     using System.Threading;
     using WixToolset.Data;
@@ -11,12 +12,12 @@ namespace WixToolset.Core
 
     internal class LinkContext : ILinkContext
     {
-        internal LinkContext(IWixToolsetServiceProvider serviceProvider)
+        internal LinkContext(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         public IEnumerable<ILinkerExtension> Extensions { get; set; }
 
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs
index f5461bbc..d5c51f96 100644
--- a/src/WixToolset.Core/Linker.cs
+++ b/src/WixToolset.Core/Linker.cs
@@ -27,14 +27,14 @@ namespace WixToolset.Core
         /// <summary>
         /// Creates a linker.
         /// </summary>
-        internal Linker(IWixToolsetServiceProvider serviceProvider)
+        internal Linker(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
             this.Messaging = this.ServiceProvider.GetService<IMessaging>();
             this.sectionIdOnRows = true; // TODO: what is the correct value for this?
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
diff --git a/src/WixToolset.Core/LocalizationParser.cs b/src/WixToolset.Core/LocalizationParser.cs
index aaf4c425..dd5144ca 100644
--- a/src/WixToolset.Core/LocalizationParser.cs
+++ b/src/WixToolset.Core/LocalizationParser.cs
@@ -15,7 +15,7 @@ namespace WixToolset.Core
         public static readonly XNamespace WxlNamespace = "http://wixtoolset.org/schemas/v4/wxl";
         private const string XmlElementName = "WixLocalization";
 
-        internal LocalizationParser(IWixToolsetServiceProvider serviceProvider)
+        internal LocalizationParser(IServiceProvider serviceProvider)
         {
             this.Messaging = serviceProvider.GetService<IMessaging>();
         }
diff --git a/src/WixToolset.Core/PreprocessContext.cs b/src/WixToolset.Core/PreprocessContext.cs
index d273d76b..0b735a7c 100644
--- a/src/WixToolset.Core/PreprocessContext.cs
+++ b/src/WixToolset.Core/PreprocessContext.cs
@@ -2,21 +2,21 @@
 
 namespace WixToolset.Core
 {
+    using System;
     using System.Collections.Generic;
     using System.Threading;
     using WixToolset.Data;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
-    using WixToolset.Extensibility.Services;
 
     internal class PreprocessContext : IPreprocessContext
     {
-        internal PreprocessContext(IWixToolsetServiceProvider serviceProvider)
+        internal PreprocessContext(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         public IEnumerable<IPreprocessorExtension> Extensions { get; set; }
 
diff --git a/src/WixToolset.Core/Preprocessor.cs b/src/WixToolset.Core/Preprocessor.cs
index 81b17578..603c0e5b 100644
--- a/src/WixToolset.Core/Preprocessor.cs
+++ b/src/WixToolset.Core/Preprocessor.cs
@@ -37,14 +37,14 @@ namespace WixToolset.Core
             XmlResolver = null,
         };
 
-        internal Preprocessor(IWixToolsetServiceProvider serviceProvider)
+        internal Preprocessor(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
 
             this.Messaging = this.ServiceProvider.GetService<IMessaging>();
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
@@ -1489,7 +1489,7 @@ namespace WixToolset.Core
 
         private class ProcessingState
         {
-            public ProcessingState(IWixToolsetServiceProvider serviceProvider, IPreprocessContext context)
+            public ProcessingState(IServiceProvider serviceProvider, IPreprocessContext context)
             {
                 var path = Path.GetFullPath(context.SourcePath);
 
diff --git a/src/WixToolset.Core/ResolveContext.cs b/src/WixToolset.Core/ResolveContext.cs
index 6e1718b6..185b556c 100644
--- a/src/WixToolset.Core/ResolveContext.cs
+++ b/src/WixToolset.Core/ResolveContext.cs
@@ -2,6 +2,7 @@
 
 namespace WixToolset.Core
 {
+    using System;
     using System.Collections.Generic;
     using System.Threading;
     using WixToolset.Data;
@@ -11,12 +12,12 @@ namespace WixToolset.Core
 
     internal class ResolveContext : IResolveContext
     {
-        internal ResolveContext(IWixToolsetServiceProvider serviceProvider)
+        internal ResolveContext(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         public IEnumerable<IBindPath> BindPaths { get; set; }
 
diff --git a/src/WixToolset.Core/Resolver.cs b/src/WixToolset.Core/Resolver.cs
index 4f12ae76..92c2a9c9 100644
--- a/src/WixToolset.Core/Resolver.cs
+++ b/src/WixToolset.Core/Resolver.cs
@@ -17,7 +17,7 @@ namespace WixToolset.Core
     /// </summary>
     internal class Resolver : IResolver
     {
-        internal Resolver(IWixToolsetServiceProvider serviceProvider)
+        internal Resolver(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
 
@@ -26,7 +26,7 @@ namespace WixToolset.Core
             this.VariableResolver = serviceProvider.GetService<IVariableResolver>();
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
diff --git a/src/WixToolset.Core/UnbindContext.cs b/src/WixToolset.Core/UnbindContext.cs
index acfb8f1e..c3817a08 100644
--- a/src/WixToolset.Core/UnbindContext.cs
+++ b/src/WixToolset.Core/UnbindContext.cs
@@ -2,17 +2,17 @@
 
 namespace WixToolset.Core
 {
+    using System;
     using WixToolset.Extensibility.Data;
-    using WixToolset.Extensibility.Services;
 
     internal class UnbindContext : IUnbindContext
     {
-        internal UnbindContext(IWixToolsetServiceProvider serviceProvider)
+        internal UnbindContext(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         public string ExportBasePath { get; set; }
 
diff --git a/src/WixToolset.Core/Unbinder.cs b/src/WixToolset.Core/Unbinder.cs
index f712ec3f..3ef77083 100644
--- a/src/WixToolset.Core/Unbinder.cs
+++ b/src/WixToolset.Core/Unbinder.cs
@@ -2,6 +2,7 @@
 
 namespace WixToolset.Core
 {
+    using System;
     using System.Collections.Generic;
     using System.IO;
     using WixToolset.Data;
@@ -13,7 +14,7 @@ namespace WixToolset.Core
     /// </summary>
     internal sealed class Unbinder : IUnbinder
     {
-        public Unbinder(IWixToolsetServiceProvider serviceProvider)
+        public Unbinder(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
 
@@ -21,7 +22,7 @@ namespace WixToolset.Core
             this.BackendFactories = extensionManager.GetServices<IBackendFactory>();
         }
 
-        public IWixToolsetServiceProvider ServiceProvider { get; }
+        public IServiceProvider ServiceProvider { get; }
 
         public IEnumerable<IBackendFactory> BackendFactories { get; }
 
diff --git a/src/WixToolset.Core/VariableResolver.cs b/src/WixToolset.Core/VariableResolver.cs
index 140e7def..437cabb7 100644
--- a/src/WixToolset.Core/VariableResolver.cs
+++ b/src/WixToolset.Core/VariableResolver.cs
@@ -21,7 +21,7 @@ namespace WixToolset.Core
         /// <summary>
         /// Instantiate a new VariableResolver.
         /// </summary>
-        internal VariableResolver(IWixToolsetServiceProvider serviceProvider)
+        internal VariableResolver(IServiceProvider serviceProvider)
         {
             this.ServiceProvider = serviceProvider;
             this.Messaging = serviceProvider.GetService<IMessaging>();
@@ -31,7 +31,7 @@ namespace WixToolset.Core
             this.localizedControls = new Dictionary<string, LocalizedControl>();
         }
 
-        private IWixToolsetServiceProvider ServiceProvider { get; }
+        private IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
diff --git a/src/WixToolset.Core/WixToolsetServiceProvider.cs b/src/WixToolset.Core/WixToolsetServiceProvider.cs
index 87a6f76b..5d700ba0 100644
--- a/src/WixToolset.Core/WixToolsetServiceProvider.cs
+++ b/src/WixToolset.Core/WixToolsetServiceProvider.cs
@@ -73,14 +73,14 @@ namespace WixToolset.Core
 
         private Dictionary<Type, object> Singletons { get; }
 
-        public bool TryGetService(Type serviceType, out object service)
+        public object GetService(Type serviceType)
         {
             if (serviceType == null)
             {
                 throw new ArgumentNullException(nameof(serviceType));
             }
 
-            if (!this.Singletons.TryGetValue(serviceType, out service))
+            if (!this.Singletons.TryGetValue(serviceType, out var service))
             {
                 if (this.CreationFunctions.TryGetValue(serviceType, out var creationFunction))
                 {
@@ -95,24 +95,7 @@ namespace WixToolset.Core
                 }
             }
 
-            return service != null;
-        }
-
-        public bool TryGetService<T>(out T service) where T : class
-        {
-            var success = this.TryGetService(typeof(T), out var untypedService);
-            service = (T)untypedService;
-            return success;
-        }
-
-        public object GetService(Type serviceType)
-        {
-            return this.TryGetService(serviceType, out var service) ? service : throw new ArgumentException($"Unknown service type: {serviceType.Name}", nameof(serviceType));
-        }
-
-        public T GetService<T>() where T : class
-        {
-            return (T)this.GetService(typeof(T));
+            return service;
         }
 
         public void AddService(Type serviceType, Func<IWixToolsetCoreServiceProvider, Dictionary<Type, object>, object> creationFunction)
diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs
index 5c37c25b..b33b8891 100644
--- a/src/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs
@@ -8,6 +8,7 @@ namespace WixToolsetTest.CoreIntegration
     using WixToolset.Core;
     using WixToolset.Core.TestPackage;
     using WixToolset.Data;
+    using WixToolset.Extensibility.Services;
     using Xunit;
 
     public class BundleExtractionFixture
diff --git a/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs b/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs
index 89057991..ae8a1bcc 100644
--- a/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs
@@ -10,6 +10,7 @@ namespace WixToolsetTest.CoreIntegration
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Data;
+    using WixToolset.Extensibility.Services;
     using Xunit;
 
     public class PreprocessorFixture