aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-06-19 13:52:20 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-06-19 14:07:03 +1000
commitabff61df823505abc01776cec7b207501c671bf2 (patch)
treedf1358638c44accce92d8a1a2da9e5795d8d231d /src/WixToolset.Core.WindowsInstaller
parent40d7700f0c5f6464f9491bf60d9d8604a81b7466 (diff)
downloadwix-abff61df823505abc01776cec7b207501c671bf2.tar.gz
wix-abff61df823505abc01776cec7b207501c671bf2.tar.bz2
wix-abff61df823505abc01776cec7b207501c671bf2.zip
Implement BundleCustomData. Remove Unreal from CustomTable.
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs4
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
index daf4c96e..553b470b 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
@@ -4,6 +4,7 @@ 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;
7 using System.Globalization; 8 using System.Globalization;
8 using System.Linq; 9 using System.Linq;
9 using WixToolset.Data; 10 using WixToolset.Data;
@@ -978,7 +979,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
978 979
979 if (customTableDefinition.Unreal) 980 if (customTableDefinition.Unreal)
980 { 981 {
981 return; 982 Debug.Assert(false, "CustomTableDefinition should never be unreal.");
983 continue;
982 } 984 }
983 985
984 var customRow = this.CreateRow(firstCellTuple, customTableDefinition); 986 var customRow = this.CreateRow(firstCellTuple, customTableDefinition);
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs
index 0312ab44..cfb46ff9 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, tuple.Unreal); 211 var customTable = new TableDefinition(tuple.Id.Id, null, columns);
212 return customTable; 212 return customTable;
213 } 213 }
214 } 214 }