Incorporate refactoring of WixToolset.Core assemblies

3 files changed, 157 insertions, 0 deletions

diff --git a/src/WixToolset.Data/Bind/BindResult.cs b/src/WixToolset.Data/Bind/BindResult.cs
new file mode 100644
index 00000000..917bebca
--- /dev/null
+++ b/src/WixToolset.Data/Bind/BindResult.cs
@@ -0,0 +1,19 @@
+// 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.Data.Bind
+{
+    using System.Collections.Generic;
+
+    public class BindResult
+    {
+        public BindResult(IEnumerable<FileTransfer> fileTransfers, IEnumerable<string> contentFilePaths)
+        {
+            this.FileTransfers = fileTransfers;
+            this.ContentFilePaths = contentFilePaths;
+        }
+
+        public IEnumerable<FileTransfer> FileTransfers { get; }
+
+        public IEnumerable<string> ContentFilePaths { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/WixToolset.Data/Bind/BindStage.cs b/src/WixToolset.Data/Bind/BindStage.cs
new file mode 100644
index 00000000..500ea288
--- /dev/null
+++ b/src/WixToolset.Data/Bind/BindStage.cs
@@ -0,0 +1,27 @@
+// 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.Data.Bind
+{
+    /// <summary>
+    /// Bind stage of a file.. The reason we need this is to change the ResolveFile behavior based on if
+    /// dynamic bindpath plugin is desirable. We cannot change the signature of ResolveFile since it might
+    /// break existing implementers which derived from BinderFileManager
+    /// </summary>
+    public enum BindStage
+    {
+        /// <summary>
+        /// Normal binding
+        /// </summary>
+        Normal,
+
+        /// <summary>
+        /// Bind the file path of the target build file
+        /// </summary>
+        Target,
+
+        /// <summary>
+        /// Bind the file path of the updated build file
+        /// </summary>
+        Updated,
+    }
+}
diff --git a/src/WixToolset.Data/Bind/FileTransfer.cs b/src/WixToolset.Data/Bind/FileTransfer.cs
new file mode 100644
index 00000000..178934e8
--- /dev/null
+++ b/src/WixToolset.Data/Bind/FileTransfer.cs
@@ -0,0 +1,111 @@
+// 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.Data.Bind
+{
+    using System;
+    using System.IO;
+
+    /// <summary>
+    /// Structure used for all file transfer information.
+    /// </summary>
+    public class FileTransfer
+    {
+        /// <summary>Source path to file.</summary>
+        public string Source { get; set; }
+
+        /// <summary>Destination path for file.</summary>
+        public string Destination { get; set; }
+
+        /// <summary>Flag if file should be moved (optimal).</summary>
+        public bool Move { get; set; }
+
+        /// <summary>Optional source line numbers where this file transfer orginated.</summary>
+        public SourceLineNumber SourceLineNumbers { get; set; }
+
+        /// <summary>Optional type of file this transfer is moving or copying.</summary>
+        public string Type { get; set; }
+
+        /// <summary>Indicates whether the file transer was a built by this build or copied from other some build.</summary>
+        public bool Built { get; set; }
+
+        /// <summary>Set during layout of media when the file transfer when the source and target resolve to the same path.</summary>
+        public bool Redundant { get; set; }
+
+        /// <summary>
+        /// Prefer the TryCreate() method to create FileTransfer objects.
+        /// </summary>
+        /// <param name="source">Source path to file.</param>
+        /// <param name="destination">Destination path for file.</param>
+        /// <param name="move">File if file should be moved (optimal).</param>
+        /// <param name="type">Optional type of file this transfer is transferring.</param>
+        /// <param name="sourceLineNumbers">Optional source line numbers wher this transfer originated.</param>
+        public FileTransfer(string source, string destination, bool move, string type = null, SourceLineNumber sourceLineNumbers = null)
+        {
+            this.Source = source;
+            this.Destination = destination;
+            this.Move = move;
+
+            this.Type = type;
+            this.SourceLineNumbers = sourceLineNumbers;
+        }
+
+        /// <summary>
+        /// Creates a file transfer if the source and destination are different.
+        /// </summary>
+        /// <param name="source">Source path to file.</param>
+        /// <param name="destination">Destination path for file.</param>
+        /// <param name="move">File if file should be moved (optimal).</param>
+        /// <param name="type">Optional type of file this transfer is transferring.</param>
+        /// <param name="sourceLineNumbers">Optional source line numbers where this transfer originated.</param>
+        /// <returns>true if the source and destination are the different, false if no file transfer is created.</returns>
+        public static bool TryCreate(string source, string destination, bool move, string type, SourceLineNumber sourceLineNumbers, out FileTransfer transfer)
+        {
+            string sourceFullPath = GetValidatedFullPath(sourceLineNumbers, source);
+
+            string fileLayoutFullPath = GetValidatedFullPath(sourceLineNumbers, destination);
+
+            // if the current source path (where we know that the file already exists) and the resolved
+            // path as dictated by the Directory table are not the same, then propagate the file.  The
+            // image that we create may have already been done by some other process other than the linker, so 
+            // there is no reason to copy the files to the resolved source if they are already there.
+            if (String.Equals(sourceFullPath, fileLayoutFullPath, StringComparison.OrdinalIgnoreCase))
+            {
+                transfer = null;
+                return false;
+            }
+
+            transfer = new FileTransfer(source, destination, move, type, sourceLineNumbers);
+            return true;
+        }
+
+        private static string GetValidatedFullPath(SourceLineNumber sourceLineNumbers, string path)
+        {
+            string result;
+
+            try
+            {
+                result = Path.GetFullPath(path);
+
+                string filename = Path.GetFileName(result);
+
+                foreach (string reservedName in Common.ReservedFileNames)
+                {
+                    if (reservedName.Equals(filename, StringComparison.OrdinalIgnoreCase))
+                    {
+                        throw new WixException(WixDataErrors.InvalidFileName(sourceLineNumbers, path));
+                    }
+                }
+            }
+            catch (System.ArgumentException)
+            {
+                throw new WixException(WixDataErrors.InvalidFileName(sourceLineNumbers, path));
+            }
+            catch (System.IO.PathTooLongException)
+            {
+                throw new WixException(WixDataErrors.PathTooLong(sourceLineNumbers, path));
+            }
+
+            return result;
+        }
+    }
+}