Ensure elevated SFXCA uses Windows Installer cache and unelevated uses Temp folder

Fixes 8078

2 files changed, 43 insertions, 1 deletions

diff --git a/src/test/msi/TestData/CustomActionTests/ManagedCustomActions/Package.wxs b/src/test/msi/TestData/CustomActionTests/ManagedCustomActions/Package.wxs
index 9b1d224a..4159cd3e 100644
--- a/src/test/msi/TestData/CustomActionTests/ManagedCustomActions/Package.wxs
+++ b/src/test/msi/TestData/CustomActionTests/ManagedCustomActions/Package.wxs
@@ -13,13 +13,17 @@
     <Binary Id="ManagedCA" SourceFile="TestCA.CA.dll" />
 
     <CustomAction Id="ImmediateCA" BinaryRef="ManagedCA" DllEntry="ImmediateCA" Execute="immediate" Return="check" />
-    <CustomAction Id="DeferredCA" BinaryRef="ManagedCA" DllEntry="DeferredCA" Execute="deferred" Return="check" />
+    <CustomAction Id="ExecuteImmediateCA" BinaryRef="ManagedCA" DllEntry="ExecuteImmediateCA" Execute="immediate" Return="check" />
+    <CustomAction Id="ImpersonatedDeferredCA" BinaryRef="ManagedCA" DllEntry="ImpersonatedDeferredCA" Execute="deferred" Impersonate="yes" Return="check" />
+    <CustomAction Id="DeferredCA" BinaryRef="ManagedCA" DllEntry="DeferredCA" Execute="deferred" Impersonate="no" Return="check" />
 
     <InstallUISequence>
       <Custom Action="ImmediateCA" Before="CostFinalize" />
     </InstallUISequence>
 
     <InstallExecuteSequence>
+      <Custom Action="ExecuteImmediateCA" Before="CostFinalize" />
+      <Custom Action="ImpersonatedDeferredCA" Before="InstallFiles" />
       <Custom Action="DeferredCA" After="InstallFiles" />
     </InstallExecuteSequence>
   </Package>
diff --git a/src/test/msi/TestData/CustomActionTests/TestCA/CustomAction.cs b/src/test/msi/TestData/CustomActionTests/TestCA/CustomAction.cs
index 6891f8da..54afc2cf 100644
--- a/src/test/msi/TestData/CustomActionTests/TestCA/CustomAction.cs
+++ b/src/test/msi/TestData/CustomActionTests/TestCA/CustomAction.cs
@@ -4,7 +4,9 @@ namespace WixToolsetTest.TestCA
 {
     using System;
     using System.Collections.Generic;
+    using System.IO;
     using System.Linq;
+    using System.Text;
     using WixToolset.Dtf.WindowsInstaller;
 
     public class CustomActions
@@ -14,6 +16,31 @@ namespace WixToolsetTest.TestCA
         {
             session.Log("Begin ImmediateCA");
 
+            var path = Path.Combine(Path.GetTempPath(), "ImmediateCA.txt");
+            WriteNow(path);
+
+            return ActionResult.Success;
+        }
+
+        [CustomAction]
+        public static ActionResult ExecuteImmediateCA(Session session)
+        {
+            session.Log("Begin ExecuteImmediateCA");
+
+            var path = Path.Combine(Path.GetTempPath(), "ExecuteImmediateCA.txt");
+            WriteNow(path);
+
+            return ActionResult.Success;
+        }
+
+        [CustomAction]
+        public static ActionResult ImpersonatedDeferredCA(Session session)
+        {
+            session.Log("Begin ImpersonatedDeferredCA");
+
+            var path = Path.Combine(Path.GetTempPath(), "ImpersonatedDeferredCA.txt");
+            WriteNow(path);
+
             return ActionResult.Success;
         }
 
@@ -22,7 +49,18 @@ namespace WixToolsetTest.TestCA
         {
             session.Log("Begin DeferredCA");
 
+            WriteNow(@"C:\Windows\Installer\DeferredCA.txt");
+
             return ActionResult.Success;
         }
+
+        private static void WriteNow(string path)
+        {
+            using (var file = File.Create(path))
+            {
+                var now = Encoding.UTF8.GetBytes(DateTime.Now.ToString("o"));
+                file.Write(now, 0, now.Length);
+            }
+        }
     }
 }