From 7ff59a67c279c2c6a3139b29cb8f0c4ffdc2ea7f Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Mon, 4 Apr 2022 10:58:32 -0500
Subject: Fix bug where MSIFASTINSTALL was not set properly for MsiPackages.

---
 src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs      | 3 ++-
 src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs       | 2 ++
 .../TestData/Container/HarvestIntoDetachedContainer.wxs               | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
index b950d06c..d9560cb0 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
@@ -170,7 +170,7 @@ namespace WixToolset.Core.Burn.Bundles
                     this.SetPackageVisibility(systemComponent, msiPackage, msiPropertyNames);
 
                     // Unless the MSI or setup code overrides the default, set MSIFASTINSTALL for best performance.
-                    if (!String.IsNullOrEmpty(fastInstall))
+                    if (String.IsNullOrEmpty(fastInstall) && !msiPropertyNames.Contains("MSIFASTINSTALL"))
                     {
                         this.AddMsiProperty(msiPackage, "MSIFASTINSTALL", "7");
                     }
@@ -218,6 +218,7 @@ namespace WixToolset.Core.Burn.Bundles
 
         private void SetPerMachineAppropriately(string allusers, WixBundleMsiPackageSymbol msiPackage, string sourcePath)
         {
+            // Can ignore ALLUSERS from MsiProperties because it is not allowed there.
             if (msiPackage.ForcePerMachine)
             {
                 if (YesNoDefaultType.No == this.Facade.PackageSymbol.PerMachine)
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs
index 7cfcdded..0abcaffc 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs
@@ -149,6 +149,7 @@ namespace WixToolsetTest.CoreIntegration
                 WixAssert.CompareLineByLine(new string[]
                 {
                     "<MsiPackage Id='FirstX86.msi' Cache='keep' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' LogPathVariable='WixBundleLog_FirstX86.msi' RollbackLogPathVariable='WixBundleRollbackLog_FirstX86.msi' ProductCode='*' Language='1033' Version='1.0.0.0' UpgradeCode='{12E4699F-E774-4D05-8A01-5BDD41BBA127}'>" +
+                      "<MsiProperty Id='MSIFASTINSTALL' Value='1' />" +
                       "<MsiProperty Id='ARPSYSTEMCOMPONENT' Value='1' />" +
                      $"<Provides Key='{GetProductCodeFromMsiPdb(pdbPaths[0])}_v1.0.0.0' Version='1.0.0.0' DisplayName='MsiPackage' />" +
                       "<RelatedPackage Id='{12E4699F-E774-4D05-8A01-5BDD41BBA127}' MaxVersion='1.0.0.0' MaxInclusive='no' OnlyDetect='no' LangInclusive='yes'><Language Id='1033' /></RelatedPackage>" +
@@ -158,6 +159,7 @@ namespace WixToolsetTest.CoreIntegration
                     "</MsiPackage>",
                     "<MsiPackage Id='FirstX64.msi' Cache='keep' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_FirstX64.msi' RollbackLogPathVariable='WixBundleRollbackLog_FirstX64.msi' ProductCode='*' Language='1033' Version='1.0.0.0' UpgradeCode='{12E4699F-E774-4D05-8A01-5BDD41BBA127}'>" +
                       "<MsiProperty Id='ARPSYSTEMCOMPONENT' Value='1' />" +
+                      "<MsiProperty Id='MSIFASTINSTALL' Value='7' />" +
                      $"<Provides Key='{GetProductCodeFromMsiPdb(pdbPaths[1])}_v1.0.0.0' Version='1.0.0.0' DisplayName='MsiPackage' />" +
                       "<RelatedPackage Id='{12E4699F-E774-4D05-8A01-5BDD41BBA127}' MaxVersion='1.0.0.0' MaxInclusive='no' OnlyDetect='no' LangInclusive='yes'><Language Id='1033' /></RelatedPackage>" +
                       "<RelatedPackage Id='{12E4699F-E774-4D05-8A01-5BDD41BBA127}' MinVersion='1.0.0.0' MinInclusive='no' OnlyDetect='yes' LangInclusive='yes'><Language Id='1033' /></RelatedPackage>" +
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoDetachedContainer.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoDetachedContainer.wxs
index e175a18f..d70399b8 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoDetachedContainer.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoDetachedContainer.wxs
@@ -2,7 +2,9 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <PackageGroup Id="BundlePackages">
-            <MsiPackage SourceFile="FirstX86.msi" />
+            <MsiPackage SourceFile="FirstX86.msi">
+                <MsiProperty Name="MSIFASTINSTALL" Value="1" />
+            </MsiPackage>
             <PackageGroupRef Id="FirstX64" />
         </PackageGroup>
         <PackageGroup Id="FirstX64">
-- 
cgit v1.2.3-55-g6feb