Support add, modify and remove comments on user accounts

Fixes 5371

14 files changed, 332 insertions, 40 deletions

diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductA/ProductA.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductA/ProductA.wixproj
index fbc6f292..3895b853 100644
--- a/src/test/msi/TestData/UtilExtensionUserTests/ProductA/ProductA.wixproj
+++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductA/ProductA.wixproj
@@ -1,7 +1,7 @@
 <!-- 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. -->
 <Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
-    <UpgradeCode>{1A1795A6-87C0-4A9A-ABD5-DF9BED697037}</UpgradeCode>
+    <UpgradeCode>{A3E0B539-63F9-4B43-9E34-F33AE1C6E06D}</UpgradeCode>
     <ProductComponentsRef>true</ProductComponentsRef>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductA/product.wxs b/src/test/msi/TestData/UtilExtensionUserTests/ProductA/product.wxs
index a7bec54e..be6e16a4 100644
--- a/src/test/msi/TestData/UtilExtensionUserTests/ProductA/product.wxs
+++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductA/product.wxs
@@ -15,10 +15,10 @@
         <util:Group Id="ADMIN" Name="Administrators" />
         <util:Group Id="POWER_USER" Name="Power Users" />
 
-        <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER">
+        <Component Id="Component1" Guid="09624A9A-4BBC-4126-BBF9-0713C5217DB1" Directory="INSTALLFOLDER">
             <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" />
 
-            <util:User Id="TEST_USER1" Name="testName1" Password="test123!@#" PasswordExpired="yes">
+            <util:User Id="TEST_USER1" Name="testName1" Password="test123!@#" PasswordExpired="yes" CreateUser="yes" RemoveOnUninstall="yes">
                 <util:GroupRef Id="ADMIN" />
                 <util:GroupRef Id="POWER_USER" />
             </util:User>
@@ -27,7 +27,7 @@
                 <util:GroupRef Id="POWER_USER" />
             </util:User>
 
