fix: Fixed appearance of the last commit of every release in the next…

… release.
Heleonix · Jun 25, 2024 · 7bff3a9 · 7bff3a9
1 parent 1d53ec6
commit 7bff3a9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Heleonix.Build/Targets/Hx_NetBuild.targets b/src/Heleonix.Build/Targets/Hx_NetBuild.targets
@@ -57,7 +57,7 @@
       <_Hx_NetBuild_SigningProps Condition="Exists('$(Hx_NetBuild_SnkFile)')">SignAssembly=true;AssemblyOriginatorKeyFile=$(Hx_NetBuild_SnkFile)</_Hx_NetBuild_SigningProps>
       <_Hx_NetBuild_VersionProps Condition="'$(Hx_NetBuild_Version)' != ''">Version=$(Hx_NetBuild_Version)</_Hx_NetBuild_VersionProps>
       <_Hx_NetBuild_AssemblyVersionProps Condition="'$(Hx_NetBuild_AssemblyVersion)' != ''">AssemblyVersion=$(Hx_NetBuild_AssemblyVersion)</_Hx_NetBuild_AssemblyVersionProps>
-      <_Hx_NetBuild_ReleaseNotes Condition="'$(Hx_NetBuild_ReleaseNotesFile)' != ''">PackageReleaseNotes=&quot;$([System.IO.File]::ReadAllText('$(Hx_NetBuild_ReleaseNotesFile)').Trim())&quot;</_Hx_NetBuild_ReleaseNotes>
+      <_Hx_NetBuild_ReleaseNotes Condition="'$(Hx_NetBuild_ReleaseNotesFile)' != ''">PackageReleaseNotes=$([System.IO.File]::ReadAllText('$(Hx_NetBuild_ReleaseNotesFile)').Trim())</_Hx_NetBuild_ReleaseNotes>
     </PropertyGroup>
     <MSBuild
       Projects="$(Hx_NetBuild_SlnFile)"

diff --git a/src/Heleonix.Build/Tasks/Hx_GitHubCommitChangeLog.cs b/src/Heleonix.Build/Tasks/Hx_GitHubCommitChangeLog.cs
@@ -110,12 +110,12 @@ private static TaskItem CreateTaskItemFromChangeMatch(Regex changeLogRegExp, Mat
 
     private void CollectChanges(
         HttpClient client,
-        string createdAt,
+        string since,
         (int Major, int Minor, int Patch) latestVersion,
         RegexOptions regExpOptions,
         string tagSource)
     {
-        var createdAtDateTime = createdAt != null ? DateTime.Parse(createdAt, DateTimeFormatInfo.InvariantInfo) : DateTime.MinValue;
+        var sinceDateTime = since != null ? DateTime.Parse(since, DateTimeFormatInfo.InvariantInfo) : DateTime.MinValue;
 
         var previousVersion = $"{latestVersion.Major}.{latestVersion.Minor}.{latestVersion.Patch}";
 
@@ -138,7 +138,7 @@ private void CollectChanges(
         {
             commitPage = client.GetFromJsonAsync<JsonArray>(
                 $"{this.GitHubRepositoryApiUrl}/commits?sha={tagSource}&per_page={100}&page={pageNumber}"
-                + (createdAt != null ? $"&since={createdAt}" : string.Empty));
+                + (since != null ? $"&since={since}" : string.Empty));
 
             commitPage.Wait(3 * 60 * 1000);
 
@@ -149,7 +149,7 @@ private void CollectChanges(
                     c["commit"]["committer"]["date"].GetValue<string>(),
                     DateTimeFormatInfo.InvariantInfo);
 
-                if (dateTime < createdAtDateTime)
+                if (dateTime <= sinceDateTime)
                 {
                     continue;
                 }