Correctly schedule custom actions in Merge Modules

Fixes 7098

5 files changed, 99 insertions, 1 deletions

diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
index e634a50e..49ae1256 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
@@ -1136,7 +1136,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             if (SectionType.Module == this.Section.Type)
             {
                 row[0] = symbol.Action;
-                if (0 != symbol.Sequence)
+                if (symbol.Sequence.HasValue && symbol.Sequence.Value != 0)
                 {
                     row[1] = symbol.Sequence;
                 }
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs
index fea82267..035b0641 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/CustomActionFixture.cs
@@ -65,6 +65,78 @@ namespace WixToolsetTest.CoreIntegration
         }
 
         [Fact]
+        public void CanScheduleCustomActionInModule()
+        {
+            var folder = TestData.Get(@"TestData");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var msmPath = Path.Combine(baseFolder, "bin", "test.msm");
+
+                var result = WixRunner.Execute(new[]
+                    {
+                    "build",
+                    Path.Combine(folder, "CustomAction", "MsmCustomAction.wxs"),
+                    Path.Combine(folder, "CustomAction", "SimpleCustomAction.wxs"),
+                    "-bindpath", Path.Combine(folder, ".Data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", msmPath
+                });
+
+                result.AssertSuccess();
+
+                var rows = Query.QueryDatabase(msmPath, new[] { "CustomAction", "ModuleInstallExecuteSequence" });
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "CustomAction:Action1.243FB739_4D05_472F_9CFB_EF6B1017B6DE\t1\tBinary1.243FB739_4D05_472F_9CFB_EF6B1017B6DE\tEntryPoint1\t",
+                    "ModuleInstallExecuteSequence:Action1.243FB739_4D05_472F_9CFB_EF6B1017B6DE\t\tInstallFiles\t1\t",
+                    "ModuleInstallExecuteSequence:CreateFolders\t3700\t\t\t",
+                    "ModuleInstallExecuteSequence:InstallFiles\t4000\t\t\t",
+                    "ModuleInstallExecuteSequence:RemoveFiles\t3500\t\t\t",
+                    "ModuleInstallExecuteSequence:RemoveFolders\t3600\t\t\t"
+                }, rows);
+            }
+        }
+
+        [Fact]
+        public void CanScheduleSetPropertyInModule()
+        {
+            var folder = TestData.Get(@"TestData");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var intermediateFolder = Path.Combine(baseFolder, "obj");
+                var msmPath = Path.Combine(baseFolder, "bin", "test.msm");
+
+                var result = WixRunner.Execute(new[]
+                    {
+                    "build",
+                    Path.Combine(folder, "SetProperty", "MsmSetProperty.wxs"),
+                    "-bindpath", Path.Combine(folder, "SetProperty", "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", msmPath
+                });
+
+                result.AssertSuccess();
+
+                var rows = Query.QueryDatabase(msmPath, new[] { "CustomAction", "ModuleInstallExecuteSequence" });
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "CustomAction:SetINSTALLLOCATION.243FB739_4D05_472F_9CFB_EF6B1017B6DE\t51\tINSTALLLOCATION.243FB739_4D05_472F_9CFB_EF6B1017B6DE\t[INSTALLFOLDER.243FB739_4D05_472F_9CFB_EF6B1017B6DE]\t",
+                    "ModuleInstallExecuteSequence:CostFinalize\t1000\t\t\t",
+                    "ModuleInstallExecuteSequence:CreateFolders\t3700\t\t\t",
+                    "ModuleInstallExecuteSequence:InstallFiles\t4000\t\t\t",
+                    "ModuleInstallExecuteSequence:RemoveFiles\t3500\t\t\t",
+                    "ModuleInstallExecuteSequence:RemoveFolders\t3600\t\t\t","" +
+                    "ModuleInstallExecuteSequence:SetINSTALLLOCATION.243FB739_4D05_472F_9CFB_EF6B1017B6DE\t\tCostFinalize\t1\t"
+                }, rows);
+            }
+        }
+
+        [Fact]
         public void PopulatesCustomActionTable()
         {
             var folder = TestData.Get(@"TestData");
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/.Data/test.txt b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/.Data/test.txt
new file mode 100644
index 00000000..fb6c6684
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/.Data/test.txt
@@ -0,0 +1 @@
+This is test.txt in .Data.
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/MsmCustomAction.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/MsmCustomAction.wxs
new file mode 100644
index 00000000..3bae1783
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/CustomAction/MsmCustomAction.wxs
@@ -0,0 +1,13 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE">
+        <ComponentGroupRef Id="ProductComponents" />
+    </Module>
+
+    <Fragment>
+        <ComponentGroup Id="MinimalComponentGroup" Directory="TARGETDIR">
+            <Component Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE">
+                <File Source="test.txt" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/MsmSetProperty.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/MsmSetProperty.wxs
new file mode 100644
index 00000000..156922c2
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SetProperty/MsmSetProperty.wxs
@@ -0,0 +1,12 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE">
+
+        <Directory Id="InstallFolder">
+            <Component Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE">
+                <File Source="test.txt" />
+            </Component>
+        </Directory>
+
+        <SetProperty Id="INSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
+    </Module>
+</Wix>