diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-02-11 13:05:23 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-02-12 22:56:39 -0600 |
| commit | 1f422997c701625a53d08648521de709e280f4af (patch) | |
| tree | a04ab5c32983c297dbd354725b479065cdf5c3bf /src/test | |
| parent | 40492973be6075efbfbd231aed7168194d36cc73 (diff) | |
| download | wix-1f422997c701625a53d08648521de709e280f4af.tar.gz wix-1f422997c701625a53d08648521de709e280f4af.tar.bz2 wix-1f422997c701625a53d08648521de709e280f4af.zip | |
Detect MinorUpgrade MsiPackages independently of the base product.
Fixes #6535
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs index ba02d8ee..3437bf00 100644 --- a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs +++ b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs | |||
| @@ -730,22 +730,21 @@ namespace WixToolsetTest.BurnE2E | |||
| 730 | bundleNv101.VerifyUnregisteredAndRemovedFromPackageCache(); | 730 | bundleNv101.VerifyUnregisteredAndRemovedFromPackageCache(); |
| 731 | bundleNv1.VerifyRegisteredAndInPackageCache(); | 731 | bundleNv1.VerifyRegisteredAndInPackageCache(); |
| 732 | 732 | ||
| 733 | // The expected values will change after implementing https://github.com/wixtoolset/issues/issues/6535 and https://github.com/wixtoolset/issues/issues/3421 | ||
| 734 | packageAv1.VerifyInstalled(true); | 733 | packageAv1.VerifyInstalled(true); |
| 735 | packageC.VerifyInstalled(false); | 734 | packageC.VerifyInstalled(false); |
| 736 | packageFv1.VerifyInstalledWithVersion(false); | 735 | packageFv1.VerifyInstalledWithVersion(true); |
| 737 | packageFv101.VerifyInstalledWithVersion(true); | 736 | packageFv101.VerifyInstalledWithVersion(false); |
| 738 | packageGv1.VerifyInstalledWithVersion(false); | 737 | packageGv1.VerifyInstalledWithVersion(true); |
| 739 | packageGv101.VerifyInstalledWithVersion(true); | 738 | packageGv101.VerifyInstalledWithVersion(false); |
| 740 | 739 | ||
| 741 | bundleM.Uninstall(); | 740 | bundleM.Uninstall(); |
| 742 | bundleM.VerifyUnregisteredAndRemovedFromPackageCache(); | 741 | bundleM.VerifyUnregisteredAndRemovedFromPackageCache(); |
| 743 | 742 | ||
| 744 | packageAv1.VerifyInstalled(false); | 743 | packageAv1.VerifyInstalled(false); |
| 745 | packageFv1.VerifyInstalledWithVersion(false); | 744 | packageFv1.VerifyInstalledWithVersion(true); |
| 746 | packageFv101.VerifyInstalledWithVersion(true); | 745 | packageFv101.VerifyInstalledWithVersion(false); |
| 747 | packageGv1.VerifyInstalledWithVersion(false); | 746 | packageGv1.VerifyInstalledWithVersion(true); |
| 748 | packageGv101.VerifyInstalledWithVersion(true); | 747 | packageGv101.VerifyInstalledWithVersion(false); |
| 749 | 748 | ||
| 750 | bundleNv1.Uninstall(); | 749 | bundleNv1.Uninstall(); |
| 751 | bundleNv1.VerifyUnregisteredAndRemovedFromPackageCache(); | 750 | bundleNv1.VerifyUnregisteredAndRemovedFromPackageCache(); |
| @@ -804,20 +803,19 @@ namespace WixToolsetTest.BurnE2E | |||
| 804 | bundleNv101.VerifyUnregisteredAndRemovedFromPackageCache(); | 803 | bundleNv101.VerifyUnregisteredAndRemovedFromPackageCache(); |
| 805 | bundleNv1.VerifyRegisteredAndInPackageCache(); | 804 | bundleNv1.VerifyRegisteredAndInPackageCache(); |
| 806 | 805 | ||
| 807 | // The expected values will change after implementing https://github.com/wixtoolset/issues/issues/6535 and https://github.com/wixtoolset/issues/issues/3421 | ||
| 808 | packageAv1.VerifyInstalled(true); | 806 | packageAv1.VerifyInstalled(true); |
| 809 | packageC.VerifyInstalled(false); | 807 | packageC.VerifyInstalled(false); |
| 810 | packageFv1.VerifyInstalledWithVersion(false); | 808 | packageFv1.VerifyInstalledWithVersion(true); |
| 811 | packageFv101.VerifyInstalledWithVersion(true); | 809 | packageFv101.VerifyInstalledWithVersion(false); |
| 812 | packageGv1.VerifyInstalledWithVersion(false); | 810 | packageGv1.VerifyInstalledWithVersion(true); |
| 813 | packageGv101.VerifyInstalledWithVersion(true); | 811 | packageGv101.VerifyInstalledWithVersion(false); |
| 814 | 812 | ||
| 815 | bundleNv1.Uninstall(); | 813 | bundleNv1.Uninstall(); |
| 816 | bundleNv1.VerifyUnregisteredAndRemovedFromPackageCache(); | 814 | bundleNv1.VerifyUnregisteredAndRemovedFromPackageCache(); |
| 817 | 815 | ||
| 818 | packageAv1.VerifyInstalled(true); | 816 | packageAv1.VerifyInstalled(true); |
| 819 | packageFv1.VerifyInstalledWithVersion(false); | 817 | packageFv1.VerifyInstalledWithVersion(true); |
| 820 | packageFv101.VerifyInstalledWithVersion(true); | 818 | packageFv101.VerifyInstalledWithVersion(false); |
| 821 | packageGv1.VerifyInstalledWithVersion(false); | 819 | packageGv1.VerifyInstalledWithVersion(false); |
| 822 | packageGv101.VerifyInstalledWithVersion(false); | 820 | packageGv101.VerifyInstalledWithVersion(false); |
| 823 | 821 | ||