From a13f13130b84845fed54f812e2ad33136c7649cb Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Tue, 2 Mar 2021 15:22:42 -0600
Subject: Don't recommend "/ChainingPackage" for netfx4 protocol ExePackages.

#5762
---
 src/WixToolset.Core/Compiler_Bundle.cs                               | 2 +-
 .../TestData/SingleExeBundle/SingleExeRemotePayload.wxs              | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Core/Compiler_Bundle.cs b/src/WixToolset.Core/Compiler_Bundle.cs
index 60db75d6..46b79484 100644
--- a/src/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/WixToolset.Core/Compiler_Bundle.cs
@@ -1973,7 +1973,7 @@ namespace WixToolset.Core
             var slipstream = YesNoType.NotSet;
             var hasPayloadInfo = false;
 
-            var expectedNetFx4Args = new string[] { "/q", "/norestart", "/chainingpackage" };
+            var expectedNetFx4Args = new string[] { "/q", "/norestart" };
 
             // This list lets us evaluate extension attributes *after* all core attributes
             // have been parsed and dealt with, regardless of authoring order.
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs
index 56f08ba9..0d459f02 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs
@@ -3,9 +3,8 @@
     <Fragment>
         <PackageGroup Id="BundlePackages">
             <ExePackage
-                InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
-                RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
-                UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
+                InstallArguments="/q /norestart &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
+                UninstallArguments="/uninstall /q /norestart &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
                 PerMachine="yes"
                 DetectCondition="A"
                 InstallCondition="B"
-- 
cgit v1.2.3-55-g6feb