Support wixout and extract Resolve and Layout from Binder

6 files changed, 118 insertions, 145 deletions

diff --git a/src/WixToolset.Core/Bind/FileResolver.cs b/src/WixToolset.Core/Bind/FileResolver.cs
index 2142d261..a20d3f34 100644
--- a/src/WixToolset.Core/Bind/FileResolver.cs
+++ b/src/WixToolset.Core/Bind/FileResolver.cs
@@ -6,7 +6,6 @@ namespace WixToolset.Core.Bind
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
-    using System.Runtime.InteropServices;
     using WixToolset.Data;
     using WixToolset.Data.Bind;
     using WixToolset.Extensibility;
@@ -22,9 +21,9 @@ namespace WixToolset.Core.Bind
             this.RebaseUpdated = this.BindPaths[BindStage.Updated].Any();
         }
 
-        public FileResolver(IEnumerable<BindPath> bindPaths, IEnumerable<IBinderExtension> extensions) : this(bindPaths)
+        public FileResolver(IEnumerable<BindPath> bindPaths, IEnumerable<IResolverExtension> extensions) : this(bindPaths)
         {
-            this.BinderExtensions = extensions ?? Array.Empty<IBinderExtension>();
+            this.ResolverExtensions = extensions ?? Array.Empty<IResolverExtension>();
         }
 
         public FileResolver(IEnumerable<BindPath> bindPaths, IEnumerable<ILibrarianExtension> extensions) : this(bindPaths)
@@ -38,79 +37,15 @@ namespace WixToolset.Core.Bind
 
         public bool RebaseUpdated { get; }
 
-        private IEnumerable<IBinderExtension> BinderExtensions { get; }
+        private IEnumerable<IResolverExtension> ResolverExtensions { get; }
 
         private IEnumerable<ILibrarianExtension> LibrarianExtensions { get; }
 
-        /// <summary>
-        /// Copies a file.
-        /// </summary>
-        /// <param name="source">The file to copy.</param>
-        /// <param name="destination">The destination file.</param>
-        /// <param name="overwrite">true if the destination file can be overwritten; otherwise, false.</param>
-        public bool CopyFile(string source, string destination, bool overwrite)
-        {
-            foreach (var extension in this.BinderExtensions)
-            {
-                if (extension.CopyFile(source, destination, overwrite))
-                {
-                    return true;
-                }
-            }
-
-            if (overwrite && File.Exists(destination))
-            {
-                File.Delete(destination);
-            }
-
-            if (!CreateHardLink(destination, source, IntPtr.Zero))
-            {
-#if DEBUG
-                int er = Marshal.GetLastWin32Error();
-#endif
-
-                File.Copy(source, destination, overwrite);
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Moves a file.
-        /// </summary>
-        /// <param name="source">The file to move.</param>
-        /// <param name="destination">The destination file.</param>
-        public bool MoveFile(string source, string destination, bool overwrite)
-        {
-            foreach (var extension in this.BinderExtensions)
-            {
-                if (extension.MoveFile(source, destination, overwrite))
-                {
-                    return true;
-                }
-            }
-
-            if (overwrite && File.Exists(destination))
-            {
-                File.Delete(destination);
-            }
-
-            var directory = Path.GetDirectoryName(destination);
-            if (!String.IsNullOrEmpty(directory))
-            {
-                Directory.CreateDirectory(directory);
-            }
-
-            File.Move(source, destination);
-
-            return true;
-        }
-
-        public string Resolve(SourceLineNumber sourceLineNumbers, string table, string path)
+        public string Resolve(SourceLineNumber sourceLineNumbers, IntermediateTupleDefinition tupleDefinition, string source)
         {
             foreach (var extension in this.LibrarianExtensions)
             {
-                var resolved = extension.Resolve(sourceLineNumbers, table, path);
+                var resolved = extension.Resolve(sourceLineNumbers, tupleDefinition, source);
 
                 if (null != resolved)
                 {
@@ -118,7 +53,7 @@ namespace WixToolset.Core.Bind
                 }
             }
 
-            return this.ResolveUsingBindPaths(path, table, sourceLineNumbers, BindStage.Normal);
+            return this.ResolveUsingBindPaths(source, tupleDefinition, sourceLineNumbers, BindStage.Normal);
         }
 
         /// <summary>
@@ -129,11 +64,11 @@ namespace WixToolset.Core.Bind
         /// <param name="sourceLineNumbers">Optional source line of source file being resolved.</param>
         /// <param name="bindStage">The binding stage used to determine what collection of bind paths will be used</param>
         /// <returns>Should return a valid path for the stream to be imported.</returns>
-        public string ResolveFile(string source, string type, SourceLineNumber sourceLineNumbers, BindStage bindStage)
+        public string ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage)
         {
-            foreach (var extension in this.BinderExtensions)
+            foreach (var extension in this.ResolverExtensions)
             {
-                var resolved = extension.ResolveFile(source, type, sourceLineNumbers, bindStage);
+                var resolved = extension.ResolveFile(source, tupleDefinition, sourceLineNumbers, bindStage);
 
                 if (null != resolved)
                 {
@@ -141,10 +76,10 @@ namespace WixToolset.Core.Bind
                 }
             }
 
-            return this.ResolveUsingBindPaths(source, type, sourceLineNumbers, bindStage);
+            return this.ResolveUsingBindPaths(source, tupleDefinition, sourceLineNumbers, bindStage);
         }
 
-        private string ResolveUsingBindPaths(string source, string type, SourceLineNumber sourceLineNumbers, BindStage bindStage)
+        private string ResolveUsingBindPaths(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage)
         {
             string resolved = null;
 
@@ -206,7 +141,7 @@ namespace WixToolset.Core.Bind
 
             if (null == resolved)
             {
-                throw new WixFileNotFoundException(sourceLineNumbers, source, type);
+                throw new WixFileNotFoundException(sourceLineNumbers, source, tupleDefinition.Name);
             }
 
             // Didn't find the file.
@@ -224,8 +159,5 @@ namespace WixToolset.Core.Bind
                 throw new WixException(ErrorMessages.IllegalCharactersInPath(path));
             }
         }
