3 files changed, 14 insertions, 6 deletions

diff --git a/src/test/burn/WixTestTools/BundleInstaller.cs b/src/test/burn/WixTestTools/BundleInstaller.cs
index 5551d3c0..0f2cfa8f 100644
--- a/src/test/burn/WixTestTools/BundleInstaller.cs
+++ b/src/test/burn/WixTestTools/BundleInstaller.cs
@@ -28,6 +28,8 @@ namespace WixTestTools
 
         public int? AlternateExitCode { get; set; }
 
+        public string LogDirectory { get; set; }
+
         public int? LastExitCode { get; set; }
 
         /// <summary>
@@ -194,7 +196,7 @@ namespace WixTestTools
             sb.Append(" -quiet");
             
             // Generate the log file name.
-            string logFile = Path.Combine(Path.GetTempPath(), String.Format("{0}_{1}_{2:yyyyMMddhhmmss}_{4}_{3}.log", this.TestGroupName, this.TestName, DateTime.UtcNow, Path.GetFileNameWithoutExtension(this.Bundle), mode));
+            string logFile = Path.Combine(this.LogDirectory ?? Path.GetTempPath(), String.Format("{0}_{1}_{2:yyyyMMddhhmmss}_{4}_{3}.log", this.TestGroupName, this.TestName, DateTime.UtcNow, Path.GetFileNameWithoutExtension(this.Bundle), mode));
             sb.AppendFormat(" -log \"{0}\"", logFile);
 
             // Set operation.
diff --git a/src/test/burn/WixTestTools/MSIExec.cs b/src/test/burn/WixTestTools/MSIExec.cs
index a10a48d6..5f57da7b 100644
--- a/src/test/burn/WixTestTools/MSIExec.cs
+++ b/src/test/burn/WixTestTools/MSIExec.cs
@@ -110,7 +110,7 @@ namespace WixTestTools
             this.NoRestart = true;
             this.ForceRestart = false;
             this.PromptRestart = false;
-            this.LogFile = string.Empty;
+            this.LogFile = String.Empty;
             this.LoggingOptions = MSIExecLoggingOptions.VOICEWARMUP;
             this.OtherArguments = String.Empty;
         }
@@ -230,14 +230,14 @@ namespace WixTestTools
             }
 
             // logfile and logging options
-            if (0 != loggingOptionsString.Length || !string.IsNullOrEmpty(this.LogFile))
+            if (0 != loggingOptionsString.Length || !String.IsNullOrEmpty(this.LogFile))
             {
                 arguments.Append(" /l");
                 if (0 != loggingOptionsString.Length)
                 {
                     arguments.AppendFormat("{0} ", loggingOptionsString);
                 }
-                if (!string.IsNullOrEmpty(this.LogFile))
+                if (!String.IsNullOrEmpty(this.LogFile))
                 {
                     arguments.AppendFormat(" \"{0}\" ", this.LogFile);
                 }
@@ -268,7 +268,7 @@ namespace WixTestTools
             };
 
             // product
-            if (!string.IsNullOrEmpty(this.Product))
+            if (!String.IsNullOrEmpty(this.Product))
             {
                 arguments.AppendFormat(" \"{0}\" ", this.Product);
             }
@@ -311,6 +311,12 @@ namespace WixTestTools
             ERROR_CALL_NOT_IMPLEMENTED = 120,
 
             /// <summary>
+            /// ERROR_FILENAME_EXCED_RANGE              206
+            /// The filename or extension is too long.
+            /// </summary>
+            ERROR_FILENAME_EXCED_RANGE = 206,
+
+            /// <summary>
             /// ERROR_APPHELP_BLOCK                     1259 
             /// If Windows Installer determines a product may be incompatible with the current operating system, 
             /// it displays a dialog box informing the user and asking whether to try to install anyway. 
diff --git a/src/test/burn/WixTestTools/TestTool.cs b/src/test/burn/WixTestTools/TestTool.cs
index eb77c75b..79e7004c 100644
--- a/src/test/burn/WixTestTools/TestTool.cs
+++ b/src/test/burn/WixTestTools/TestTool.cs
@@ -229,7 +229,7 @@ namespace WixTestTools
             returnValue.AppendLine("Tool run result:");
             returnValue.AppendLine("----------------");
             returnValue.AppendLine("Command:");
-            returnValue.AppendLine($"\"{result.StartInfo.FileName}\" {result.StartInfo.Arguments}");
+            returnValue.AppendLine($"\"{result.FileName}\" {result.Arguments}");
             returnValue.AppendLine();
             returnValue.AppendLine("Standard Output:");
             foreach (var line in result.StandardOutput ?? new string[0])