1 files changed, 55 insertions, 396 deletions

diff --git a/src/WixToolset.Core/Binder.cs b/src/WixToolset.Core/Binder.cs
index 2369b600..9db27fec 100644
--- a/src/WixToolset.Core/Binder.cs
+++ b/src/WixToolset.Core/Binder.cs
@@ -3,14 +3,11 @@
 namespace WixToolset.Core
 {
     using System;
-    using System.Collections;
     using System.Collections.Generic;
     using System.Diagnostics;
-    using System.Globalization;
     using System.IO;
     using System.Linq;
     using System.Reflection;
-    using WixToolset.Bind;
     using WixToolset.Core.Bind;
     using WixToolset.Data;
     using WixToolset.Data.Bind;
@@ -148,130 +145,72 @@ namespace WixToolset.Core
         /// <value>The Wix variable resolver.</value>
         internal WixVariableResolver WixVariableResolver { get; set; }
 
-        /// <summary>
-        /// Add a binder extension.
-        /// </summary>
-        /// <param name="extension">New extension.</param>
-        //public void AddExtension(IBinderExtension extension)
-        //{
-        //    this.extensions.Add(extension);
-        //}
-
-        /// <summary>
-        /// Add a file manager extension.
-        /// </summary>
-        /// <param name="extension">New file manager.</param>
-        //public void AddExtension(IBinderFileManager extension)
-        //{
-        //    this.fileManagers.Add(extension);
-        //}
-
-        public bool Bind(IBindContext context)
+        public BindResult Bind(IBindContext context)
         {
             this.Context = context;
 
-            //if (!String.IsNullOrEmpty(this.Context.FileManagerCore.CabCachePath))
-            //{
-            //    Directory.CreateDirectory(this.Context.FileManagerCore.CabCachePath);
-            //}
-
-            //this.core = new BinderCore();
-            //this.core.FileManagerCore = this.Context.FileManagerCore;
-
             this.WriteBuildInfoTable(this.Context.IntermediateRepresentation, this.Context.OutputPath);
 
-            // Prebind.
-            //
-            this.Context.Extensions = this.Context.ExtensionManager.Create<IBinderExtension>();
-
-            foreach (IBinderExtension extension in this.Context.Extensions)
-            {
-                extension.PreBind(this.Context);
-            }
-
-            // Resolve.
-            //
-            var resolveResult = this.Resolve();
-
-            this.Context.DelayedFields = resolveResult.DelayedFields;
-
-            this.Context.ExpectedEmbeddedFiles = resolveResult.ExpectedEmbeddedFiles;
-
-            // Backend.
-            //
             var bindResult = this.BackendBind();
-
-            if (bindResult != null)
-            {
-                // Postbind.
-                //
-                foreach (IBinderExtension extension in this.Context.Extensions)
-                {
-                    extension.PostBind(bindResult);
-                }
-
-                // Layout.
-                //
-                this.Layout(bindResult);
-            }
-
-            return this.Context.Messaging.EncounteredError;
+            return bindResult;
         }
 
-        private ResolveResult Resolve()
-        {
-            var buildingPatch = this.Context.IntermediateRepresentation.Sections.Any(s => s.Type == SectionType.Patch);
-
-            var filesWithEmbeddedFiles = new ExtractEmbeddedFiles();
-
-            IEnumerable<DelayedField> delayedFields;
-            {
-                var command = new ResolveFieldsCommand();
-                command.Messaging = this.Context.Messaging;
-                command.BuildingPatch = buildingPatch;
-                command.BindVariableResolver = this.Context.WixVariableResolver;
-                command.BindPaths = this.Context.BindPaths;
-                command.Extensions = this.Context.Extensions;
-                command.FilesWithEmbeddedFiles = filesWithEmbeddedFiles;
-                command.IntermediateFolder = this.Context.IntermediateFolder;
-                command.Intermediate = this.Context.IntermediateRepresentation;
-                command.SupportDelayedResolution = true;
-                command.Execute();
-
-                delayedFields = command.DelayedFields;
-            }
-
-#if REVISIT_FOR_PATCHING
-            if (this.Context.IntermediateRepresentation.SubStorages != null)
-            {
-                foreach (SubStorage transform in this.Context.IntermediateRepresentation.SubStorages)
-                {
-                    var command = new ResolveFieldsCommand();
-                    command.BuildingPatch = buildingPatch;
-                    command.BindVariableResolver = this.Context.WixVariableResolver;
-                    command.BindPaths = this.Context.BindPaths;
-                    command.Extensions = this.Context.Extensions;
-                    command.FilesWithEmbeddedFiles = filesWithEmbeddedFiles;
-                    command.IntermediateFolder = this.Context.IntermediateFolder;
-                    command.Intermediate = this.Context.IntermediateRepresentation;
-                    command.SupportDelayedResolution = false;
-                    command.Execute();
-                }
-            }
-#endif
-
-            var expectedEmbeddedFiles = filesWithEmbeddedFiles.GetExpectedEmbeddedFiles();
-
-            return new ResolveResult
-            {
-                ExpectedEmbeddedFiles = expectedEmbeddedFiles,
-                DelayedFields = delayedFields,
-            };
-        }
+////        private ResolveResult Resolve()
+////        {
+////            var buildingPatch = this.Context.IntermediateRepresentation.Sections.Any(s => s.Type == SectionType.Patch);
+
+////            var filesWithEmbeddedFiles = new ExtractEmbeddedFiles();
+
+////            IEnumerable<DelayedField> delayedFields;
+////            {
+////                var command = new ResolveFieldsCommand();
+////                command.Messaging = this.Context.Messaging;
+////                command.BuildingPatch = buildingPatch;
+////                command.BindVariableResolver = this.Context.WixVariableResolver;
+////                command.BindPaths = this.Context.BindPaths;
+////                command.Extensions = this.Context.Extensions;
+////                command.FilesWithEmbeddedFiles = filesWithEmbeddedFiles;
+////                command.IntermediateFolder = this.Context.IntermediateFolder;
+////                command.Intermediate = this.Context.IntermediateRepresentation;
+////                command.SupportDelayedResolution = true;
+////                command.Execute();
+
+////                delayedFields = command.DelayedFields;
+////            }
+
+////#if REVISIT_FOR_PATCHING
+////            if (this.Context.IntermediateRepresentation.SubStorages != null)
+////            {
+////                foreach (SubStorage transform in this.Context.IntermediateRepresentation.SubStorages)
+////                {
+////                    var command = new ResolveFieldsCommand();
+////                    command.BuildingPatch = buildingPatch;
+////                    command.BindVariableResolver = this.Context.WixVariableResolver;
+////                    command.BindPaths = this.Context.BindPaths;
+////                    command.Extensions = this.Context.Extensions;
+////                    command.FilesWithEmbeddedFiles = filesWithEmbeddedFiles;
+////                    command.IntermediateFolder = this.Context.IntermediateFolder;
+////                    command.Intermediate = this.Context.IntermediateRepresentation;
+////                    command.SupportDelayedResolution = false;
+////                    command.Execute();
+////                }
+////            }
+////#endif
+
+////            var expectedEmbeddedFiles = filesWithEmbeddedFiles.GetExpectedEmbeddedFiles();
+
+////            return new ResolveResult
+////            {
+////                ExpectedEmbeddedFiles = expectedEmbeddedFiles,
+////                DelayedFields = delayedFields,
+////            };
+////        }
 
         private BindResult BackendBind()
         {
-            var backendFactories = this.Context.ExtensionManager.Create<IBackendFactory>();
+            var extensionManager = this.Context.ServiceProvider.GetService<IExtensionManager>();
+
+            var backendFactories = extensionManager.Create<IBackendFactory>();
 
             var entrySection = this.Context.IntermediateRepresentation.Sections[0];
 
@@ -289,31 +228,6 @@ namespace WixToolset.Core
             return null;
         }
 
-        private void Layout(BindResult result)
-        {
-            try
-            {
-                this.LayoutMedia(result.FileTransfers);
-            }
-            finally
-            {
-                if (!String.IsNullOrEmpty(this.Context.ContentsFile) && result.ContentFilePaths != null)
-                {
-                    this.CreateContentsFile(this.Context.ContentsFile, result.ContentFilePaths);
-                }
-
-                if (!String.IsNullOrEmpty(this.Context.OutputsFile) && result.FileTransfers != null)
-                {
-                    this.CreateOutputsFile(this.Context.OutputsFile, result.FileTransfers, this.Context.OutputPdbPath);
-                }
-
-                if (!String.IsNullOrEmpty(this.Context.BuiltOutputsFile) && result.FileTransfers != null)
-                {
-                    this.CreateBuiltOutputsFile(this.Context.BuiltOutputsFile, result.FileTransfers, this.Context.OutputPdbPath);
-                }
-            }
-        }
-
         /// <summary>
         /// Binds an output.
         /// </summary>
@@ -429,35 +343,6 @@ namespace WixToolset.Core
 #endif
 
         /// <summary>
-        /// Does any housekeeping after Bind.
-        /// </summary>
-        /// <param name="tidy">Whether or not any actual tidying should be done.</param>
-        public void Cleanup(bool tidy)
-        {
-            if (tidy)
-            {
-                if (!this.DeleteTempFiles())
-                {
-                    this.Context.Messaging.Write(WarningMessages.FailedToDeleteTempDir(this.TempFilesLocation));
-                }
-            }
-            else
-            {
-                this.Context.Messaging.Write(VerboseMessages.BinderTempDirLocatedAt(this.TempFilesLocation));
-            }
-        }
-
-        /// <summary>
-        /// Cleans up the temp files used by the Binder.
-        /// </summary>
-        /// <returns>True if all files were deleted, false otherwise.</returns>
-        private bool DeleteTempFiles()
-        {
-            bool deleted = Common.DeleteTempFiles(this.TempFilesLocation, this.Context.Messaging);
-            return deleted;
-        }
-
-        /// <summary>
         /// Populates the WixBuildInfo table in an output.
         /// </summary>
         /// <param name="output">The output.</param>
@@ -585,231 +470,5 @@ namespace WixToolset.Core
             command.Execute();
         }
 #endif
