From 02e682881979cd87592ee1e8e39b7744b575829c Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Mon, 9 May 2022 22:21:16 -0700
Subject: Add support for semver in bundles and dependencies

Take advantage of WixVersion/verutil functionality to support wider
range of version numbers were possible in the WiX Toolset

Completes 4666
---
 .../DependencyTests/PackageB/ProductComponents.wxs    |  2 +-
 .../burn/WixToolsetTest.BurnE2E/DependencyTests.cs    | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'src/test')

diff --git a/src/test/burn/TestData/DependencyTests/PackageB/ProductComponents.wxs b/src/test/burn/TestData/DependencyTests/PackageB/ProductComponents.wxs
index b59e53e1..65ae1e44 100644
--- a/src/test/burn/TestData/DependencyTests/PackageB/ProductComponents.wxs
+++ b/src/test/burn/TestData/DependencyTests/PackageB/ProductComponents.wxs
@@ -11,7 +11,7 @@
     <Component Id="FileComponent2" Guid="A1866388-65B4-4215-A8FB-9A7AADBE4E8E" Directory="INSTALLFOLDER">
       <File Source="$(sys.SOURCEFILEPATH)" />
       <Provides>
-        <Requires ProviderKey="WiX.$(var.TestGroupName).A,v1.0" Minimum="1.0.0.0" IncludeMinimum="yes" dep:Enforce="yes" />
+        <Requires ProviderKey="WiX.$(var.TestGroupName).A,v1.0" Minimum="1.0.0-alpha.420" IncludeMinimum="yes" dep:Enforce="yes" />
       </Provides>
     </Component>
   </Fragment>
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
index 3437bf00..f4bc6ba9 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
@@ -1086,5 +1086,24 @@ namespace WixToolsetTest.BurnE2E
             packageA.UninstallProduct();
             packageA.VerifyInstalled(false);
         }
+
+        [Fact]
+        public void CannotInstallWhenDependencyUnsatisfied()
+        {
+            var packageA = this.CreatePackageInstaller("PackageAv1");
+            var packageB = this.CreatePackageInstaller("PackageB");
+            var bundleB = this.CreateBundleInstaller("BundleB");
+            var testBAController = this.CreateTestBAController();
+
+            packageA.VerifyInstalled(false);
+            packageB.VerifyInstalled(false);
+
+            // Prevent install of PackageA to cause PackageB's enforced dependency
+            // to fail the install.
+            testBAController.SetPackageRequestedState("PackageA", RequestState.None);
+
+            var bundleBInstallLogFilePath = bundleB.Install((int)MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE);
+            Assert.True(LogVerifier.MessageInLogFileRegex(bundleBInstallLogFilePath, @"Applied execute package: PackageB, result: 0x80070643, restart: None"));
+        }
     }
 }
-- 
cgit v1.2.3-55-g6feb