Introduce WixToolsetServiceProvider

Using a service provider allows all of WixToolset.Core's internal
functionality to be abstracted behind interfaces in WixToolset.Extensibility.
The service provide can also control what interfaces are singletons.

1 files changed, 14 insertions, 4 deletions

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>