Move Windows Installer specific backend services to WindowsInstaller

3 files changed, 18 insertions, 2 deletions

diff --git a/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs b/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs
index a923a8cc..a1df335c 100644
--- a/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs
+++ b/src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.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.Core.ExtensibilityServices
+namespace WixToolset.Core.WindowsInstaller.ExtensibilityServices
 {
     using System.Linq;
     using WixToolset.Data;
diff --git a/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs b/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs
index f3671332..15fbf679 100644
--- a/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs
+++ b/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs
@@ -2,16 +2,33 @@
 
 namespace WixToolset.Core.WindowsInstaller
 {
+    using System;
+    using System.Collections.Generic;
+    using WixToolset.Core.WindowsInstaller.ExtensibilityServices;
     using WixToolset.Extensibility.Services;
 
     public static class WixToolsetCoreServiceProviderExtensions
     {
         public static IWixToolsetCoreServiceProvider AddWindowsInstallerBackend(this IWixToolsetCoreServiceProvider coreProvider)
         {
+            AddServices(coreProvider);
+
             var extensionManager = coreProvider.GetService<IExtensionManager>();
             extensionManager.Add(typeof(WindowsInstallerExtensionFactory).Assembly);
 
             return coreProvider;
         }
+
+        private static void AddServices(IWixToolsetCoreServiceProvider coreProvider)
+        {
+            // Singletons.
+            coreProvider.AddService((provider, singletons) => AddSingleton<IWindowsInstallerBackendHelper>(singletons, new WindowsInstallerBackendHelper()));
+        }
+
+        private static T AddSingleton<T>(Dictionary<Type, object> singletons, T service) where T : class
+        {
+            singletons.Add(typeof(T), service);
+            return service;
+        }
     }
 }
diff --git a/src/WixToolset.Core/WixToolsetServiceProvider.cs b/src/WixToolset.Core/WixToolsetServiceProvider.cs
index 1d475d00..d7a6171a 100644
--- a/src/WixToolset.Core/WixToolsetServiceProvider.cs
+++ b/src/WixToolset.Core/WixToolsetServiceProvider.cs
@@ -25,7 +25,6 @@ namespace WixToolset.Core
             this.AddService((provider, singletons) => AddSingleton<IPreprocessHelper>(singletons, new PreprocessHelper(provider)));
             this.AddService((provider, singletons) => AddSingleton<IBackendHelper>(singletons, new BackendHelper(provider)));
             this.AddService((provider, singletons) => AddSingleton<IPathResolver>(singletons, new PathResolver()));
-            this.AddService((provider, singletons) => AddSingleton<IWindowsInstallerBackendHelper>(singletons, new WindowsInstallerBackendHelper()));
 
             // Transients.
             this.AddService<ICommandLineArguments>((provider, singletons) => new CommandLineArguments(provider));