Enable codepages and languages to be set via .wxl files

Fixes wixtoolset/issues#5801

15 files changed, 124 insertions, 111 deletions

diff --git a/src/WixToolset.Core/BindContext.cs b/src/WixToolset.Core/BindContext.cs
index 6b0a09a2..09454824 100644
--- a/src/WixToolset.Core/BindContext.cs
+++ b/src/WixToolset.Core/BindContext.cs
@@ -26,8 +26,6 @@ namespace WixToolset.Core
 
         public string CabCachePath { get; set; }
 
-        public int Codepage { get; set; }
-
         public CompressionLevel? DefaultCompressionLevel { get; set; }
 
         public IEnumerable<IDelayedField> DelayedFields { get; set; }
@@ -50,6 +48,12 @@ namespace WixToolset.Core
 
         public string PdbPath { get; set; }
 
+        public int? ResolvedCodepage { get; set; }
+
+        public int? ResolvedSummaryInformationCodepage { get; set; }
+
+        public int? ResolvedLcid { get; set; }
+
         public IEnumerable<string> SuppressIces { get; set; }
 
         public bool SuppressValidation { get; set; }
diff --git a/src/WixToolset.Core/CommandLine/BuildCommand.cs b/src/WixToolset.Core/CommandLine/BuildCommand.cs
index 9efef830..59aa2f1f 100644
--- a/src/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -338,7 +338,9 @@ namespace WixToolset.Core.CommandLine
                     var context = this.ServiceProvider.GetService<IBindContext>();
                     //context.CabbingThreadCount = this.CabbingThreadCount;
                     context.CabCachePath = cabCachePath;
-                    context.Codepage = resolveResult.Codepage;
+                    context.ResolvedCodepage = resolveResult.Codepage;
+                    context.ResolvedSummaryInformationCodepage = resolveResult.SummaryInformationCodepage;
+                    context.ResolvedLcid = resolveResult.PackageLcid;
                     context.DefaultCompressionLevel = this.DefaultCompressionLevel;
                     context.DelayedFields = resolveResult.DelayedFields;
                     context.ExpectedEmbeddedFiles = resolveResult.ExpectedEmbeddedFiles;
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index c2783481..926a46c5 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -384,7 +384,7 @@ namespace WixToolset.Core
                 {
                     var id = String.Concat(this.Core.ActiveSection.Id, ".", propertyId.Id);
 
-                    section = this.Core.CreateSection(id, SectionType.Fragment, this.Core.ActiveSection.Codepage, this.Context.CompilationId);
+                    section = this.Core.CreateSection(id, SectionType.Fragment, this.Context.CompilationId);
 
                     // Reference the property in the active section.
                     this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Property, propertyId.Id);
@@ -6159,7 +6159,7 @@ namespace WixToolset.Core
 
             // NOTE: Id is not required for Fragments, this is a departure from the normal run of the mill processing.
 
-            this.Core.CreateActiveSection(id?.Id, SectionType.Fragment, 0, this.Context.CompilationId);
+            this.Core.CreateActiveSection(id?.Id, SectionType.Fragment, this.Context.CompilationId);
 
             var featureDisplay = 0;
             foreach (var child in node.Elements())
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
 
             Debug.Assert(minimum > CompilerConstants.IntegerNotSet && minimum > CompilerConstants.IllegalInteger, "The legal values for this attribute collide with at least one sentinel used during parsing.");
 
