aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-05-30 14:53:05 -0700
committerRob Mensching <rob@firegiant.com>2020-05-30 15:07:21 -0700
commitd529525a1e331f3ef9ec2707791c99bd78fdd82f (patch)
tree1d9fe1f0c0ee9850371c916802eb03ec9dc37a87 /src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs
parent9c54d2fce80983bbee5f0f113b5aa30f22bc8a23 (diff)
downloadwix-d529525a1e331f3ef9ec2707791c99bd78fdd82f.tar.gz
wix-d529525a1e331f3ef9ec2707791c99bd78fdd82f.tar.bz2
wix-d529525a1e331f3ef9ec2707791c99bd78fdd82f.zip
Basic patching support
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs13
1 files changed, 5 insertions, 8 deletions
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
10 using WixToolset.Data.Tuples; 10 using WixToolset.Data.Tuples;
11 using WixToolset.Data.WindowsInstaller; 11 using WixToolset.Data.WindowsInstaller;
12 using WixToolset.Data.WindowsInstaller.Rows; 12 using WixToolset.Data.WindowsInstaller.Rows;
13 using WixToolset.Extensibility;
14 using WixToolset.Extensibility.Services; 13 using WixToolset.Extensibility.Services;
15 14
16 /// <summary> 15 /// <summary>
@@ -25,11 +24,12 @@ namespace WixToolset.Core.WindowsInstaller
25 /// <summary> 24 /// <summary>
26 /// Instantiates a new Differ class. 25 /// Instantiates a new Differ class.
27 /// </summary> 26 /// </summary>
28 public GenerateTransformCommand(IMessaging messaging, WindowsInstallerData targetOutput, WindowsInstallerData updatedOutput, bool showPedanticMessages) 27 public GenerateTransformCommand(IMessaging messaging, WindowsInstallerData targetOutput, WindowsInstallerData updatedOutput, bool preserveUnchangedRows, bool showPedanticMessages)
29 { 28 {
30 this.messaging = messaging; 29 this.messaging = messaging;
31 this.TargetOutput = targetOutput; 30 this.TargetOutput = targetOutput;
32 this.UpdatedOutput = updatedOutput; 31 this.UpdatedOutput = updatedOutput;
32 this.PreserveUnchangedRows = preserveUnchangedRows;
33 this.ShowPedanticMessages = showPedanticMessages; 33 this.ShowPedanticMessages = showPedanticMessages;
34 } 34 }
35 35
@@ -111,10 +111,10 @@ namespace WixToolset.Core.WindowsInstaller
111 } 111 }
112 else if (TableOperation.None == operation) 112 else if (TableOperation.None == operation)
113 { 113 {
114 var modified = transform.EnsureTable(updatedTable.Definition); 114 var modifiedTable = transform.EnsureTable(updatedTable.Definition);
115 foreach (var row in rows) 115 foreach (var row in rows)
116 { 116 {
117 modified.Rows.Add(row); 117 modifiedTable.Rows.Add(row);
118 } 118 }
119 } 119 }
120 } 120 }
@@ -242,10 +242,7 @@ namespace WixToolset.Core.WindowsInstaller
242 { 242 {
243 var columnDefinition = updatedRow.Fields[i].Column; 243 var columnDefinition = updatedRow.Fields[i].Column;
244 244
245 if (columnDefinition.Unreal) 245 if (!columnDefinition.PrimaryKey)
246 {
247 }
248 else if (!columnDefinition.PrimaryKey)
249 { 246 {
250 var modified = false; 247 var modified = false;
251 248