From 148ad02da05070245c8345d6650e2a70bd4706be Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 12 Apr 2020 11:19:14 +1000 Subject: Merge and move default tuple logic from CreateOutputFromIRCommand to WindowsInstallerBackendHelper. --- .../WindowsInstallerBackendHelper.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/WixToolset.Core') diff --git a/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs b/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs index 80179d1c..753b8b34 100644 --- a/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs +++ b/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs @@ -2,7 +2,6 @@ namespace WixToolset.Core.ExtensibilityServices { - using System.Collections.Generic; using System.Linq; using WixToolset.Data; using WixToolset.Data.WindowsInstaller; @@ -10,17 +9,25 @@ namespace WixToolset.Core.ExtensibilityServices internal class WindowsInstallerBackendHelper : IWindowsInstallerBackendHelper { - public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, WindowsInstallerData output, IEnumerable tableDefinitions) + public Row CreateRow(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinition tableDefinition) { - var tableDefinition = tableDefinitions.FirstOrDefault(t => t.TupleDefinitionName == tuple.Definition.Name); + var table = output.EnsureTable(tableDefinition); + + var row = table.CreateRow(tuple.SourceLineNumbers); + row.SectionId = section.Id; + + return row; + } + public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateSection section, IntermediateTuple tuple, WindowsInstallerData output, TableDefinitionCollection tableDefinitions) + { + var tableDefinition = tableDefinitions.FirstOrDefault(t => t.TupleDefinitionName == tuple.Definition.Name); if (tableDefinition == null) { return false; } - var table = output.EnsureTable(tableDefinition); - var row = table.CreateRow(tuple.SourceLineNumbers); + var row = this.CreateRow(section, tuple, output, tableDefinition); var rowOffset = 0; if (tableDefinition.TupleIdIsPrimaryKey) -- cgit v1.2.3-55-g6feb