Reorganize data into Extensibility.Data namespace

50 files changed, 308 insertions, 79 deletions

diff --git a/src/WixToolset.Extensibility/BaseBinderExtension.cs b/src/WixToolset.Extensibility/BaseBinderExtension.cs
index e5e38793..51d63694 100644
--- a/src/WixToolset.Extensibility/BaseBinderExtension.cs
+++ b/src/WixToolset.Extensibility/BaseBinderExtension.cs
@@ -2,7 +2,7 @@
 
 namespace WixToolset.Extensibility
 {
-    using WixToolset.Data.Bind;
+    using WixToolset.Extensibility.Data;
 
     /// <summary>
     /// Base class for creating a resolver extension.
diff --git a/src/WixToolset.Extensibility/BaseCompilerExtension.cs b/src/WixToolset.Extensibility/BaseCompilerExtension.cs
index abe2f4a9..e1584bc3 100644
--- a/src/WixToolset.Extensibility/BaseCompilerExtension.cs
+++ b/src/WixToolset.Extensibility/BaseCompilerExtension.cs
@@ -5,6 +5,7 @@ namespace WixToolset.Extensibility
     using System.Collections.Generic;
     using System.Xml.Linq;
     using WixToolset.Data;
+    using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
 
     /// <summary>
@@ -40,7 +41,7 @@ namespace WixToolset.Extensibility
         {
             this.Context = context;
 
-            this.Messaging = context.Messaging;
+            this.Messaging = context.ServiceProvider.GetService<IMessaging>();
 
             this.ParseHelper = context.ServiceProvider.GetService<IParseHelper>();
         }
diff --git a/src/WixToolset.Extensibility/BaseLayoutExtension.cs b/src/WixToolset.Extensibility/BaseLayoutExtension.cs
index bc80d432..78ec8d0a 100644
--- a/src/WixToolset.Extensibility/BaseLayoutExtension.cs
+++ b/src/WixToolset.Extensibility/BaseLayoutExtension.cs
@@ -2,6 +2,9 @@
 
 namespace WixToolset.Extensibility
 {
+    using WixToolset.Extensibility.Data;
+    using WixToolset.Extensibility.Services;
+
     /// <summary>
     /// Base class for creating a resolver extension.
     /// </summary>
@@ -13,11 +16,18 @@ namespace WixToolset.Extensibility
         protected ILayoutContext Context { get; private set; }
 
         /// <summary>
+        /// Messaging for use by the extension.
+        /// </summary>
+        protected IMessaging Messaging { get; private set; }
+
+        /// <summary>
         /// Called at the beginning of layout.
         /// </summary>
         public virtual void PreLayout(ILayoutContext context)
         {
             this.Context = context;
+
+            this.Messaging = context.ServiceProvider.GetService<IMessaging>();
         }
 
         public virtual bool CopyFile(string source, string destination)
diff --git a/src/WixToolset.Extensibility/BasePreprocessorExtension.cs b/src/WixToolset.Extensibility/BasePreprocessorExtension.cs
index f5d89103..b7d29095 100644
--- a/src/WixToolset.Extensibility/BasePreprocessorExtension.cs
+++ b/src/WixToolset.Extensibility/BasePreprocessorExtension.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.Extensibility
 {
     using System.Xml.Linq;
+    using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
 
     /// <summary>
@@ -16,6 +17,11 @@ namespace WixToolset.Extensibility
         protected IPreprocessContext Context { get; private set; }
 
         /// <summary>
+        /// Messaging for use by the extension.
+        /// </summary>
+        protected IMessaging Messaging { get; private set; }
+
+        /// <summary>
         /// PreprocessHelper for use by the extension.
         /// </summary>
         protected IPreprocessHelper PreprocessHelper { get; private set; }
@@ -33,6 +39,8 @@ namespace WixToolset.Extensibility
         {
             this.Context = context;
 
+            this.Messaging = context.ServiceProvider.GetService<IMessaging>();
+
             this.PreprocessHelper = context.ServiceProvider.GetService<IPreprocessHelper>();
         }
 
diff --git a/src/WixToolset.Extensibility/BaseResolverExtension.cs b/src/WixToolset.Extensibility/BaseResolverExtension.cs
index 9498d126..16219e93 100644
--- a/src/WixToolset.Extensibility/BaseResolverExtension.cs
+++ b/src/WixToolset.Extensibility/BaseResolverExtension.cs
@@ -3,7 +3,8 @@
 namespace WixToolset.Extensibility
 {
     using WixToolset.Data;
-    using WixToolset.Data.Bind;
+    using WixToolset.Extensibility.Data;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Base class for creating a resolver extension.
@@ -16,11 +17,18 @@ namespace WixToolset.Extensibility
         protected IResolveContext Context { get; private set; }
 
         /// <summary>
+        /// Messaging for use by the extension.
+        /// </summary>
+        protected IMessaging Messaging { get; private set; }
+
+        /// <summary>
         /// Called at the beginning of the resolving variables and files.
         /// </summary>
         public virtual void PreResolve(IResolveContext context)
         {
             this.Context = context;
+
+            this.Messaging = context.ServiceProvider.GetService<IMessaging>();
         }
 
         public virtual string ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage)
diff --git a/src/WixToolset.Extensibility/BaseWindowsInstallerBackendExtension.cs b/src/WixToolset.Extensibility/BaseWindowsInstallerBackendExtension.cs
index 28f3f927..4393dfda 100644
--- a/src/WixToolset.Extensibility/BaseWindowsInstallerBackendExtension.cs
+++ b/src/WixToolset.Extensibility/BaseWindowsInstallerBackendExtension.cs
@@ -4,9 +4,9 @@ namespace WixToolset.Extensibility
 {
     using System.Collections.Generic;
     using WixToolset.Data;
-    using WixToolset.Data.Bind;
     using WixToolset.Data.Tuples;
     using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
 
     /// <summary>
@@ -20,6 +20,11 @@ namespace WixToolset.Extensibility
         protected IBindContext Context { get; private set; }
 
         /// <summary>
+        /// Messaging for use by the extension.
+        /// </summary>
+        protected IMessaging Messaging { get; private set; }
+
+        /// <summary>
         /// Backend helper for use by the extension.
         /// </summary>
         protected IWindowsInstallerBackendHelper BackendHelper { get; private set; }
@@ -33,6 +38,8 @@ namespace WixToolset.Extensibility
         {
             this.Context = context;
 
+            this.Messaging = context.ServiceProvider.GetService<IMessaging>();
+
             this.BackendHelper = context.ServiceProvider.GetService<IWindowsInstallerBackendHelper>();
         }
 
diff --git a/src/WixToolset.Extensibility/BindFileWithPath.cs b/src/WixToolset.Extensibility/Data/BindFileWithPath.cs
index f07873fc..d65ae1ba 100644
--- a/src/WixToolset.Extensibility/BindFileWithPath.cs
+++ b/src/WixToolset.Extensibility/Data/BindFileWithPath.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     /// <summary>
     /// Bind file with its path.
diff --git a/src/WixToolset.Extensibility/Data/BindPath.cs b/src/WixToolset.Extensibility/Data/BindPath.cs
new file mode 100644
index 00000000..3b0b73bb
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/BindPath.cs
@@ -0,0 +1,59 @@
+// 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;
+
+    /// <summary>
+    /// Bind path representation.
+    /// </summary>
+    public class BindPath
+    {
+        /// <summary>
+        /// Creates an unnamed bind path.
+        /// </summary>
+        /// <param name="path">Path for the bind path.</param>
+        public BindPath(string path) : this(String.Empty, path, BindStage.Normal)
+        {
+        }
+
+        /// <summary>
+        /// Creates a named bind path.
+        /// </summary>
+        /// <param name="name">Name of the bind path.</param>
+        /// <param name="path">Path for the bind path.</param>
+        /// <param name="stage">Stage for the bind path.</param>
+        public BindPath(string name, string path, BindStage stage = BindStage.Normal)
+        {
+            this.Name = name;
+            this.Path = path;
+            this.Stage = stage;
+        }
+
+        /// <summary>
+        /// Name of the bind path or String.Empty if the path is unnamed.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Path for the bind path.
+        /// </summary>
+        public string Path { get; set; }
+
+        /// <summary>
+        /// Stage for the bind path.
+        /// </summary>
+        public BindStage Stage { get; set; }
+
+        /// <summary>
+        /// Parses a normal bind path from its string representation
+        /// </summary>
+        /// <param name="bindPath">String representation of bind path that looks like: [name=]path</param>
+        /// <returns>Parsed normal bind path.</returns>
+        public static BindPath Parse(string bindPath)
+        {
+            string[] namedPath = bindPath.Split(new char[] { '=' }, 2);
+            return (1 == namedPath.Length) ? new BindPath(namedPath[0]) : new BindPath(namedPath[0], namedPath[1]);
+        }
+    }
+}
diff --git a/src/WixToolset.Extensibility/Data/BindResult.cs b/src/WixToolset.Extensibility/Data/BindResult.cs
new file mode 100644
index 00000000..ec97154f
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/BindResult.cs
@@ -0,0 +1,13 @@
+// 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.Collections.Generic;
+
+    public class BindResult
+    {
+        public IEnumerable<FileTransfer> FileTransfers { get; set; }
+
+        public IEnumerable<string> ContentFilePaths { get; set; }
+    }
+}
diff --git a/src/WixToolset.Extensibility/Data/BindStage.cs b/src/WixToolset.Extensibility/Data/BindStage.cs
new file mode 100644
index 00000000..559a5a5a
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/BindStage.cs
@@ -0,0 +1,22 @@
+// 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 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.Extensibility/CabinetBuildOption.cs b/src/WixToolset.Extensibility/Data/CabinetBuildOption.cs
index 6f63131c..f9938814 100644
--- a/src/WixToolset.Extensibility/CabinetBuildOption.cs
+++ b/src/WixToolset.Extensibility/Data/CabinetBuildOption.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     /// <summary>
     /// Options for building the cabinet.
diff --git a/src/WixToolset.Extensibility/ComponentKeyPath.cs b/src/WixToolset.Extensibility/Data/ComponentKeyPath.cs
index 15cbb02f..112f562c 100644
--- a/src/WixToolset.Extensibility/ComponentKeyPath.cs
+++ b/src/WixToolset.Extensibility/Data/ComponentKeyPath.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     public enum ComponentKeyPathType
     {
diff --git a/src/WixToolset.Extensibility/Data/ExtensionCommandLineSwitch.cs b/src/WixToolset.Extensibility/Data/ExtensionCommandLineSwitch.cs
new file mode 100644
index 00000000..d1d8f0c3
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/ExtensionCommandLineSwitch.cs
@@ -0,0 +1,14 @@
+// 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
+{
+    /// <summary>
+    /// A command line option.
+    /// </summary>
+    public struct ExtensionCommandLineSwitch
+    {
+        public string Switch { get; set; }
+
+        public string Description { get; set; }
+    }
+}
diff --git a/src/WixToolset.Extensibility/Data/FileTransfer.cs b/src/WixToolset.Extensibility/Data/FileTransfer.cs
new file mode 100644
index 00000000..0356ac4c
--- /dev/null
+++ b/src/WixToolset.Extensibility/Data/FileTransfer.cs
@@ -0,0 +1,114 @@
+// 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/IBindContext.cs b/src/WixToolset.Extensibility/Data/IBindContext.cs
index 59509ecf..355b1a53 100644
--- a/src/WixToolset.Extensibility/IBindContext.cs
+++ b/src/WixToolset.Extensibility/Data/IBindContext.cs
@@ -1,18 +1,15 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     using System;
     using System.Collections.Generic;
     using WixToolset.Data;
-    using WixToolset.Extensibility.Services;
 
     public interface IBindContext
     {
         IServiceProvider ServiceProvider { get; }
 
-        IMessaging Messaging { get; set; }
-
         int CabbingThreadCount { get; set; }
 
         string CabCachePath { get; set; }
diff --git a/src/WixToolset.Extensibility/Services/ICommandLineArguments.cs b/src/WixToolset.Extensibility/Data/ICommandLineArguments.cs
index eb1f8765..5729ff36 100644
--- a/src/WixToolset.Extensibility/Services/ICommandLineArguments.cs
+++ b/src/WixToolset.Extensibility/Data/ICommandLineArguments.cs
@@ -1,8 +1,8 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
-    using System.Collections.Generic;
+    using WixToolset.Extensibility.Services;
 
     public interface ICommandLineArguments
     {
diff --git a/src/WixToolset.Extensibility/Services/ICommandLineCommand.cs b/src/WixToolset.Extensibility/Data/ICommandLineCommand.cs
index f2333c55..1146d40a 100644
--- a/src/WixToolset.Extensibility/Services/ICommandLineCommand.cs
+++ b/src/WixToolset.Extensibility/Data/ICommandLineCommand.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     public interface ICommandLineCommand
     {
diff --git a/src/WixToolset.Extensibility/Services/ICommandLineContext.cs b/src/WixToolset.Extensibility/Data/ICommandLineContext.cs
index 84b9654f..1b2db4a4 100644
--- a/src/WixToolset.Extensibility/Services/ICommandLineContext.cs
+++ b/src/WixToolset.Extensibility/Data/ICommandLineContext.cs
@@ -1,15 +1,14 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     using System;
+    using WixToolset.Extensibility.Services;
 
     public interface ICommandLineContext
     {
         IServiceProvider ServiceProvider { get; }
 
-        IMessaging Messaging { get; set; }
-
         IExtensionManager ExtensionManager { get; set; }
 
         ICommandLineArguments Arguments { get; set; }
diff --git a/src/WixToolset.Extensibility/ICompileContext.cs b/src/WixToolset.Extensibility/Data/ICompileContext.cs
index fbe38d63..50ad10b9 100644
--- a/src/WixToolset.Extensibility/ICompileContext.cs
+++ b/src/WixToolset.Extensibility/Data/ICompileContext.cs
@@ -1,19 +1,16 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     using System;
     using System.Collections.Generic;
     using System.Xml.Linq;
     using WixToolset.Data;
-    using WixToolset.Extensibility.Services;
 
     public interface ICompileContext
     {
         IServiceProvider ServiceProvider { get; }
 
-        IMessaging Messaging { get; set; }
-
         string CompilationId { get; set; }
 
         IEnumerable<ICompilerExtension> Extensions { get; set; }
diff --git a/src/WixToolset.Extensibility/IDelayedField.cs b/src/WixToolset.Extensibility/Data/IDelayedField.cs
index e06dbe59..5c078762 100644
--- a/src/WixToolset.Extensibility/IDelayedField.cs
+++ b/src/WixToolset.Extensibility/Data/IDelayedField.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     using WixToolset.Data;
 
diff --git a/src/WixToolset.Extensibility/IExpectedExtractFile.cs b/src/WixToolset.Extensibility/Data/IExpectedExtractFile.cs
index 06e4f77f..edcf82e0 100644
--- a/src/WixToolset.Extensibility/IExpectedExtractFile.cs
+++ b/src/WixToolset.Extensibility/Data/IExpectedExtractFile.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     using System;
 
diff --git a/src/WixToolset.Extensibility/IFileSystemContext.cs b/src/WixToolset.Extensibility/Data/IFileSystemContext.cs
index 32783957..86fc106c 100644
--- a/src/WixToolset.Extensibility/IFileSystemContext.cs
+++ b/src/WixToolset.Extensibility/Data/IFileSystemContext.cs
@@ -1,17 +1,14 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     using System;
     using WixToolset.Data;
-    using WixToolset.Extensibility.Services;
 
     public interface IFileSystemContext
     {
         IServiceProvider ServiceProvider { get; }
 
-        IMessaging Messaging { get; set; }
-
         string CabCachePath { get; set; }
 
         string IntermediateFolder { get; set; }
diff --git a/src/WixToolset.Extensibility/IInscribeContext.cs b/src/WixToolset.Extensibility/Data/IInscribeContext.cs
index 7f741024..4f13ba10 100644
--- a/src/WixToolset.Extensibility/IInscribeContext.cs
+++ b/src/WixToolset.Extensibility/Data/IInscribeContext.cs
@@ -1,16 +1,13 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     using System;
-    using WixToolset.Extensibility.Services;
 
     public interface IInscribeContext
     {
         IServiceProvider ServiceProvider { get; }
 
-        IMessaging Messaging { get; set; }
-
         string InputFilePath { get; set; }
 
         string IntermediateFolder { get; set; }
diff --git a/src/WixToolset.Extensibility/ILayoutContext.cs b/src/WixToolset.Extensibility/Data/ILayoutContext.cs
index 9ec559f9..c3555268 100644
--- a/src/WixToolset.Extensibility/ILayoutContext.cs
+++ b/src/WixToolset.Extensibility/Data/ILayoutContext.cs
@@ -1,26 +1,20 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     using System;
     using System.Collections.Generic;
-    using WixToolset.Data.Bind;
-    using WixToolset.Extensibility.Services;
 
     public interface ILayoutContext
     {
         IServiceProvider ServiceProvider { get; }
 
-        IMessaging Messaging { get; set; }
-
         IEnumerable<ILayoutExtension> Extensions { get; set; }
 
         IEnumerable<string> ContentFilePaths { get; set; }
 
         IEnumerable<FileTransfer> FileTransfers { get; set; }
 
-        string OutputPdbPath { get; set; }
-
         string ContentsFile { get; set; }
 
         string OutputsFile { get; set; }
diff --git a/src/WixToolset.Extensibility/ILibraryContext.cs b/src/WixToolset.Extensibility/Data/ILibraryContext.cs
index 0c29a3dd..08b4ed26 100644
--- a/src/WixToolset.Extensibility/ILibraryContext.cs
+++ b/src/WixToolset.Extensibility/Data/ILibraryContext.cs
@@ -1,18 +1,15 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     using System;
     using System.Collections.Generic;
     using WixToolset.Data;
-    using WixToolset.Extensibility.Services;
 
     public interface ILibraryContext
     {
         IServiceProvider ServiceProvider { get; }
 
-        IMessaging Messaging { get; set; }
-
         bool BindFiles { get; set; }
 
         IEnumerable<BindPath> BindPaths { get; set; }
diff --git a/src/WixToolset.Extensibility/ILinkContext.cs b/src/WixToolset.Extensibility/Data/ILinkContext.cs
index 65eeb6f1..8c1d6f22 100644
--- a/src/WixToolset.Extensibility/ILinkContext.cs
+++ b/src/WixToolset.Extensibility/Data/ILinkContext.cs
@@ -1,18 +1,15 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     using System;
     using System.Collections.Generic;
     using WixToolset.Data;
-    using WixToolset.Extensibility.Services;
 
     public interface ILinkContext
     {
         IServiceProvider ServiceProvider { get; }
 
-        IMessaging Messaging { get; set; }
-
         IEnumerable<ILinkerExtension> Extensions { get; set; }
 
         IEnumerable<IExtensionData> ExtensionData { get; set; }
diff --git a/src/WixToolset.Extensibility/IPreprocessContext.cs b/src/WixToolset.Extensibility/Data/IPreprocessContext.cs
index fcf698c1..a923c4db 100644
--- a/src/WixToolset.Extensibility/IPreprocessContext.cs
+++ b/src/WixToolset.Extensibility/Data/IPreprocessContext.cs
@@ -1,18 +1,15 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     using System;
     using System.Collections.Generic;
     using WixToolset.Data;
-    using WixToolset.Extensibility.Services;
 
     public interface IPreprocessContext
     {
         IServiceProvider ServiceProvider { get; }
 
-        IMessaging Messaging { get; set; }
-
         IEnumerable<IPreprocessorExtension> Extensions { get; set; }
 
         IList<string> IncludeSearchPaths { get; set; }
diff --git a/src/WixToolset.Extensibility/IResolveContext.cs b/src/WixToolset.Extensibility/Data/IResolveContext.cs
index 26891d6b..0e12a534 100644
--- a/src/WixToolset.Extensibility/IResolveContext.cs
+++ b/src/WixToolset.Extensibility/Data/IResolveContext.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     using System;
     using System.Collections.Generic;
@@ -11,8 +11,6 @@ namespace WixToolset.Extensibility
     {
         IServiceProvider ServiceProvider { get; }
 
-        IMessaging Messaging { get; set; }
-
         IEnumerable<BindPath> BindPaths { get; set; }
 
         IEnumerable<IResolverExtension> Extensions { get; set; }
diff --git a/src/WixToolset.Extensibility/IUnbindContext.cs b/src/WixToolset.Extensibility/Data/IUnbindContext.cs
index beaa5491..84dc5167 100644
--- a/src/WixToolset.Extensibility/IUnbindContext.cs
+++ b/src/WixToolset.Extensibility/Data/IUnbindContext.cs
@@ -1,16 +1,13 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     using System;
-    using WixToolset.Extensibility.Services;
 
     public interface IUnbindContext
     {
         IServiceProvider ServiceProvider { get; }
 
-        IMessaging Messaging { get; set; }
-
         string ExportBasePath { get; set; }
 
         string InputFilePath { get; set; }
diff --git a/src/WixToolset.Extensibility/ResolveResult.cs b/src/WixToolset.Extensibility/Data/ResolveResult.cs
index 53f12fe9..cdc9cfcc 100644
--- a/src/WixToolset.Extensibility/ResolveResult.cs
+++ b/src/WixToolset.Extensibility/Data/ResolveResult.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     using System.Collections.Generic;
     using WixToolset.Data;
diff --git a/src/WixToolset.Extensibility/ResolvedCabinet.cs b/src/WixToolset.Extensibility/Data/ResolvedCabinet.cs
index e98d6d96..047b7448 100644
--- a/src/WixToolset.Extensibility/ResolvedCabinet.cs
+++ b/src/WixToolset.Extensibility/Data/ResolvedCabinet.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Extensibility.Data
 {
     /// <summary>
     /// Data returned from build file manager ResolveCabinet callback.
diff --git a/src/WixToolset.Extensibility/IBackend.cs b/src/WixToolset.Extensibility/IBackend.cs
index 385fd086..80f885c3 100644
--- a/src/WixToolset.Extensibility/IBackend.cs
+++ b/src/WixToolset.Extensibility/IBackend.cs
@@ -3,7 +3,7 @@
 namespace WixToolset.Extensibility
 {
     using WixToolset.Data;
-    using WixToolset.Data.Bind;
+    using WixToolset.Extensibility.Data;
 
     public interface IBackend
     {
diff --git a/src/WixToolset.Extensibility/IBackendFactory.cs b/src/WixToolset.Extensibility/IBackendFactory.cs
index 12704c0f..02f0809a 100644
--- a/src/WixToolset.Extensibility/IBackendFactory.cs
+++ b/src/WixToolset.Extensibility/IBackendFactory.cs
@@ -2,7 +2,7 @@
 
 namespace WixToolset.Extensibility
 {
-    using WixToolset.Extensibility.Services;
+    using WixToolset.Extensibility.Data;
 
     public interface IBackendFactory
     {
diff --git a/src/WixToolset.Extensibility/IBindExtension.cs b/src/WixToolset.Extensibility/IBindExtension.cs
index c9830a35..2dcf5eff 100644
--- a/src/WixToolset.Extensibility/IBindExtension.cs
+++ b/src/WixToolset.Extensibility/IBindExtension.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.Extensibility
 {
     using WixToolset.Data.Bind;
+    using WixToolset.Extensibility.Data;
 
     /// <summary>
     /// Interface all binder extensions implement.
diff --git a/src/WixToolset.Extensibility/IBurnBackendExtension.cs b/src/WixToolset.Extensibility/IBurnBackendExtension.cs
index c8b8e407..bcd0d5ee 100644
--- a/src/WixToolset.Extensibility/IBurnBackendExtension.cs
+++ b/src/WixToolset.Extensibility/IBurnBackendExtension.cs
@@ -4,7 +4,7 @@ namespace WixToolset.Extensibility
 {
     using WixToolset.Data;
     using WixToolset.Data.Bind;
-    using WixToolset.Extensibility.Services;
+    using WixToolset.Extensibility.Data;
 
     public interface IBurnBackendExtension
     {
diff --git a/src/WixToolset.Extensibility/ICompilerExtension.cs b/src/WixToolset.Extensibility/ICompilerExtension.cs
index 0aa5c9e2..b2dd6d04 100644
--- a/src/WixToolset.Extensibility/ICompilerExtension.cs
+++ b/src/WixToolset.Extensibility/ICompilerExtension.cs
@@ -5,6 +5,7 @@ namespace WixToolset.Extensibility
     using System.Collections.Generic;
     using System.Xml.Linq;
     using WixToolset.Data;
+    using WixToolset.Extensibility.Data;
 
     /// <summary>
     /// Interface all compiler extensions implement.
diff --git a/src/WixToolset.Extensibility/IDecompilerExtension.cs b/src/WixToolset.Extensibility/IDecompilerExtension.cs
index 1574f964..e2b80089 100644
--- a/src/WixToolset.Extensibility/IDecompilerExtension.cs
+++ b/src/WixToolset.Extensibility/IDecompilerExtension.cs
@@ -2,8 +2,6 @@
 
 namespace WixToolset.Extensibility
 {
-    using WixToolset.Data;
-
     /// <summary>
     /// Base class for creating a decompiler extension.
     /// </summary>
diff --git a/src/WixToolset.Extensibility/IExtensionCommandLine.cs b/src/WixToolset.Extensibility/IExtensionCommandLine.cs
index 831a1bc2..5c6f578d 100644
--- a/src/WixToolset.Extensibility/IExtensionCommandLine.cs
+++ b/src/WixToolset.Extensibility/IExtensionCommandLine.cs
@@ -3,19 +3,10 @@
 namespace WixToolset.Extensibility
 {
     using System.Collections.Generic;
+    using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
 
     /// <summary>
-    /// A command line option.
-    /// </summary>
-    public struct ExtensionCommandLineSwitch
-    {
-        public string Switch { get; set; }
-
-        public string Description { get; set; }
-    }
-
-    /// <summary>
     /// Interface extensions implement to be able to parse command-line options.
     /// </summary>
     public interface IExtensionCommandLine
diff --git a/src/WixToolset.Extensibility/IFileSystemExtension.cs b/src/WixToolset.Extensibility/IFileSystemExtension.cs
index 96c8a748..0a3e84b8 100644
--- a/src/WixToolset.Extensibility/IFileSystemExtension.cs
+++ b/src/WixToolset.Extensibility/IFileSystemExtension.cs
@@ -2,6 +2,8 @@
 
 namespace WixToolset.Extensibility
 {
+    using WixToolset.Extensibility.Data;
+
     /// <summary>
     /// Interface all file system extensions implement.
     /// </summary>
diff --git a/src/WixToolset.Extensibility/ILayoutExtension.cs b/src/WixToolset.Extensibility/ILayoutExtension.cs
index 1cf4871f..7bcee0a8 100644
--- a/src/WixToolset.Extensibility/ILayoutExtension.cs
+++ b/src/WixToolset.Extensibility/ILayoutExtension.cs
@@ -2,6 +2,8 @@
 
 namespace WixToolset.Extensibility
 {
+    using WixToolset.Extensibility.Data;
+
     /// <summary>
     /// Interface all layout extensions implement.
     /// </summary>
diff --git a/src/WixToolset.Extensibility/ILibrarianExtension.cs b/src/WixToolset.Extensibility/ILibrarianExtension.cs
index 381abf01..7319f8b9 100644
--- a/src/WixToolset.Extensibility/ILibrarianExtension.cs
+++ b/src/WixToolset.Extensibility/ILibrarianExtension.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.Extensibility
 {
     using WixToolset.Data;
+    using WixToolset.Extensibility.Data;
 
     public interface ILibrarianExtension
     {
diff --git a/src/WixToolset.Extensibility/ILinkerExtension.cs b/src/WixToolset.Extensibility/ILinkerExtension.cs
index cb82720a..febca1df 100644
--- a/src/WixToolset.Extensibility/ILinkerExtension.cs
+++ b/src/WixToolset.Extensibility/ILinkerExtension.cs
@@ -3,7 +3,7 @@
 namespace WixToolset.Extensibility
 {
     using WixToolset.Data;
-    using WixToolset.Extensibility.Services;
+    using WixToolset.Extensibility.Data;
 
     /// <summary>
     /// Interface all binder extensions implement.
diff --git a/src/WixToolset.Extensibility/IPreprocessorExtension.cs b/src/WixToolset.Extensibility/IPreprocessorExtension.cs
index 68f82693..7eb8584f 100644
--- a/src/WixToolset.Extensibility/IPreprocessorExtension.cs
+++ b/src/WixToolset.Extensibility/IPreprocessorExtension.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.Extensibility
 {
     using System.Xml.Linq;
+    using WixToolset.Extensibility.Data;
 
     /// <summary>
     /// Interface for extending the WiX toolset preprocessor.
diff --git a/src/WixToolset.Extensibility/IResolverExtension.cs b/src/WixToolset.Extensibility/IResolverExtension.cs
index b0478ff0..152ef64a 100644
--- a/src/WixToolset.Extensibility/IResolverExtension.cs
+++ b/src/WixToolset.Extensibility/IResolverExtension.cs
@@ -3,7 +3,7 @@
 namespace WixToolset.Extensibility
 {
     using WixToolset.Data;
-    using WixToolset.Data.Bind;
+    using WixToolset.Extensibility.Data;
 
     /// <summary>
     /// Interface all resolver extensions implement.
diff --git a/src/WixToolset.Extensibility/IWindowsInstallerBackendExtension.cs b/src/WixToolset.Extensibility/IWindowsInstallerBackendExtension.cs
index 5ea73995..bc251bb2 100644
--- a/src/WixToolset.Extensibility/IWindowsInstallerBackendExtension.cs
+++ b/src/WixToolset.Extensibility/IWindowsInstallerBackendExtension.cs
@@ -7,6 +7,7 @@ namespace WixToolset.Extensibility
     using WixToolset.Data.Bind;
     using WixToolset.Data.Tuples;
     using WixToolset.Data.WindowsInstaller;
+    using WixToolset.Extensibility.Data;
 
     /// <summary>
     /// Interface all binder extensions implement.
diff --git a/src/WixToolset.Extensibility/Services/ICommandLine.cs b/src/WixToolset.Extensibility/Services/ICommandLine.cs
index 9dd247ff..48f3620f 100644
--- a/src/WixToolset.Extensibility/Services/ICommandLine.cs
+++ b/src/WixToolset.Extensibility/Services/ICommandLine.cs
@@ -2,8 +2,14 @@
 
 namespace WixToolset.Extensibility.Services
 {
+    using WixToolset.Extensibility.Data;
+
     public interface ICommandLine
     {
-        ICommandLineCommand ParseStandardCommandLine(ICommandLineContext commandLineContext);
+        IExtensionManager ExtensionManager { get; set; }
+
+        ICommandLineArguments Arguments { get; set; }
+
+        ICommandLineCommand ParseStandardCommandLine();
     }
 }
diff --git a/src/WixToolset.Extensibility/Services/IParseHelper.cs b/src/WixToolset.Extensibility/Services/IParseHelper.cs
index 96e2c83c..49218d4f 100644
--- a/src/WixToolset.Extensibility/Services/IParseHelper.cs
+++ b/src/WixToolset.Extensibility/Services/IParseHelper.cs
@@ -6,6 +6,7 @@ namespace WixToolset.Extensibility.Services
     using System.Collections.Generic;
     using System.Xml.Linq;
     using WixToolset.Data;
+    using WixToolset.Extensibility.Data;
 
     /// <summary>
     /// Interface provided to help compiler extensions parse.
diff --git a/src/WixToolset.Extensibility/Services/IPreprocessHelper.cs b/src/WixToolset.Extensibility/Services/IPreprocessHelper.cs
index 01c55009..d55383db 100644
--- a/src/WixToolset.Extensibility/Services/IPreprocessHelper.cs
+++ b/src/WixToolset.Extensibility/Services/IPreprocessHelper.cs
@@ -3,6 +3,7 @@
 namespace WixToolset.Extensibility.Services
 {
     using System.Xml.Linq;
+    using WixToolset.Extensibility.Data;
 
     /// <summary>
     /// Interface provided to help preprocessor extensions.
diff --git a/src/WixToolset.Extensibility/ServiceProviderExtensions.cs b/src/WixToolset.Extensibility/Services/ServiceProviderExtensions.cs
index 408d1523..f4a5e8c3 100644
--- a/src/WixToolset.Extensibility/ServiceProviderExtensions.cs
+++ b/src/WixToolset.Extensibility/Services/ServiceProviderExtensions.cs
@@ -1,6 +1,6 @@
 // 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
+namespace WixToolset.Extensibility.Services
 {
     using System;
 
diff --git a/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj b/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj
index b1f758e5..31de1095 100644
--- a/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj
+++ b/src/WixToolset.Extensibility/WixToolset.Extensibility.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" />
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
   </ItemGroup>
 </Project>