aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/CompilerCore.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-04-02 14:41:49 -0700
committerRob Mensching <rob@firegiant.com>2021-04-02 14:58:00 -0700
commit4449fcc5b8d104817c67135229682c66c3d892ca (patch)
tree327f617de2e296ddb4e62c50bf07ec8b5dcf0a3e /src/WixToolset.Core/CompilerCore.cs
parent9cca339473d77c7036035f949239f5231c325968 (diff)
downloadwix-4449fcc5b8d104817c67135229682c66c3d892ca.tar.gz
wix-4449fcc5b8d104817c67135229682c66c3d892ca.tar.bz2
wix-4449fcc5b8d104817c67135229682c66c3d892ca.zip
Enable codepages and languages to be set via .wxl files
Fixes wixtoolset/issues#5801
Diffstat (limited to 'src/WixToolset.Core/CompilerCore.cs')
-rw-r--r--src/WixToolset.Core/CompilerCore.cs18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/WixToolset.Core/CompilerCore.cs b/src/WixToolset.Core/CompilerCore.cs
index 0bc63d79..df532d74 100644
--- a/src/WixToolset.Core/CompilerCore.cs
+++ b/src/WixToolset.Core/CompilerCore.cs
@@ -680,7 +680,7 @@ namespace WixToolset.Core
680 680
681 Debug.Assert(minimum > CompilerConstants.IntegerNotSet && minimum > CompilerConstants.IllegalInteger, "The legal values for this attribute collide with at least one sentinel used during parsing."); 681 Debug.Assert(minimum > CompilerConstants.IntegerNotSet && minimum > CompilerConstants.IllegalInteger, "The legal values for this attribute collide with at least one sentinel used during parsing.");
682 682
683 string value = this.GetAttributeValue(sourceLineNumbers, attribute); 683 var value = this.GetAttributeValue(sourceLineNumbers, attribute);
684 684
685 if (0 < value.Length) 685 if (0 < value.Length)
686 { 686 {
@@ -692,7 +692,7 @@ namespace WixToolset.Core
692 { 692 {
693 try 693 try
694 { 694 {
695 int integer = Convert.ToInt32(value, CultureInfo.InvariantCulture.NumberFormat); 695 var integer = Convert.ToInt32(value, CultureInfo.InvariantCulture.NumberFormat);
696 696
697 if (CompilerConstants.IntegerNotSet == integer || CompilerConstants.IllegalInteger == integer) 697 if (CompilerConstants.IntegerNotSet == integer || CompilerConstants.IllegalInteger == integer)
698 { 698 {
@@ -1036,12 +1036,11 @@ namespace WixToolset.Core
1036 /// </summary> 1036 /// </summary>
1037 /// <param name="id">Unique identifier for the section.</param> 1037 /// <param name="id">Unique identifier for the section.</param>
1038 /// <param name="type">Type of section to create.</param> 1038 /// <param name="type">Type of section to create.</param>
1039 /// <param name="codepage">Codepage for the resulting database for this ection.</param> 1039 /// <param name="compilationId">Unique identifier for the compilation.</param>
1040 /// <param name="compilationId"></param>
1041 /// <returns>New section.</returns> 1040 /// <returns>New section.</returns>
1042 internal IntermediateSection CreateActiveSection(string id, SectionType type, int codepage, string compilationId) 1041 internal IntermediateSection CreateActiveSection(string id, SectionType type, string compilationId)
1043 { 1042 {
1044 this.ActiveSection = this.CreateSection(id, type, codepage, compilationId); 1043 this.ActiveSection = this.CreateSection(id, type, compilationId);
1045 1044
1046 this.activeSectionCachedInlinedDirectoryIds = new Dictionary<string, string>(); 1045 this.activeSectionCachedInlinedDirectoryIds = new Dictionary<string, string>();
1047 this.activeSectionSimpleReferences = new HashSet<string>(); 1046 this.activeSectionSimpleReferences = new HashSet<string>();
@@ -1054,12 +1053,11 @@ namespace WixToolset.Core
1054 /// </summary> 1053 /// </summary>
1055 /// <param name="id">Unique identifier for the section.</param> 1054 /// <param name="id">Unique identifier for the section.</param>
1056 /// <param name="type">Type of section to create.</param> 1055 /// <param name="type">Type of section to create.</param>
1057 /// <param name="codepage">Codepage for the resulting database for this ection.</param> 1056 /// <param name="compilationId">Unique identifier for the compilation.</param>
1058 /// <param name="compilationId"></param>
1059 /// <returns>New section.</returns> 1057 /// <returns>New section.</returns>
1060 internal IntermediateSection CreateSection(string id, SectionType type, int codepage, string compilationId) 1058 internal IntermediateSection CreateSection(string id, SectionType type, string compilationId)
1061 { 1059 {
1062 var section = new IntermediateSection(id, type, codepage, compilationId); 1060 var section = new IntermediateSection(id, type, compilationId);
1063 1061
1064 this.intermediate.Sections.Add(section); 1062 this.intermediate.Sections.Add(section);
1065 1063