-            <util:User Id="TEST_USER3" Name="[TEMPUSERNAME]" Domain="[TEMPDOMAIN]" CreateUser="no">
+            <util:User Id="TEST_USER3" Name="testName3" CreateUser="no">
                 <util:GroupRef Id="POWER_USER" />
             </util:User>
         </Component>
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductAddCommentToExistingUser/ProductAddCommentToExistingUser.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductAddCommentToExistingUser/ProductAddCommentToExistingUser.wixproj
new file mode 100644
index 00000000..5938e525
--- /dev/null
+++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductAddCommentToExistingUser/ProductAddCommentToExistingUser.wixproj
@@ -0,0 +1,13 @@
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <UpgradeCode>{B33D3140-4AA5-469D-9DEE-AAF8F0C626DA}</UpgradeCode>
+    <ProductComponentsRef>true</ProductComponentsRef>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Util.wixext" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductAddCommentToExistingUser/product.wxs b/src/test/msi/TestData/UtilExtensionUserTests/ProductAddCommentToExistingUser/product.wxs
new file mode 100644
index 00000000..ce8c4cae
--- /dev/null
+++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductAddCommentToExistingUser/product.wxs
@@ -0,0 +1,25 @@
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents">
+            <ComponentRef Id="Component1" />
+        </ComponentGroup>
+    </Fragment>
+
+    <Fragment>
+        <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER">
+            <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" />
+
+            <util:User Id="TEST_USER1"
+              Name="testName1"
+              Password="test123!@#"
+              PasswordExpired="yes"
+              CreateUser="yes"
+              UpdateIfExists="yes"
+              RemoveOnUninstall="yes"
+              Comment="testComment1"/>
+        </Component>
+    </Fragment>
+</Wix>
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentDelete/ProductCommentDelete.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentDelete/ProductCommentDelete.wixproj
new file mode 100644
index 00000000..63bb2370
--- /dev/null
+++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentDelete/ProductCommentDelete.wixproj
@@ -0,0 +1,13 @@
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <UpgradeCode>{9E4C301E-5F36-4A86-85BE-776E067D929D}</UpgradeCode>
+    <ProductComponentsRef>true</ProductComponentsRef>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Util.wixext" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentDelete/product.wxs b/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentDelete/product.wxs
new file mode 100644
index 00000000..f0fbc55e
--- /dev/null
+++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentDelete/product.wxs
@@ -0,0 +1,18 @@
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents">
+            <ComponentRef Id="Component1" />
+        </ComponentGroup>
+    </Fragment>
+
+    <Fragment>
+        <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER">
+            <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" />
+
+            <util:User Id="TEST_USER1" Name="testName1" Password="test123!@#" PasswordExpired="yes" UpdateIfExists="yes" RemoveOnUninstall="yes" RemoveComment="yes"/>
+        </Component>
+    </Fragment>
+</Wix>
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentFail/ProductCommentFail.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentFail/ProductCommentFail.wixproj
new file mode 100644
index 00000000..66f308ae
--- /dev/null
+++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentFail/ProductCommentFail.wixproj
@@ -0,0 +1,13 @@
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <UpgradeCode>{85F698E0-F542-4CB4-80A1-6630D2DEB647}</UpgradeCode>
+    <ProductComponentsRef>true</ProductComponentsRef>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Util.wixext" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentFail/product_fail.wxs b/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentFail/product_fail.wxs
new file mode 100644
index 00000000..f36d5bd5
--- /dev/null
+++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductCommentFail/product_fail.wxs
@@ -0,0 +1,22 @@
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <Fragment>
+        <ComponentGroup Id="ProductComponents">
+            <ComponentRef Id="Component1" />
+        </ComponentGroup>
+
+        <InstallExecuteSequence>
+            <Custom Action="CaFail" After="Wix4ConfigureUsers_X86" />
+        </InstallExecuteSequence>
+    </Fragment>
+
+    <Fragment>
+        <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER">
+            <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" />
+
+            <util:User Id="TEST_USER1" Name="testName1" Password="test123!@#" PasswordExpired="yes" CreateUser="yes" RemoveOnUninstall="yes" Comment="testComment1"/>
+        </Component>
+    </Fragment>
+</Wix>
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductFail/product_fail.wxs b/src/test/msi/TestData/UtilExtensionUserTests/ProductFail/product_fail.wxs
index c5da862c..82472d4e 100644
--- a/src/test/msi/TestData/UtilExtensionUserTests/ProductFail/product_fail.wxs
+++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductFail/product_fail.wxs
@@ -31,7 +31,7 @@
                 <util:GroupRef Id="POWER_USER" />
             </util:User>
 
