Move copy/move file operations to ILayoutExtension plus other cleanup

6 files changed, 17 insertions, 9 deletions

diff --git a/src/WixToolset.Extensibility/BaseLayoutExtension.cs b/src/WixToolset.Extensibility/BaseLayoutExtension.cs
index 6dfe7f2c..624d01fc 100644
--- a/src/WixToolset.Extensibility/BaseLayoutExtension.cs
+++ b/src/WixToolset.Extensibility/BaseLayoutExtension.cs
@@ -20,6 +20,16 @@ namespace WixToolset.Extensibility
             this.Context = context;
         }
 
+        public bool CopyFile(string source, string destination)
+        {
+            return false;
+        }
+
+        public bool MoveFile(string source, string destination)
+        {
+            return false;
+        }
+
         /// <summary>
         /// Called at the end of ayout.
         /// </summary>
diff --git a/src/WixToolset.Extensibility/IFileSystemExtension.cs b/src/WixToolset.Extensibility/IFileSystemExtension.cs
index 37b8e24a..96c8a748 100644
--- a/src/WixToolset.Extensibility/IFileSystemExtension.cs
+++ b/src/WixToolset.Extensibility/IFileSystemExtension.cs
@@ -10,9 +10,5 @@ namespace WixToolset.Extensibility
         void Initialize(IFileSystemContext context);
 
         bool? CompareFiles(string targetFile, string updatedFile);
-
-        bool CopyFile(string source, string destination, bool overwrite);
-
-        bool MoveFile(string source, string destination, bool overwrite);
     }
 }
diff --git a/src/WixToolset.Extensibility/ILayoutContext.cs b/src/WixToolset.Extensibility/ILayoutContext.cs
index 5b4f014d..9ec559f9 100644
--- a/src/WixToolset.Extensibility/ILayoutContext.cs
+++ b/src/WixToolset.Extensibility/ILayoutContext.cs
@@ -15,8 +15,6 @@ namespace WixToolset.Extensibility
 
         IEnumerable<ILayoutExtension> Extensions { get; set; }
 
-        IEnumerable<IFileSystemExtension> FileSystemExtensions { get; set; }
-
         IEnumerable<string> ContentFilePaths { get; set; }
 
         IEnumerable<FileTransfer> FileTransfers { get; set; }
diff --git a/src/WixToolset.Extensibility/ILayoutExtension.cs b/src/WixToolset.Extensibility/ILayoutExtension.cs
index 525c5053..1cf4871f 100644
--- a/src/WixToolset.Extensibility/ILayoutExtension.cs
+++ b/src/WixToolset.Extensibility/ILayoutExtension.cs
@@ -12,6 +12,10 @@ namespace WixToolset.Extensibility
         /// </summary>
         void PreLayout(ILayoutContext context);
 
+        bool CopyFile(string source, string destination);
+
+        bool MoveFile(string source, string destination);
+
         /// <summary>
         /// Called after all layout occurs.
         /// </summary>
diff --git a/src/WixToolset.Extensibility/IPreprocessContext.cs b/src/WixToolset.Extensibility/IPreprocessContext.cs
index 2e288d59..fcf698c1 100644
--- a/src/WixToolset.Extensibility/IPreprocessContext.cs
+++ b/src/WixToolset.Extensibility/IPreprocessContext.cs
@@ -15,14 +15,14 @@ namespace WixToolset.Extensibility
 
         IEnumerable<IPreprocessorExtension> Extensions { get; set; }
 
+        IList<string> IncludeSearchPaths { get; set; }
+
         /// <summary>
         /// Gets the platform which the compiler will use when defaulting 64-bit attributes and elements.
         /// </summary>
         /// <value>The platform which the compiler will use when defaulting 64-bit attributes and elements.</value>
         Platform Platform { get; set; }
 
-        IList<string> IncludeSearchPaths { get; set; }
-
         string SourceFile { get; set; }
 
         IDictionary<string, string> Variables { get; set; }
diff --git a/src/WixToolset.Extensibility/Services/ServiceProviderExtensions.cs b/src/WixToolset.Extensibility/ServiceProviderExtensions.cs
index f4a5e8c3..408d1523 100644
--- a/src/WixToolset.Extensibility/Services/ServiceProviderExtensions.cs
+++ b/src/WixToolset.Extensibility/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.Services
+namespace WixToolset.Extensibility
 {
     using System;