6 files changed, 122 insertions, 0 deletions

diff --git a/src/test/msi/TestData/CustomActionTests/ManagedCustomActions/ManagedCustomActions.wixproj b/src/test/msi/TestData/CustomActionTests/ManagedCustomActions/ManagedCustomActions.wixproj
new file mode 100644
index 00000000..c11a7c79
--- /dev/null
+++ b/src/test/msi/TestData/CustomActionTests/ManagedCustomActions/ManagedCustomActions.wixproj
@@ -0,0 +1,6 @@
+<!-- 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">
+  <ItemGroup>
+    <ProjectReference Include="..\TestCA\TestCA.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/msi/TestData/CustomActionTests/ManagedCustomActions/Package.wxs b/src/test/msi/TestData/CustomActionTests/ManagedCustomActions/Package.wxs
new file mode 100644
index 00000000..9b1d224a
--- /dev/null
+++ b/src/test/msi/TestData/CustomActionTests/ManagedCustomActions/Package.wxs
@@ -0,0 +1,32 @@
+<!-- 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">
+  <Package Name="~Managed Custom Actions" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="41B5F815-E7F6-44E0-B92A-AE95DFF683F9">
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+
+    <Feature Id="ProductFeature" Title="Feature with merged modules">
+      <Component Directory="INSTALLFOLDER">
+        <File Source="$(sys.SOURCEFILEPATH)" />
+      </Component>
+    </Feature>
+
+    <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" />
+
+    <InstallUISequence>
+      <Custom Action="ImmediateCA" Before="CostFinalize" />
+    </InstallUISequence>
+
+    <InstallExecuteSequence>
+      <Custom Action="DeferredCA" After="InstallFiles" />
+    </InstallExecuteSequence>
+  </Package>
+
+  <Fragment>
+    <StandardDirectory Id="ProgramFilesFolder">
+      <Directory Id="INSTALLFOLDER" Name="ManagedCA" />
+    </StandardDirectory>
+  </Fragment>
+</Wix>
diff --git a/src/test/msi/TestData/CustomActionTests/TestCA/CustomAction.config b/src/test/msi/TestData/CustomActionTests/TestCA/CustomAction.config
new file mode 100644
index 00000000..cfae001e
--- /dev/null
+++ b/src/test/msi/TestData/CustomActionTests/TestCA/CustomAction.config
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    <!--
+    Use supportedRuntime tags to explicitly specify the version(s) of the .NET Framework runtime that
+    the custom action should run on. If no versions are specified, the chosen version of the runtime
+    will be the "best" match to what WixToolset.Dtf.CustomAction.dll was built against.
+
+    WARNING: leaving the version unspecified is dangerous as it introduces a risk of compatibility
+    problems with future versions of the .NET Framework runtime. It is highly recommended that you specify
+    only the version(s) of the .NET Framework runtime that you have tested against.
+
+    For more information https://learn.microsoft.com/en-us/dotnet/framework/configure-apps/file-schema/startup/startup-element
+    -->
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+  </startup>
+</configuration>
diff --git a/src/test/msi/TestData/CustomActionTests/TestCA/CustomAction.cs b/src/test/msi/TestData/CustomActionTests/TestCA/CustomAction.cs
new file mode 100644
index 00000000..6891f8da
--- /dev/null
+++ b/src/test/msi/TestData/CustomActionTests/TestCA/CustomAction.cs
@@ -0,0 +1,28 @@
+// 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.
+
+namespace WixToolsetTest.TestCA
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using WixToolset.Dtf.WindowsInstaller;
+
+    public class CustomActions
+    {
+        [CustomAction]
+        public static ActionResult ImmediateCA(Session session)
+        {
+            session.Log("Begin ImmediateCA");
+
+            return ActionResult.Success;
+        }
+
+        [CustomAction]
+        public static ActionResult DeferredCA(Session session)
+        {
+            session.Log("Begin DeferredCA");
+
+            return ActionResult.Success;
+        }
+    }
+}
diff --git a/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj b/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj
new file mode 100644
index 00000000..80602295
--- /dev/null
+++ b/src/test/msi/TestData/CustomActionTests/TestCA/TestCA.csproj
@@ -0,0 +1,16 @@
+<!-- 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="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="CustomAction.config" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dtf.CustomAction" />
+    <PackageReference Include="WixToolset.Dtf.WindowsInstaller" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/msi/WixToolsetTest.MsiE2E/CustomActionTests.cs b/src/test/msi/WixToolsetTest.MsiE2E/CustomActionTests.cs
new file mode 100644
index 00000000..a30cf36f
--- /dev/null
+++ b/src/test/msi/WixToolsetTest.MsiE2E/CustomActionTests.cs
@@ -0,0 +1,23 @@
+// 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.
+
+namespace WixToolsetTest.MsiE2E
+{
+    using System;
+    using WixTestTools;
+    using Xunit;
+    using Xunit.Abstractions;
+
+    public class CustomActionTests : MsiE2ETests
+    {
+        public CustomActionTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
+
+        [RuntimeFact]
+        public void CanInstallAndUninstallWithManagedCustomAction()
+        {
+            var product = this.CreatePackageInstaller("ManagedCustomActions");
+            product.InstallProduct(MSIExec.MSIExecReturnCode.SUCCESS);
+
+            product.UninstallProduct(MSIExec.MSIExecReturnCode.SUCCESS);
+        }
+    }
+}