From d529525a1e331f3ef9ec2707791c99bd78fdd82f Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 30 May 2020 14:53:05 -0700 Subject: Basic patching support --- .../Bind/GenerateTransformCommand.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs index 8a7dd702..201a890c 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs @@ -10,7 +10,6 @@ namespace WixToolset.Core.WindowsInstaller using WixToolset.Data.Tuples; using WixToolset.Data.WindowsInstaller; using WixToolset.Data.WindowsInstaller.Rows; - using WixToolset.Extensibility; using WixToolset.Extensibility.Services; /// @@ -25,11 +24,12 @@ namespace WixToolset.Core.WindowsInstaller /// /// Instantiates a new Differ class. /// - public GenerateTransformCommand(IMessaging messaging, WindowsInstallerData targetOutput, WindowsInstallerData updatedOutput, bool showPedanticMessages) + public GenerateTransformCommand(IMessaging messaging, WindowsInstallerData targetOutput, WindowsInstallerData updatedOutput, bool preserveUnchangedRows, bool showPedanticMessages) { this.messaging = messaging; this.TargetOutput = targetOutput; this.UpdatedOutput = updatedOutput; + this.PreserveUnchangedRows = preserveUnchangedRows; this.ShowPedanticMessages = showPedanticMessages; } @@ -111,10 +111,10 @@ namespace WixToolset.Core.WindowsInstaller } else if (TableOperation.None == operation) { - var modified = transform.EnsureTable(updatedTable.Definition); + var modifiedTable = transform.EnsureTable(updatedTable.Definition); foreach (var row in rows) { - modified.Rows.Add(row); + modifiedTable.Rows.Add(row); } } } @@ -242,10 +242,7 @@ namespace WixToolset.Core.WindowsInstaller { var columnDefinition = updatedRow.Fields[i].Column; - if (columnDefinition.Unreal) - { - } - else if (!columnDefinition.PrimaryKey) + if (!columnDefinition.PrimaryKey) { var modified = false; -- cgit v1.2.3-55-g6feb