-            string value = this.GetAttributeValue(sourceLineNumbers, attribute);
+            var value = this.GetAttributeValue(sourceLineNumbers, attribute);
 
             if (0 < value.Length)
             {
@@ -692,7 +692,7 @@ namespace WixToolset.Core
                 {
                     try
                     {
-                        int integer = Convert.ToInt32(value, CultureInfo.InvariantCulture.NumberFormat);
+                        var integer = Convert.ToInt32(value, CultureInfo.InvariantCulture.NumberFormat);
 
                         if (CompilerConstants.IntegerNotSet == integer || CompilerConstants.IllegalInteger == integer)
                         {
@@ -1036,12 +1036,11 @@ namespace WixToolset.Core
         /// </summary>
         /// <param name="id">Unique identifier for the section.</param>
         /// <param name="type">Type of section to create.</param>
-        /// <param name="codepage">Codepage for the resulting database for this ection.</param>
-        /// <param name="compilationId"></param>
+        /// <param name="compilationId">Unique identifier for the compilation.</param>
         /// <returns>New section.</returns>
-        internal IntermediateSection CreateActiveSection(string id, SectionType type, int codepage, string compilationId)
+        internal IntermediateSection CreateActiveSection(string id, SectionType type, string compilationId)
         {
-            this.ActiveSection = this.CreateSection(id, type, codepage, compilationId);
+            this.ActiveSection = this.CreateSection(id, type, compilationId);
 
             this.activeSectionCachedInlinedDirectoryIds = new Dictionary<string, string>();
             this.activeSectionSimpleReferences = new HashSet<string>();
@@ -1054,12 +1053,11 @@ namespace WixToolset.Core
         /// </summary>
         /// <param name="id">Unique identifier for the section.</param>
         /// <param name="type">Type of section to create.</param>
-        /// <param name="codepage">Codepage for the resulting database for this ection.</param>
-        /// <param name="compilationId"></param>
+        /// <param name="compilationId">Unique identifier for the compilation.</param>
         /// <returns>New section.</returns>
-        internal IntermediateSection CreateSection(string id, SectionType type, int codepage, string compilationId)
+        internal IntermediateSection CreateSection(string id, SectionType type, string compilationId)
         {
-            var section = new IntermediateSection(id, type, codepage, compilationId);
+            var section = new IntermediateSection(id, type, compilationId);
 
             this.intermediate.Sections.Add(section);
 
diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs
index 7e07532e..779ad376 100644
--- a/src/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/WixToolset.Core/Compiler_Bundle.cs
@@ -259,7 +259,7 @@ namespace WixToolset.Core
             }
 
             this.activeName = String.IsNullOrEmpty(name) ? Common.GenerateGuid() : name;
-            this.Core.CreateActiveSection(this.activeName, SectionType.Bundle, 0, this.Context.CompilationId);
+            this.Core.CreateActiveSection(this.activeName, SectionType.Bundle, this.Context.CompilationId);
 
             // Now that the active section is initialized, process only extension attributes and the special ProviderKey attribute.
             foreach (var attrib in node.Attributes())
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
diff --git a/src/WixToolset.Core/Compiler_Package.cs b/src/WixToolset.Core/Compiler_Package.cs
index fed08001..afe02f08 100644
--- a/src/WixToolset.Core/Compiler_Package.cs
+++ b/src/WixToolset.Core/Compiler_Package.cs
@@ -5,7 +5,6 @@ namespace WixToolset.Core
     using System;
     using System.Collections;
     using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
     using System.Globalization;
     using System.IO;
     using System.Xml.Linq;
@@ -28,10 +27,10 @@ namespace WixToolset.Core
             var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
             var compressed = YesNoDefaultType.Default;
             var sourceBits = 0;
-            var codepage = 65001;
+            string codepage = null;
             var productCode = "*";
+            string productLanguage = null;
             var isPerMachine = true;
-            string installScope = null;
             string upgradeCode = null;
             string manufacturer = null;
             string version = null;
@@ -53,7 +52,7 @@ namespace WixToolset.Core
                     switch (attrib.Name.LocalName)
                     {
                     case "Codepage":
-                        codepage = this.Core.GetAttributeCodePageValue(sourceLineNumbers, attrib);
+                        codepage = this.Core.GetAttributeLocalizableCodePageValue(sourceLineNumbers, attrib);
                         break;
                     case "Compressed":
                         compressed = this.Core.GetAttributeYesNoDefaultValue(sourceLineNumbers, attrib);
@@ -62,7 +61,7 @@ namespace WixToolset.Core
                         msiVersion = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue);
                         break;
                     case "Language":
-                        this.activeLanguage = this.Core.GetAttributeLocalizableIntegerValue(sourceLineNumbers, attrib, 0, Int16.MaxValue);
+                        productLanguage = this.Core.GetAttributeLocalizableIntegerValue(sourceLineNumbers, attrib, 0, Int16.MaxValue);
                         break;
                     case "Manufacturer":
                         manufacturer = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.MustHaveNonWhitespaceCharacters);
@@ -82,7 +81,7 @@ namespace WixToolset.Core
                         productCode = this.Core.GetAttributeGuidValue(sourceLineNumbers, attrib, true);
                         break;
                     case "Scope":
-                        installScope = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                        var installScope = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                         switch (installScope)
                         {
                             case "perMachine":
@@ -129,11 +128,6 @@ namespace WixToolset.Core
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
             }
 
-            if (null == this.activeLanguage)
-            {
-                this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Language"));
-            }
-
             if (null == manufacturer)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Manufacturer"));
@@ -171,11 +165,11 @@ namespace WixToolset.Core
             try
             {
                 this.compilingProduct = true;
-                this.Core.CreateActiveSection(productCode, SectionType.Product, codepage, this.Context.CompilationId);
+                this.Core.CreateActiveSection(productCode, SectionType.Product, this.Context.CompilationId);
 
                 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "Manufacturer"), manufacturer, false, false, false, true);
                 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductCode"), productCode, false, false, false, true);
-                this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductLanguage"), this.activeLanguage, false, false, false, true);
+                this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductLanguage"), productLanguage, false, false, false, true);
                 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductName"), this.activeName, false, false, false, true);
                 this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ProductVersion"), version, false, false, false, true);
                 if (null != upgradeCode)
@@ -188,7 +182,7 @@ namespace WixToolset.Core
                     this.AddProperty(sourceLineNumbers, new Identifier(AccessModifier.Global, "ALLUSERS"), "1", false, false, false, false);
                 }
 
-                this.ValidateAndAddCommonSummaryInformationSymbols(sourceLineNumbers, msiVersion, platform);
+                this.ValidateAndAddCommonSummaryInformationSymbols(sourceLineNumbers, msiVersion, platform, productLanguage);
 
                 this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
                 {
@@ -198,7 +192,7 @@ namespace WixToolset.Core
 
                 var contextValues = new Dictionary<string, string>
                 {
-                    ["ProductLanguage"] = this.activeLanguage,
+                    ["ProductLanguage"] = productLanguage,
                     ["ProductVersion"] = version,
                     ["UpgradeCode"] = upgradeCode
                 };
@@ -360,14 +354,17 @@ namespace WixToolset.Core
 
                 if (!this.Core.EncounteredError)
                 {
-                    if (!isCodepageSet)
+                    this.Core.AddSymbol(new WixPackageSymbol(sourceLineNumbers)
                     {
-                        this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
-                        {
-                            PropertyId = SummaryInformationType.Codepage,
-                            Value = "1252"
-                        });
-                    }
+                        PackageId = productCode,
+                        UpgradeCode = upgradeCode,
+                        Name = this.activeName,
+                        Language = productLanguage,
+                        Version = version,
+                        Manufacturer = manufacturer,
+                        Attributes = isPerMachine ? WixPackageAttributes.PerMachine : WixPackageAttributes.None,
+                        Codepage = codepage,
+                    });
 
                     if (!isPackageNameSet)
                     {
@@ -435,7 +432,7 @@ namespace WixToolset.Core
             }
         }
 
-        private void ValidateAndAddCommonSummaryInformationSymbols(SourceLineNumber sourceLineNumbers, int msiVersion, string platform)
+        private void ValidateAndAddCommonSummaryInformationSymbols(SourceLineNumber sourceLineNumbers, int msiVersion, string platform, string language)
         {
             if (String.Equals(platform, "X64", StringComparison.OrdinalIgnoreCase) && 200 > msiVersion)
             {
@@ -464,7 +461,7 @@ namespace WixToolset.Core
             this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
             {
                 PropertyId = SummaryInformationType.PlatformAndLanguage,
-                Value = String.Format(CultureInfo.InvariantCulture, "{0};{1}", platform, this.activeLanguage)
+                Value = $"{platform};{language}"
             });
 
             this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
@@ -478,7 +475,6 @@ namespace WixToolset.Core
                 PropertyId = SummaryInformationType.Security,
                 Value = "2"
             });
