3 files changed, 143 insertions, 18 deletions

diff --git a/src/ext/Util/wixext/Symbols/GroupGroupSymbol.cs b/src/ext/Util/wixext/Symbols/GroupGroupSymbol.cs
new file mode 100644
index 00000000..fdd1ee76
--- /dev/null
+++ b/src/ext/Util/wixext/Symbols/GroupGroupSymbol.cs
@@ -0,0 +1,56 @@
+// 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.Util
+{
+    using WixToolset.Data;
+    using WixToolset.Util.Symbols;
+
+    public static partial class UtilSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition GroupGroup = new IntermediateSymbolDefinition(
+            UtilSymbolDefinitionType.GroupGroup.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(GroupGroupSymbol.SymbolFields.ParentGroupRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(GroupGroupSymbol.SymbolFields.ChildGroupRef), IntermediateFieldType.String),
+            },
+            typeof(UserGroupSymbol));
+    }
+}
+
+namespace WixToolset.Util.Symbols
+{
+    using WixToolset.Data;
+
+    public class GroupGroupSymbol : IntermediateSymbol
+    {
+        public enum SymbolFields
+        {
+            ParentGroupRef,
+            ChildGroupRef,
+        }
+
+        public GroupGroupSymbol() : base(UtilSymbolDefinitions.GroupGroup, null, null)
+        {
+        }
+
+        public GroupGroupSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.GroupGroup, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[GroupGroupSymbol.SymbolFields index] => this.Fields[(int)index];
+
+        public string ParentGroupRef
+        {
+            get => this.Fields[(int)GroupGroupSymbol.SymbolFields.ParentGroupRef].AsString();
+            set => this.Set((int)GroupGroupSymbol.SymbolFields.ParentGroupRef, value);
+        }
+
+        public string ChildGroupRef
+        {
+            get => this.Fields[(int)GroupGroupSymbol.SymbolFields.ChildGroupRef].AsString();
+            set => this.Set((int)GroupGroupSymbol.SymbolFields.ChildGroupRef, value);
+        }
+
+    }
+}
diff --git a/src/ext/Util/wixext/Symbols/GroupSymbol.cs b/src/ext/Util/wixext/Symbols/GroupSymbol.cs
index b378db44..ef1dc33f 100644
--- a/src/ext/Util/wixext/Symbols/GroupSymbol.cs
+++ b/src/ext/Util/wixext/Symbols/GroupSymbol.cs
@@ -11,27 +11,38 @@ namespace WixToolset.Util
             UtilSymbolDefinitionType.Group.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(GroupSymbolFields.ComponentRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(GroupSymbolFields.Name), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(GroupSymbolFields.Domain), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(GroupSymbol.SymbolFields.ComponentRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(GroupSymbol.SymbolFields.Name), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(GroupSymbol.SymbolFields.Domain), IntermediateFieldType.String),
             },
             typeof(GroupSymbol));
+
+        public static readonly IntermediateSymbolDefinition Group6 = new IntermediateSymbolDefinition(
+            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),
+            },
+            typeof(Group6Symbol));
     }
 }
 
 namespace WixToolset.Util.Symbols
 {
+    using System;
     using WixToolset.Data;
 
-    public enum GroupSymbolFields
-    {
-        ComponentRef,
-        Name,
-        Domain,
-    }
-
     public class GroupSymbol : IntermediateSymbol
     {
+        public enum SymbolFields
+        {
+            ComponentRef,
+            Name,
+            Domain,
+        }
+
         public GroupSymbol() : base(UtilSymbolDefinitions.Group, null, null)
         {
         }
@@ -40,24 +51,74 @@ namespace WixToolset.Util.Symbols
         {
         }
 
-        public IntermediateField this[GroupSymbolFields index] => this.Fields[(int)index];
+        public IntermediateField this[GroupSymbol.SymbolFields index] => this.Fields[(int)index];
 
         public string ComponentRef
         {
-            get => this.Fields[(int)GroupSymbolFields.ComponentRef].AsString();
-            set => this.Set((int)GroupSymbolFields.ComponentRef, value);
+            get => this.Fields[(int)GroupSymbol.SymbolFields.ComponentRef].AsString();
+            set => this.Set((int)GroupSymbol.SymbolFields.ComponentRef, value);
         }
 
         public string Name
         {
-            get => this.Fields[(int)GroupSymbolFields.Name].AsString();
-            set => this.Set((int)GroupSymbolFields.Name, value);
+            get => this.Fields[(int)GroupSymbol.SymbolFields.Name].AsString();
+            set => this.Set((int)GroupSymbol.SymbolFields.Name, value);
         }
 
         public string Domain
         {
-            get => this.Fields[(int)GroupSymbolFields.Domain].AsString();
-            set => this.Set((int)GroupSymbolFields.Domain, value);
+            get => this.Fields[(int)GroupSymbol.SymbolFields.Domain].AsString();
+            set => this.Set((int)GroupSymbol.SymbolFields.Domain, value);
         }
     }
-}
\ No newline at end of file
+
+    public class Group6Symbol : IntermediateSymbol
+    {
+        [Flags]
+        public enum SymbolAttributes
+        {
+            None = 0x00000000,
+            FailIfExists = 0x00000001,
+            UpdateIfExists = 0x00000002,
+            DontRemoveOnUninstall = 0x00000004,
+            DontCreateGroup = 0x00000008,
+            NonVital = 0x00000010,
+            RemoveComment = 0x00000020,
+        }
+
+        public enum SymbolFields
+        {
+            GroupRef,
+            Comment,
+            Attributes,
+        }
+
+        public Group6Symbol() : base(UtilSymbolDefinitions.Group6, null, null)
+        {
+        }
+
+        public Group6Symbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(UtilSymbolDefinitions.Group6, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[Group6Symbol.SymbolFields index] => this.Fields[(int)index];
+
+        public string GroupRef
+        {
+            get => this.Fields[(int)Group6Symbol.SymbolFields.GroupRef].AsString();
+            set => this.Set((int)Group6Symbol.SymbolFields.GroupRef, value);
+        }
+
+        public string Comment
+        {
+            get => this.Fields[(int)Group6Symbol.SymbolFields.Comment].AsString();
+            set => this.Set((int)Group6Symbol.SymbolFields.Comment, value);
+        }
+
+        public SymbolAttributes Attributes
+        {
+            get => (SymbolAttributes)this.Fields[(int)Group6Symbol.SymbolFields.Attributes].AsNumber();
+            set => this.Set((int)Group6Symbol.SymbolFields.Attributes, (int)value);
+        }
+    }
+}
diff --git a/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs b/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs
index 8152868f..43d0fca0 100644
--- a/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs
+++ b/src/ext/Util/wixext/Symbols/UtilSymbolDefinitions.cs
@@ -12,6 +12,8 @@ namespace WixToolset.Util
         FileShare,
         FileSharePermissions,
         Group,
+        Group6,
+        GroupGroup,
         Perfmon,
         PerfmonManifest,
         PerformanceCategory,
@@ -59,6 +61,12 @@ namespace WixToolset.Util
                 case UtilSymbolDefinitionType.Group:
                     return UtilSymbolDefinitions.Group;
 
+                case UtilSymbolDefinitionType.Group6:
+                    return UtilSymbolDefinitions.Group6;
+
+                case UtilSymbolDefinitionType.GroupGroup:
+                    return UtilSymbolDefinitions.GroupGroup;
+
                 case UtilSymbolDefinitionType.Perfmon:
                     return UtilSymbolDefinitions.Perfmon;