Fix merged ProductCode from mergemod.cub and...

...work around other bugs in mergemod.cub.

Fixes https://github.com/wixtoolset/issues/issues/7413.

7 files changed, 86 insertions, 54 deletions

diff --git a/src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs b/src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs
index 4c1a3952..7978304a 100644
--- a/src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs
+++ b/src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs
@@ -190,14 +190,17 @@ namespace WixToolset.Core.Native
 
                     using (var session = new Session(database))
                     {
-                        // Add the product code back into the database.
-                        if (null != productCode)
+                        // Some CUBs erroneously have a ProductCode property, so delete it if we just picked one up.
+                        if (propertyTableExists)
                         {
-                            // Some CUBs erroneously have a ProductCode property, so delete it if we just picked one up.
                             using (var dropProductCodeView = database.OpenExecuteView("DELETE FROM `Property` WHERE `Property` = 'ProductCode'"))
                             {
                             }
+                        }
 
+                        // Add the product code back into the database.
+                        if (null != productCode)
+                        {
                             using (var view = database.OpenExecuteView($"INSERT INTO `Property` (`Property`, `Value`) VALUES ('ProductCode', '{productCode}')"))
                             {
                             }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs
index 86212c99..a9f03171 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs
@@ -102,6 +102,16 @@ namespace WixToolset.Core.WindowsInstaller.Validate
                 messageSourceLineNumbers = this.GetSourceLineNumbers(message.Table, message.PrimaryKeys);
             }
 
+            // Sigh. These are bad messages we get from the poorly-built mergemod.cub that supports Arm64.
+            // TODO: Re-evaluate mergemod.cub that's current for the next version of WiX.
+            if (message.IceName == "ICE03"
+                && (message.Table == "File" && message.Description.Contains("_ICEM07CAB Missing specifications"))
+                || (message.Table == "Component" && message.Description.Contains("_IceM05Mark Missing specifications"))
+                )
+            {
+                return;
+            }
+
             switch (message.Type)
             {
                 case ValidationMessageType.InternalFailure:
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wixproj b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wixproj
deleted file mode 100644
index 597d4318..00000000
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleModule/Module.wixproj
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>0.9</ProductVersion>
-    <ProjectGuid>27df04c6-3cef-4b9a-bac6-4e78d188384f</ProjectGuid>
-    <OutputName>MergeModule1</OutputName>
-    <OutputType>Module</OutputType>
-    <Name>MergeModule1</Name>
-    <RootNamespace>MergeModule1</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="MergeModule.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="MergeModule.en-us.wxl" />
-  </ItemGroup>
-  <ItemGroup>
-    <WixExtension Include="FgwepExtension.wixext">
-      <Name>FgwepExtension.wixext</Name>
-      <HintPath>$(WixExtDir)\FgwepExtension.wixext.dll</HintPath>
-    </WixExtension>
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="FG-WiX or WiX Toolset build tools (v3.11 or later) must be installed to build this project. To download FG-WiX, go to https://www.firegiant.com/downloads/. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleModuleWithProperty/Module.en-us.wxl b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleModuleWithProperty/Module.en-us.wxl
new file mode 100644
index 00000000..1b7195ad
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleModuleWithProperty/Module.en-us.wxl
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+This file contains the declaration of all the localizable strings.
+-->
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
+
+  <String Id="Manufacturer" Value="Example Company" />
+
+</WixLocalization>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleModuleWithProperty/Module.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleModuleWithProperty/Module.wxs
new file mode 100644
index 00000000..fbff36bc
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleModuleWithProperty/Module.wxs
@@ -0,0 +1,19 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Module Id="MergeModule1" Language="1033" Version="1.0.0.0" Guid="243FB739-4D05-472F-9CFB-EF6B1017B6DE">
+        <SummaryInformation Manufacturer="!(loc.Manufacturer)" />
+
+        <Property Id="MERGEMODULEPROPERTY" Value="1" />
+
+        <Directory Id="MergeRedirectFolder">
+            <Component Id="ModuleComponent1" Guid="A04E61B2-3ED4-4803-B2EB-4B773576FA45">
+                <File Id="File1" Name="file1.txt" Source="test.txt" />
+            </Component>
+        </Directory>
+
+        <Directory Id="NotTheMergeRedirectFolder">
+            <Component Id="ModuleComponent2" Guid="EADB3047-BD32-417B-AABF-B8D9CCDC22DA">
+                <File Id="File2" Name="file2.txt" Source="test.txt" />
+            </Component>
+        </Directory>
+    </Module>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleModuleWithProperty/data/test.txt b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleModuleWithProperty/data/test.txt
new file mode 100644
index 00000000..cd0db0e1
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/SimpleModuleWithProperty/data/test.txt
@@ -0,0 +1 @@
+This is test.txt.
\ No newline at end of file
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ValidationFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ValidationFixture.cs
index babe58f5..aa901b46 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/ValidationFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/ValidationFixture.cs
@@ -35,6 +35,7 @@ namespace WixToolsetTest.CoreIntegration
                 var result = WixRunner.Execute(new[]
                 {
                     "build",
+                    "-arch", "arm64",
                     Path.Combine(folder, "Module.wxs"),
                     "-loc", Path.Combine(folder, "Module.en-us.wxl"),
                     "-bindpath", Path.Combine(folder, "data"),
@@ -91,7 +92,7 @@ namespace WixToolsetTest.CoreIntegration
                     "_SummaryInformation:Author\tExample Company",
                     "_SummaryInformation:Keywords\tMergeModule, MSI, database",
                     "_SummaryInformation:Comments\tThis merge module contains the logic and data required to install MergeModule1.",
-                    "_SummaryInformation:Template\tIntel;1033",
+                    "_SummaryInformation:Template\tArm64;1033",
                     "_SummaryInformation:CodePage\t1252",
                     "_SummaryInformation:PageCount\t500",
                     "_SummaryInformation:WordCount\t0",
@@ -110,6 +111,42 @@ namespace WixToolsetTest.CoreIntegration
         }
 
         [Fact]
+        public void CanBuildAndValidateSimpleModuleWithProperty()
+        {
+            var folder = TestData.Get(@"TestData\SimpleModuleWithProperty");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var intermediateFolder = fs.GetFolder();
+
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    "-arch", "arm64",
+                    Path.Combine(folder, "Module.wxs"),
+                    "-loc", Path.Combine(folder, "Module.en-us.wxl"),
+                    "-bindpath", Path.Combine(folder, "data"),
+                    "-intermediateFolder", intermediateFolder,
+                    "-o", Path.Combine(intermediateFolder, @"bin\test.msm")
+                });
+
+                result.AssertSuccess();
+
+                var msmPath = Path.Combine(intermediateFolder, @"bin\test.msm");
+                Assert.True(File.Exists(msmPath));
+                Assert.True(File.Exists(Path.Combine(intermediateFolder, @"bin\test.wixpdb")));
+
+                var validationResult = WixRunner.Execute(new[]
+                {
+                    "msi", "validate",
+                    "-intermediateFolder", intermediateFolder,
+                    msmPath
+                });
+                validationResult.AssertSuccess();
+            }
+        }
+
+        [Fact]
         public void CanMergeModuleAndValidate()
         {
             var msmFolder = TestData.Get(@"TestData\SimpleModule");
@@ -342,14 +379,14 @@ namespace WixToolsetTest.CoreIntegration
                     msiPath
                 });
 
-                Assert.Equal(1076, validationResult.ExitCode);
-
                 var messages = validationResult.Messages.Select(m => m.ToString()).ToArray();
                 WixAssert.CompareLineByLine(new[]
                 {
                     "ICE12: CustomAction: CausesICE12Error is of type: 35. Therefore it must come after CostFinalize @ 1000 in Seq Table: InstallExecuteSequence. CA Seq#: 49",
                     "ICE46: Property 'Myproperty' referenced in column 'LaunchCondition'.'Condition' of row 'Myproperty' differs from a defined property by case only.",
                 }, messages);
+
+                Assert.Equal(1076, validationResult.ExitCode);
             }
         }