Merge pull request #450 from rasmus/fix-semver-alignment

Better guess at a version
rasmus · Dec 8, 2024 · e0cb1a6 · e0cb1a6
2 parents 8c76ae1 + 88f444a
commit e0cb1a6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,6 @@
 # 0.31-beta
 
-* *Nothing yet...*
+* Fix: If we have no exact match, we should try to find one that matches regardless of metadata
 
 # 0.30-beta
 

diff --git a/Source/Bake.Tests/UnitTests/Cooking/Ingredients/Gathers/ReleaseNotesGatherTests.cs b/Source/Bake.Tests/UnitTests/Cooking/Ingredients/Gathers/ReleaseNotesGatherTests.cs
@@ -55,6 +55,10 @@ public void SetUp()
             "1.0.129",
             "1.1,1.0-alpha,0.9",
             "1.0-alpha")]
+        [TestCase(
+            "1.0.0-alpha",
+            "1.1.0,1.0.0,0.9.0",
+            "1.0.0")]
         public async Task PickExpectedVersion(
             string version,
             string releaseNoteVersions,

diff --git a/Source/Bake/Cooking/Ingredients/Gathers/ReleaseNotesGather.cs b/Source/Bake/Cooking/Ingredients/Gathers/ReleaseNotesGather.cs
@@ -133,7 +133,6 @@ private async Task InternalGatherAsync(
                 .Where(n => n.Version.IsSubset(version))
                 .OrderByDescending(n => n.Version)
                 .ToList();
-
             if (withSubset.Any())
             {
                 var notes = withSubset.First();
@@ -147,6 +146,23 @@ private async Task InternalGatherAsync(
                 return notes;
             }
 
+            var withLegacyVersion = releaseNotes
+                .Where(n => n.Version.LegacyVersion == version.LegacyVersion)
+                .OrderByDescending(n => n.Version)
+                .ToList();
+            if (withLegacyVersion.Any())
+            {
+                var notes = withLegacyVersion.First();
+
+                _logger.LogInformation(
+                    "Found {Count} release notes that matches the non-meta {Version}, picking the most recent. Got {PickedVersion}",
+                    withLegacyVersion.Count,
+                    version.ToString(),
+                    notes.Version.ToString());
+
+                return notes;
+            }
+
             var orderedReleaseNotes = releaseNotes
                 .OrderByDescending(n => n.Version)
                 .ToList();