diff options
| author | Rob Mensching <rob@firegiant.com> | 2017-12-02 00:44:45 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2017-12-02 00:44:45 -0800 |
| commit | 53e877183abe0dbbb623c39380101bc369e9f265 (patch) | |
| tree | 2b1a35e142d76013ba28d0a50e894ff477ee247a /src/WixToolset.Data/IntermediateSection.cs | |
| parent | 414bf166e07703056ad186fa8ec23a4119dd9993 (diff) | |
| download | wix-53e877183abe0dbbb623c39380101bc369e9f265.tar.gz wix-53e877183abe0dbbb623c39380101bc369e9f265.tar.bz2 wix-53e877183abe0dbbb623c39380101bc369e9f265.zip | |
Support tuples from extensions and make SourcePath a path instead of string
Diffstat (limited to 'src/WixToolset.Data/IntermediateSection.cs')
| -rw-r--r-- | src/WixToolset.Data/IntermediateSection.cs | 3 |
1 files changed, 2 insertions, 1 deletions
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 | |||
| 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"); |
| 68 | var type = jsonObject.GetEnumOrDefault("type", SectionType.Unknown); | 68 | var type = jsonObject.GetEnumOrDefault("type", SectionType.Unknown); |
| 69 | var tuplesJson = jsonObject.GetValueOrDefault<JsonArray>("tuples"); | ||
| 70 | 69 | ||
| 71 | if (null == id && (SectionType.Unknown != type && SectionType.Fragment != type)) | 70 | if (null == id && (SectionType.Unknown != type && SectionType.Fragment != type)) |
| 72 | { | 71 | { |
| @@ -80,6 +79,8 @@ namespace WixToolset.Data | |||
| 80 | 79 | ||
| 81 | var section = new IntermediateSection(id, type, codepage); | 80 | var section = new IntermediateSection(id, type, codepage); |
| 82 | 81 | ||
| 82 | var tuplesJson = jsonObject.GetValueOrDefault<JsonArray>("tuples"); | ||
| 83 | |||
| 83 | foreach (JsonObject tupleJson in tuplesJson) | 84 | foreach (JsonObject tupleJson in tuplesJson) |
| 84 | { | 85 | { |
| 85 | var tuple = IntermediateTuple.Deserialize(creator, tupleJson); | 86 | var tuple = IntermediateTuple.Deserialize(creator, tupleJson); |
