diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-03-02 15:22:42 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-03-02 15:50:47 -0600 |
| commit | a13f13130b84845fed54f812e2ad33136c7649cb (patch) | |
| tree | 5dc233d741eafc8a5c197b5b0018bec95e637214 /src | |
| parent | 7d8072cce7aae6c889b0979202b5ee285d0a35c9 (diff) | |
| download | wix-a13f13130b84845fed54f812e2ad33136c7649cb.tar.gz wix-a13f13130b84845fed54f812e2ad33136c7649cb.tar.bz2 wix-a13f13130b84845fed54f812e2ad33136c7649cb.zip | |
Don't recommend "/ChainingPackage" for netfx4 protocol ExePackages.
#5762
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.Core/Compiler_Bundle.cs | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs | 5 |
2 files changed, 3 insertions, 4 deletions
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 | |||
| 1973 | var slipstream = YesNoType.NotSet; | 1973 | var slipstream = YesNoType.NotSet; |
| 1974 | var hasPayloadInfo = false; | 1974 | var hasPayloadInfo = false; |
| 1975 | 1975 | ||
| 1976 | var expectedNetFx4Args = new string[] { "/q", "/norestart", "/chainingpackage" }; | 1976 | var expectedNetFx4Args = new string[] { "/q", "/norestart" }; |
| 1977 | 1977 | ||
| 1978 | // This list lets us evaluate extension attributes *after* all core attributes | 1978 | // This list lets us evaluate extension attributes *after* all core attributes |
| 1979 | // have been parsed and dealt with, regardless of authoring order. | 1979 | // 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 @@ | |||
| 3 | <Fragment> | 3 | <Fragment> |
| 4 | <PackageGroup Id="BundlePackages"> | 4 | <PackageGroup Id="BundlePackages"> |
| 5 | <ExePackage | 5 | <ExePackage |
| 6 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html"" | 6 | InstallArguments="/q /norestart "[WixBundleName]" /log "[NetFx462FullLog].html"" |
| 7 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html"" | 7 | UninstallArguments="/uninstall /q /norestart "[WixBundleName]" /log "[NetFx462FullLog].html"" |
| 8 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html"" | ||
| 9 | PerMachine="yes" | 8 | PerMachine="yes" |
| 10 | DetectCondition="A" | 9 | DetectCondition="A" |
| 11 | InstallCondition="B" | 10 | InstallCondition="B" |