Reset current directory so SFXCA directory can be cleaned up

Fixes 8630

1 files changed, 19 insertions, 0 deletions

diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs
index d3fd7d1b..ae2673ca 100644
--- a/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs
@@ -101,8 +101,13 @@ namespace WixToolset.Dtf.WindowsInstaller
                 return (int) ActionResult.Failure;
             }
 
+            string originalDirectory = null;
+
             try
             {
+                // Remember the original directory so we can restore it later.
+                originalDirectory = Environment.CurrentDirectory;
+
                 // Set the current directory to the location of the extracted files.
                 Environment.CurrentDirectory =
                     AppDomain.CurrentDomain.BaseDirectory;
@@ -142,6 +147,20 @@ namespace WixToolset.Dtf.WindowsInstaller
                 session.Log(ex.ToString());
                 return (int) ActionResult.Failure;
             }
+            finally
+            {
+                try
+                {
+                    if (!String.IsNullOrEmpty(originalDirectory))
+                    {
+                        Environment.CurrentDirectory = originalDirectory;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    session.Log("Failed to restore current directory after running custom action: {0}", ex.Message);
+                }
+            }
         }
 
         /// <summary>