7 files changed, 87 insertions, 116 deletions

diff --git a/src/WixToolset.Extensibility/BaseBinderExtension.cs b/src/WixToolset.Extensibility/BaseBinderExtension.cs
index 51d63694..d533b0cb 100644
--- a/src/WixToolset.Extensibility/BaseBinderExtension.cs
+++ b/src/WixToolset.Extensibility/BaseBinderExtension.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.Extensibility
 {
     using WixToolset.Extensibility.Data;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Base class for creating a resolver extension.
@@ -15,11 +16,25 @@ namespace WixToolset.Extensibility
         protected IBindContext Context { get; private set; }
 
         /// <summary>
+        /// Messaging for use by the extension.
+        /// </summary>
+        protected IMessaging Messaging { get; private set; }
+
+        /// <summary>
+        /// BackendHelper for use by the extension.
+        /// </summary>
+        protected IBackendHelper BackendHelper { get; private set; }
+
+        /// <summary>
         /// Called at the beginning of bind.
         /// </summary>
         public virtual void PreBind(IBindContext context)
         {
             this.Context = context;
+
+            this.Messaging = context.ServiceProvider.GetService<IMessaging>();
+
+            this.BackendHelper = context.ServiceProvider.GetService<IBackendHelper>();
         }
 
         /// <summary>
diff --git a/src/WixToolset.Extensibility/Data/BindResult.cs b/src/WixToolset.Extensibility/Data/BindResult.cs
index ec97154f..0ccaa08b 100644
--- a/src/WixToolset.Extensibility/Data/BindResult.cs
+++ b/src/WixToolset.Extensibility/Data/BindResult.cs
@@ -6,7 +6,7 @@ namespace WixToolset.Extensibility.Data
 
     public class BindResult
     {
-        public IEnumerable<FileTransfer> FileTransfers { get; set; }
+        public IEnumerable<IFileTransfer> FileTransfers { get; set; }
 
         public IEnumerable<string> ContentFilePaths { get; set; }
     }
diff --git a/src/WixToolset.Extensibility/Data/FileTransfer.cs b/src/WixToolset.Extensibility/Data/FileTransfer.cs
deleted file mode 100644
index 0356ac4c..00000000
--- a/src/WixToolset.Extensibility/Data/FileTransfer.cs
+++ /dev/null
@@ -1,114 +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.Extensibility.Data
-{
-    using System;
-    using System.IO;
-    using WixToolset.Data;
-
-    /// <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);
-            //transfer.Redundant = String.Equals(sourceFullPath, fileLayoutFullPath, StringComparison.OrdinalIgnoreCase);
-            //return true;
-            throw new NotImplementedException();
-        }
-
-        //private static string GetValidatedFullPath(SourceLineNumber sourceLineNumbers, string path)
-        //{
-        //    string result;
-
-        //    try
-        //    {
-        //        result = Path.GetFullPath(path);
-
-        //        var filename = Path.GetFileName(result);
-
-        //        foreach (var reservedName in Common.ReservedFileNames)
-        //        {
-        //            if (reservedName.Equals(filename, StringComparison.OrdinalIgnoreCase))
-        //            {
-        //                throw new WixException(ErrorMessages.InvalidFileName(sourceLineNumbers, path));
-        //            }
-        //        }
-        //    }
-        //    catch (ArgumentException)
-        //    {
-        //        throw new WixException(ErrorMessages.InvalidFileName(sourceLineNumbers, path));
-        //    }
-        //    catch (PathTooLongException)
-        //    {
-        //        throw new WixException(ErrorMessages.PathTooLong(sourceLineNumbers, path));
-        //    }
-
-        //    return result;
-        //}
-    }
-}
diff --git a/src/WixToolset.Extensibility/Data/FileTransferType.cs b/src/WixToolset.Extensibility/Data/FileTransferType.cs
new file mode 100644
index 00000000..b00a00c4
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/FileTransferType.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.Extensibility.Data
+{
+    public enum FileTransferType
+    {
+        /// <summary>
+        /// Transfer of a file built during this build.
+        /// </summary>
+        Built,
+
+        /// <summary>
+        /// Transfer of a file contained in the output.
+        /// </summary>
+        Content,
+    }
+}
diff --git a/src/WixToolset.Extensibility/Data/IFileTransfer.cs b/src/WixToolset.Extensibility/Data/IFileTransfer.cs
new file mode 100644
index 00000000..ca936219
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/IFileTransfer.cs
@@ -0,0 +1,30 @@
+// 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.Extensibility.Data
+{
+    using WixToolset.Data;
+
+    /// <summary>
+    /// Structure used for all file transfer information.
+    /// </summary>
+    public interface IFileTransfer
+    {
+        /// <summary>Destination path for file.</summary>
+        string Destination { get; set; }
+
+        /// <summary>Flag if file should be moved (optimal).</summary>
+        bool Move { get; set; }
+
+        /// <summary>Set during layout of media when the file transfer when the source and target resolve to the same path.</summary>
+        bool Redundant { get; set; }
+
+        /// <summary>Source path to file.</summary>
+        string Source { get; set; }
+
+        /// <summary>Optional source line numbers where this file transfer orginated.</summary>
+        SourceLineNumber SourceLineNumbers { get; set; }
+
+        /// <summary>Type of file this transfer is moving or copying.</summary>
+        FileTransferType Type { get; set; }
+    }
+}
diff --git a/src/WixToolset.Extensibility/Data/ILayoutContext.cs b/src/WixToolset.Extensibility/Data/ILayoutContext.cs
index c3555268..7011fcf6 100644
--- a/src/WixToolset.Extensibility/Data/ILayoutContext.cs
+++ b/src/WixToolset.Extensibility/Data/ILayoutContext.cs
@@ -13,7 +13,7 @@ namespace WixToolset.Extensibility.Data
 
         IEnumerable<string> ContentFilePaths { get; set; }
 
-        IEnumerable<FileTransfer> FileTransfers { get; set; }
+        IEnumerable<IFileTransfer> FileTransfers { get; set; }
 
         string ContentsFile { get; set; }
 
diff --git a/src/WixToolset.Extensibility/Services/IBackendHelper.cs b/src/WixToolset.Extensibility/Services/IBackendHelper.cs
new file mode 100644
index 00000000..83f57e35
--- /dev/null
+++ b/src/WixToolset.Extensibility/Services/IBackendHelper.cs
@@ -0,0 +1,23 @@
+// 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.Extensibility.Services
+{
+    using WixToolset.Data;
+    using WixToolset.Extensibility.Data;
+
+    /// <summary>
+    /// Interface provided to help backend extensions.
+    /// </summary>
+    public interface IBackendHelper
+    {
+        /// <summary>
+        /// Creates a file transfer and marks it redundant if the source and destination are identical.
+        /// </summary>
+        /// <param name="source">Source for the file transfer.</param>
+        /// <param name="destination">Destiation for the file transfer.</param>
+        /// <param name="move">Indicates whether to move or copy the source file.</param>
+        /// <param name="type">Type of file transfer to create.</param>
+        /// <param name="sourceLineNumbers">Optional source line numbers that requested the file transfer.</param>
+        IFileTransfer CreateFileTransfer(string source, string destination, bool move, FileTransferType type, SourceLineNumber sourceLineNumbers = null);
+    }
+}