-
         }
 
         /// <summary>
diff --git a/src/WixToolset.Core/Compiler_Patch.cs b/src/WixToolset.Core/Compiler_Patch.cs
index a2cadd67..c9cae183 100644
--- a/src/WixToolset.Core/Compiler_Patch.cs
+++ b/src/WixToolset.Core/Compiler_Patch.cs
@@ -24,7 +24,7 @@ namespace WixToolset.Core
         {
             var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
             string patchId = null;
-            var codepage = 0;
+            string codepage = null;
             ////bool versionMismatches = false;
             ////bool productMismatches = false;
             var allowRemoval = false;
@@ -53,7 +53,7 @@ namespace WixToolset.Core
                         patchId = this.Core.GetAttributeGuidValue(sourceLineNumbers, attrib, true);
                         break;
                     case "Codepage":
-                        codepage = this.Core.GetAttributeCodePageValue(sourceLineNumbers, attrib);
+                        codepage = this.Core.GetAttributeLocalizableCodePageValue(sourceLineNumbers, attrib);
                         break;
                     case "AllowMajorVersionMismatches":
                         ////versionMismatches = (YesNoType.Yes == this.core.GetAttributeYesNoValue(sourceLineNumbers, attrib));
@@ -149,7 +149,7 @@ namespace WixToolset.Core
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Manufacturer"));
             }
 
