diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-19 14:44:23 +1000 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-19 00:53:14 -0700 |
| commit | 89416eb8c4e7dc8ae4dd2aa27aa7c5930421f61a (patch) | |
| tree | 23bb1c1c6a4af551b8edd465ba491089ebf6239d /src/WixToolset.Core.WindowsInstaller/Bind | |
| parent | 00e4ccb89b3e2450ad95e298588d80e90b6f8742 (diff) | |
| download | wix-89416eb8c4e7dc8ae4dd2aa27aa7c5930421f61a.tar.gz wix-89416eb8c4e7dc8ae4dd2aa27aa7c5930421f61a.tar.bz2 wix-89416eb8c4e7dc8ae4dd2aa27aa7c5930421f61a.zip | |
Restore Unreal to CustomTable.
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs | 2 | ||||
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs index 553b470b..90d1c148 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs | |||
| @@ -4,7 +4,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 4 | { | 4 | { |
| 5 | using System; | 5 | using System; |
| 6 | using System.Collections.Generic; | 6 | using System.Collections.Generic; |
| 7 | using System.Diagnostics; | ||
| 8 | using System.Globalization; | 7 | using System.Globalization; |
| 9 | using System.Linq; | 8 | using System.Linq; |
| 10 | using WixToolset.Data; | 9 | using WixToolset.Data; |
| @@ -979,7 +978,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 979 | 978 | ||
| 980 | if (customTableDefinition.Unreal) | 979 | if (customTableDefinition.Unreal) |
| 981 | { | 980 | { |
| 982 | Debug.Assert(false, "CustomTableDefinition should never be unreal."); | ||
| 983 | continue; | 981 | continue; |
| 984 | } | 982 | } |
| 985 | 983 | ||
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs index cfb46ff9..0312ab44 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs | |||
| @@ -208,7 +208,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 208 | columns.Add(columnDefinition); | 208 | columns.Add(columnDefinition); |
| 209 | } | 209 | } |
| 210 | 210 | ||
| 211 | var customTable = new TableDefinition(tuple.Id.Id, null, columns); | 211 | var customTable = new TableDefinition(tuple.Id.Id, null, columns, tuple.Unreal); |
| 212 | return customTable; | 212 | return customTable; |
| 213 | } | 213 | } |
| 214 | } | 214 | } |
