Keep Group symbol fields and attributes unnested

2 files changed, 59 insertions, 59 deletions

diff --git a/src/ext/Util/wixext/Symbols/GroupGroupSymbol.cs b/src/ext/Util/wixext/Symbols/GroupGroupSymbol.cs
index fdd1ee76..a4ec6ddd 100644
--- a/src/ext/Util/wixext/Symbols/GroupGroupSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/GroupGroupSymbol.cs
@@ -11,8 +11,8 @@ namespace WixToolset.Util
             UtilSymbolDefinitionType.GroupGroup.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(GroupGroupSymbol.SymbolFields.ParentGroupRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(GroupGroupSymbol.SymbolFields.ChildGroupRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(GroupGroupSymbolFields.ParentGroupRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(GroupGroupSymbolFields.ChildGroupRef), IntermediateFieldType.String),
             },
             typeof(UserGroupSymbol));
     }
@@ -22,14 +22,14 @@ namespace WixToolset.Util.Symbols
 {
     using WixToolset.Data;
 
-    public class GroupGroupSymbol : IntermediateSymbol
+    public enum GroupGroupSymbolFields
     {
-        public enum SymbolFields
-        {
-            ParentGroupRef,
-            ChildGroupRef,
-        }
+        ParentGroupRef,
+        ChildGroupRef,
+    }
 
+    public class GroupGroupSymbol : IntermediateSymbol
+    {
         public GroupGroupSymbol() : base(UtilSymbolDefinitions.GroupGroup, null, null)
         {
         }
@@ -38,18 +38,18 @@ namespace WixToolset.Util.Symbols
         {
         }
 
-        public IntermediateField this[GroupGroupSymbol.SymbolFields index] => this.Fields[(int)index];
+        public IntermediateField this[GroupGroupSymbolFields index] => this.Fields[(int)index];
 
         public string ParentGroupRef
         {
-            get => this.Fields[(int)GroupGroupSymbol.SymbolFields.ParentGroupRef].AsString();
-            set => this.Set((int)GroupGroupSymbol.SymbolFields.ParentGroupRef, value);
+            get => this.Fields[(int)GroupGroupSymbolFields.ParentGroupRef].AsString();
+            set => this.Set((int)GroupGroupSymbolFields.ParentGroupRef, value);
         }
 
         public string ChildGroupRef
         {
-            get => this.Fields[(int)GroupGroupSymbol.SymbolFields.ChildGroupRef].AsString();
-            set => this.Set((int)GroupGroupSymbol.SymbolFields.ChildGroupRef, value);
+            get => this.Fields[(int)GroupGroupSymbolFields.ChildGroupRef].AsString();
+            set => this.Set((int)GroupGroupSymbolFields.ChildGroupRef, value);
         }
 
     }
diff --git a/src/ext/Util/wixext/Symbols/GroupSymbol.cs b/src/ext/Util/wixext/Symbols/GroupSymbol.cs
index ac6f6608..551b22e7 100644
--- a/src/ext/Util/wixext/Symbols/GroupSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/GroupSymbol.cs
@@ -11,9 +11,9 @@ namespace WixToolset.Util
             UtilSymbolDefinitionType.Group.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(GroupSymbol.SymbolFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(GroupSymbol.SymbolFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(GroupSymbol.SymbolFields.Domain), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(GroupSymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(GroupSymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(GroupSymbolFields.Domain), IntermediateFieldType.String),
             },
             typeof(GroupSymbol));
 
@@ -21,9 +21,9 @@ namespace WixToolset.Util
             UtilSymbolDefinitionType.Group6.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(Group6Symbol.SymbolFields.GroupRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(Group6Symbol.SymbolFields.Comment), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(Group6Symbol.SymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(Group6SymbolFields.GroupRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(Group6SymbolFields.Comment), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(Group6SymbolFields.Attributes), IntermediateFieldType.Number),
             },
             typeof(Group6Symbol));
     }
@@ -34,15 +34,15 @@ namespace WixToolset.Util.Symbols
     using System;
     using WixToolset.Data;
 
-    public class GroupSymbol : IntermediateSymbol
+    public enum GroupSymbolFields
     {
-        public enum SymbolFields
-        {
-            ComponentRef,
-            Name,
-            Domain,
-        }
+        ComponentRef,
+        Name,
+        Domain,
+    }
 
+    public class GroupSymbol : IntermediateSymbol
+    {
         public GroupSymbol() : base(UtilSymbolDefinitions.Group, null, null)
         {
         }
@@ -51,48 +51,48 @@ namespace WixToolset.Util.Symbols
         {
         }
 
-        public IntermediateField this[GroupSymbol.SymbolFields index] => this.Fields[(int)index];
+        public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => this.Fields[(int)GroupSymbol.SymbolFields.ComponentRef].AsString();
-            set => this.Set((int)GroupSymbol.SymbolFields.ComponentRef, value);
+            get => this.Fields[(int)GroupSymbolFields.ComponentRef].AsString();
+            set => this.Set((int)GroupSymbolFields.ComponentRef, value);
         }
 
         public string Name
         {
-            get => this.Fields[(int)GroupSymbol.SymbolFields.Name].AsString();
-            set => this.Set((int)GroupSymbol.SymbolFields.Name, value);
+            get => this.Fields[(int)GroupSymbolFields.Name].AsString();
+            set => this.Set((int)GroupSymbolFields.Name, value);
         }
 
         public string Domain
         {
-            get => this.Fields[(int)GroupSymbol.SymbolFields.Domain].AsString();
-            set => this.Set((int)GroupSymbol.SymbolFields.Domain, value);
+            get => this.Fields[(int)GroupSymbolFields.Domain].AsString();
+            set => this.Set((int)GroupSymbolFields.Domain, value);
         }
     }
 