-            this.Core.CreateActiveSection(this.activeName, SectionType.Patch, codepage, this.Context.CompilationId);
+            this.Core.CreateActiveSection(this.activeName, SectionType.Patch, this.Context.CompilationId);
 
             foreach (var child in node.Elements())
             {
@@ -197,8 +197,9 @@ namespace WixToolset.Core
 
             if (!this.Core.EncounteredError)
             {
-                this.Core.AddSymbol(new WixPatchIdSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, patchId))
+                this.Core.AddSymbol(new WixPatchSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, patchId))
                 {
+                    Codepage = codepage,
                     ClientPatchId = clientPatchId,
                     OptimizePatchSizeForLargeFiles = optimizePatchSizeForLargeFiles,
                     ApiPatchingSymbolFlags = apiPatchingSymbolFlags,
diff --git a/src/WixToolset.Core/Compiler_PatchCreation.cs b/src/WixToolset.Core/Compiler_PatchCreation.cs
index 7675a5c0..81ae4121 100644
--- a/src/WixToolset.Core/Compiler_PatchCreation.cs
+++ b/src/WixToolset.Core/Compiler_PatchCreation.cs
@@ -82,7 +82,7 @@ namespace WixToolset.Core
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
             }
 
-            this.Core.CreateActiveSection(this.activeName, SectionType.PatchCreation, codepage, this.Context.CompilationId);
+            this.Core.CreateActiveSection(this.activeName, SectionType.PatchCreation, this.Context.CompilationId);
 
             foreach (var child in node.Elements())
             {
diff --git a/src/WixToolset.Core/IResolver.cs b/src/WixToolset.Core/IResolver.cs
index 3004ad2c..db25edbe 100644
--- a/src/WixToolset.Core/IResolver.cs
+++ b/src/WixToolset.Core/IResolver.cs
@@ -4,9 +4,16 @@ namespace WixToolset.Core
 {
     using WixToolset.Extensibility.Data;
 
-#pragma warning disable 1591 // TODO: add documentation
+    /// <summary>
+    /// Resolves localization and bind variables.
+    /// </summary>
     public interface IResolver
     {
+        /// <summary>
+        /// Resolve localization and bind variables.
+        /// </summary>
+        /// <param name="context">Resolve context.</param>
+        /// <returns>Resolve result.</returns>
         IResolveResult Resolve(IResolveContext context);
     }
 }
diff --git a/src/WixToolset.Core/Link/CollateLocalizationsCommand.cs b/src/WixToolset.Core/Link/CollateLocalizationsCommand.cs
index ffa66210..d5c69838 100644
--- a/src/WixToolset.Core/Link/CollateLocalizationsCommand.cs
+++ b/src/WixToolset.Core/Link/CollateLocalizationsCommand.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
 namespace WixToolset.Core.Link
 {
@@ -65,7 +65,7 @@ namespace WixToolset.Core.Link
                 }
             }
 
