From 64122090e63c4c79fcbfdf7710ca10877e4c8e67 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 12 Apr 2020 10:25:25 +1000 Subject: Add section and TableDefinitionCollection to TryAddTupleToOutput methods. --- .../BaseWindowsInstallerBackendBinderExtension.cs | 4 ++-- .../IWindowsInstallerBackendBinderExtension.cs | 2 +- .../Services/IWindowsInstallerBackendHelper.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') 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 public virtual string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory) => null; - public virtual bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output) + public virtual bool TryAddTupleToOutput(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions) { if (this.TableDefinitions.Any()) { - return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitions); + return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(section, tuple, output, tableDefinitions); } 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 string ResolveMedia(MediaTuple mediaRow, string mediaLayoutDirectory, string layoutDirectory); - bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output); + bool TryAddTupleToOutput(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions); /// /// 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 @@ namespace WixToolset.Extensibility.Services { - using System.Collections.Generic; using WixToolset.Data; using WixToolset.Data.WindowsInstaller; @@ -11,6 +10,7 @@ namespace WixToolset.Extensibility.Services /// public interface IWindowsInstallerBackendHelper { - bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, WindowsInstallerData output, IEnumerable tableDefinitions); + Row CreateRow(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinition tableDefinition); + bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions); } } -- cgit v1.2.3-55-g6feb