-    public class Group6Symbol : IntermediateSymbol
+    [Flags]
+    public enum Group6SymbolAttributes
     {
-        [Flags]
-        public enum SymbolAttributes
-        {
-            None = 0x00000000,
-            FailIfExists = 0x00000010,
-            UpdateIfExists = 0x00000020,
-            DontRemoveOnUninstall = 0x00000100,
-            DontCreateGroup = 0x00000200,
-            NonVital = 0x00000400,
-            RemoveComment = 0x00000800,
-        }
+        None = 0x00000000,
+        FailIfExists = 0x00000010,
+        UpdateIfExists = 0x00000020,
+        DontRemoveOnUninstall = 0x00000100,
+        DontCreateGroup = 0x00000200,
+        NonVital = 0x00000400,
+        RemoveComment = 0x00000800,
+    }
 
-        public enum SymbolFields
-        {
-            GroupRef,
-            Comment,
-            Attributes,
-        }
+    public enum Group6SymbolFields
+    {
+        GroupRef,
+        Comment,
+        Attributes,
+    }
 
+    public class Group6Symbol : IntermediateSymbol
+    {
         public Group6Symbol() : base(UtilSymbolDefinitions.Group6, null, null)
         {
         }
@@ -101,24 +101,24 @@ namespace WixToolset.Util.Symbols
         {
         }
 
-        public IntermediateField this[Group6Symbol.SymbolFields index] => this.Fields[(int)index];
+        public IntermediateField this[Group6SymbolFields index] => this.Fields[(int)index];
 
         public string GroupRef
         {
-            get => this.Fields[(int)Group6Symbol.SymbolFields.GroupRef].AsString();
-            set => this.Set((int)Group6Symbol.SymbolFields.GroupRef, value);
+            get => this.Fields[(int)Group6SymbolFields.GroupRef].AsString();
+            set => this.Set((int)Group6SymbolFields.GroupRef, value);
         }
 
         public string Comment
         {
-            get => this.Fields[(int)Group6Symbol.SymbolFields.Comment].AsString();
-            set => this.Set((int)Group6Symbol.SymbolFields.Comment, value);
+            get => this.Fields[(int)Group6SymbolFields.Comment].AsString();
+            set => this.Set((int)Group6SymbolFields.Comment, value);
         }
 
-        public SymbolAttributes Attributes
+        public Group6SymbolAttributes Attributes
         {
-            get => (SymbolAttributes)this.Fields[(int)Group6Symbol.SymbolFields.Attributes].AsNumber();
-            set => this.Set((int)Group6Symbol.SymbolFields.Attributes, (int)value);
+            get => (Group6SymbolAttributes)this.Fields[(int)Group6SymbolFields.Attributes].AsNumber();
+            set => this.Set((int)Group6SymbolFields.Attributes, (int)value);
         }
     }
 }