-            return new Localization(existingLocalization.Codepage, existingLocalization.Culture, variables, controls);
+            return new Localization(existingLocalization.Codepage ?? localization.Codepage, existingLocalization.SummaryInformationCodepage ?? localization.SummaryInformationCodepage, existingLocalization.Culture, variables, controls);
         }
     }
 }
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs
index 320f7d1f..2c8508a8 100644
--- a/src/WixToolset.Core/Linker.cs
+++ b/src/WixToolset.Core/Linker.cs
@@ -180,7 +180,7 @@ namespace WixToolset.Core
 
                 // Create a new section to hold the linked content. Start with the entry section's
                 // metadata.
-                var resolvedSection = new IntermediateSection(find.EntrySection.Id, find.EntrySection.Type, find.EntrySection.Codepage);
+                var resolvedSection = new IntermediateSection(find.EntrySection.Id, find.EntrySection.Type);
 
                 var sectionCount = 0;
 
diff --git a/src/WixToolset.Core/LocalizationParser.cs b/src/WixToolset.Core/LocalizationParser.cs
index dd5144ca..d6113fc6 100644
--- a/src/WixToolset.Core/LocalizationParser.cs
+++ b/src/WixToolset.Core/LocalizationParser.cs
@@ -86,7 +86,8 @@ namespace WixToolset.Core
         private static Localization ParseWixLocalizationElement(IMessaging messaging, XElement node)
         {
             var sourceLineNumbers = SourceLineNumber.CreateFromXObject(node);
-            var codepage = -1;
+            int? codepage = null;
+            int? summaryInformationCodepage = null;
             string culture = null;
 
             foreach (var attrib in node.Attributes())
@@ -98,6 +99,9 @@ namespace WixToolset.Core
                         case "Codepage":
                             codepage = Common.GetValidCodePage(attrib.Value, true, false, sourceLineNumbers);
                             break;
+                        case "SummaryInformationCodepage":
+                            summaryInformationCodepage = Common.GetValidCodePage(attrib.Value, true, false, sourceLineNumbers);
+                            break;
                         case "Culture":
                             culture = attrib.Value;
                             break;
@@ -143,7 +147,7 @@ namespace WixToolset.Core
                 }
             }
 
-            return messaging.EncounteredError ? null : new Localization(codepage, culture, variables, localizedControls);
+            return messaging.EncounteredError ? null : new Localization(codepage, summaryInformationCodepage, culture, variables, localizedControls);
         }
 
         /// <summary>
@@ -254,24 +258,12 @@ namespace WixToolset.Core
                             break;
                         case "RightToLeft":
                             rightToLeft = YesNoType.Yes == Common.GetAttributeYesNoValue(messaging, sourceLineNumbers, attrib);
-                            //if (YesNoType.Yes == Common.GetAttributeYesNoValue(messaging, sourceLineNumbers, attrib))
-                            //{
-                            //    attribs |= MsiInterop.MsidbControlAttributesRTLRO;
-                            //}
                             break;
                         case "RightAligned":
                             rightAligned = YesNoType.Yes == Common.GetAttributeYesNoValue(messaging, sourceLineNumbers, attrib);
-                            //if (YesNoType.Yes == Common.GetAttributeYesNoValue(messaging, sourceLineNumbers, attrib))
-                            //{
-                            //    attribs |= MsiInterop.MsidbControlAttributesRightAligned;
-                            //}
                             break;
                         case "LeftScroll":
                             leftScroll = YesNoType.Yes == Common.GetAttributeYesNoValue(messaging, sourceLineNumbers, attrib);
