diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-01-24 15:27:20 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-02-05 16:15:47 -0800 |
| commit | 6ff680e386b1543ad1a58d1b1d465ce8aa20bc7d (patch) | |
| tree | c717333cd10d5592e59dfb898b391275bba1f389 /src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs | |
| parent | 6e2e67ab55c75f4655397588c0dcc64f50d22f92 (diff) | |
| download | wix-6ff680e386b1543ad1a58d1b1d465ce8aa20bc7d.tar.gz wix-6ff680e386b1543ad1a58d1b1d465ce8aa20bc7d.tar.bz2 wix-6ff680e386b1543ad1a58d1b1d465ce8aa20bc7d.zip | |
Start on new patch infrastructure
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs index 6b1dead5..f09a2e47 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. | 1 | // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. |
| 2 | 2 | ||
| 3 | namespace WixToolset.Core.WindowsInstaller.Bind | 3 | namespace WixToolset.Core.WindowsInstaller.Bind |
| 4 | { | 4 | { |
| @@ -122,13 +122,18 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 122 | tableString.Append(definition.Name); | 122 | tableString.Append(definition.Name); |
| 123 | foreach (var column in definition.Columns) | 123 | foreach (var column in definition.Columns) |
| 124 | { | 124 | { |
| 125 | // conditionally keep columns added in a transform; otherwise, | 125 | // Conditionally keep columns added in a transform; otherwise, |
| 126 | // break because columns can only be added at the end | 126 | // break because columns can only be added at the end. |
| 127 | if (column.Added && !keepAddedColumns) | 127 | if (column.Added && !keepAddedColumns) |
| 128 | { | 128 | { |
| 129 | break; | 129 | break; |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | if (column.Unreal) | ||
| 133 | { | ||
| 134 | continue; | ||
| 135 | } | ||
| 136 | |||
| 132 | if (!first) | 137 | if (!first) |
| 133 | { | 138 | { |
| 134 | columnString.Append('\t'); | 139 | columnString.Append('\t'); |
| @@ -168,6 +173,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 168 | break; | 173 | break; |
| 169 | } | 174 | } |
| 170 | 175 | ||
| 176 | if (field.Column.Unreal) | ||
| 177 | { | ||
| 178 | continue; | ||
| 179 | } | ||
| 180 | |||
| 171 | if (first) | 181 | if (first) |
| 172 | { | 182 | { |
| 173 | first = false; | 183 | first = false; |
