From 1f422997c701625a53d08648521de709e280f4af Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 11 Feb 2022 13:05:23 -0600 Subject: Detect MinorUpgrade MsiPackages independently of the base product. Fixes #6535 --- .../burn/WixToolsetTest.BurnE2E/DependencyTests.cs | 30 ++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'src/test') 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 bundleNv101.VerifyUnregisteredAndRemovedFromPackageCache(); bundleNv1.VerifyRegisteredAndInPackageCache(); - // The expected values will change after implementing https://github.com/wixtoolset/issues/issues/6535 and https://github.com/wixtoolset/issues/issues/3421 packageAv1.VerifyInstalled(true); packageC.VerifyInstalled(false); - packageFv1.VerifyInstalledWithVersion(false); - packageFv101.VerifyInstalledWithVersion(true); - packageGv1.VerifyInstalledWithVersion(false); - packageGv101.VerifyInstalledWithVersion(true); + packageFv1.VerifyInstalledWithVersion(true); + packageFv101.VerifyInstalledWithVersion(false); + packageGv1.VerifyInstalledWithVersion(true); + packageGv101.VerifyInstalledWithVersion(false); bundleM.Uninstall(); bundleM.VerifyUnregisteredAndRemovedFromPackageCache(); packageAv1.VerifyInstalled(false); - packageFv1.VerifyInstalledWithVersion(false); - packageFv101.VerifyInstalledWithVersion(true); - packageGv1.VerifyInstalledWithVersion(false); - packageGv101.VerifyInstalledWithVersion(true); + packageFv1.VerifyInstalledWithVersion(true); + packageFv101.VerifyInstalledWithVersion(false); + packageGv1.VerifyInstalledWithVersion(true); + packageGv101.VerifyInstalledWithVersion(false); bundleNv1.Uninstall(); bundleNv1.VerifyUnregisteredAndRemovedFromPackageCache(); @@ -804,20 +803,19 @@ namespace WixToolsetTest.BurnE2E bundleNv101.VerifyUnregisteredAndRemovedFromPackageCache(); bundleNv1.VerifyRegisteredAndInPackageCache(); - // The expected values will change after implementing https://github.com/wixtoolset/issues/issues/6535 and https://github.com/wixtoolset/issues/issues/3421 packageAv1.VerifyInstalled(true); packageC.VerifyInstalled(false); - packageFv1.VerifyInstalledWithVersion(false); - packageFv101.VerifyInstalledWithVersion(true); - packageGv1.VerifyInstalledWithVersion(false); - packageGv101.VerifyInstalledWithVersion(true); + packageFv1.VerifyInstalledWithVersion(true); + packageFv101.VerifyInstalledWithVersion(false); + packageGv1.VerifyInstalledWithVersion(true); + packageGv101.VerifyInstalledWithVersion(false); bundleNv1.Uninstall(); bundleNv1.VerifyUnregisteredAndRemovedFromPackageCache(); packageAv1.VerifyInstalled(true); - packageFv1.VerifyInstalledWithVersion(false); - packageFv101.VerifyInstalledWithVersion(true); + packageFv1.VerifyInstalledWithVersion(true); + packageFv101.VerifyInstalledWithVersion(false); packageGv1.VerifyInstalledWithVersion(false); packageGv101.VerifyInstalledWithVersion(false); -- cgit v1.2.3-55-g6feb