6 files changed, 69 insertions, 12 deletions

diff --git a/src/ext/Iis/wixext/IIsCompiler.cs b/src/ext/Iis/wixext/IIsCompiler.cs
index 5e3c0a95..53160dcd 100644
--- a/src/ext/Iis/wixext/IIsCompiler.cs
+++ b/src/ext/Iis/wixext/IIsCompiler.cs
@@ -219,7 +219,7 @@ namespace WixToolset.Iis
                                         break;
                                     default:
                                         storeLocation = -1;
-                                        this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "StoreLocation", storeLocationValue, "currentUser", "localMachine"));
+                                        this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "StoreLocation", storeLocationValue, "currentUser", "localMachine", "services", "users", "userPolicy", "localMachinePolicy", "localMachineEnterprise"));
                                         break;
                                 }
                             }
diff --git a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
index e06feac7..ae3a49be 100644
--- a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
+++ b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
@@ -109,7 +109,7 @@ namespace WixToolsetTest.UI
             var bindFolder = TestData.Get(@"TestData", "data");
             var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
 
-            var results = build.BuildAndQuery(BuildX64, "Binary", "Dialog", "CustomAction", "ControlEvent", "InstallUISequence");
+            var results = build.BuildAndQuery(Build, validate: true, "Binary", "Dialog", "CustomAction", "ControlEvent", "InstallUISequence");
             WixAssert.Single(results, result => result.StartsWith("Dialog:WelcomeDlg\t"));
             WixAssert.Single(results, result => result.StartsWith("Dialog:CustomizeDlg\t"));
             WixAssert.Empty(results.Where(result => result.StartsWith("Dialog:SetupTypeDlg\t")));
diff --git a/src/ext/UI/wixlib/WixUI_FeatureTree.wxs b/src/ext/UI/wixlib/WixUI_FeatureTree.wxs
index 5ec27445..a02ad28b 100644
--- a/src/ext/UI/wixlib/WixUI_FeatureTree.wxs
+++ b/src/ext/UI/wixlib/WixUI_FeatureTree.wxs
@@ -35,6 +35,8 @@ Patch dialog sequence:
 
             <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
 
+            <DialogRef Id="BrowseDlg" />
+            <DialogRef Id="DiskCostDlg" />
             <DialogRef Id="ErrorDlg" />
             <DialogRef Id="FatalError" />
             <DialogRef Id="FilesInUse" />
@@ -56,6 +58,9 @@ Patch dialog sequence:
             <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="2" Condition="NOT Installed" />
             <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" />
 
+            <Publish Dialog="BrowseDlg" Control="OK" Event="SetTargetPath" Value="[_BrowseProperty]" Order="3" />
+            <Publish Dialog="BrowseDlg" Control="OK" Event="EndDialog" Value="Return" Order="4" />
+
             <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1" Condition="NOT Installed OR WixUI_InstallMode = &quot;Change&quot;" />
             <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2" Condition="Installed AND NOT PATCH" />
             <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3" Condition="Installed AND PATCH" />
diff --git a/src/xsd/iis.xsd b/src/xsd/iis.xsd
index b43bff42..4bc59cf2 100644
--- a/src/xsd/iis.xsd
+++ b/src/xsd/iis.xsd
@@ -685,10 +685,21 @@
         </xs:simpleType>
       </xs:attribute>
       <xs:attribute name="StoreLocation" use="required">
+        <xs:annotation>
+          <xs:documentation>
+              This attribute controls which Certificate Store Location will be used for the Certificate.
+              See <a href="https://learn.microsoft.com/en-us/windows/win32/seccrypto/system-store-locations" target="_blank">MSDN documentation</a> for more information.
+          </xs:documentation>
+        </xs:annotation>
         <xs:simpleType>
           <xs:restriction base="xs:string">
             <xs:enumeration value="currentUser"/>
             <xs:enumeration value="localMachine"/>
+            <xs:enumeration value="services"/>
+            <xs:enumeration value="users"/>
+            <xs:enumeration value="userPolicy"/>
+            <xs:enumeration value="localMachinePolicy"/>
+            <xs:enumeration value="localMachineEnterprise"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
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 4816ae8c..4229352c 100644
--- a/src/xsd/wix.xsd
+++ b/src/xsd/wix.xsd
@@ -2341,7 +2341,14 @@
           </xs:annotation>
         </xs:any>
       </xs:choice>
-      <xs:attribute name="Id" type="Guid" use="required">
+      <xs:attribute name="Id" type="Guid">
+        <xs:annotation>
+          <xs:appinfo>
+            <xse:deprecated ref="Code" />
+          </xs:appinfo>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="Code" type="Guid" use="required">
         <xs:annotation>
           <xs:documentation>The identifier of the RelatedBundle group.</xs:documentation>
         </xs:annotation>