-            <util:User Id="TEST_USER3" Name="[TEMPUSERNAME]" Domain="[TEMPDOMAIN]" CreateUser="no">
+            <util:User Id="TEST_USER3" Name="testName3" CreateUser="no">
                 <util:GroupRef Id="POWER_USER" />
             </util:User>
         </Component>
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductNewUserWithComment/ProductNewUserWithComment.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductNewUserWithComment/ProductNewUserWithComment.wixproj
new file mode 100644
index 00000000..aeac903a
--- /dev/null
+++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductNewUserWithComment/ProductNewUserWithComment.wixproj
@@ -0,0 +1,13 @@
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <UpgradeCode>{549E1829-BBDE-42E1-968A-BEB8FC12BFC7}</UpgradeCode>
+    <ProductComponentsRef>true</ProductComponentsRef>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Util.wixext" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductNewUserWithComment/product.wxs b/src/test/msi/TestData/UtilExtensionUserTests/ProductNewUserWithComment/product.wxs
new file mode 100644
index 00000000..dde23aab
--- /dev/null
+++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductNewUserWithComment/product.wxs
@@ -0,0 +1,25 @@
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+  <Fragment>
+    <ComponentGroup Id="ProductComponents">
+      <ComponentRef Id="Component1" />
+    </ComponentGroup>
+  </Fragment>
+
+  <Fragment>
+    <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER">
+      <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" />
+      <util:User
+        Id="TEST_USER1"
+        Name="testName1"
+        Password="test123!@#"
+        PasswordExpired="yes"
+        CreateUser="yes"
+        UpdateIfExists="yes"
+        RemoveOnUninstall="yes"
+        Comment="testComment1" />
+    </Component>
+  </Fragment>
+</Wix>
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wixproj b/src/test/msi/TestData/UtilExtensionUserTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wixproj
new file mode 100644
index 00000000..93a56216
--- /dev/null
+++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wixproj
@@ -0,0 +1,13 @@
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <UpgradeCode>{79F2CB65-1E71-42EB-AA30-51BD70C29B23}</UpgradeCode>
+    <ProductComponentsRef>true</ProductComponentsRef>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Product.wxs" Link="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Util.wixext" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wxs b/src/test/msi/TestData/UtilExtensionUserTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wxs
new file mode 100644
index 00000000..564ce4f0
--- /dev/null
+++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductWithCommandLineParameters/ProductWithCommandLineParameters.wxs
@@ -0,0 +1,21 @@
+<!-- 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. -->
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+  <Fragment>
+    <ComponentGroup Id="ProductComponents">
+      <ComponentRef Id="Component1" />
+    </ComponentGroup>
+  </Fragment>
+
+  <Fragment>
+      <Component Id="Component1"
+                 Guid="1FDC6C4D-7741-4BF1-A4F0-4231879CEC45"
+                 Directory="INSTALLFOLDER">
+          <util:User Id="TEST_USER1"
+                     Name="[TESTPARAMETER1]"
+                     Password="test123!@#"
+                     PasswordExpired="yes"
+                     CreateUser="yes"
+                     RemoveOnUninstall="yes" />
+      </Component>
+  </Fragment>
+</Wix>
diff --git a/src/test/msi/WixToolsetTest.MsiE2E/UtilExtensionUserTests.cs b/src/test/msi/WixToolsetTest.MsiE2E/UtilExtensionUserTests.cs
index fcdfde52..30bc53e8 100644
--- a/src/test/msi/WixToolsetTest.MsiE2E/UtilExtensionUserTests.cs
+++ b/src/test/msi/WixToolsetTest.MsiE2E/UtilExtensionUserTests.cs
@@ -11,21 +11,14 @@ namespace WixToolsetTest.MsiE2E
     {
         public UtilExtensionUserTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
 
-        const string TempDomain = "USERDOMAIN";
-        const string TempUsername = "USERNAME";
-
         // Verify that the users specified in the authoring are created as expected.
         [RuntimeFact]
         public void CanInstallAndUninstallUsers()
         {
-            var arguments = new string[]
-            {
-                $"TEMPDOMAIN={Environment.GetEnvironmentVariable(TempDomain)}",
-                $"TEMPUSERNAME={Environment.GetEnvironmentVariable(TempUsername)}",
-            };
+            UserVerifier.CreateLocalUser("testName3", "test123!@#");
             var productA = this.CreatePackageInstaller("ProductA");
 
-            productA.InstallProduct(MSIExec.MSIExecReturnCode.SUCCESS, arguments);
+            productA.InstallProduct(MSIExec.MSIExecReturnCode.SUCCESS);
 
             // Validate New User Information.
             UserVerifier.VerifyUserInformation(String.Empty, "testName1", true, false, false);
@@ -34,62 +27,90 @@ namespace WixToolsetTest.MsiE2E
             UserVerifier.VerifyUserInformation(String.Empty, "testName2", true, true, true);
             UserVerifier.VerifyUserIsMemberOf(String.Empty, "testName2", "Power Users");
 
-            UserVerifier.VerifyUserIsMemberOf(Environment.GetEnvironmentVariable(TempDomain), Environment.GetEnvironmentVariable(TempUsername), "Power Users");
+            UserVerifier.VerifyUserIsMemberOf("", "testName3", "Power Users");
 
-            productA.UninstallProduct(MSIExec.MSIExecReturnCode.SUCCESS, arguments);
+            productA.UninstallProduct(MSIExec.MSIExecReturnCode.SUCCESS);
 
             // Verify Users marked as RemoveOnUninstall were removed.
             Assert.False(UserVerifier.UserExists(String.Empty, "testName1"), String.Format("User '{0}' was not removed on Uninstall", "testName1"));
             Assert.True(UserVerifier.UserExists(String.Empty, "testName2"), String.Format("User '{0}' was removed on Uninstall", "testName2"));
 
+            // Verify that user added to power users group is removed on uninstall.
+            UserVerifier.VerifyUserIsNotMemberOf("", "testName3", "Power Users");
+
             // clean up
+            UserVerifier.DeleteLocalUser("testName1");
             UserVerifier.DeleteLocalUser("testName2");
-
-            UserVerifier.VerifyUserIsNotMemberOf(Environment.GetEnvironmentVariable(TempDomain), Environment.GetEnvironmentVariable(TempUsername), "Power Users");
+            UserVerifier.DeleteLocalUser("testName3");
         }
 
         // Verify the rollback action reverts all Users changes.
         [RuntimeFact]
         public void CanRollbackUsers()
         {
-            var arguments = new string[]
-            {
-                $"TEMPDOMAIN={Environment.GetEnvironmentVariable(TempDomain)}",
-                $"TEMPUSERNAME={Environment.GetEnvironmentVariable(TempUsername)}",
-            };
+            UserVerifier.CreateLocalUser("testName3", "test123!@#");
             var productFail = this.CreatePackageInstaller("ProductFail");
 
             // make sure the user accounts are deleted before we start
             UserVerifier.DeleteLocalUser("testName1");
             UserVerifier.DeleteLocalUser("testName2");
-            UserVerifier.VerifyUserIsNotMemberOf(Environment.GetEnvironmentVariable(TempDomain), Environment.GetEnvironmentVariable(TempUsername), "Power Users");
 
-            productFail.InstallProduct(MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE, arguments);
+            productFail.InstallProduct(MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE);
 
-            // Verify Users marked as RemoveOnUninstall were removed.
+            // Verify added Users were removed on rollback.
             Assert.False(UserVerifier.UserExists(String.Empty, "testName1"), String.Format("User '{0}' was not removed on Rollback", "testName1"));
             Assert.False(UserVerifier.UserExists(String.Empty, "testName2"), String.Format("User '{0}' was not removed on Rollback", "testName2"));
 
-            UserVerifier.VerifyUserIsNotMemberOf(Environment.GetEnvironmentVariable(TempDomain), Environment.GetEnvironmentVariable(TempUsername), "Power Users");
+            // Verify that user added to power users group is removed from power users group on rollback.
+            UserVerifier.VerifyUserIsNotMemberOf("", "testName3", "Power Users");
+
+            // clean up
+            UserVerifier.DeleteLocalUser("testName1");
+            UserVerifier.DeleteLocalUser("testName2");
+            UserVerifier.DeleteLocalUser("testName3");
         }
 
-        // Verify that the users specified in the authoring are created as expected on repair.
-        [RuntimeFact(Skip = "Test demonstrates failure")]
-        public void CanRepairUsers()
+
+        // Verify that command-line parameters aer not blocked by repair switches.
+        // Original code signalled repair mode by using "-f ", which silently
+        // terminated the command-line parsing, ignoring any parameters that followed.
+        [RuntimeFact()]
+        public void CanRepairUsersWithCommandLineParameters()
         {
             var arguments = new string[]
             {
-                $"TEMPDOMAIN={Environment.GetEnvironmentVariable(TempDomain)}",
-                $"TEMPUSERNAME={Environment.GetEnvironmentVariable(TempUsername)}",
+                "TESTPARAMETER1=testName1",
             };
+            var productWithCommandLineParameters = this.CreatePackageInstaller("ProductWithCommandLineParameters");
+
+            // Make sure that the user doesn't exist when we start the test.
+            UserVerifier.DeleteLocalUser("testName1");
+
+            // Install
+            productWithCommandLineParameters.InstallProduct(MSIExec.MSIExecReturnCode.SUCCESS, arguments);
+
+            // Repair
+            productWithCommandLineParameters.RepairProduct(MSIExec.MSIExecReturnCode.SUCCESS, arguments);
+
+            // Clean up
+            UserVerifier.DeleteLocalUser("testName1");
+        }
+
+
+        // Verify that the users specified in the authoring are created as expected on repair.
+        [RuntimeFact()]
+        public void CanRepairUsers()
+        {
+            UserVerifier.CreateLocalUser("testName3", "test123!@#");
             var productA = this.CreatePackageInstaller("ProductA");
 
-            productA.InstallProduct(MSIExec.MSIExecReturnCode.SUCCESS, arguments);
+            productA.InstallProduct(MSIExec.MSIExecReturnCode.SUCCESS);
 
+            // Validate New User Information.
             UserVerifier.DeleteLocalUser("testName1");
             UserVerifier.SetUserInformation(String.Empty, "testName2", true, false, false);
 
-            productA.RepairProduct(MSIExec.MSIExecReturnCode.SUCCESS, arguments);
+            productA.RepairProduct(MSIExec.MSIExecReturnCode.SUCCESS);
 
             // Validate New User Information.
             UserVerifier.VerifyUserInformation(String.Empty, "testName1", true, false, false);
@@ -98,21 +119,24 @@ namespace WixToolsetTest.MsiE2E
             UserVerifier.VerifyUserInformation(String.Empty, "testName2", true, true, true);
             UserVerifier.VerifyUserIsMemberOf(String.Empty, "testName2", "Power Users");
 
-            UserVerifier.VerifyUserIsMemberOf(Environment.GetEnvironmentVariable(TempDomain), Environment.GetEnvironmentVariable(TempUsername), "Power Users");
+            UserVerifier.VerifyUserIsMemberOf("", "testName3", "Power Users");
 
-            productA.UninstallProduct(MSIExec.MSIExecReturnCode.SUCCESS, arguments);
+            productA.UninstallProduct(MSIExec.MSIExecReturnCode.SUCCESS);
 
             // Verify Users marked as RemoveOnUninstall were removed.
             Assert.False(UserVerifier.UserExists(String.Empty, "testName1"), String.Format("User '{0}' was not removed on Uninstall", "testName1"));
             Assert.True(UserVerifier.UserExists(String.Empty, "testName2"), String.Format("User '{0}' was removed on Uninstall", "testName2"));
 
+            // Verify that user added to power users group is removed on uninstall.
+            UserVerifier.VerifyUserIsNotMemberOf("", "testName3", "Power Users");
+
             // clean up
+            UserVerifier.DeleteLocalUser("testName1");
             UserVerifier.DeleteLocalUser("testName2");
-
-            UserVerifier.VerifyUserIsNotMemberOf(Environment.GetEnvironmentVariable(TempDomain), Environment.GetEnvironmentVariable(TempUsername), "Power Users");
+            UserVerifier.DeleteLocalUser("testName3");
         }
 
-        // Verify that Installation fails if FailIfExisits is set.
+        // Verify that Installation fails if FailIfExists is set.
         [RuntimeFact]
         public void FailsIfUserExists()
         {
@@ -135,7 +159,6 @@ namespace WixToolsetTest.MsiE2E
                 // clean up
                 UserVerifier.DeleteLocalUser("existinguser");
             }
-
         }
 
         // Verify that a user cannot be created on a domain on which you dont have create user permission.