-
-        /// <summary>
-        /// Final step in binding that transfers (moves/copies) all files generated into the appropriate
-        /// location in the source image
-        /// </summary>
-        /// <param name="fileTransfers">List of files to transfer.</param>
-        private void LayoutMedia(IEnumerable<FileTransfer> transfers)
-        {
-            if (null != transfers && transfers.Any())
-            {
-                this.Context.Messaging.Write(VerboseMessages.LayingOutMedia());
-
-                var command = new TransferFilesCommand(this.Context.Messaging, this.Context.BindPaths, this.Context.Extensions, transfers, this.Context.SuppressAclReset);
-                command.Execute();
-            }
-        }
-
-        /// <summary>
-        /// Get the source path of a directory.
-        /// </summary>
-        /// <param name="directories">All cached directories.</param>
-        /// <param name="componentIdGenSeeds">Hash table of Component GUID generation seeds indexed by directory id.</param>
-        /// <param name="directory">Directory identifier.</param>
-        /// <param name="canonicalize">Canonicalize the path for standard directories.</param>
-        /// <returns>Source path of a directory.</returns>
-        public static string GetDirectoryPath(Dictionary<string, ResolvedDirectory> directories, Dictionary<string, string> componentIdGenSeeds, string directory, bool canonicalize)
-        {
-            if (!directories.ContainsKey(directory))
-            {
-                throw new WixException(ErrorMessages.ExpectedDirectory(directory));
-            }
-
-            ResolvedDirectory resolvedDirectory = (ResolvedDirectory)directories[directory];
-
-            if (null == resolvedDirectory.Path)
-            {
-                if (null != componentIdGenSeeds && componentIdGenSeeds.ContainsKey(directory))
-                {
-                    resolvedDirectory.Path = (string)componentIdGenSeeds[directory];
-                }
-                else if (canonicalize && WindowsInstallerStandard.IsStandardDirectory(directory))
-                {
-                    // when canonicalization is on, standard directories are treated equally
-                    resolvedDirectory.Path = directory;
-                }
-                else
-                {
-                    string name = resolvedDirectory.Name;
-
-                    if (canonicalize && null != name)
-                    {
-                        name = name.ToLower(CultureInfo.InvariantCulture);
-                    }
-
-                    if (String.IsNullOrEmpty(resolvedDirectory.DirectoryParent))
-                    {
-                        resolvedDirectory.Path = name;
-                    }
-                    else
-                    {
-                        string parentPath = GetDirectoryPath(directories, componentIdGenSeeds, resolvedDirectory.DirectoryParent, canonicalize);
-
-                        if (null != resolvedDirectory.Name)
-                        {
-                            resolvedDirectory.Path = Path.Combine(parentPath, name);
-                        }
-                        else
-                        {
-                            resolvedDirectory.Path = parentPath;
-                        }
-                    }
-                }
-            }
-
-            return resolvedDirectory.Path;
-        }
-
-        /// <summary>
-        /// Gets the source path of a file.
-        /// </summary>
-        /// <param name="directories">All cached directories in <see cref="ResolvedDirectory"/>.</param>
-        /// <param name="directoryId">Parent directory identifier.</param>
-        /// <param name="fileName">File name (in long|source format).</param>
-        /// <param name="compressed">Specifies the package is compressed.</param>
-        /// <param name="useLongName">Specifies the package uses long file names.</param>
-        /// <returns>Source path of file relative to package directory.</returns>
-        public static string GetFileSourcePath(Dictionary<string, ResolvedDirectory> directories, string directoryId, string fileName, bool compressed, bool useLongName)
-        {
-            string fileSourcePath = Common.GetName(fileName, true, useLongName);
-
-            if (compressed)
-            {
-                // Use just the file name of the file since all uncompressed files must appear
-                // in the root of the image in a compressed package.
-            }
-            else
-            {
-                // Get the relative path of where we want the file to be layed out as specified
-                // in the Directory table.
-                string directoryPath = Binder.GetDirectoryPath(directories, null, directoryId, false);
-                fileSourcePath = Path.Combine(directoryPath, fileSourcePath);
-            }
-
-            // Strip off "SourceDir" if it's still on there.
-            if (fileSourcePath.StartsWith("SourceDir\\", StringComparison.Ordinal))
-            {
-                fileSourcePath = fileSourcePath.Substring(10);
-            }
-
-            return fileSourcePath;
-        }
-
-        /// <summary>
-        /// Writes the paths to the content files included in the package to a text file.
-        /// </summary>
-        /// <param name="path">Path to write file.</param>
-        /// <param name="contentFilePaths">Collection of paths to content files that will be written to file.</param>
-        private void CreateContentsFile(string path, IEnumerable<string> contentFilePaths)
-        {
-            string directory = Path.GetDirectoryName(path);
-            if (!Directory.Exists(directory))
-            {
-                Directory.CreateDirectory(directory);
-            }
-
-            using (StreamWriter contents = new StreamWriter(path, false))
-            {
-                foreach (string contentPath in contentFilePaths)
-                {
-                    contents.WriteLine(contentPath);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Writes the paths to the content files included in the bundle to a text file.
-        /// </summary>
-        /// <param name="path">Path to write file.</param>
-        /// <param name="payloads">Collection of payloads whose source will be written to file.</param>
-        private void CreateContentsFile(string path, IEnumerable<WixBundlePayloadTuple> payloads)
-        {
-            string directory = Path.GetDirectoryName(path);
-            if (!Directory.Exists(directory))
-            {
-                Directory.CreateDirectory(directory);
-            }
-
-            using (StreamWriter contents = new StreamWriter(path, false))
-            {
-                foreach (var payload in payloads)
-                {
-                    if (payload.ContentFile)
-                    {
-                        var fullPath = Path.GetFullPath(payload.SourceFile);
-                        contents.WriteLine(fullPath);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Writes the paths to the output files to a text file.
-        /// </summary>
-        /// <param name="path">Path to write file.</param>
-        /// <param name="fileTransfers">Collection of files that were transferred to the output directory.</param>
-        /// <param name="pdbPath">Optional path to created .wixpdb.</param>
-        private void CreateOutputsFile(string path, IEnumerable<FileTransfer> fileTransfers, string pdbPath)
-        {
-            string directory = Path.GetDirectoryName(path);
-            if (!Directory.Exists(directory))
-            {
-                Directory.CreateDirectory(directory);
-            }
-
-            using (StreamWriter outputs = new StreamWriter(path, false))
-            {
-                foreach (FileTransfer fileTransfer in fileTransfers)
-                {
-                    // Don't list files where the source is the same as the destination since
-                    // that might be the only place the file exists. The outputs file is often
-                    // used to delete stuff and losing the original source would be bad.
-                    if (!fileTransfer.Redundant)
-                    {
-                        outputs.WriteLine(fileTransfer.Destination);
-                    }
-                }
-
-                if (!String.IsNullOrEmpty(pdbPath))
-                {
-                    outputs.WriteLine(Path.GetFullPath(pdbPath));
-                }
-            }
-        }
-
-        /// <summary>
-        /// Writes the paths to the built output files to a text file.
-        /// </summary>
-        /// <param name="path">Path to write file.</param>
-        /// <param name="fileTransfers">Collection of files that were transferred to the output directory.</param>
-        /// <param name="pdbPath">Optional path to created .wixpdb.</param>
-        private void CreateBuiltOutputsFile(string path, IEnumerable<FileTransfer> fileTransfers, string pdbPath)
-        {
-            string directory = Path.GetDirectoryName(path);
-            if (!Directory.Exists(directory))
-            {
-                Directory.CreateDirectory(directory);
-            }
-
-            using (StreamWriter outputs = new StreamWriter(path, false))
-            {
-                foreach (FileTransfer fileTransfer in fileTransfers)
-                {
-                    // Only write the built file transfers. Also, skip redundant
-                    // files for the same reason spelled out in this.CreateOutputsFile().
-                    if (fileTransfer.Built && !fileTransfer.Redundant)
-                    {
-                        outputs.WriteLine(fileTransfer.Destination);
-                    }
-                }
-
-                if (!String.IsNullOrEmpty(pdbPath))
-                {
-                    outputs.WriteLine(Path.GetFullPath(pdbPath));
-                }
-            }
-        }
     }
 }