Move copy/move file operations to ILayoutExtension plus other cleanup
Rob Mensching committed
Dec 26, 2017 at 15:12 UTC
ed5fd9d8258a5c752cd37fe7702f3a0dc37052f7
6 files changed
+17
-9
src/WixToolset.Extensibility/BaseLayoutExtension.cs
+10
@@ -20,6 +20,16 @@ namespace WixToolset.Extensibility
20
this.Context = context;
21
}
22
23
+ public bool CopyFile(string source, string destination)
24
+ {
25
+ return false;
26
+ }
27
+
28
+ public bool MoveFile(string source, string destination)
29
+ {
30
+ return false;
31
+ }
32
+
33
/// <summary>
34
/// Called at the end of ayout.
35
/// </summary>
src/WixToolset.Extensibility/IFileSystemExtension.cs
-4
@@ -10,9 +10,5 @@ namespace WixToolset.Extensibility
10
void Initialize(IFileSystemContext context);
11
12
bool? CompareFiles(string targetFile, string updatedFile);
13
-
14
- bool CopyFile(string source, string destination, bool overwrite);
15
-
16
- bool MoveFile(string source, string destination, bool overwrite);
13
}
14
}
src/WixToolset.Extensibility/ILayoutContext.cs
-2
@@ -15,8 +15,6 @@ namespace WixToolset.Extensibility
15
16
IEnumerable<ILayoutExtension> Extensions { get; set; }
17
18
- IEnumerable<IFileSystemExtension> FileSystemExtensions { get; set; }
19
-
18
IEnumerable<string> ContentFilePaths { get; set; }
19
20
IEnumerable<FileTransfer> FileTransfers { get; set; }
src/WixToolset.Extensibility/ILayoutExtension.cs
+4
@@ -12,6 +12,10 @@ namespace WixToolset.Extensibility
12
/// </summary>
13
void PreLayout(ILayoutContext context);
14
15
+ bool CopyFile(string source, string destination);
16
+
17
+ bool MoveFile(string source, string destination);
18
+
19
/// <summary>
20
/// Called after all layout occurs.
21
/// </summary>
src/WixToolset.Extensibility/IPreprocessContext.cs
+2
-2
@@ -15,14 +15,14 @@ namespace WixToolset.Extensibility
15
16
IEnumerable<IPreprocessorExtension> Extensions { get; set; }
17
18
+ IList<string> IncludeSearchPaths { get; set; }
19
+
20
/// <summary>
21
/// Gets the platform which the compiler will use when defaulting 64-bit attributes and elements.
22
/// </summary>
23
/// <value>The platform which the compiler will use when defaulting 64-bit attributes and elements.</value>
24
Platform Platform { get; set; }
25
24
- IList<string> IncludeSearchPaths { get; set; }
25
-
26
string SourceFile { get; set; }
27
28
IDictionary<string, string> Variables { get; set; }
src/WixToolset.Extensibility/ServiceProviderExtensions.cs
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// 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.
2
3
-namespace WixToolset.Extensibility.Services
3
+namespace WixToolset.Extensibility
4
{
5
using System;
6