-                            //if (YesNoType.Yes == Common.GetAttributeYesNoValue(messaging, sourceLineNumbers, attrib))
-                            //{
-                            //    attribs |= MsiInterop.MsidbControlAttributesLeftScroll;
-                            //}
                             break;
                         default:
                             Common.UnexpectedAttribute(messaging, sourceLineNumbers, attrib);
diff --git a/src/WixToolset.Core/ResolveResult.cs b/src/WixToolset.Core/ResolveResult.cs
index 6b6bc7c4..38b432b0 100644
--- a/src/WixToolset.Core/ResolveResult.cs
+++ b/src/WixToolset.Core/ResolveResult.cs
@@ -8,7 +8,11 @@ namespace WixToolset.Core
 
     internal class ResolveResult : IResolveResult
     {
-        public int Codepage { get; set; }
+        public int? Codepage { get; set; }
+
+        public int? SummaryInformationCodepage { get; set; }
+
+        public int? PackageLcid { get; set; }
 
         public IEnumerable<IDelayedField> DelayedFields { get; set; }
 
diff --git a/src/WixToolset.Core/Resolver.cs b/src/WixToolset.Core/Resolver.cs
index 92c2a9c9..f4cb2fd6 100644
--- a/src/WixToolset.Core/Resolver.cs
+++ b/src/WixToolset.Core/Resolver.cs
@@ -4,6 +4,7 @@ namespace WixToolset.Core
 {
     using System;
     using System.Collections.Generic;
+    using System.Globalization;
     using System.Linq;
     using WixToolset.Core.Bind;
     using WixToolset.Data;
@@ -22,26 +23,12 @@ namespace WixToolset.Core
             this.ServiceProvider = serviceProvider;
 
             this.Messaging = serviceProvider.GetService<IMessaging>();
-
-            this.VariableResolver = serviceProvider.GetService<IVariableResolver>();
         }
 
         private IServiceProvider ServiceProvider { get; }
 
         private IMessaging Messaging { get; }
 
-        private IVariableResolver VariableResolver { get; set; }
-
-        public IEnumerable<IBindPath> BindPaths { get; set; }
-
-        public string IntermediateFolder { get; set; }
-
-        public Intermediate IntermediateRepresentation { get; set; }
-
-        public IEnumerable<Localization> Localizations { get; set; }
-
-        public IEnumerable<string> FilterCultures { get; set; }
-
         public IResolveResult Resolve(IResolveContext context)
         {
             foreach (var extension in context.Extensions)
@@ -52,11 +39,26 @@ namespace WixToolset.Core
             ResolveResult resolveResult = null;
             try
             {
-                var codepage = this.PopulateVariableResolver(context);
+                var filteredLocalizations = FilterLocalizations(context);
+
+                var variableResolver = this.CreateVariableResolver(context, filteredLocalizations);
+
+                this.LocalizeUI(variableResolver, context.IntermediateRepresentation);
+
+                resolveResult = this.DoResolve(context, variableResolver);
+
+                var primaryLocalization = filteredLocalizations.FirstOrDefault();
+
+                if (primaryLocalization != null)
+                {
+                    this.TryGetCultureInfo(primaryLocalization.Culture, out var cultureInfo);
 
-                this.LocalizeUI(context);
+                    resolveResult.Codepage = primaryLocalization.Codepage ?? cultureInfo?.TextInfo.ANSICodePage;
 
-                resolveResult = this.DoResolve(context, codepage);
+                    resolveResult.SummaryInformationCodepage = primaryLocalization.SummaryInformationCodepage ?? primaryLocalization.Codepage ?? cultureInfo?.TextInfo.ANSICodePage;
+
+                    resolveResult.PackageLcid = cultureInfo?.LCID;
+                }
             }
             finally
             {
@@ -69,7 +71,7 @@ namespace WixToolset.Core
             return resolveResult;
         }
 
-        private ResolveResult DoResolve(IResolveContext context, int? codepage)
+        private ResolveResult DoResolve(IResolveContext context, IVariableResolver variableResolver)
         {
             var buildingPatch = context.IntermediateRepresentation.Sections.Any(s => s.Type == SectionType.Patch);
 
@@ -80,7 +82,7 @@ namespace WixToolset.Core
                 var command = new ResolveFieldsCommand();
                 command.Messaging = this.Messaging;
                 command.BuildingPatch = buildingPatch;
-                command.VariableResolver = this.VariableResolver;
+                command.VariableResolver = variableResolver;
                 command.BindPaths = context.BindPaths;
                 command.Extensions = context.Extensions;
                 command.FilesWithEmbeddedFiles = filesWithEmbeddedFiles;
@@ -118,7 +120,6 @@ namespace WixToolset.Core
 
             return new ResolveResult
             {
-                Codepage = codepage.HasValue ? codepage.Value : -1,
                 ExpectedEmbeddedFiles = expectedEmbeddedFiles,
                 DelayedFields = delayedFields,
                 IntermediateRepresentation = context.IntermediateRepresentation
@@ -128,13 +129,13 @@ namespace WixToolset.Core
         /// <summary>
         /// Localize dialogs and controls.
         /// </summary>
-        private void LocalizeUI(IResolveContext context)
+        private void LocalizeUI(IVariableResolver variableResolver, Intermediate intermediate)
         {
-            foreach (var section in context.IntermediateRepresentation.Sections)
+            foreach (var section in intermediate.Sections)
             {
                 foreach (var symbol in section.Symbols.OfType<DialogSymbol>())
                 {
-                    if (this.VariableResolver.TryGetLocalizedControl(symbol.Id.Id, null, out var localizedControl))
+                    if (variableResolver.TryGetLocalizedControl(symbol.Id.Id, null, out var localizedControl))
                     {
                         if (CompilerConstants.IntegerNotSet != localizedControl.X)
                         {
@@ -169,7 +170,7 @@ namespace WixToolset.Core
 
                 foreach (var symbol in section.Symbols.OfType<ControlSymbol>())
                 {
-                    if (this.VariableResolver.TryGetLocalizedControl(symbol.DialogRef, symbol.Control, out var localizedControl))
+                    if (variableResolver.TryGetLocalizedControl(symbol.DialogRef, symbol.Control, out var localizedControl))
                     {
                         if (CompilerConstants.IntegerNotSet != localizedControl.X)
                         {
@@ -204,24 +205,42 @@ namespace WixToolset.Core
             }
         }
 
-        private int? PopulateVariableResolver(IResolveContext context)
+        private IVariableResolver CreateVariableResolver(IResolveContext context, IEnumerable<Localization> filteredLocalizations)
         {
-            var localizations = FilterLocalizations(context);
-            var codepage = localizations.FirstOrDefault()?.Codepage;
+            var variableResolver = this.ServiceProvider.GetService<IVariableResolver>();
 
-            foreach (var localization in localizations)
+            foreach (var localization in filteredLocalizations)
             {
-                this.VariableResolver.AddLocalization(localization);
+                variableResolver.AddLocalization(localization);
             }
 
             // Gather all the wix variables.
             var wixVariableSymbols = context.IntermediateRepresentation.Sections.SelectMany(s => s.Symbols).OfType<WixVariableSymbol>();
             foreach (var symbol in wixVariableSymbols)
             {
-                this.VariableResolver.AddVariable(symbol.SourceLineNumbers, symbol.Id.Id, symbol.Value, symbol.Overridable);
+                variableResolver.AddVariable(symbol.SourceLineNumbers, symbol.Id.Id, symbol.Value, symbol.Overridable);
+            }
+
+            return variableResolver;
+        }
+
+        private bool TryGetCultureInfo(string culture, out CultureInfo cultureInfo)
+        {
+            cultureInfo = null;
+
+            if (!String.IsNullOrEmpty(culture))
+            {
+                try
+                {
+                    cultureInfo = new CultureInfo(culture, useUserOverride: false);
+                }
+                catch
+                {
+                    this.Messaging.Write("");
+                }
             }
 
-            return codepage;
+            return cultureInfo != null;
         }
 
         private static IEnumerable<Localization> FilterLocalizations(IResolveContext context)