Enable codepages and languages to be set via .wxl files

Fixes wixtoolset/issues#5801

1 files changed, 5 insertions, 15 deletions

diff --git a/src/WixToolset.Core/Compiler_Module.cs b/src/WixToolset.Core/Compiler_Module.cs
index 597bc25c..59fe9164 100644
--- a/src/WixToolset.Core/Compiler_Module.cs
+++ b/src/WixToolset.Core/Compiler_Module.cs
@@ -104,7 +104,7 @@ namespace WixToolset.Core
             try
             {
                 this.compilingModule = true; // notice that we are actually building a Merge Module here
-                this.Core.CreateActiveSection(this.activeName, SectionType.Module, codepage, this.Context.CompilationId);
+                this.Core.CreateActiveSection(this.activeName, SectionType.Module, this.Context.CompilationId);
 
                 foreach (var child in node.Elements())
                 {
@@ -232,15 +232,6 @@ namespace WixToolset.Core
 
                 if (!this.Core.EncounteredError)
                 {
-                    if (!setCodepage)
-                    {
-                        this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
-                        {
-                            PropertyId = SummaryInformationType.Codepage,
-                            Value = "1252"
-                        });
-                    }
-
                     if (!setPackageName)
                     {
                         this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
@@ -259,21 +250,20 @@ namespace WixToolset.Core
                         });
                     }
 
-                    var symbol = this.Core.AddSymbol(new ModuleSignatureSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, this.activeName, this.activeLanguage))
+                    var symbol = this.Core.AddSymbol(new WixModuleSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, this.activeName, this.activeLanguage))
                     {
-                        ModuleID = this.activeName,
+                        ModuleId = this.activeName,
+                        Language = this.activeLanguage,
                         Version = version
                     });
 
-                    symbol.Set((int)ModuleSignatureSymbolFields.Language, this.activeLanguage);
-
                     this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
                     {
                         PropertyId = SummaryInformationType.PackageCode,
                         Value = moduleId
                     });
 
-                    this.ValidateAndAddCommonSummaryInformationSymbols(sourceLineNumbers, msiVersion, platform);
+                    this.ValidateAndAddCommonSummaryInformationSymbols(sourceLineNumbers, msiVersion, platform, this.activeLanguage);
                 }
             }
             finally