@@ -158,5 +181,98 @@ namespace WixToolsetTest.MsiE2E
 
             productNonVitalGroup.InstallProduct();
         }
+
+        // Verify that a user can be created with a user comment
+        [RuntimeFact]
+        public void CanCreateNewUserWithComment()
+        {
+            var productNewUserWithComment = this.CreatePackageInstaller("ProductNewUserWithComment");
+
+            productNewUserWithComment.InstallProduct();
+            UserVerifier.VerifyUserComment(String.Empty, "testName1", "testComment1");
+
+            // clean up
+            UserVerifier.DeleteLocalUser("testName1");
+        }
+
+        // Verify that a comment can be added to an existing user
+        [RuntimeFact]
+        public void CanAddCommentToExistingUser()
+        {
+            UserVerifier.CreateLocalUser("testName1", "test123!@#");
+            var productAddCommentToExistingUser = this.CreatePackageInstaller("ProductAddCommentToExistingUser");
+
+            productAddCommentToExistingUser.InstallProduct();
+
+            UserVerifier.VerifyUserComment(String.Empty, "testName1", "testComment1");
+
+            // clean up
+            UserVerifier.DeleteLocalUser("testName1");
+        }
+
+        // Verify that a comment can be repaired for a new user
+        [RuntimeFact]
+        public void CanRepairCommentOfNewUser()
+        {
+            var productNewUserWithComment = this.CreatePackageInstaller("ProductNewUserWithComment");
+
+            productNewUserWithComment.InstallProduct();
+            UserVerifier.SetUserComment(String.Empty, "testName1", "");
+
+            productNewUserWithComment.RepairProduct();
+            UserVerifier.VerifyUserComment(String.Empty, "testName1", "testComment1");
+
+            // clean up
+            UserVerifier.DeleteLocalUser("testName1");
+        }
+
+        // Verify that a comment can be changed for an existing user
+        [RuntimeFact]
+        public void CanChangeCommentOfExistingUser()
+        {
+            UserVerifier.CreateLocalUser("testName1", "test123!@#");
+            UserVerifier.SetUserComment(String.Empty, "testName1", "initialTestComment1");
+            var productNewUserWithComment = this.CreatePackageInstaller("ProductNewUserWithComment");
+
+            productNewUserWithComment.InstallProduct();
+            UserVerifier.VerifyUserComment(String.Empty, "testName1", "testComment1");
+
+            // clean up
+            UserVerifier.DeleteLocalUser("testName1");
+        }
+
+        // Verify that a comment can be rolled back for an existing user
+        [RuntimeFact]
+        public void CanRollbackCommentOfExistingUser()
+        {
+            UserVerifier.CreateLocalUser("testName1", "test123!@#");
+            UserVerifier.SetUserComment(String.Empty, "testName1", "initialTestComment1");
+            var productCommentFail = this.CreatePackageInstaller("ProductCommentFail");
+
+            productCommentFail.InstallProduct(MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE);
+
+            // Verify that comment change was rolled back.
+            UserVerifier.VerifyUserComment(String.Empty, "testName1", "initialTestComment1");
+
+            // clean up
+            UserVerifier.DeleteLocalUser("testName1");
+        }
+
+        // Verify that a comment can be deleted for an existing user
+        [RuntimeFact]
+        public void CanDeleteCommentOfExistingUser()
+        {
+            UserVerifier.CreateLocalUser("testName1", "test123!@#");
+            UserVerifier.SetUserComment(String.Empty, "testName1", "testComment1");
+            var productCommentDelete = this.CreatePackageInstaller("ProductCommentDelete");
+
+            productCommentDelete.InstallProduct(MSIExec.MSIExecReturnCode.SUCCESS);
+
+            // Verify that comment was removed.
+            UserVerifier.VerifyUserComment(String.Empty, "testName1", "");
+
+            // clean up
+            UserVerifier.DeleteLocalUser("testName1");
+        }
     }
 }