-
-        [DllImport("Kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        private static extern bool CreateHardLink(string lpFileName, string lpExistingFileName, IntPtr lpSecurityAttributes);
     }
 }
diff --git a/src/WixToolset.Core/Bind/FileSystem.cs b/src/WixToolset.Core/Bind/FileSystem.cs
new file mode 100644
index 00000000..7d1b223e
--- /dev/null
+++ b/src/WixToolset.Core/Bind/FileSystem.cs
@@ -0,0 +1,87 @@
+// 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.Bind
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Runtime.InteropServices;
+    using WixToolset.Extensibility;
+
+    internal class FileSystem
+    {
+        public FileSystem(IEnumerable<IFileSystemExtension> extensions)
+        {
+            this.Extensions = extensions ?? Array.Empty<IFileSystemExtension>();
+        }
+
+        private IEnumerable<IFileSystemExtension> Extensions { get; }
+
+        /// <summary>
+        /// Copies a file.
+        /// </summary>
+        /// <param name="source">The file to copy.</param>
+        /// <param name="destination">The destination file.</param>
+        /// <param name="overwrite">true if the destination file can be overwritten; otherwise, false.</param>
+        public bool CopyFile(string source, string destination, bool overwrite)
+        {
+            foreach (var extension in this.Extensions)
+            {
+                if (extension.CopyFile(source, destination, overwrite))
+                {
+                    return true;
+                }
+            }
+
+            if (overwrite && File.Exists(destination))
+            {
+                File.Delete(destination);
+            }
+
+            if (!CreateHardLink(destination, source, IntPtr.Zero))
+            {
+#if DEBUG
+                int er = Marshal.GetLastWin32Error();
+#endif
+
+                File.Copy(source, destination, overwrite);
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Moves a file.
+        /// </summary>
+        /// <param name="source">The file to move.</param>
+        /// <param name="destination">The destination file.</param>
+        public bool MoveFile(string source, string destination, bool overwrite)
+        {
+            foreach (var extension in this.Extensions)
+            {
+                if (extension.MoveFile(source, destination, overwrite))
+                {
+                    return true;
+                }
+            }
+
+            if (overwrite && File.Exists(destination))
+            {
+                File.Delete(destination);
+            }
+
+            var directory = Path.GetDirectoryName(destination);
+            if (!String.IsNullOrEmpty(directory))
+            {
+                Directory.CreateDirectory(directory);
+            }
+
+            File.Move(source, destination);
+
+            return true;
+        }
+
+        [DllImport("Kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        private static extern bool CreateHardLink(string lpFileName, string lpExistingFileName, IntPtr lpSecurityAttributes);
+    }
+}
diff --git a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
index e8c90956..824eb9a5 100644
--- a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
+++ b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
@@ -22,7 +22,7 @@ namespace WixToolset.Core.Bind
 
         public IEnumerable<BindPath> BindPaths { private get; set; }
 
-        public IEnumerable<IBinderExtension> Extensions { private get; set; }
+        public IEnumerable<IResolverExtension> Extensions { private get; set; }
 
         public ExtractEmbeddedFiles FilesWithEmbeddedFiles { private get; set; }
 
@@ -52,7 +52,6 @@ namespace WixToolset.Core.Bind
                         }
 
                         var isDefault = true;
-                        var delayedResolve = false;
 
                         // Check to make sure we're in a scenario where we can handle variable resolution.
                         if (null != delayedFields)
@@ -63,16 +62,18 @@ namespace WixToolset.Core.Bind
                                 var original = field.AsString();
                                 if (!String.IsNullOrEmpty(original))
                                 {
-                                    var value = this.BindVariableResolver.ResolveVariables(row.SourceLineNumbers, original, false, out isDefault, out delayedResolve);
-                                    if (original != value)
+                                    var resolution = this.BindVariableResolver.ResolveVariables(row.SourceLineNumbers, original, false);
+                                    if (resolution.UpdatedValue)
                                     {
-                                        field.Set(value);
+                                        field.Set(resolution.Value);
                                     }
 
-                                    if (delayedResolve)
+                                    if (resolution.DelayedResolve)
                                     {
                                         delayedFields.Add(new DelayedField(row, field));
                                     }
+
+                                    isDefault = resolution.IsDefault;
                                 }
                             }
                         }
