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
---
 src/ext/Dependency/Dependency.wixext.v3.ncrunchsolution             | 6 ++++++
 .../test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs    | 3 ++-
 .../WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs    | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 src/ext/Dependency/Dependency.wixext.v3.ncrunchsolution

(limited to 'src/ext')

diff --git a/src/ext/Dependency/Dependency.wixext.v3.ncrunchsolution b/src/ext/Dependency/Dependency.wixext.v3.ncrunchsolution
new file mode 100644
index 00000000..10420ac9
--- /dev/null
+++ b/src/ext/Dependency/Dependency.wixext.v3.ncrunchsolution
@@ -0,0 +1,6 @@
+<SolutionConfiguration>
+  <Settings>
+    <AllowParallelTestExecution>True</AllowParallelTestExecution>
+    <SolutionConfigured>True</SolutionConfigured>
+  </Settings>
+</SolutionConfiguration>
\ No newline at end of file
diff --git a/src/ext/Dependency/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs b/src/ext/Dependency/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
index bce128e8..9e837cff 100644
--- a/src/ext/Dependency/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
+++ b/src/ext/Dependency/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
@@ -17,13 +17,14 @@ namespace WixToolsetTest.Dependency
             var folder = TestData.Get(@"TestData\UsingProvides");
             var build = new Builder(folder, typeof(DependencyExtensionFactory), new[] { folder });
 
-            var results = build.BuildAndQuery(Build, "CustomAction", "Wix4DependencyProvider")
+            var results = build.BuildAndQuery(Build, "CustomAction", "Wix4DependencyProvider", "Wix4Dependency")
                                .Select(r => Regex.Replace(r, "{[^}]*}", "{*}"))
                                .ToArray();
             WixAssert.CompareLineByLine(new[]
             {
                 "CustomAction:Wix4DependencyCheck_X86\t1\tDependencyCA_X86\tWixDependencyCheck\t",
                 "CustomAction:Wix4DependencyRequire_X86\t1\tDependencyCA_X86\tWixDependencyRequire\t",
+                "Wix4Dependency:depL8BNflcqZaN5CQEWh2U3SBHFDdg\tUsingRequires\t1.0.0-beta.9\t\t0",
                 "Wix4DependencyProvider:dep74OfIcniaqxA7EprRGBw4Oyy3r8\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tUsingProvides\t\t\t",
                 "Wix4DependencyProvider:depTpv28q7slcxvXPWmU4Z0GfbiI.4\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\t{*}\t\t\t",
             }, results);
diff --git a/src/ext/Dependency/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs b/src/ext/Dependency/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs
index 65984395..990d984e 100644
--- a/src/ext/Dependency/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs
+++ b/src/ext/Dependency/test/WixToolsetTest.Dependency/TestData/UsingProvides/Package.wxs
@@ -12,7 +12,7 @@
         <File Name="example.txt" Source="Package.wxs" />
         <Provides Key="UsingProvides" dep:Check="yes" />
         <Provides>
-          <Requires ProviderKey="UsingRequires" Minimum="1.0.0.0" dep:Enforce="yes" />
+          <Requires ProviderKey="UsingRequires" Minimum="1.0.0-beta.9" dep:Enforce="yes" />
         </Provides>
       </Component>
     </Feature>
-- 
cgit v1.2.3-55-g6feb