Reorganize data into Extensibility.Data namespace
Rob Mensching committed
Jul 23, 2018 at 13:46 UTC
e130a7a296696e3a7b1229cf580de393b3f20cbd
50 files changed
+308
-79
src/WixToolset.Extensibility/BaseBinderExtension.cs
+1
-1
@@ -2,7 +2,7 @@
2
3
namespace WixToolset.Extensibility
4
{
5
- using WixToolset.Data.Bind;
5
+ using WixToolset.Extensibility.Data;
6
7
/// <summary>
8
/// Base class for creating a resolver extension.
src/WixToolset.Extensibility/BaseCompilerExtension.cs
+2
-1
@@ -5,6 +5,7 @@ namespace WixToolset.Extensibility
5
using System.Collections.Generic;
6
using System.Xml.Linq;
7
using WixToolset.Data;
8
+ using WixToolset.Extensibility.Data;
9
using WixToolset.Extensibility.Services;
10
11
/// <summary>
@@ -40,7 +41,7 @@ namespace WixToolset.Extensibility
41
{
42
this.Context = context;
43
43
- this.Messaging = context.Messaging;
44
+ this.Messaging = context.ServiceProvider.GetService<IMessaging>();
45
46
this.ParseHelper = context.ServiceProvider.GetService<IParseHelper>();
47
}
src/WixToolset.Extensibility/BaseLayoutExtension.cs
+10
@@ -2,6 +2,9 @@
2
3
namespace WixToolset.Extensibility
4
{
5
+ using WixToolset.Extensibility.Data;
6
+ using WixToolset.Extensibility.Services;
7
+
8
/// <summary>
9
/// Base class for creating a resolver extension.
10
/// </summary>
@@ -12,12 +15,19 @@ namespace WixToolset.Extensibility
15
/// </summary>
16
protected ILayoutContext Context { get; private set; }
17
18
+ /// <summary>
19
+ /// Messaging for use by the extension.
20
+ /// </summary>
21
+ protected IMessaging Messaging { get; private set; }
22
+
23
/// <summary>
24
/// Called at the beginning of layout.
25
/// </summary>
26
public virtual void PreLayout(ILayoutContext context)
27
{
28
this.Context = context;
29
+
30
+ this.Messaging = context.ServiceProvider.GetService<IMessaging>();
31
}
32
33
public virtual bool CopyFile(string source, string destination)
src/WixToolset.Extensibility/BasePreprocessorExtension.cs
+8
@@ -3,6 +3,7 @@
3
namespace WixToolset.Extensibility
4
{
5
using System.Xml.Linq;
6
+ using WixToolset.Extensibility.Data;
7
using WixToolset.Extensibility.Services;
8
9
/// <summary>
@@ -15,6 +16,11 @@ namespace WixToolset.Extensibility
16
/// </summary>
17
protected IPreprocessContext Context { get; private set; }
18
19
+ /// <summary>
20
+ /// Messaging for use by the extension.
21
+ /// </summary>
22
+ protected IMessaging Messaging { get; private set; }
23
+
24
/// <summary>
25
/// PreprocessHelper for use by the extension.
26
/// </summary>
@@ -33,6 +39,8 @@ namespace WixToolset.Extensibility
39
{
40
this.Context = context;
41
42
+ this.Messaging = context.ServiceProvider.GetService<IMessaging>();
43
+
44
this.PreprocessHelper = context.ServiceProvider.GetService<IPreprocessHelper>();
45
}
46
src/WixToolset.Extensibility/BaseResolverExtension.cs
+9
-1
@@ -3,7 +3,8 @@
3
namespace WixToolset.Extensibility
4
{
5
using WixToolset.Data;
6
- using WixToolset.Data.Bind;
6
+ using WixToolset.Extensibility.Data;
7
+ using WixToolset.Extensibility.Services;
8
9
/// <summary>
10
/// Base class for creating a resolver extension.
@@ -15,12 +16,19 @@ namespace WixToolset.Extensibility
16
/// </summary>
17
protected IResolveContext Context { get; private set; }
18
19
+ /// <summary>
20
+ /// Messaging for use by the extension.
21
+ /// </summary>
22
+ protected IMessaging Messaging { get; private set; }
23
+
24
/// <summary>
25
/// Called at the beginning of the resolving variables and files.
26
/// </summary>
27
public virtual void PreResolve(IResolveContext context)
28
{
29
this.Context = context;
30
+
31
+ this.Messaging = context.ServiceProvider.GetService<IMessaging>();
32
}
33
34
public virtual string ResolveFile(string source, IntermediateTupleDefinition tupleDefinition, SourceLineNumber sourceLineNumbers, BindStage bindStage)
src/WixToolset.Extensibility/BaseWindowsInstallerBackendExtension.cs
+8
-1
@@ -4,9 +4,9 @@ namespace WixToolset.Extensibility
4
{
5
using System.Collections.Generic;
6
using WixToolset.Data;
7
- using WixToolset.Data.Bind;
7
using WixToolset.Data.Tuples;
8
using WixToolset.Data.WindowsInstaller;
9
+ using WixToolset.Extensibility.Data;
10
using WixToolset.Extensibility.Services;
11
12
/// <summary>
@@ -19,6 +19,11 @@ namespace WixToolset.Extensibility
19
/// </summary>
20
protected IBindContext Context { get; private set; }
21
22
+ /// <summary>
23
+ /// Messaging for use by the extension.
24
+ /// </summary>
25
+ protected IMessaging Messaging { get; private set; }
26
+
27
/// <summary>
28
/// Backend helper for use by the extension.
29
/// </summary>
@@ -33,6 +38,8 @@ namespace WixToolset.Extensibility
38
{
39
this.Context = context;
40
41
+ this.Messaging = context.ServiceProvider.GetService<IMessaging>();
42
+
43
this.BackendHelper = context.ServiceProvider.GetService<IWindowsInstallerBackendHelper>();
44
}
45
src/WixToolset.Extensibility/Data/BindFileWithPath.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
3
+namespace WixToolset.Extensibility.Data
4
{
5
/// <summary>
6
/// Bind file with its path.
src/WixToolset.Extensibility/Data/BindPath.cs
new
+59
@@ -0,0 +1,59 @@
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.Data
4
+{
5
+ using System;
6
+
7
+ /// <summary>
8
+ /// Bind path representation.
9
+ /// </summary>
10
+ public class BindPath
11
+ {
12
+ /// <summary>
13
+ /// Creates an unnamed bind path.
14
+ /// </summary>
15
+ /// <param name="path">Path for the bind path.</param>
16
+ public BindPath(string path) : this(String.Empty, path, BindStage.Normal)
17
+ {
18
+ }
19
+
20
+ /// <summary>
21
+ /// Creates a named bind path.
22
+ /// </summary>
23
+ /// <param name="name">Name of the bind path.</param>
24
+ /// <param name="path">Path for the bind path.</param>
25
+ /// <param name="stage">Stage for the bind path.</param>
26
+ public BindPath(string name, string path, BindStage stage = BindStage.Normal)
27
+ {
28
+ this.Name = name;
29
+ this.Path = path;
30
+ this.Stage = stage;
31
+ }
32
+
33
+ /// <summary>
34
+ /// Name of the bind path or String.Empty if the path is unnamed.
35
+ /// </summary>
36
+ public string Name { get; set; }
37
+
38
+ /// <summary>
39
+ /// Path for the bind path.
40
+ /// </summary>
41
+ public string Path { get; set; }
42
+
43
+ /// <summary>
44
+ /// Stage for the bind path.
45
+ /// </summary>
46
+ public BindStage Stage { get; set; }
47
+
48
+ /// <summary>
49
+ /// Parses a normal bind path from its string representation
50
+ /// </summary>
51
+ /// <param name="bindPath">String representation of bind path that looks like: [name=]path</param>
52
+ /// <returns>Parsed normal bind path.</returns>
53
+ public static BindPath Parse(string bindPath)
54
+ {
55
+ string[] namedPath = bindPath.Split(new char[] { '=' }, 2);
56
+ return (1 == namedPath.Length) ? new BindPath(namedPath[0]) : new BindPath(namedPath[0], namedPath[1]);
57
+ }
58
+ }
59
+}
src/WixToolset.Extensibility/Data/BindResult.cs
new
+13
@@ -0,0 +1,13 @@
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.Data
4
+{
5
+ using System.Collections.Generic;
6
+
7
+ public class BindResult
8
+ {
9
+ public IEnumerable<FileTransfer> FileTransfers { get; set; }
10
+
11
+ public IEnumerable<string> ContentFilePaths { get; set; }
12
+ }
13
+}
src/WixToolset.Extensibility/Data/BindStage.cs
new
+22
@@ -0,0 +1,22 @@
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.Data
4
+{
5
+ public enum BindStage
6
+ {
7
+ /// <summary>
8
+ /// Normal binding
9
+ /// </summary>
10
+ Normal,
11
+
12
+ /// <summary>
13
+ /// Bind the file path of the target build file
14
+ /// </summary>
15
+ Target,
16
+
17
+ /// <summary>
18
+ /// Bind the file path of the updated build file
19
+ /// </summary>
20
+ Updated,
21
+ }
22
+}
src/WixToolset.Extensibility/Data/CabinetBuildOption.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
3
+namespace WixToolset.Extensibility.Data
4
{
5
/// <summary>
6
/// Options for building the cabinet.
src/WixToolset.Extensibility/Data/ComponentKeyPath.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
3
+namespace WixToolset.Extensibility.Data
4
{
5
public enum ComponentKeyPathType
6
{
src/WixToolset.Extensibility/Data/ExtensionCommandLineSwitch.cs
new
+14
@@ -0,0 +1,14 @@
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.Data
4
+{
5
+ /// <summary>
6
+ /// A command line option.
7
+ /// </summary>
8
+ public struct ExtensionCommandLineSwitch
9
+ {
10
+ public string Switch { get; set; }
11
+
12
+ public string Description { get; set; }
13
+ }
14
+}
src/WixToolset.Extensibility/Data/FileTransfer.cs
new
+114
@@ -0,0 +1,114 @@
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.Data
4
+{
5
+ using System;
6
+ using System.IO;
7
+ using WixToolset.Data;
8
+
9
+ /// <summary>
10
+ /// Structure used for all file transfer information.
11
+ /// </summary>
12
+ public class FileTransfer
13
+ {
14
+ /// <summary>Source path to file.</summary>
15
+ public string Source { get; set; }
16
+
17
+ /// <summary>Destination path for file.</summary>
18
+ public string Destination { get; set; }
19
+
20
+ /// <summary>Flag if file should be moved (optimal).</summary>
21
+ public bool Move { get; set; }
22
+
23
+ /// <summary>Optional source line numbers where this file transfer orginated.</summary>
24
+ public SourceLineNumber SourceLineNumbers { get; set; }
25
+
26
+ /// <summary>Optional type of file this transfer is moving or copying.</summary>
27
+ public string Type { get; set; }
28
+
29
+ /// <summary>Indicates whether the file transer was a built by this build or copied from other some build.</summary>
30
+ public bool Built { get; set; }
31
+
32
+ /// <summary>Set during layout of media when the file transfer when the source and target resolve to the same path.</summary>
33
+ public bool Redundant { get; set; }
34
+
35
+ /// <summary>
36
+ /// Prefer the TryCreate() method to create FileTransfer objects.
37
+ /// </summary>
38
+ /// <param name="source">Source path to file.</param>
39
+ /// <param name="destination">Destination path for file.</param>
40
+ /// <param name="move">File if file should be moved (optimal).</param>
41
+ /// <param name="type">Optional type of file this transfer is transferring.</param>
42
+ /// <param name="sourceLineNumbers">Optional source line numbers wher this transfer originated.</param>
43
+ public FileTransfer(string source, string destination, bool move, string type = null, SourceLineNumber sourceLineNumbers = null)
44
+ {
45
+ this.Source = source;
46
+ this.Destination = destination;
47
+ this.Move = move;
48
+
49
+ this.Type = type;
50
+ this.SourceLineNumbers = sourceLineNumbers;
51
+ }
52
+
53
+ /// <summary>
54
+ /// Creates a file transfer if the source and destination are different.
55
+ /// </summary>
56
+ /// <param name="source">Source path to file.</param>
57
+ /// <param name="destination">Destination path for file.</param>
58
+ /// <param name="move">File if file should be moved (optimal).</param>
59
+ /// <param name="type">Optional type of file this transfer is transferring.</param>
60
+ /// <param name="sourceLineNumbers">Optional source line numbers where this transfer originated.</param>
61
+ /// <returns>true if the source and destination are the different, false if no file transfer is created.</returns>
62
+ public static bool TryCreate(string source, string destination, bool move, string type, SourceLineNumber sourceLineNumbers, out FileTransfer transfer)
63
+ {
64
+ //string sourceFullPath = GetValidatedFullPath(sourceLineNumbers, source);
65
+
66
+ //string fileLayoutFullPath = GetValidatedFullPath(sourceLineNumbers, destination);
67
+
68
+ ////// if the current source path (where we know that the file already exists) and the resolved
69
+ ////// path as dictated by the Directory table are not the same, then propagate the file. The
70
+ ////// image that we create may have already been done by some other process other than the linker, so
71
+ ////// there is no reason to copy the files to the resolved source if they are already there.
72
+ ////if (String.Equals(sourceFullPath, fileLayoutFullPath, StringComparison.OrdinalIgnoreCase))
73
+ ////{
74
+ //// transfer = null;
75
+ //// return false;
76
+ ////}
77
+
78
+ //transfer = new FileTransfer(source, destination, move, type, sourceLineNumbers);
79
+ //transfer.Redundant = String.Equals(sourceFullPath, fileLayoutFullPath, StringComparison.OrdinalIgnoreCase);
80
+ //return true;
81
+ throw new NotImplementedException();
82
+ }
83
+
84
+ //private static string GetValidatedFullPath(SourceLineNumber sourceLineNumbers, string path)
85
+ //{
86
+ // string result;
87
+
88
+ // try
89
+ // {
90
+ // result = Path.GetFullPath(path);
91
+
92
+ // var filename = Path.GetFileName(result);
93
+
94
+ // foreach (var reservedName in Common.ReservedFileNames)
95
+ // {
96
+ // if (reservedName.Equals(filename, StringComparison.OrdinalIgnoreCase))
97
+ // {
98
+ // throw new WixException(ErrorMessages.InvalidFileName(sourceLineNumbers, path));
99
+ // }
100
+ // }
101
+ // }
102
+ // catch (ArgumentException)
103
+ // {
104
+ // throw new WixException(ErrorMessages.InvalidFileName(sourceLineNumbers, path));
105
+ // }
106
+ // catch (PathTooLongException)
107
+ // {
108
+ // throw new WixException(ErrorMessages.PathTooLong(sourceLineNumbers, path));
109
+ // }
110
+
111
+ // return result;
112
+ //}
113
+ }
114
+}
src/WixToolset.Extensibility/Data/IBindContext.cs
renamed
+1
-4
@@ -1,18 +1,15 @@
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
3
+namespace WixToolset.Extensibility.Data
4
{
5
using System;
6
using System.Collections.Generic;
7
using WixToolset.Data;
8
- using WixToolset.Extensibility.Services;
8
9
public interface IBindContext
10
{
11
IServiceProvider ServiceProvider { get; }
12
14
- IMessaging Messaging { get; set; }
15
-
13
int CabbingThreadCount { get; set; }
14
15
string CabCachePath { get; set; }
src/WixToolset.Extensibility/Data/ICommandLineArguments.cs
renamed
+2
-2
@@ -1,8 +1,8 @@
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.Data
4
{
5
- using System.Collections.Generic;
5
+ using WixToolset.Extensibility.Services;
6
7
public interface ICommandLineArguments
8
{
src/WixToolset.Extensibility/Data/ICommandLineCommand.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.Data
4
{
5
public interface ICommandLineCommand
6
{
src/WixToolset.Extensibility/Data/ICommandLineContext.cs
renamed
+2
-3
@@ -1,15 +1,14 @@
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.Data
4
{
5
using System;
6
+ using WixToolset.Extensibility.Services;
7
8
public interface ICommandLineContext
9
{
10
IServiceProvider ServiceProvider { get; }
11
11
- IMessaging Messaging { get; set; }
12
-
12
IExtensionManager ExtensionManager { get; set; }
13
14
ICommandLineArguments Arguments { get; set; }
src/WixToolset.Extensibility/Data/ICompileContext.cs
renamed
+1
-4
@@ -1,19 +1,16 @@
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
3
+namespace WixToolset.Extensibility.Data
4
{
5
using System;
6
using System.Collections.Generic;
7
using System.Xml.Linq;
8
using WixToolset.Data;
9
- using WixToolset.Extensibility.Services;
9
10
public interface ICompileContext
11
{
12
IServiceProvider ServiceProvider { get; }
13
15
- IMessaging Messaging { get; set; }
16
-
14
string CompilationId { get; set; }
15
16
IEnumerable<ICompilerExtension> Extensions { get; set; }
src/WixToolset.Extensibility/Data/IDelayedField.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
3
+namespace WixToolset.Extensibility.Data
4
{
5
using WixToolset.Data;
6
src/WixToolset.Extensibility/Data/IExpectedExtractFile.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
3
+namespace WixToolset.Extensibility.Data
4
{
5
using System;
6
src/WixToolset.Extensibility/Data/IFileSystemContext.cs
renamed
+1
-4
@@ -1,17 +1,14 @@
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
3
+namespace WixToolset.Extensibility.Data
4
{
5
using System;
6
using WixToolset.Data;
7
- using WixToolset.Extensibility.Services;
7
8
public interface IFileSystemContext
9
{
10
IServiceProvider ServiceProvider { get; }
11
13
- IMessaging Messaging { get; set; }
14
-
12
string CabCachePath { get; set; }
13
14
string IntermediateFolder { get; set; }
src/WixToolset.Extensibility/Data/IInscribeContext.cs
renamed
+1
-4
@@ -1,16 +1,13 @@
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
3
+namespace WixToolset.Extensibility.Data
4
{
5
using System;
6
- using WixToolset.Extensibility.Services;
6
7
public interface IInscribeContext
8
{
9
IServiceProvider ServiceProvider { get; }
10
12
- IMessaging Messaging { get; set; }
13
-
11
string InputFilePath { get; set; }
12
13
string IntermediateFolder { get; set; }
src/WixToolset.Extensibility/Data/ILayoutContext.cs
renamed
+1
-7
@@ -1,26 +1,20 @@
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
3
+namespace WixToolset.Extensibility.Data
4
{
5
using System;
6
using System.Collections.Generic;
7
- using WixToolset.Data.Bind;
8
- using WixToolset.Extensibility.Services;
7
8
public interface ILayoutContext
9
{
10
IServiceProvider ServiceProvider { get; }
11
14
- IMessaging Messaging { get; set; }
15
-
12
IEnumerable<ILayoutExtension> Extensions { get; set; }
13
14
IEnumerable<string> ContentFilePaths { get; set; }
15
16
IEnumerable<FileTransfer> FileTransfers { get; set; }
17
22
- string OutputPdbPath { get; set; }
23
-
18
string ContentsFile { get; set; }
19
20
string OutputsFile { get; set; }
src/WixToolset.Extensibility/Data/ILibraryContext.cs
renamed
+1
-4
@@ -1,18 +1,15 @@
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
3
+namespace WixToolset.Extensibility.Data
4
{
5
using System;
6
using System.Collections.Generic;
7
using WixToolset.Data;
8
- using WixToolset.Extensibility.Services;
8
9
public interface ILibraryContext
10
{
11
IServiceProvider ServiceProvider { get; }
12
14
- IMessaging Messaging { get; set; }
15
-
13
bool BindFiles { get; set; }
14
15
IEnumerable<BindPath> BindPaths { get; set; }
src/WixToolset.Extensibility/Data/ILinkContext.cs
renamed
+1
-4
@@ -1,18 +1,15 @@
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
3
+namespace WixToolset.Extensibility.Data
4
{
5
using System;
6
using System.Collections.Generic;
7
using WixToolset.Data;
8
- using WixToolset.Extensibility.Services;
8
9
public interface ILinkContext
10
{
11
IServiceProvider ServiceProvider { get; }
12
14
- IMessaging Messaging { get; set; }
15
-
13
IEnumerable<ILinkerExtension> Extensions { get; set; }
14
15
IEnumerable<IExtensionData> ExtensionData { get; set; }
src/WixToolset.Extensibility/Data/IPreprocessContext.cs
renamed
+1
-4
@@ -1,18 +1,15 @@
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
3
+namespace WixToolset.Extensibility.Data
4
{
5
using System;
6
using System.Collections.Generic;
7
using WixToolset.Data;
8
- using WixToolset.Extensibility.Services;
8
9
public interface IPreprocessContext
10
{
11
IServiceProvider ServiceProvider { get; }
12
14
- IMessaging Messaging { get; set; }
15
-
13
IEnumerable<IPreprocessorExtension> Extensions { get; set; }
14
15
IList<string> IncludeSearchPaths { get; set; }
src/WixToolset.Extensibility/Data/IResolveContext.cs
renamed
+1
-3
@@ -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
3
+namespace WixToolset.Extensibility.Data
4
{
5
using System;
6
using System.Collections.Generic;
@@ -11,8 +11,6 @@ namespace WixToolset.Extensibility
11
{
12
IServiceProvider ServiceProvider { get; }
13
14
- IMessaging Messaging { get; set; }
15
-
14
IEnumerable<BindPath> BindPaths { get; set; }
15
16
IEnumerable<IResolverExtension> Extensions { get; set; }
src/WixToolset.Extensibility/Data/IUnbindContext.cs
renamed
+1
-4
@@ -1,16 +1,13 @@
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
3
+namespace WixToolset.Extensibility.Data
4
{
5
using System;
6
- using WixToolset.Extensibility.Services;
6
7
public interface IUnbindContext
8
{
9
IServiceProvider ServiceProvider { get; }
10
12
- IMessaging Messaging { get; set; }
13
-
11
string ExportBasePath { get; set; }
12
13
string InputFilePath { get; set; }
src/WixToolset.Extensibility/Data/ResolveResult.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
3
+namespace WixToolset.Extensibility.Data
4
{
5
using System.Collections.Generic;
6
using WixToolset.Data;
src/WixToolset.Extensibility/Data/ResolvedCabinet.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
3
+namespace WixToolset.Extensibility.Data
4
{
5
/// <summary>
6
/// Data returned from build file manager ResolveCabinet callback.
src/WixToolset.Extensibility/IBackend.cs
+1
-1
@@ -3,7 +3,7 @@
3
namespace WixToolset.Extensibility
4
{
5
using WixToolset.Data;
6
- using WixToolset.Data.Bind;
6
+ using WixToolset.Extensibility.Data;
7
8
public interface IBackend
9
{
src/WixToolset.Extensibility/IBackendFactory.cs
+1
-1
@@ -2,7 +2,7 @@
2
3
namespace WixToolset.Extensibility
4
{
5
- using WixToolset.Extensibility.Services;
5
+ using WixToolset.Extensibility.Data;
6
7
public interface IBackendFactory
8
{
src/WixToolset.Extensibility/IBindExtension.cs
+1
@@ -3,6 +3,7 @@
3
namespace WixToolset.Extensibility
4
{
5
using WixToolset.Data.Bind;
6
+ using WixToolset.Extensibility.Data;
7
8
/// <summary>
9
/// Interface all binder extensions implement.
src/WixToolset.Extensibility/IBurnBackendExtension.cs
+1
-1
@@ -4,7 +4,7 @@ namespace WixToolset.Extensibility
4
{
5
using WixToolset.Data;
6
using WixToolset.Data.Bind;
7
- using WixToolset.Extensibility.Services;
7
+ using WixToolset.Extensibility.Data;
8
9
public interface IBurnBackendExtension
10
{
src/WixToolset.Extensibility/ICompilerExtension.cs
+1
@@ -5,6 +5,7 @@ namespace WixToolset.Extensibility
5
using System.Collections.Generic;
6
using System.Xml.Linq;
7
using WixToolset.Data;
8
+ using WixToolset.Extensibility.Data;
9
10
/// <summary>
11
/// Interface all compiler extensions implement.
src/WixToolset.Extensibility/IDecompilerExtension.cs
-2
@@ -2,8 +2,6 @@
2
3
namespace WixToolset.Extensibility
4
{
5
- using WixToolset.Data;
6
-
5
/// <summary>
6
/// Base class for creating a decompiler extension.
7
/// </summary>
src/WixToolset.Extensibility/IExtensionCommandLine.cs
+1
-10
@@ -3,18 +3,9 @@
3
namespace WixToolset.Extensibility
4
{
5
using System.Collections.Generic;
6
+ using WixToolset.Extensibility.Data;
7
using WixToolset.Extensibility.Services;
8
8
- /// <summary>
9
- /// A command line option.
10
- /// </summary>
11
- public struct ExtensionCommandLineSwitch
12
- {
13
- public string Switch { get; set; }
14
-
15
- public string Description { get; set; }
16
- }
17
-
9
/// <summary>
10
/// Interface extensions implement to be able to parse command-line options.
11
/// </summary>
src/WixToolset.Extensibility/IFileSystemExtension.cs
+2
@@ -2,6 +2,8 @@
2
3
namespace WixToolset.Extensibility
4
{
5
+ using WixToolset.Extensibility.Data;
6
+
7
/// <summary>
8
/// Interface all file system extensions implement.
9
/// </summary>
src/WixToolset.Extensibility/ILayoutExtension.cs
+2
@@ -2,6 +2,8 @@
2
3
namespace WixToolset.Extensibility
4
{
5
+ using WixToolset.Extensibility.Data;
6
+
7
/// <summary>
8
/// Interface all layout extensions implement.
9
/// </summary>
src/WixToolset.Extensibility/ILibrarianExtension.cs
+1
@@ -3,6 +3,7 @@
3
namespace WixToolset.Extensibility
4
{
5
using WixToolset.Data;
6
+ using WixToolset.Extensibility.Data;
7
8
public interface ILibrarianExtension
9
{
src/WixToolset.Extensibility/ILinkerExtension.cs
+1
-1
@@ -3,7 +3,7 @@
3
namespace WixToolset.Extensibility
4
{
5
using WixToolset.Data;
6
- using WixToolset.Extensibility.Services;
6
+ using WixToolset.Extensibility.Data;
7
8
/// <summary>
9
/// Interface all binder extensions implement.
src/WixToolset.Extensibility/IPreprocessorExtension.cs
+1
@@ -3,6 +3,7 @@
3
namespace WixToolset.Extensibility
4
{
5
using System.Xml.Linq;
6
+ using WixToolset.Extensibility.Data;
7
8
/// <summary>
9
/// Interface for extending the WiX toolset preprocessor.
src/WixToolset.Extensibility/IResolverExtension.cs
+1
-1
@@ -3,7 +3,7 @@
3
namespace WixToolset.Extensibility
4
{
5
using WixToolset.Data;
6
- using WixToolset.Data.Bind;
6
+ using WixToolset.Extensibility.Data;
7
8
/// <summary>
9
/// Interface all resolver extensions implement.
src/WixToolset.Extensibility/IWindowsInstallerBackendExtension.cs
+1
@@ -7,6 +7,7 @@ namespace WixToolset.Extensibility
7
using WixToolset.Data.Bind;
8
using WixToolset.Data.Tuples;
9
using WixToolset.Data.WindowsInstaller;
10
+ using WixToolset.Extensibility.Data;
11
12
/// <summary>
13
/// Interface all binder extensions implement.
src/WixToolset.Extensibility/Services/ICommandLine.cs
+7
-1
@@ -2,8 +2,14 @@
2
3
namespace WixToolset.Extensibility.Services
4
{
5
+ using WixToolset.Extensibility.Data;
6
+
7
public interface ICommandLine
8
{
7
- ICommandLineCommand ParseStandardCommandLine(ICommandLineContext commandLineContext);
9
+ IExtensionManager ExtensionManager { get; set; }
10
+
11
+ ICommandLineArguments Arguments { get; set; }
12
+
13
+ ICommandLineCommand ParseStandardCommandLine();
14
}
15
}
src/WixToolset.Extensibility/Services/IParseHelper.cs
+1
@@ -6,6 +6,7 @@ namespace WixToolset.Extensibility.Services
6
using System.Collections.Generic;
7
using System.Xml.Linq;
8
using WixToolset.Data;
9
+ using WixToolset.Extensibility.Data;
10
11
/// <summary>
12
/// Interface provided to help compiler extensions parse.
src/WixToolset.Extensibility/Services/IPreprocessHelper.cs
+1
@@ -3,6 +3,7 @@
3
namespace WixToolset.Extensibility.Services
4
{
5
using System.Xml.Linq;
6
+ using WixToolset.Extensibility.Data;
7
8
/// <summary>
9
/// Interface provided to help preprocessor extensions.
src/WixToolset.Extensibility/Services/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
3
+namespace WixToolset.Extensibility.Services
4
{
5
using System;
6
src/WixToolset.Extensibility/WixToolset.Extensibility.csproj
+1
-1
@@ -16,7 +16,7 @@
16
</ItemGroup>
17
18
<ItemGroup>
19
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
19
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" />
20
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
21
</ItemGroup>
22
</Project>