From ed5fd9d8258a5c752cd37fe7702f3a0dc37052f7 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 26 Dec 2017 15:12:34 -0800
Subject: Move copy/move file operations to ILayoutExtension plus other cleanup

---
 src/WixToolset.Extensibility/BaseLayoutExtension.cs        | 10 ++++++++++
 src/WixToolset.Extensibility/IFileSystemExtension.cs       |  4 ----
 src/WixToolset.Extensibility/ILayoutContext.cs             |  2 --
 src/WixToolset.Extensibility/ILayoutExtension.cs           |  4 ++++
 src/WixToolset.Extensibility/IPreprocessContext.cs         |  4 ++--
 src/WixToolset.Extensibility/ServiceProviderExtensions.cs  | 14 ++++++++++++++
 .../Services/ServiceProviderExtensions.cs                  | 14 --------------
 7 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 src/WixToolset.Extensibility/ServiceProviderExtensions.cs
 delete mode 100644 src/WixToolset.Extensibility/Services/ServiceProviderExtensions.cs

(limited to 'src')

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/ServiceProviderExtensions.cs b/src/WixToolset.Extensibility/ServiceProviderExtensions.cs
new file mode 100644
index 00000000..408d1523
--- /dev/null
+++ b/src/WixToolset.Extensibility/ServiceProviderExtensions.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
+{
+    using System;
+
+    public static class ServiceProviderExtensions
+    {
+        public static T GetService<T>(this IServiceProvider serviceProvider) where T : class
+        {
+            return (T)serviceProvider.GetService(typeof(T));
+        }
+    }
+}
diff --git a/src/WixToolset.Extensibility/Services/ServiceProviderExtensions.cs b/src/WixToolset.Extensibility/Services/ServiceProviderExtensions.cs
deleted file mode 100644
index f4a5e8c3..00000000
--- a/src/WixToolset.Extensibility/Services/ServiceProviderExtensions.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.Extensibility.Services
-{
-    using System;
-
-    public static class ServiceProviderExtensions
-    {
-        public static T GetService<T>(this IServiceProvider serviceProvider) where T : class
-        {
-            return (T)serviceProvider.GetService(typeof(T));
-        }
-    }
-}
-- 
cgit v1.2.3-55-g6feb