From 4a8dc1f4d55278abdff056bb2a332ffec0f60c90 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 3 Jun 2020 02:04:35 -0700 Subject: Redesign CustomTable tuples to enable file resolution in Core --- src/WixToolset.Data/Tuples/TupleDefinitions.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/WixToolset.Data/Tuples/TupleDefinitions.cs') diff --git a/src/WixToolset.Data/Tuples/TupleDefinitions.cs b/src/WixToolset.Data/Tuples/TupleDefinitions.cs index 67393f04..a91b3f8f 100644 --- a/src/WixToolset.Data/Tuples/TupleDefinitions.cs +++ b/src/WixToolset.Data/Tuples/TupleDefinitions.cs @@ -144,8 +144,9 @@ namespace WixToolset.Data WixComplexReference, WixComponentGroup, WixComponentSearch, - WixCustomRow, WixCustomTable, + WixCustomTableCell, + WixCustomTableColumn, WixDeltaPatchFile, WixDeltaPatchSymbolPaths, WixDependencyProvider, @@ -613,12 +614,15 @@ namespace WixToolset.Data case TupleDefinitionType.WixComponentSearch: return TupleDefinitions.WixComponentSearch; - case TupleDefinitionType.WixCustomRow: - return TupleDefinitions.WixCustomRow; - case TupleDefinitionType.WixCustomTable: return TupleDefinitions.WixCustomTable; + case TupleDefinitionType.WixCustomTableCell: + return TupleDefinitions.WixCustomTableCell; + + case TupleDefinitionType.WixCustomTableColumn: + return TupleDefinitions.WixCustomTableColumn; + case TupleDefinitionType.WixDeltaPatchFile: return TupleDefinitions.WixDeltaPatchFile; -- cgit v1.2.3-55-g6feb