aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Data/IntermediateTuple.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/WixToolset.Data/IntermediateTuple.cs5
1 files changed, 3 insertions, 2 deletions
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 @@
2 2
3namespace WixToolset.Data 3namespace WixToolset.Data
4{ 4{
5 using System;
5 using SimpleJson; 6 using SimpleJson;
6 7
7 public class IntermediateTuple 8 public class IntermediateTuple
@@ -28,7 +29,7 @@ namespace WixToolset.Data
28 29
29 public IntermediateField this[int index] => this.Fields[index]; 30 public IntermediateField this[int index] => this.Fields[index];
30 31
31 internal static IntermediateTuple Deserialize(ITupleDefinitionCreator creator, JsonObject jsonObject) 32 internal static IntermediateTuple Deserialize(ITupleDefinitionCreator creator, Uri baseUri, JsonObject jsonObject)
32 { 33 {
33 var definitionName = jsonObject.GetValueOrDefault<string>("type"); 34 var definitionName = jsonObject.GetValueOrDefault<string>("type");
34 var idJson = jsonObject.GetValueOrDefault<JsonObject>("id"); 35 var idJson = jsonObject.GetValueOrDefault<JsonObject>("id");
@@ -45,7 +46,7 @@ namespace WixToolset.Data
45 { 46 {
46 if (tuple.Fields.Length > i && fieldsJson[i] is JsonObject fieldJson) 47 if (tuple.Fields.Length > i && fieldsJson[i] is JsonObject fieldJson)
47 { 48 {
48 tuple.Fields[i] = IntermediateField.Deserialize(tuple.Definition.FieldDefinitions[i], fieldJson); 49 tuple.Fields[i] = IntermediateField.Deserialize(tuple.Definition.FieldDefinitions[i], baseUri, fieldJson);
49 } 50 }
50 } 51 }
51 52