2 files changed, 35 insertions, 0 deletions

diff --git a/src/test/burn/WixTestTools/BundleInstaller.cs b/src/test/burn/WixTestTools/BundleInstaller.cs
index a49c4024..2b449ebf 100644
--- a/src/test/burn/WixTestTools/BundleInstaller.cs
+++ b/src/test/burn/WixTestTools/BundleInstaller.cs
@@ -3,6 +3,7 @@
 namespace WixTestTools
 {
     using System;
+    using System.Collections.Generic;
     using System.IO;
     using System.Text;
 
@@ -131,6 +132,35 @@ namespace WixTestTools
         }
 
         /// <summary>
+        /// Uninstalls the bundle unsafely with optional arguments.
+        /// </summary>
+        /// <param name="expectedExitCode">Expected exit code, defaults to success.</param>
+        /// <param name="arguments">Optional arguments to pass to the tool.</param>
+        /// <returns>Path to the generated log file.</returns>
+        public string UnsafeUninstall(int expectedExitCode = (int)MSIExec.MSIExecReturnCode.SUCCESS, params string[] arguments)
+        {
+            var newArgumentList = new List<string>();
+            newArgumentList.Add("-unsafeuninstall");
+            newArgumentList.AddRange(arguments);
+            return this.RunBundleWithArguments(expectedExitCode, MSIExec.MSIExecMode.Custom, newArgumentList.ToArray());
+        }
+
+        /// <summary>
+        /// Uninstalls the bundle unsafely at the given path with optional arguments.
+        /// </summary>
+        /// <param name="bundlePath">This should be the bundle in the package cache.</param>
+        /// <param name="expectedExitCode">Expected exit code, defaults to success.</param>
+        /// <param name="arguments">Optional arguments to pass to the tool.</param>
+        /// <returns>Path to the generated log file.</returns>
+        public string UnsafeUninstall(string bundlePath, int expectedExitCode = (int)MSIExec.MSIExecReturnCode.SUCCESS, params string[] arguments)
+        {
+            var newArgumentList = new List<string>();
+            newArgumentList.Add("-unsafeuninstall");
+            newArgumentList.AddRange(arguments);
+            return this.RunBundleWithArguments(expectedExitCode, MSIExec.MSIExecMode.Custom, newArgumentList.ToArray(), bundlePath: bundlePath);
+        }
+
+        /// <summary>
         /// Executes the bundle with optional arguments.
         /// </summary>
         /// <param name="expectedExitCode">Expected exit code.</param>
diff --git a/src/test/burn/WixTestTools/MSIExec.cs b/src/test/burn/WixTestTools/MSIExec.cs
index 8dce96cf..a10a48d6 100644
--- a/src/test/burn/WixTestTools/MSIExec.cs
+++ b/src/test/burn/WixTestTools/MSIExec.cs
@@ -697,6 +697,11 @@ namespace WixTestTools
             /// Uninstalls the product as part of cleanup
             /// </summary>
             Cleanup,
+
+            /// <summary>
+            /// No action automatically added to arguments
+            /// </summary>
+            Custom,
         }
 
         /// <summary>