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/IntermediateSection.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/WixToolset.Data/IntermediateSection.cs') diff --git a/src/WixToolset.Data/IntermediateSection.cs b/src/WixToolset.Data/IntermediateSection.cs index 2b1f7375..5d17eb31 100644 --- a/src/WixToolset.Data/IntermediateSection.cs +++ b/src/WixToolset.Data/IntermediateSection.cs @@ -66,7 +66,6 @@ namespace WixToolset.Data var codepage = jsonObject.GetValueOrDefault("codepage", 0); var id = jsonObject.GetValueOrDefault("id"); var type = jsonObject.GetEnumOrDefault("type", SectionType.Unknown); - var tuplesJson = jsonObject.GetValueOrDefault("tuples"); if (null == id && (SectionType.Unknown != type && SectionType.Fragment != type)) { @@ -80,6 +79,8 @@ namespace WixToolset.Data var section = new IntermediateSection(id, type, codepage); + var tuplesJson = jsonObject.GetValueOrDefault("tuples"); + foreach (JsonObject tupleJson in tuplesJson) { var tuple = IntermediateTuple.Deserialize(creator, tupleJson); -- cgit v1.2.3-55-g6feb