Move Windows Installer specific backend services to WindowsInstaller

1 files changed, 17 insertions, 0 deletions

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;
+        }
     }
 }