Merge branch 'hotfix/7.0.5'

nuke-build · Sep 4, 2023 · f6123b1 · f6123b1
2 parents ea86450 + 538cf31
commit f6123b1
Show file tree

Hide file tree

Showing 6 changed files with 745 additions and 454 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/source/Nuke.Common.Tests/ChangelogTasksTest.cs b/source/Nuke.Common.Tests/ChangelogTasksTest.cs
@@ -22,36 +22,6 @@ public class ChangelogTasksTest
 
         private static AbsolutePath PathToChangelogReferenceFiles => RootDirectory / "source" / "Nuke.Common.Tests" / "ChangelogReferenceFiles";
 
-        [Theory]
-        [MemberData(nameof(AllChangelogReference_1_0_0_Files))]
-        [MemberData(nameof(AllChangelogReference_NUKE_Files))]
-        public void ReadReleaseNotes_ChangelogReferenceFile_ThrowsNoExceptions(AbsolutePath file)
-        {
-            Action act = () => ChangelogTasks.ReadReleaseNotes(file);
-
-            act.Should().NotThrow();
-        }
-
-        [Theory]
-        [MemberData(nameof(AllChangelogReference_1_0_0_Files))]
-        [MemberData(nameof(AllChangelogReference_NUKE_Files))]
-        public void ReadReleaseNotes_ChangelogReferenceFile_ReturnsAnyReleaseNotes(AbsolutePath file)
-        {
-            var releaseNotes = ChangelogTasks.ReadReleaseNotes(file);
-
-            releaseNotes.Should().NotBeEmpty();
-        }
-
-        [Theory]
-        [MemberData(nameof(AllChangelogReference_1_0_0_Files))]
-        [MemberData(nameof(AllChangelogReference_NUKE_Files))]
-        public void ReadChangelog_ChangelogReferenceFile_ThrowsNoExceptions(AbsolutePath file)
-        {
-            Action act = () => ChangelogTasks.ReadChangelog(file);
-
-            act.Should().NotThrow();
-        }
-
         [Theory]
         [MemberData(nameof(AllChangelogReference_1_0_0_Files))]
         [MemberData(nameof(AllChangelogReference_NUKE_Files))]
@@ -62,16 +32,6 @@ public void ExtractChangelogSectionNotes_ChangelogReferenceFile_ThrowsNoExceptio
             act.Should().NotThrow();
         }
 
-        [Theory]
-        [MemberData(nameof(AllChangelogReference_1_0_0_Files))]
-        [MemberData(nameof(AllChangelogReference_NUKE_Files))]
-        public Task ReadReleaseNotes_ChangelogReferenceFile_HasParsedCorrectly(AbsolutePath file)
-        {
-            var releaseNotes = ChangelogTasks.ReadReleaseNotes(file);
-
-            return Verifier.Verify(releaseNotes).UseDirectory(PathToChangelogReferenceFiles).UseFileName(file.NameWithoutExtension);
-        }
-
         [Fact]
         public void GetReleaseSections_ChangelogReferenceFileWithoutReleaseHead_ReturnsEmpty()
         {

diff --git a/source/Nuke.Common/ChangeLog/ChangeLogTasks.cs b/source/Nuke.Common/ChangeLog/ChangeLogTasks.cs
@@ -178,6 +178,12 @@ internal static IEnumerable<ReleaseSection> GetReleaseSections(List<string> cont
         static bool IsReleaseHead(string str)
             => str.StartsWith("## ");
 
+        static bool IsReleaseContent(string str)
+            => str.StartsWith("###")
+               || str.Trim().StartsWith("-")
+               || str.Trim().StartsWith("*")
+               || str.Trim().StartsWith("+");
+
         static string GetCaption(string str)
             => str
                 .TrimStart('#', ' ', '[')
@@ -199,7 +205,7 @@ static string GetCaption(string str)
             }
 
             var caption = GetCaption(line);
-            var nextReleaseHeadIndex = content.FindIndex(index + 1, IsReleaseHead);
+            var nextReleaseHeadIndex = content.FindIndex(index + 1,  x => IsReleaseHead(x) || !IsReleaseContent(x));
 
             var releaseData =
                 new ReleaseSection