Remove references to Core from backends.

#6340

6 files changed, 2 insertions, 134 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
index 0a543650..43afd718 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
@@ -8,7 +8,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System.IO;
     using System.Linq;
     using System.Runtime.InteropServices;
-    using WixToolset.Core.Bind;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateDeltaPatchesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateDeltaPatchesCommand.cs
index 640322e6..b587e6d9 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateDeltaPatchesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateDeltaPatchesCommand.cs
@@ -6,7 +6,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
-    using WixToolset.Core.Bind;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Data;
diff --git a/src/WixToolset.Core.WindowsInstaller/UnbindContext.cs b/src/WixToolset.Core.WindowsInstaller/UnbindContext.cs
deleted file mode 100644
index acfb8f1e..00000000
--- a/src/WixToolset.Core.WindowsInstaller/UnbindContext.cs
+++ /dev/null
@@ -1,29 +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
-{
-    using WixToolset.Extensibility.Data;
-    using WixToolset.Extensibility.Services;
-
-    internal class UnbindContext : IUnbindContext
-    {
-        internal UnbindContext(IWixToolsetServiceProvider serviceProvider)
-        {
-            this.ServiceProvider = serviceProvider;
-        }
-
-        public IWixToolsetServiceProvider ServiceProvider { get; }
-
-        public string ExportBasePath { get; set; }
-
-        public string InputFilePath { get; set; }
-
-        public string IntermediateFolder { get; set; }
-
-        public bool IsAdminImage { get; set; }
-
-        public bool SuppressExtractCabinets { get; set; }
-
-        public bool SuppressDemodularization { get; set; }
-    }
-}
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbinder.cs b/src/WixToolset.Core.WindowsInstaller/Unbinder.cs
deleted file mode 100644
index f712ec3f..00000000
--- a/src/WixToolset.Core.WindowsInstaller/Unbinder.cs
+++ /dev/null
@@ -1,98 +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
-{
-    using System.Collections.Generic;
-    using System.IO;
-    using WixToolset.Data;
-    using WixToolset.Extensibility;
-    using WixToolset.Extensibility.Services;
-
-    /// <summary>
-    /// Unbinder core of the WiX toolset.
-    /// </summary>
-    internal sealed class Unbinder : IUnbinder
-    {
-        public Unbinder(IWixToolsetServiceProvider serviceProvider)
-        {
-            this.ServiceProvider = serviceProvider;
-
-            var extensionManager = this.ServiceProvider.GetService<IExtensionManager>();
-            this.BackendFactories = extensionManager.GetServices<IBackendFactory>();
-        }
-
-        public IWixToolsetServiceProvider ServiceProvider { get; }
-
-        public IEnumerable<IBackendFactory> BackendFactories { get; }
-
-        /// <summary>
-        /// Gets or sets whether the input msi is an admin image.
-        /// </summary>
-        /// <value>Set to true if the input msi is part of an admin image.</value>
-        public bool IsAdminImage { get; set; }
-
-        /// <summary>
-        /// Gets or sets the option to suppress demodularizing values.
-        /// </summary>
-        /// <value>The option to suppress demodularizing values.</value>
-        public bool SuppressDemodularization { get; set; }
-
-        /// <summary>
-        /// Gets or sets the option to suppress extracting cabinets.
-        /// </summary>
-        /// <value>The option to suppress extracting cabinets.</value>
-        public bool SuppressExtractCabinets { get; set; }
-
-        /// <summary>
-        /// Gets or sets the temporary path for the Binder.  If left null, the binder
-        /// will use %TEMP% environment variable.
-        /// </summary>
-        /// <value>Path to temp files.</value>
-        public string TempFilesLocation => Path.GetTempPath();
-
-        /// <summary>
-        /// Unbind a Windows Installer file.
-        /// </summary>
-        /// <param name="file">The Windows Installer file.</param>
-        /// <param name="outputType">The type of output to create.</param>
-        /// <param name="exportBasePath">The path where files should be exported.</param>
-        /// <returns>The output representing the database.</returns>
-        public Intermediate Unbind(string file, OutputType outputType, string exportBasePath)
-        {
-            if (!File.Exists(file))
-            {
-                if (OutputType.Transform == outputType)
-                {
-                    throw new WixException(ErrorMessages.FileNotFound(null, file, "Transform"));
-                }
-                else
-                {
-                    throw new WixException(ErrorMessages.FileNotFound(null, file, "Database"));
-                }
-            }
-
-            // if we don't have the temporary files object yet, get one
-            Directory.CreateDirectory(this.TempFilesLocation); // ensure the base path is there
-
-            var context = new UnbindContext(this.ServiceProvider);
-            context.InputFilePath = file;
-            context.ExportBasePath = exportBasePath;
-            context.IntermediateFolder = this.TempFilesLocation;
-            context.IsAdminImage = this.IsAdminImage;
-            context.SuppressDemodularization = this.SuppressDemodularization;
-            context.SuppressExtractCabinets = this.SuppressExtractCabinets;
-
-            foreach (var factory in this.BackendFactories)
-            {
-                if (factory.TryCreateBackend(outputType.ToString(), file, out var backend))
-                {
-                    return backend.Unbind(context);
-                }
-            }
-
-            // TODO: Display message that could not find a unbinder for output type?
-
-            return null;
-        }
-    }
-}
diff --git a/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj b/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
index 900115ec..cd2c917c 100644
--- a/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
+++ b/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj
@@ -13,12 +13,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Data" Version="4.0.*" />
     <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs b/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs
index d9649dec..e686fa49 100644
--- a/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs
+++ b/src/WixToolset.Core.WindowsInstaller/WixToolsetCoreServiceProviderExtensions.cs
@@ -31,7 +31,6 @@ namespace WixToolset.Core.WindowsInstaller
         {
             // Singletons.
             coreProvider.AddService((provider, singletons) => AddSingleton<IWindowsInstallerBackendHelper>(singletons, new WindowsInstallerBackendHelper(provider)));
-            coreProvider.AddService<IUnbinder>((provider, singletons) => new Unbinder(provider));
         }
 
         private static T AddSingleton<T>(Dictionary<Type, object> singletons, T service) where T : class