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/Symbols/SymbolDefinitions.cs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/WixToolset.Data/Symbols/SymbolDefinitions.cs')

diff --git a/src/WixToolset.Data/Symbols/SymbolDefinitions.cs b/src/WixToolset.Data/Symbols/SymbolDefinitions.cs
index 54deb87f..0ed0a4ec 100644
--- a/src/WixToolset.Data/Symbols/SymbolDefinitions.cs
+++ b/src/WixToolset.Data/Symbols/SymbolDefinitions.cs
@@ -56,7 +56,7 @@ namespace WixToolset.Data
         ModuleDependency,
         ModuleExclusion,
         ModuleIgnoreTable,
-        ModuleSignature,
+        WixModule,
         ModuleSubstitution,
         MoveFile,
         Assembly,
@@ -172,9 +172,10 @@ namespace WixToolset.Data
         WixMediaTemplate,
         WixMerge,
         WixOrdering,
+        WixPackage,
         WixPatchBaseline,
         WixPatchFamilyGroup,
-        WixPatchId,
+        WixPatch,
         WixPatchRef,
         WixPatchTarget,
         WixProductSearch,
@@ -362,8 +363,8 @@ namespace WixToolset.Data
                 case SymbolDefinitionType.ModuleIgnoreTable:
                     return SymbolDefinitions.ModuleIgnoreTable;
 
-                case SymbolDefinitionType.ModuleSignature:
-                    return SymbolDefinitions.ModuleSignature;
+                case SymbolDefinitionType.WixModule:
+                    return SymbolDefinitions.WixModule;
 
                 case SymbolDefinitionType.ModuleSubstitution:
                     return SymbolDefinitions.ModuleSubstitution;
@@ -707,13 +708,16 @@ namespace WixToolset.Data
                 case SymbolDefinitionType.WixOrdering:
                     return SymbolDefinitions.WixOrdering;
 
+                case SymbolDefinitionType.WixPackage:
+                    return SymbolDefinitions.WixPackage;
+
                 case SymbolDefinitionType.WixPatchBaseline:
                     return SymbolDefinitions.WixPatchBaseline;
 
                 case SymbolDefinitionType.WixPatchFamilyGroup:
                     return SymbolDefinitions.WixPatchFamilyGroup;
 
-                case SymbolDefinitionType.WixPatchId:
+                case SymbolDefinitionType.WixPatch:
                     return SymbolDefinitions.WixPatchId;
 
                 case SymbolDefinitionType.WixPatchRef:
-- 
cgit v1.2.3-55-g6feb