From ca376995792d2e2a1a7f39760989496702a8f603 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 6 Dec 2017 11:21:42 -0800 Subject: Fix handling of long values and baseUri in path fields --- src/WixToolset.Data/IntermediateTuple.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/WixToolset.Data/IntermediateTuple.cs') diff --git a/src/WixToolset.Data/IntermediateTuple.cs b/src/WixToolset.Data/IntermediateTuple.cs index cda133b5..e5df9ecb 100644 --- a/src/WixToolset.Data/IntermediateTuple.cs +++ b/src/WixToolset.Data/IntermediateTuple.cs @@ -2,6 +2,7 @@ namespace WixToolset.Data { + using System; using SimpleJson; public class IntermediateTuple @@ -28,7 +29,7 @@ namespace WixToolset.Data public IntermediateField this[int index] => this.Fields[index]; - internal static IntermediateTuple Deserialize(ITupleDefinitionCreator creator, JsonObject jsonObject) + internal static IntermediateTuple Deserialize(ITupleDefinitionCreator creator, Uri baseUri, JsonObject jsonObject) { var definitionName = jsonObject.GetValueOrDefault("type"); var idJson = jsonObject.GetValueOrDefault("id"); @@ -45,7 +46,7 @@ namespace WixToolset.Data { if (tuple.Fields.Length > i && fieldsJson[i] is JsonObject fieldJson) { - tuple.Fields[i] = IntermediateField.Deserialize(tuple.Definition.FieldDefinitions[i], fieldJson); + tuple.Fields[i] = IntermediateField.Deserialize(tuple.Definition.FieldDefinitions[i], baseUri, fieldJson); } } -- cgit v1.2.3-55-g6feb