diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-12 12:55:28 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-13 09:22:27 -0700 |
| commit | c0f1332a0e18e9d506fe80c328548b001dcf93df (patch) | |
| tree | 4980dddd35350e79b00a61574feafa859e857e3f /src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs | |
| parent | 167d26d002b1412e72d96ed2bbc0761fc0f1344b (diff) | |
| download | wix-c0f1332a0e18e9d506fe80c328548b001dcf93df.tar.gz wix-c0f1332a0e18e9d506fe80c328548b001dcf93df.tar.bz2 wix-c0f1332a0e18e9d506fe80c328548b001dcf93df.zip | |
Remove use of remaining WixXxxRows
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs index 201a890c..fc713954 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs | |||
| @@ -160,6 +160,7 @@ namespace WixToolset.Core.WindowsInstaller | |||
| 160 | { | 160 | { |
| 161 | if (index.TryGetValue(primaryKey, out var collisionRow)) | 161 | if (index.TryGetValue(primaryKey, out var collisionRow)) |
| 162 | { | 162 | { |
| 163 | #if TODO_PATCH // This case doesn't seem like it can happen any longer. | ||
| 163 | // Overriding WixActionRows have a primary key defined and take precedence in the index. | 164 | // Overriding WixActionRows have a primary key defined and take precedence in the index. |
| 164 | if (row is WixActionRow actionRow) | 165 | if (row is WixActionRow actionRow) |
| 165 | { | 166 | { |
| @@ -176,6 +177,7 @@ namespace WixToolset.Core.WindowsInstaller | |||
| 176 | // If we got this far, the row does not need to be indexed. | 177 | // If we got this far, the row does not need to be indexed. |
| 177 | return; | 178 | return; |
| 178 | } | 179 | } |
| 180 | #endif | ||
| 179 | 181 | ||
| 180 | if (this.ShowPedanticMessages) | 182 | if (this.ShowPedanticMessages) |
| 181 | { | 183 | { |
