Update changelog builder

Author: AndreyAkinshin

build/Build.csproj

@@ -10,6 +10,6 @@
     <PackageReference Include="Microsoft.DocAsCode.App" Version="2.67.3" />
     <PackageReference Include="Ben.Demystifier" Version="0.1.1" />
     <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
-    <PackageReference Include="Octokit" Version="0.29.0" />
+    <PackageReference Include="Octokit" Version="6.2.1" />
   </ItemGroup>
 </Project>

build/ChangeLogBuilder.cs

@@ -97,6 +97,9 @@ public class AuthorEqualityComparer : IEqualityComparer<Author>
 
     public class MarkdownBuilder
     {
+        private static IReadOnlyList<Milestone> AllMilestones = null;
+        private static readonly Dictionary<string, string> AuthorNames = new();
+        
         private readonly Config config;
         private readonly StringBuilder builder;
 
@@ -114,11 +117,13 @@ private MarkdownBuilder(Config config)
         private async Task<string> Build()
         {
             var (repoOwner, repoName, milestone, previousMilestone, lastCommit) = config;
+            if (string.IsNullOrEmpty(lastCommit))
+                lastCommit = milestone;
 
             var client = new GitHubClient(new ProductHeaderValue(config.ProductHeader));
             var tokenAuth = new Credentials(config.Token);
             client.Credentials = tokenAuth;
-
+            
             if (milestone == "_")
             {
                 var allContributors = await client.Repository.GetAllContributors(repoOwner, repoName);
@@ -136,46 +141,62 @@ private async Task<string> Build()
                 return builder.ToString();
             }
 
-            var issueRequest = new RepositoryIssueRequest
+            if (AllMilestones == null)
             {
-                State = ItemStateFilter.Closed
-            };
-            var pullRequestRequest = new PullRequestRequest
+                var milestoneRequest = new MilestoneRequest
+                {
+                    State = ItemStateFilter.All
+                };
+                AllMilestones = await client.Issue.Milestone.GetAllForRepository(repoOwner, repoName, milestoneRequest);
+            }
+
+            IReadOnlyList<Issue> allIssues = Array.Empty<Issue>();
+            var targetMilestone = AllMilestones.FirstOrDefault(m => m.Title == milestone);
+            if (targetMilestone != null)
             {
-                State = ItemStateFilter.Closed
-            };
+                var issueRequest = new RepositoryIssueRequest
+                {
+                    State = ItemStateFilter.Closed,
+                    Milestone = targetMilestone.Number.ToString()
+                };
+
+                allIssues = await client.Issue.GetAllForRepository(repoOwner, repoName, issueRequest);
+            }
 
-            var issues = (await client.Issue.GetAllForRepository(repoOwner, repoName, issueRequest))
-                .Where(issue => issue.Milestone != null && issue.Milestone.Title == milestone)
+            var issues = allIssues
                 .Where(issue => issue.PullRequest == null)
                 .OrderBy(issue => issue.Number)
                 .ToList();
-
-            var pullRequests =
-                (await client.PullRequest.GetAllForRepository(repoOwner, repoName, pullRequestRequest))
-                .Where(issue => issue.Milestone != null && issue.Milestone.Title == milestone)
+            var pullRequests = allIssues
+                .Where(issue => issue.PullRequest != null)
                 .OrderBy(issue => issue.Number)
                 .ToList();
-
+            
             var compare = await client.Repository.Commit.Compare(repoOwner, repoName, previousMilestone, lastCommit);
             var commits = compare.Commits;
-
-            var authorNames = new Dictionary<string, string>();
+            
+            
             foreach (var contributor in commits.Select(commit => commit.Author))
-                if (contributor != null && !authorNames.ContainsKey(contributor.Login))
+                if (contributor != null && !AuthorNames.ContainsKey(contributor.Login))
                 {
                     var user = await client.User.Get(contributor.Login);
                     var name = user?.Name;
-                    authorNames[contributor.Login] = string.IsNullOrWhiteSpace(name) ? contributor.Login : name;
+                    AuthorNames[contributor.Login] = string.IsNullOrWhiteSpace(name) ? contributor.Login : name;
                 }
 
+            string PresentContributor(GitHubCommit commit)
+            {
+                if (commit.Author != null)
+                    return $"{AuthorNames[commit.Author.Login]} ({commit.Author.ToLink()})".Trim();
+                return commit.Commit.Author.Name;
+            }
+            
             var contributors = compare.Commits
-                .Select(commit => commit.Author)
-                .Where(author => author != null)
-                .Distinct(AuthorEqualityComparer.Default)
-                .OrderBy(author => authorNames[author.Login])
+                .Select(PresentContributor)
+                .OrderBy(it => it)
+                .Distinct()
                 .ToImmutableList();
-
+            
             var milestoneHtmlUlr = $"https://github.com/{repoOwner}/{repoName}/issues?q=milestone:{milestone}";
 
             builder.AppendLine("## Milestone details");
@@ -192,9 +213,7 @@ private async Task<string> Build()
                 $"[#{pr.Number}]({pr.HtmlUrl}) {pr.Title.Trim()}{pr.User.ToStr("by")}");
             AppendList("Commits", commits, commit =>
                 $"{commit.ToLink()} {commit.Commit.ToCommitMessage()}{commit.ToByStr()}");
-            AppendList("Contributors", contributors, contributor =>
-                    $"{authorNames[contributor.Login]} ({contributor.ToLink()})".Trim(),
-                "Thank you very much!");
+            AppendList("Contributors", contributors, it => it, "Thank you very much!");
 
             return builder.ToString();
         }

build/Program.cs

@@ -141,13 +141,8 @@ public void DocfxChangelogDownload(string version, string versionPrevious, strin
     {
         this.Information("DocfxChangelogDownload: " + version);
         // Required environment variables: GITHUB_PRODUCT, GITHUB_TOKEN
-        var changeLogBuilderDirectory = ChangeLogGenDirectory.Combine("ChangeLogBuilder");
-        ChangeLogBuilder.Run(changeLogBuilderDirectory, version, versionPrevious, lastCommit).Wait();
-
-        var src = changeLogBuilderDirectory.CombineWithFilePath(version + ".md");
-        var dest = ChangeLogGenDirectory.Combine("details").CombineWithFilePath(version + ".md");
-        this.CopyFile(src, dest);
-        this.Information($"Changelog for {version}: {dest}");
+        var path = ChangeLogGenDirectory.Combine("details");
+        ChangeLogBuilder.Run(path, version, versionPrevious, lastCommit).Wait();
     }
 
     public void DocfxChangelogGenerate(string version)
@@ -450,7 +445,7 @@ public override void Run(BuildContext context)
             context.DocfxChangelogDownload(
                 DocumentationHelper.BdnAllVersions.First(),
                 DocumentationHelper.BdnFirstCommit);
-
+        
             for (int i = 1; i < DocumentationHelper.BdnAllVersions.Length; i++)
                 context.DocfxChangelogDownload(
                     DocumentationHelper.BdnAllVersions[i],