From 53e877183abe0dbbb623c39380101bc369e9f265 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 2 Dec 2017 00:44:45 -0800 Subject: Support tuples from extensions and make SourcePath a path instead of string --- src/WixToolset.Data/IntermediateTuple.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/WixToolset.Data/IntermediateTuple.cs') diff --git a/src/WixToolset.Data/IntermediateTuple.cs b/src/WixToolset.Data/IntermediateTuple.cs index 0f1e5965..cda133b5 100644 --- a/src/WixToolset.Data/IntermediateTuple.cs +++ b/src/WixToolset.Data/IntermediateTuple.cs @@ -6,9 +6,9 @@ namespace WixToolset.Data public class IntermediateTuple { - //public IntermediateTuple(IntermediateTupleDefinition definition) : this(definition, null, null) - //{ - //} + public IntermediateTuple(IntermediateTupleDefinition definition) : this(definition, null, null) + { + } public IntermediateTuple(IntermediateTupleDefinition definition, SourceLineNumber sourceLineNumber, Identifier id = null) { @@ -35,11 +35,11 @@ namespace WixToolset.Data var sourceLineNumbersJson = jsonObject.GetValueOrDefault("ln"); var fieldsJson = jsonObject.GetValueOrDefault("fields"); - creator.TryGetTupleDefinitionByName(definitionName, out var definition); // TODO: this isn't sufficient. - var tuple = definition.CreateTuple(); + var id = (idJson == null) ? null : Identifier.Deserialize(idJson); + var sourceLineNumbers = (sourceLineNumbersJson == null) ? null : SourceLineNumber.Deserialize(sourceLineNumbersJson); - tuple.Id = (idJson == null) ? null : Identifier.Deserialize(idJson); - tuple.SourceLineNumbers = (sourceLineNumbersJson == null) ? null : SourceLineNumber.Deserialize(sourceLineNumbersJson); + creator.TryGetTupleDefinitionByName(definitionName, out var definition); // TODO: this isn't sufficient. + var tuple = definition.CreateTuple(sourceLineNumbers, id); for (var i = 0; i < fieldsJson.Count; ++i) { -- cgit v1.2.3-55-g6feb