2 files changed, 111 insertions, 14 deletions

diff --git a/src/xsd/util.xsd b/src/xsd/util.xsd
index 1b649f48..c0a9e44a 100644
--- a/src/xsd/util.xsd
+++ b/src/xsd/util.xsd
@@ -701,19 +701,18 @@
 
   <xs:element name="Group">
     <xs:annotation>
+      <xs:documentation>Group for all kinds of (usergroup) things.  When it is not nested under a component it is included in the MSI so it can be referenced by other elements such as the GroupRef element under a User element (to add the User to the Group).  When it is nested under a Component element, the Group will be created on install and can also be used for reference.</xs:documentation>
       <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Component" />
         <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
         <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
         <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Package" />
+        <xse:seeAlso ref="GroupRef" />
       </xs:appinfo>
-      <xs:documentation>
-        Finds user groups on the local machine or specified Active Directory domain. The local machine will be
-        searched for the group first then fallback to looking in Active Directory. This element is not capable
-        of creating new groups but can be used to add new or existing users to an existing group.
-      </xs:documentation>
     </xs:annotation>
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="GroupRef" minOccurs="0" maxOccurs="unbounded" />
         <xs:any namespace="##other" processContents="lax">
           <xs:annotation>
             <xs:documentation>
@@ -730,7 +729,7 @@
       </xs:attribute>
       <xs:attribute name="Name" type="xs:string" use="required">
         <xs:annotation>
