diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-04-12 10:25:25 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-04-12 12:42:50 +1000 |
| commit | 64122090e63c4c79fcbfdf7710ca10877e4c8e67 (patch) | |
| tree | 47771c51bf002871b7a19d557fd704db889dd643 /src | |
| parent | ed2e08b131b370ac12798109858a001e99e05758 (diff) | |
| download | wix-64122090e63c4c79fcbfdf7710ca10877e4c8e67.tar.gz wix-64122090e63c4c79fcbfdf7710ca10877e4c8e67.tar.bz2 wix-64122090e63c4c79fcbfdf7710ca10877e4c8e67.zip | |
Add section and TableDefinitionCollection to TryAddTupleToOutput methods.
Diffstat (limited to 'src')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs b/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs index 364b0d18..6283bd03 100644 --- a/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs +++ b/src/WixToolset.Extensibility/BaseWindowsInstallerBackendBinderExtension.cs | |||
| @@ -53,11 +53,11 @@ namespace WixToolset.Extensibility | |||
| 53 | 53 | ||
| 54 | public virtual string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory) => null; | 54 | public virtual string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory) => null; |
| 55 | 55 | ||
| 56 | public virtual bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output) | 56 | public virtual bool TryAddTupleToOutput(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions) |
| 57 | { | 57 | { |
| 58 | if (this.TableDefinitions.Any()) | 58 | if (this.TableDefinitions.Any()) |
| 59 | { | 59 | { |
| 60 | return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitions); | 60 | return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(section, tuple, output, tableDefinitions); |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | return false; | 63 | return false; |
diff --git a/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs b/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs index 3f85e62c..34a02cd7 100644 --- a/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs +++ b/src/WixToolset.Extensibility/IWindowsInstallerBackendBinderExtension.cs | |||
| @@ -24,7 +24,7 @@ namespace WixToolset.Extensibility | |||
| 24 | 24 | ||
| 25 | string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory); | 25 | string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory); |
| 26 | 26 | ||
| 27 | bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output); | 27 | bool TryAddTupleToOutput(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions); |
| 28 | 28 | ||
| 29 | /// <summary> | 29 | /// <summary> |
| 30 | /// Called after all output changes occur and right before the output is bound into its final format. | 30 | /// Called after all output changes occur and right before the output is bound into its final format. |
diff --git a/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs b/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs index ea1707c0..e23630da 100644 --- a/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs +++ b/src/WixToolset.Extensibility/Services/IWindowsInstallerBackendHelper.cs | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | 2 | ||
| 3 | namespace WixToolset.Extensibility.Services | 3 | namespace WixToolset.Extensibility.Services |
| 4 | { | 4 | { |
| 5 | using System.Collections.Generic; | ||
| 6 | using WixToolset.Data; | 5 | using WixToolset.Data; |
| 7 | using WixToolset.Data.WindowsInstaller; | 6 | using WixToolset.Data.WindowsInstaller; |
| 8 | 7 | ||
| @@ -11,6 +10,7 @@ namespace WixToolset.Extensibility.Services | |||
| 11 | /// </summary> | 10 | /// </summary> |
| 12 | public interface IWindowsInstallerBackendHelper | 11 | public interface IWindowsInstallerBackendHelper |
| 13 | { | 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 | } | 15 | } |
| 16 | } | 16 | } |
