diff options
| author | Rob Mensching <rob@firegiant.com> | 2017-12-06 11:21:42 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2017-12-06 11:21:42 -0800 |
| commit | ca376995792d2e2a1a7f39760989496702a8f603 (patch) | |
| tree | d9d2f35647d8fe77a91a63740d0ad267c32547b2 /src/WixToolset.Data/IntermediateSection.cs | |
| parent | 53e877183abe0dbbb623c39380101bc369e9f265 (diff) | |
| download | wix-ca376995792d2e2a1a7f39760989496702a8f603.tar.gz wix-ca376995792d2e2a1a7f39760989496702a8f603.tar.bz2 wix-ca376995792d2e2a1a7f39760989496702a8f603.zip | |
Fix handling of long values and baseUri in path fields
Diffstat (limited to 'src/WixToolset.Data/IntermediateSection.cs')
| -rw-r--r-- | src/WixToolset.Data/IntermediateSection.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Data/IntermediateSection.cs b/src/WixToolset.Data/IntermediateSection.cs index 5d17eb31..54758136 100644 --- a/src/WixToolset.Data/IntermediateSection.cs +++ b/src/WixToolset.Data/IntermediateSection.cs | |||
| @@ -61,7 +61,7 @@ namespace WixToolset.Data | |||
| 61 | /// <summary> | 61 | /// <summary> |
| 62 | /// Parse a section from the JSON data. | 62 | /// Parse a section from the JSON data. |
| 63 | /// </summary> | 63 | /// </summary> |
| 64 | internal static IntermediateSection Deserialize(ITupleDefinitionCreator creator, JsonObject jsonObject) | 64 | internal static IntermediateSection Deserialize(ITupleDefinitionCreator creator, Uri baseUri, JsonObject jsonObject) |
| 65 | { | 65 | { |
| 66 | var codepage = jsonObject.GetValueOrDefault("codepage", 0); | 66 | var codepage = jsonObject.GetValueOrDefault("codepage", 0); |
| 67 | var id = jsonObject.GetValueOrDefault<string>("id"); | 67 | var id = jsonObject.GetValueOrDefault<string>("id"); |
| @@ -83,7 +83,7 @@ namespace WixToolset.Data | |||
| 83 | 83 | ||
| 84 | foreach (JsonObject tupleJson in tuplesJson) | 84 | foreach (JsonObject tupleJson in tuplesJson) |
| 85 | { | 85 | { |
| 86 | var tuple = IntermediateTuple.Deserialize(creator, tupleJson); | 86 | var tuple = IntermediateTuple.Deserialize(creator, baseUri, tupleJson); |
| 87 | section.Tuples.Add(tuple); | 87 | section.Tuples.Add(tuple); |
| 88 | } | 88 | } |
| 89 | 89 | ||
