diff options
author | Rob Mensching <rob@firegiant.com> | 2019-10-23 12:53:27 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2019-10-23 12:57:55 -0700 |
commit | 752301ba571020717862d2232e3fad585de6a39a (patch) | |
tree | a97ceeb6b762af2dd18d0d561dadeaceda3bf387 /src/WixToolset.Core/Compiler.cs | |
parent | 11355d03334e300886512411d4649536a5ee65e3 (diff) | |
download | wix-752301ba571020717862d2232e3fad585de6a39a.tar.gz wix-752301ba571020717862d2232e3fad585de6a39a.tar.bz2 wix-752301ba571020717862d2232e3fad585de6a39a.zip |
Fix custom tables, small fixes in linker and update latest Data
Diffstat (limited to 'src/WixToolset.Core/Compiler.cs')
-rw-r--r-- | src/WixToolset.Core/Compiler.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 480e8758..974f3188 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
@@ -3750,7 +3750,7 @@ namespace WixToolset.Core | |||
3750 | case "Id": | 3750 | case "Id": |
3751 | tableId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); | 3751 | tableId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); |
3752 | break; | 3752 | break; |
3753 | case "BootstrapperApplicationData": | 3753 | case "Unreal": |
3754 | bootstrapperApplicationData = YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); | 3754 | bootstrapperApplicationData = YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); |
3755 | break; | 3755 | break; |
3756 | default: | 3756 | default: |
@@ -3951,7 +3951,7 @@ namespace WixToolset.Core | |||
3951 | this.Core.Write(ErrorMessages.ExpectedAttribute(dataSourceLineNumbers, data.Name.LocalName, "Column")); | 3951 | this.Core.Write(ErrorMessages.ExpectedAttribute(dataSourceLineNumbers, data.Name.LocalName, "Column")); |
3952 | } | 3952 | } |
3953 | 3953 | ||
3954 | dataValue = String.Concat(dataValue, null == dataValue ? String.Empty : Common.CustomRowFieldSeparator.ToString(), columnName, ":", Common.GetInnerText(data)); | 3954 | dataValue = String.Concat(dataValue, null == dataValue ? String.Empty : WixCustomRowTuple.FieldSeparator.ToString(), columnName, ":", Common.GetInnerText(data)); |
3955 | break; | 3955 | break; |
3956 | } | 3956 | } |
3957 | } | 3957 | } |
@@ -4001,7 +4001,7 @@ namespace WixToolset.Core | |||
4001 | Sets = sets, | 4001 | Sets = sets, |
4002 | Descriptions = descriptions, | 4002 | Descriptions = descriptions, |
4003 | Modularizations = modularizations, | 4003 | Modularizations = modularizations, |
4004 | BootstrapperApplicationData = bootstrapperApplicationData | 4004 | Unreal = bootstrapperApplicationData |
4005 | }; | 4005 | }; |
4006 | 4006 | ||
4007 | this.Core.AddTuple(tuple); | 4007 | this.Core.AddTuple(tuple); |