From 534d79c4434c4a165f4d82ddf033fa43768c3357 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 23 Oct 2019 12:48:22 -0700 Subject: Remove BootstrapperApplicationData generally in favor of Unreal --- src/WixToolset.Data/Tuples/WixCustomRowTuple.cs | 6 +++++- src/WixToolset.Data/Tuples/WixCustomTableTuple.cs | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src/WixToolset.Data/Tuples') diff --git a/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs b/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs index ec73c1b8..c51089e8 100644 --- a/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs +++ b/src/WixToolset.Data/Tuples/WixCustomRowTuple.cs @@ -27,6 +27,8 @@ namespace WixToolset.Data.Tuples public class WixCustomRowTuple : IntermediateTuple { + public const char FieldSeparator = '\x85'; + public WixCustomRowTuple() : base(TupleDefinitions.WixCustomRow, null, null) { } @@ -48,5 +50,7 @@ namespace WixToolset.Data.Tuples get => (string)this.Fields[(int)WixCustomRowTupleFields.FieldData]; set => this.Set((int)WixCustomRowTupleFields.FieldData, value); } + + public string[] FieldDataSeparated => this.FieldData.Split(FieldSeparator); } -} \ No newline at end of file +} diff --git a/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs b/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs index cf4e60db..2ef2b88d 100644 --- a/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs +++ b/src/WixToolset.Data/Tuples/WixCustomTableTuple.cs @@ -22,7 +22,7 @@ namespace WixToolset.Data new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Sets), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Descriptions), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Modularizations), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.BootstrapperApplicationData), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixCustomTableTupleFields.Unreal), IntermediateFieldType.Number), }, typeof(WixCustomTableTuple)); } @@ -44,7 +44,7 @@ namespace WixToolset.Data.Tuples Sets, Descriptions, Modularizations, - BootstrapperApplicationData, + Unreal, } public class WixCustomTableTuple : IntermediateTuple @@ -131,10 +131,10 @@ namespace WixToolset.Data.Tuples set => this.Set((int)WixCustomTableTupleFields.Modularizations, value); } - public bool BootstrapperApplicationData + public bool Unreal { - get => (bool)this.Fields[(int)WixCustomTableTupleFields.BootstrapperApplicationData]; - set => this.Set((int)WixCustomTableTupleFields.BootstrapperApplicationData, value); + get => (bool)this.Fields[(int)WixCustomTableTupleFields.Unreal]; + set => this.Set((int)WixCustomTableTupleFields.Unreal, value); } } } -- cgit v1.2.3-55-g6feb