-          <xs:documentation>A [Formatted](https://learn.microsoft.com/en-us/windows/win32/msi/formatted) string that contains the name of the group to be found.</xs:documentation>
+          <xs:documentation>A [Formatted](https://learn.microsoft.com/en-us/windows/win32/msi/formatted) string that contains the name of the group.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="Domain" type="xs:string">
@@ -738,6 +737,41 @@
           <xs:documentation>An optional [Formatted](https://learn.microsoft.com/en-us/windows/win32/msi/formatted) string that specifies the domain for the group.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
+      <xs:attribute name="RemoveOnUninstall" type="wxs:YesNoTypeUnion">
+        <xs:annotation>
+          <xs:documentation>Indicates whether the group should be removed or left behind on uninstall.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="FailIfExists" type="wxs:YesNoTypeUnion">
+        <xs:annotation>
+          <xs:documentation>Indicates if the install should fail if the group already exists.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="UpdateIfExists" type="wxs:YesNoTypeUnion">
+        <xs:annotation>
+          <xs:documentation>Indicates if the group properties should be updated if the group already exists.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="CreateGroup" type="wxs:YesNoTypeUnion">
+        <xs:annotation>
+          <xs:documentation>Indicates whether or not to create the group.  Group creation can be skipped if all that is desired is to add group memberships.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="Vital" type="wxs:YesNoTypeUnion">
+        <xs:annotation>
+          <xs:documentation>Indicates whether failure to create the group or add the group to another group fails the installation. The default value is "yes".</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="Comment" type="xs:string">
+        <xs:annotation>
+            <xs:documentation>Optional comment to set on the group.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="RemoveComment" type="wxs:YesNoTypeUnion">
+        <xs:annotation>
+          <xs:documentation>Indicates whether remove the comment from the group. The default value is "no".</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
       <xs:anyAttribute namespace="##other" processContents="lax">
         <xs:annotation>
           <xs:documentation>
@@ -751,7 +785,7 @@
 
   <xs:element name="GroupRef">
     <xs:annotation>
-      <xs:documentation>Used to join a user to a group</xs:documentation>
+      <xs:documentation>Used to join a user / group to a group</xs:documentation>
     </xs:annotation>
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -1853,12 +1887,12 @@
       <xs:attribute name="Id" type="xs:string" />
       <xs:attribute name="Name" type="xs:string" use="required">
         <xs:annotation>
-          <xs:documentation>A [Formatted])(https://learn.microsoft.com/en-us/windows/win32/msi/formatted) string that contains the name of the user account.</xs:documentation>
+          <xs:documentation>A [Formatted](https://learn.microsoft.com/en-us/windows/win32/msi/formatted) string that contains the name of the user account.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="Domain" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A [Formatted])(https://learn.microsoft.com/en-us/windows/win32/msi/formatted) string that contains the local machine or Active Directory domain for the user.</xs:documentation>
+          <xs:documentation>A [Formatted](https://learn.microsoft.com/en-us/windows/win32/msi/formatted) string that contains the local machine or Active Directory domain for the user.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="Password" type="xs:string">
diff --git a/src/xsd/wix.xsd b/src/xsd/wix.xsd
index 4229352c..165f76e3 100644
--- a/src/xsd/wix.xsd
+++ b/src/xsd/wix.xsd
@@ -87,6 +87,7 @@
         <xs:element ref="Log" minOccurs="0" maxOccurs="1" />
         <xs:element ref="PayloadGroup" />
         <xs:element ref="PayloadGroupRef" />
+        <xs:element ref="Payloads" />
         <xs:element ref="RelatedBundle" />
         <xs:element ref="Requires" />
         <xs:element ref="SetVariable" />
@@ -187,7 +188,7 @@
       <xs:attribute name="Id" type="xs:string">
         <xs:annotation>
           <xs:documentation>
-            _New in WiX v6: WiX v6 adds this attribute to the `Package` element._
+            _New in WiX v6: WiX v6 adds this attribute to the `Bundle` element._
             A globally unique identiifer for the bundle in the world. It is recommended to use a prefix such as "CompanyName." to
             create a namespace of sorts. By default, higher versioned upgrade lower versioned bundles with the same Id. Use this
             attribute instead of the UpgradeCode attribute in new development.
@@ -462,6 +463,7 @@
         <xs:element ref="BootstrapperApplicationDll" minOccurs="0" maxOccurs="1" />
         <xs:element ref="Payload" />
         <xs:element ref="PayloadGroupRef" />
+        <xs:element ref="Payloads" />
         <xs:any namespace="##other" processContents="lax">
           <xs:annotation>
             <xs:documentation>
@@ -524,6 +526,7 @@
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element ref="Payload" />
         <xs:element ref="PayloadGroupRef" />
+        <xs:element ref="Payloads" />
         <xs:any namespace="##other" processContents="lax">
           <xs:annotation>
             <xs:documentation>
@@ -666,6 +669,7 @@
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element ref="Payload" />
         <xs:element ref="PayloadGroupRef" />
+        <xs:element ref="Payloads" />
         <xs:any namespace="##other" processContents="lax">
           <xs:annotation>
             <xs:documentation>
@@ -934,6 +938,7 @@
         <xs:element ref="SlipstreamMsp" />
         <xs:element ref="Payload" />
         <xs:element ref="PayloadGroupRef" />
+        <xs:element ref="Payloads" />
         <xs:element ref="MsiPackagePayload" />
         <xs:element ref="Provides" />
         <xs:any namespace="##other" processContents="lax">
@@ -998,6 +1003,7 @@
         <xs:element ref="MsiProperty" />
         <xs:element ref="Payload" />
         <xs:element ref="PayloadGroupRef" />
+        <xs:element ref="Payloads" />
         <xs:element ref="MspPackagePayload" />
         <xs:element ref="Provides" />
         <xs:any namespace="##other" processContents="lax">
@@ -1045,6 +1051,7 @@
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element ref="Payload" />
         <xs:element ref="PayloadGroupRef" />
+        <xs:element ref="Payloads" />
         <xs:element ref="MsuPackagePayload" />
         <xs:element ref="Provides" />
         <xs:any namespace="##other" processContents="lax">
@@ -1081,6 +1088,7 @@
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element ref="Payload" />
         <xs:element ref="PayloadGroupRef" />
+        <xs:element ref="Payloads" />
         <xs:element ref="ExePackagePayload" />
         <xs:element ref="ExitCode" />
         <xs:element ref="CommandLine" />
@@ -1169,6 +1177,7 @@
       <xs:choice minOccurs="0" maxOccurs="unbounded">
         <xs:element ref="Payload" />
         <xs:element ref="PayloadGroupRef" />
+        <xs:element ref="Payloads" />
         <xs:element ref="BundlePackagePayload" />
         <xs:element ref="ExitCode" />
         <xs:element ref="CommandLine" />
@@ -1930,6 +1939,7 @@
         <xs:element ref="MsuPackagePayload" />
         <xs:element ref="Payload" />
         <xs:element ref="PayloadGroupRef" />
+        <xs:element ref="Payloads" />
       </xs:choice>
       <xs:attribute name="Id" type="xs:string" use="required">
         <xs:annotation>
@@ -8973,10 +8983,10 @@
       </xs:anyAttribute>
     </xs:complexType>
   </xs:element>
-  <xs:element name="Files">
+  <xs:element name="Payloads">
     <xs:annotation>
       <xs:documentation>
-        Authoring to define the set of files to be harvested for inclusion in a package.
+        Authoring to define the set of files to be harvested for inclusion in a bundle.
       </xs:documentation>
     </xs:annotation>
     <xs:complexType>
@@ -9011,6 +9021,59 @@
           </xs:documentation>
         </xs:annotation>
       </xs:attribute>
+      <xs:anyAttribute namespace="##other" processContents="lax">
+        <xs:annotation>
+          <xs:documentation>
+            Extensibility point in the WiX XML Schema. Schema extensions can register additional
+            attributes at this point in the schema.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:anyAttribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Files">
+    <xs:annotation>
+      <xs:documentation>
+        Authoring to define the set of files to be harvested for inclusion in a package.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="Exclude" />
+        <xs:any namespace="##other" processContents="lax">
+          <xs:annotation>
+            <xs:documentation>
+              Extensibility point in the WiX XML Schema. Schema extensions can register additional
+              elements at this point in the schema.
+            </xs:documentation>
+          </xs:annotation>
+        </xs:any>
+      </xs:choice>
+      <xs:attribute name="Include" type="xs:string" use="required">
+        <xs:annotation>
+          <xs:documentation>
+            A file-selection pattern that can include directory names, file names, and wildcards.
+            
+            We recommend that patterns be fully-qualified, absolute paths, 
+            preferably via named bind path. You can also use preprocessor 
+            variables or unnamed bind paths to create absolute paths.
+
+            If the pattern is a relative path, it is interpreted as relative to either:
+            - an unnamed bind path, if one or more is specified.
+            - the source directory of the file containing the `Files` element, if no unnamed bind paths are specified.
+
+            Wildcards include typical `*.ext` globs and MSBuild-style `**` globs to indicate
+            that directories should be recursed. Examples include:
+
+            | Pattern | Description |
+            | ------- | ----------- |
+            | `!(bindpath.ToBeHarvested)\**` | All files in the parent directory identified by the `ToBeHarvested` bind path and its subdirectories. |
+            | `$(PayloadFiles)\bin\Release\**` | All files in the `bin\Release` subdirectory in the directory named by the `PayloadFiles` preprocessor variable and its subdirectories. |
+            | `!(bindpath.arm64)\**.pdb` | All files with `.pdb` extension in the parent directory identified by the `arm64` bind path and its subdirectories. |
+            | `**` | If an unnamed bind path was specified, all files in that directory and its subdirectories. If an unnamed bind path was _not_ specified, all files in directory of the source .wxs file and its subdirectories. |
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
       <xs:attribute name="Directory" type="xs:string">
         <xs:annotation>
           <xs:documentation>
@@ -9040,7 +9103,7 @@
   <xs:element name="Exclude">
     <xs:annotation>
       <xs:documentation>
-        Using wildcards, defines the files from a parent `Files` element that should be excluded from harvesting.
+        Using wildcards, defines the files from a parent `Files` or `Payloads` element that should be excluded from harvesting.
       </xs:documentation>
     </xs:annotation>
     <xs:complexType>
@@ -9057,7 +9120,7 @@
       <xs:attribute name="Files" type="xs:string" use="required">
         <xs:annotation>
           <xs:documentation>
-            Excludes files from the set of files harvested via the parent `Files` element.
+            Excludes files from the set of files harvested via the parent `Files` or `Payloads` element.
             Inclusion and exclusion wildcards must match paths. For example, if you have a
             `Files` element with `Include="!(bindpath.ToBeHarvested)\**"` and want to
             exclude one of the files, use an `Exclude` element with a `Files` attribute