Add section and TableDefinitionCollection to TryAddTupleToOutput methods.
Sean Hall committed
Apr 12, 2020 at 10:25 UTC
64122090e63c4c79fcbfdf7710ca10877e4c8e67
3 files changed
+5
-5
src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs
+2
-2
@@ -53,11 +53,11 @@ namespace WixToolset.Extensibility
53
54
public virtual string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory) => null;
55
56
- public virtual bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output)
56
+ public virtual bool TryAddTupleToOutput(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions)
57
{
58
if (this.TableDefinitions.Any())
59
{
60
- return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitions);
60
+ return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(section, tuple, output, tableDefinitions);
61
}
62
63
return false;
src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs
+1
-1
@@ -24,7 +24,7 @@ namespace WixToolset.Extensibility
24
25
string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory);
26
27
- bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output);
27
+ bool TryAddTupleToOutput(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions);
28
29
/// <summary>
30
/// Called after all output changes occur and right before the output is bound into its final format.
src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs
+2
-2
@@ -2,7 +2,6 @@
2
3
namespace WixToolset.Extensibility.Services
4
{
5
- using System.Collections.Generic;
5
using WixToolset.Data;
6
using WixToolset.Data.WindowsInstaller;
7
@@ -11,6 +10,7 @@ namespace WixToolset.Extensibility.Services
10
/// </summary>
11
public interface IWindowsInstallerBackendHelper
12
{
14
- bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, WindowsInstallerData output, IEnumerable<TableDefinition> tableDefinitions);
13
+ Row CreateRow(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinition tableDefinition);
14
+ bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions);
15
}
16
}