@@ -119,13 +120,13 @@ namespace WixToolset.Core.Bind
 #endif
 
                                         // resolve the path to the file
-                                        var value = fileResolver.ResolveFile(objectField.Path, row.Definition.Name, row.SourceLineNumbers, BindStage.Normal);
+                                        var value = fileResolver.ResolveFile(objectField.Path, row.Definition, row.SourceLineNumbers, BindStage.Normal);
                                         field.Set(value);
                                     }
                                     else if (!fileResolver.RebaseTarget && !fileResolver.RebaseUpdated) // Normal binding for Patch Scenario (normal patch, no re-basing logic)
                                     {
                                         // resolve the path to the file
-                                        var value = fileResolver.ResolveFile(objectField.Path, row.Definition.Name, row.SourceLineNumbers, BindStage.Normal);
+                                        var value = fileResolver.ResolveFile(objectField.Path, row.Definition, row.SourceLineNumbers, BindStage.Normal);
                                         field.Set(value);
                                     }
 #if REVISIT_FOR_PATCHING
diff --git a/src/WixToolset.Core/Bind/ResolveResult.cs b/src/WixToolset.Core/Bind/ResolveResult.cs
deleted file mode 100644
index 13f25054..00000000
--- a/src/WixToolset.Core/Bind/ResolveResult.cs
+++ /dev/null
@@ -1,14 +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.Bind
-{
-    using System.Collections.Generic;
-    using WixToolset.Extensibility;
-
-    public class ResolveResult
-    {
-        public IEnumerable<IExpectedExtractFile> ExpectedEmbeddedFiles { get; set; }
-
-        public IEnumerable<IDelayedField> DelayedFields { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/WixToolset.Core/Bind/ResolvedDirectory.cs b/src/WixToolset.Core/Bind/ResolvedDirectory.cs
deleted file mode 100644
index 9d07fc93..00000000
--- a/src/WixToolset.Core/Bind/ResolvedDirectory.cs
+++ /dev/null
@@ -1,31 +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.Bind
-{
-    /// <summary>
-    /// Structure used for resolved directory information.
-    /// </summary>
-    public struct ResolvedDirectory
-    {
-        /// <summary>
-        /// Constructor for ResolvedDirectory.
-        /// </summary>
-        /// <param name="directoryParent">Parent directory.</param>
-        /// <param name="name">The directory name.</param>
-        public ResolvedDirectory(string directoryParent, string name)
-        {
-            this.DirectoryParent = directoryParent;
-            this.Name = name;
-            this.Path = null;
-        }
-
-        /// <summary>The directory parent.</summary>
-        public string DirectoryParent { get; set; }
-
-        /// <summary>The name of this directory.</summary>
-        public string Name { get; set; }
-
-        /// <summary>The path of this directory.</summary>
-        public string Path { get; set; }
-    }
-}
diff --git a/src/WixToolset.Core/Bind/TransferFilesCommand.cs b/src/WixToolset.Core/Bind/TransferFilesCommand.cs
index 68d8b129..d4e143c3 100644
--- a/src/WixToolset.Core/Bind/TransferFilesCommand.cs
+++ b/src/WixToolset.Core/Bind/TransferFilesCommand.cs
@@ -13,15 +13,15 @@ namespace WixToolset.Core.Bind
 
     internal class TransferFilesCommand
     {
-        public TransferFilesCommand(IMessaging messaging, IEnumerable<BindPath> bindPaths, IEnumerable<IBinderExtension> extensions, IEnumerable<FileTransfer> fileTransfers, bool suppressAclReset)
+        public TransferFilesCommand(IMessaging messaging, IEnumerable<IFileSystemExtension> extensions, IEnumerable<FileTransfer> fileTransfers, bool suppressAclReset)
         {
-            this.FileResolver = new FileResolver(bindPaths, extensions);
+            this.FileSystem = new FileSystem(extensions);
             this.Messaging = messaging;
             this.FileTransfers = fileTransfers;
             this.SuppressAclReset = suppressAclReset;
         }
 
-        private FileResolver FileResolver { get; }
+        private FileSystem FileSystem { get; }
 
         private IMessaging Messaging { get; }
 
@@ -35,10 +35,8 @@ namespace WixToolset.Core.Bind
 
             foreach (var fileTransfer in this.FileTransfers)
             {
-                string fileSource = this.FileResolver.ResolveFile(fileTransfer.Source, fileTransfer.Type, fileTransfer.SourceLineNumbers, BindStage.Normal);
-
                 // If the source and destination are identical, then there's nothing to do here
-                if (0 == String.Compare(fileSource, fileTransfer.Destination, StringComparison.OrdinalIgnoreCase))
+                if (0 == String.Compare(fileTransfer.Source, fileTransfer.Destination, StringComparison.OrdinalIgnoreCase))
                 {
                     fileTransfer.Redundant = true;
                     continue;
@@ -51,13 +49,13 @@ namespace WixToolset.Core.Bind
                     {
                         if (fileTransfer.Move)
                         {
-                            this.Messaging.Write(VerboseMessages.MoveFile(fileSource, fileTransfer.Destination));
-                            this.TransferFile(true, fileSource, fileTransfer.Destination);
+                            this.Messaging.Write(VerboseMessages.MoveFile(fileTransfer.Source, fileTransfer.Destination));
+                            this.TransferFile(true, fileTransfer.Source, fileTransfer.Destination);
                         }
                         else
                         {
-                            this.Messaging.Write(VerboseMessages.CopyFile(fileSource, fileTransfer.Destination));
-                            this.TransferFile(false, fileSource, fileTransfer.Destination);
+                            this.Messaging.Write(VerboseMessages.CopyFile(fileTransfer.Source, fileTransfer.Destination));
+                            this.TransferFile(false, fileTransfer.Source, fileTransfer.Destination);
                         }
 
                         retry = false;
@@ -183,11 +181,11 @@ namespace WixToolset.Core.Bind
 
             if (move)
             {
-                complete = this.FileResolver.MoveFile(source, destination, true);
+                complete = this.FileSystem.MoveFile(source, destination, true);
             }
             else
             {
-                complete = this.FileResolver.CopyFile(source, destination, true);
+                complete = this.FileSystem.CopyFile(source, destination, true);
             }
 
             if (!complete)