From cd6f466549ba8e4b138da4332b0831ab45ca8a2f Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 13 Jun 2020 10:01:27 -0700
Subject: Implement simplified command and improved backend integration

---
 .../ValidatorExtension.cs                               |  2 +-
 .../WixToolsetCoreServiceProviderExtensions.cs          | 17 +++++++++++++++++
 .../WixToolsetStandardBackend.cs                        | 12 ------------
 3 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs
 delete mode 100644 src/WixToolset.Core.WindowsInstaller/WixToolsetStandardBackend.cs

(limited to 'src/WixToolset.Core.WindowsInstaller')

diff --git a/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs b/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs
index 97208ddb..5ce04147 100644
--- a/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs
+++ b/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs
@@ -63,7 +63,7 @@ namespace WixToolset.Extensibility
         {
             if (this.databaseFile != null)
             {
-                this.sourceLineNumbers = new SourceLineNumber(databaseFile);
+                this.sourceLineNumbers = new SourceLineNumber(this.databaseFile);
             }
         }
 
diff --git a/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs b/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs
new file mode 100644
index 00000000..f3671332
--- /dev/null
+++ b/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs
@@ -0,0 +1,17 @@
+// 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
+{
+    using WixToolset.Extensibility.Services;
+
+    public static class WixToolsetCoreServiceProviderExtensions
+    {
+        public static IWixToolsetCoreServiceProvider AddWindowsInstallerBackend(this IWixToolsetCoreServiceProvider coreProvider)
+        {
+            var extensionManager = coreProvider.GetService<IExtensionManager>();
+            extensionManager.Add(typeof(WindowsInstallerExtensionFactory).Assembly);
+
+            return coreProvider;
+        }
+    }
+}
diff --git a/src/WixToolset.Core.WindowsInstaller/WixToolsetStandardBackend.cs b/src/WixToolset.Core.WindowsInstaller/WixToolsetStandardBackend.cs
deleted file mode 100644
index 3751cb54..00000000
--- a/src/WixToolset.Core.WindowsInstaller/WixToolsetStandardBackend.cs
+++ /dev/null
@@ -1,12 +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.WindowsInstaller
-{
-    /// <summary>
-    /// Denotes this assembly contains a backend that is considered
-    /// a standard part of the WiX Toolset.
-    /// </summary>
-    public static class WixToolsetStandardBackend
-    {
-    }
-}
-- 
cgit v1.2.3-55-g6feb