From 4bb99d4a7521f3182b3d8ea9833038dc067db118 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 2 Apr 2021 14:28:56 -0700
Subject: Move codepage from section and to package, module, patch symbols

Contributes to wixtoolset/issues#5801
---
 src/WixToolset.Data/IntermediateSection.cs | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'src/WixToolset.Data/IntermediateSection.cs')

diff --git a/src/WixToolset.Data/IntermediateSection.cs b/src/WixToolset.Data/IntermediateSection.cs
index 86aa0c89..b9157875 100644
--- a/src/WixToolset.Data/IntermediateSection.cs
+++ b/src/WixToolset.Data/IntermediateSection.cs
@@ -18,13 +18,11 @@ namespace WixToolset.Data
         /// </summary>
         /// <param name="id">Identifier for section.</param>
         /// <param name="type">Type of section.</param>
-        /// <param name="codepage">Codepage for resulting database.</param>
         /// <param name="compilationId">Optional compilation identifier</param>
-        public IntermediateSection(string id, SectionType type, int codepage, string compilationId = null)
+        public IntermediateSection(string id, SectionType type, string compilationId = null)
         {
             this.Id = id;
             this.Type = type;
-            this.Codepage = codepage;
             this.CompilationId = compilationId;
             this.symbols = new List<IntermediateSymbol>();
         }
@@ -41,12 +39,6 @@ namespace WixToolset.Data
         /// <value>Type of section.</value>
         public SectionType Type { get; }
 
-        /// <summary>
-        /// Gets the codepage for the section.
-        /// </summary>
-        /// <value>Codepage for the section.</value>
-        public int Codepage { get; }
-
         /// <summary>
         /// Gets and sets the identifier of the compilation of the source file containing the section.
         /// </summary>
@@ -98,7 +90,6 @@ namespace WixToolset.Data
         /// </summary>
         internal static IntermediateSection Deserialize(ISymbolDefinitionCreator creator, Uri baseUri, JsonObject jsonObject)
         {
-            var codepage = jsonObject.GetValueOrDefault("codepage", 0);
             var id = jsonObject.GetValueOrDefault<string>("id");
             var type = jsonObject.GetEnumOrDefault("type", SectionType.Unknown);
 
@@ -107,7 +98,7 @@ namespace WixToolset.Data
                 throw new ArgumentException("JSON object is not a valid section, unknown section type", nameof(type));
             }
 
-            var section = new IntermediateSection(id, type, codepage);
+            var section = new IntermediateSection(id, type);
 
             var symbolsJson = jsonObject.GetValueOrDefault<JsonArray>("symbols");
 
@@ -124,8 +115,7 @@ namespace WixToolset.Data
         {
             var jsonObject = new JsonObject
             {
-                { "type", this.Type.ToString().ToLowerInvariant() },
-                { "codepage", this.Codepage }
+                { "type", this.Type.ToString().ToLowerInvariant() }
             };
 
             if (!String.IsNullOrEmpty(this.Id))
-- 
cgit v1.2.3-55-g6feb