From e1d0eece69534177d69ac6a8ab29c228fe357ef3 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Thu, 2 Nov 2023 12:18:01 -0400
Subject: [PATCH 01/29] =?UTF-8?q?=EF=BB=BFAdd=20the=20'User'=20to=20when?=
 =?UTF-8?q?=20fetching=20issues=20and=20display=20the=20name=20of=20the=20?=
 =?UTF-8?q?author=20in=20the=20release=20notes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MappingProfiles/GitHubProfile.cs                  |  1 +
 src/GitReleaseManager.Core/Model/Issue.cs             |  2 ++
 src/GitReleaseManager.Core/Model/IssueComment.cs      |  5 +++++
 src/GitReleaseManager.Core/Model/User.cs              | 11 +++++++++++
 .../Templates/default/issue-note.sbn                  |  2 +-
 5 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 src/GitReleaseManager.Core/Model/User.cs

diff --git a/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs b/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs
index dff999dc..6420ce9a 100644
--- a/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs
+++ b/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs
@@ -23,6 +23,7 @@ public GitHubProfile()
             CreateMap<Model.ReleaseAssetUpload, Octokit.ReleaseAssetUpload>().ReverseMap();
             CreateMap<Model.Label, Octokit.Label>().ReverseMap();
             CreateMap<Model.Label, Octokit.NewLabel>().ReverseMap();
+            CreateMap<Model.User, Octokit.User>().ReverseMap();
             CreateMap<Model.Milestone, Octokit.Milestone>();
             CreateMap<Octokit.Milestone, Model.Milestone>()
                 .ForMember(dest => dest.PublicNumber, act => act.MapFrom(src => src.Number))
diff --git a/src/GitReleaseManager.Core/Model/Issue.cs b/src/GitReleaseManager.Core/Model/Issue.cs
index 222d8eb9..38d3ed6f 100644
--- a/src/GitReleaseManager.Core/Model/Issue.cs
+++ b/src/GitReleaseManager.Core/Model/Issue.cs
@@ -15,5 +15,7 @@ public sealed class Issue
         public IReadOnlyList<Label> Labels { get; set; }
 
         public bool IsPullRequest { get; set; }
+
+        public User User { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/Model/IssueComment.cs b/src/GitReleaseManager.Core/Model/IssueComment.cs
index 3d67fe5b..11d48bb3 100644
--- a/src/GitReleaseManager.Core/Model/IssueComment.cs
+++ b/src/GitReleaseManager.Core/Model/IssueComment.cs
@@ -11,5 +11,10 @@ public class IssueComment
         /// Gets or sets details about the issue comment.
         /// </summary>
         public string Body { get; set; }
+
+        /// <summary>
+        /// Gets or sets information about the user who made the comment.
+        /// </summary>
+        public User User { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/Model/User.cs b/src/GitReleaseManager.Core/Model/User.cs
new file mode 100644
index 00000000..c880942c
--- /dev/null
+++ b/src/GitReleaseManager.Core/Model/User.cs
@@ -0,0 +1,11 @@
+namespace GitReleaseManager.Core.Model
+{
+    public sealed class User
+    {
+        public string Login { get; set; }
+
+        public string HtmlUrl { get; set; }
+
+        public string AvatarUrl { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
index 218ae3cb..6da32374 100644
--- a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
@@ -2,5 +2,5 @@
     if issue.is_pull_request
 }}- [__!{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }}
 {{  else
-}}- [__#{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }}
+}}- [__#{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }} raised by [{{ issue.user.login }}]({{ issue.user.html_url }})
 {{  end -}}

From 09672e39b7d54527ee9de5bb23f01fbc54c22fa8 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Sun, 5 Nov 2023 12:46:19 -0500
Subject: [PATCH 02/29] =?UTF-8?q?=EF=BB=BFGet=20linked=20issue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Extensions/JsonExtensions.cs              |  47 +++++++
 .../GitReleaseManager.Core.csproj             |   2 +
 src/GitReleaseManager.Core/Model/Issue.cs     |   2 +
 .../Provider/GitHubProvider.cs                | 120 ++++++++++++++++++
 .../Provider/IVcsProvider.cs                  |   2 +
 .../ReleaseNotes/ReleaseNotesBuilder.cs       |   5 +
 .../Templates/default/issue-note.sbn          |   2 +-
 .../GitHubProviderIntegrationTests.cs         |  12 ++
 8 files changed, 191 insertions(+), 1 deletion(-)
 create mode 100644 src/GitReleaseManager.Core/Extensions/JsonExtensions.cs

diff --git a/src/GitReleaseManager.Core/Extensions/JsonExtensions.cs b/src/GitReleaseManager.Core/Extensions/JsonExtensions.cs
new file mode 100644
index 00000000..20368c0d
--- /dev/null
+++ b/src/GitReleaseManager.Core/Extensions/JsonExtensions.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Linq;
+using System.Text.Json;
+
+namespace GitReleaseManager.Core.Extensions
+{
+    internal static class JsonExtensions
+    {
+        public static JsonElement GetJsonElement(this JsonElement jsonElement, string path)
+        {
+            if (jsonElement.ValueKind is JsonValueKind.Null || jsonElement.ValueKind is JsonValueKind.Undefined)
+            {
+                return default(JsonElement);
+            }
+
+            string[] segments = path.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries);
+
+            foreach (var segment in segments)
+            {
+                if (int.TryParse(segment, out var index) && jsonElement.ValueKind == JsonValueKind.Array)
+                {
+                    jsonElement = jsonElement.EnumerateArray().ElementAtOrDefault(index);
+                    if (jsonElement.ValueKind is JsonValueKind.Null || jsonElement.ValueKind is JsonValueKind.Undefined)
+                    {
+                        return default(JsonElement);
+                    }
+
+                    continue;
+                }
+
+                jsonElement = jsonElement.TryGetProperty(segment, out var value) ? value : default;
+
+                if (jsonElement.ValueKind is JsonValueKind.Null || jsonElement.ValueKind is JsonValueKind.Undefined)
+                {
+                    return default(JsonElement);
+                }
+            }
+
+            return jsonElement;
+        }
+
+        public static string GetJsonElementValue(this JsonElement jsonElement) => jsonElement.ValueKind != JsonValueKind.Null &&
+                                                                                   jsonElement.ValueKind != JsonValueKind.Undefined
+            ? jsonElement.ToString()
+            : default;
+    }
+}
diff --git a/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj b/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj
index ea4a4b55..20dd1887 100644
--- a/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj
+++ b/src/GitReleaseManager.Core/GitReleaseManager.Core.csproj
@@ -19,6 +19,8 @@
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.9.1" />
         <PackageReference Include="Destructurama.Attributed" Version="3.1.0" />
+        <PackageReference Include="GraphQL.Client" Version="6.0.1" />
+        <PackageReference Include="GraphQL.Client.Serializer.SystemTextJson" Version="6.0.1" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
           <PrivateAssets>all</PrivateAssets>
diff --git a/src/GitReleaseManager.Core/Model/Issue.cs b/src/GitReleaseManager.Core/Model/Issue.cs
index 38d3ed6f..a4075bd7 100644
--- a/src/GitReleaseManager.Core/Model/Issue.cs
+++ b/src/GitReleaseManager.Core/Model/Issue.cs
@@ -17,5 +17,7 @@ public sealed class Issue
         public bool IsPullRequest { get; set; }
 
         public User User { get; set; }
+
+        public Issue LinkedIssue { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/Provider/GitHubProvider.cs b/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
index 68d19c4a..2ac322c0 100644
--- a/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
+++ b/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
@@ -2,8 +2,13 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using AutoMapper;
+using GitReleaseManager.Core.Extensions;
+using GraphQL.Client.Abstractions;
+using GraphQL.Client.Http;
+using GraphQL.Client.Serializer.SystemTextJson;
 using Octokit;
 using ApiException = GitReleaseManager.Core.Exceptions.ApiException;
 using ForbiddenException = GitReleaseManager.Core.Exceptions.ForbiddenException;
@@ -26,13 +31,62 @@ public class GitHubProvider : IVcsProvider
         private const int PAGE_SIZE = 100;
         private const string NOT_FOUND_MESSGAE = "NotFound";
 
+        // This query fragment will be executed for issues and pull requests
+        // because we don't know whether issueNumber refers to an issue or a PR
+        private const string CONNECT_AND_DISCONNECT_EVENTS_GRAPHQL_QUERY_FRAGMENT = @"
+		{0}(number: $issueNumber) {{
+			timelineItems(first: $pageSize, itemTypes: [CONNECTED_EVENT, DISCONNECTED_EVENT]) {{
+				nodes {{
+					__typename,
+					...on ConnectedEvent {{
+						createdAt,
+						id,
+						source {{
+							__typename,
+							... on Issue {{
+  								number
+							}}
+							... on PullRequest {{
+  								number
+							}}
+						}},
+						subject {{
+							__typename 
+							... on Issue {{
+  								number
+							}}
+							... on PullRequest {{
+  								number
+							}}
+						}}
+					}}
+					...on DisconnectedEvent {{
+						createdAt,
+					}}
+				}}
+			}}
+		}}";
+
+        private const string CONNECT_AND_DISCONNECT_EVENTS_GRAPHQL_QUERY = @"
+query ConnectAndDisconnectEvents($repoName: String!, $repoOwner: String!, $issueNumber: Int!, $pageSize: Int!) {{
+	repository(name: $repoName, owner: $repoOwner) {{
+		{0},
+		{1}
+	}}
+}}";
+
         private readonly IGitHubClient _gitHubClient;
         private readonly IMapper _mapper;
+        private readonly IGraphQLClient _graphQLClient;
 
         public GitHubProvider(IGitHubClient gitHubClient, IMapper mapper)
         {
             _gitHubClient = gitHubClient;
             _mapper = mapper;
+
+            var graphQLClient = new GraphQLHttpClient(new GraphQLHttpClientOptions { EndPoint = new Uri("https://api.github.com/graphql") }, new SystemTextJsonSerializer());
+            graphQLClient.HttpClient.DefaultRequestHeaders.Add("Authorization", $"bearer {_gitHubClient.Connection.Credentials.Password}");
+            _graphQLClient = graphQLClient;
         }
 
         public Task DeleteAssetAsync(string owner, string repository, ReleaseAsset asset)
@@ -356,6 +410,72 @@ public string GetIssueType(Issue issue)
             return issue.IsPullRequest ? "Pull Request" : "Issue";
         }
 
+        public async Task<Issue> GetLinkedIssueAsync(string owner, string repository, int issueNumber)
+        {
+            var graphQLQuery = string.Format(CultureInfo.InvariantCulture, CONNECT_AND_DISCONNECT_EVENTS_GRAPHQL_QUERY,
+                    string.Format(CultureInfo.InvariantCulture, CONNECT_AND_DISCONNECT_EVENTS_GRAPHQL_QUERY_FRAGMENT, "issue"),
+                    string.Format(CultureInfo.InvariantCulture, CONNECT_AND_DISCONNECT_EVENTS_GRAPHQL_QUERY_FRAGMENT, "pullRequest"));
+
+            var request = new GraphQLHttpRequest
+            {
+                Query = graphQLQuery.Replace("\r\n", string.Empty),
+                Variables = new
+                {
+                    pageSize = PAGE_SIZE,
+                    repoName = repository,
+                    repoOwner = owner,
+                    issueNumber = issueNumber,
+                },
+            };
+
+            var graphQLResponse = await _graphQLClient.SendQueryAsync<dynamic>(request).ConfigureAwait(false);
+
+            var rootNode = (JsonElement)graphQLResponse.Data;
+            var issueNode = rootNode.GetJsonElement("repository.issue");
+            if (issueNode.ValueKind == JsonValueKind.Null || issueNode.ValueKind == JsonValueKind.Undefined)
+            {
+                issueNode = rootNode.GetJsonElement("repository.pullRequest");
+            }
+
+            if (issueNode.ValueKind == JsonValueKind.Null || issueNode.ValueKind == JsonValueKind.Undefined)
+            {
+                throw new NotFoundException($"Unable to find issue/pull request {issueNumber}");
+            }
+
+            var nodes = issueNode.GetJsonElement("timelineItems.nodes");
+            var sortedNodes = nodes.EnumerateArray().OrderByDescending(n => n.GetJsonElement("createdAt").GetDateTime());
+            var mostRecentConnectedEvent = sortedNodes.FirstOrDefault(n => n.GetJsonElement("__typename").GetString() == "ConnectedEvent");
+            var mostRecentDisconnectedEvent = sortedNodes.FirstOrDefault(n => n.GetJsonElement("__typename").GetString() == "DisconnectedEvent");
+
+            // Make sure we found an event that indicates that an issue/PR was linked to this issue/PR
+            if (mostRecentConnectedEvent.ValueKind == JsonValueKind.Null || mostRecentConnectedEvent.ValueKind == JsonValueKind.Undefined)
+            {
+                return null;
+            }
+
+            // We found an event indicating that an issue was linked. Make sure it wasn't un-linked
+            else if (mostRecentDisconnectedEvent.ValueKind == JsonValueKind.Null || mostRecentDisconnectedEvent.ValueKind == JsonValueKind.Undefined)
+            {
+                var linkedIssueNumber = mostRecentConnectedEvent.GetJsonElement("subject.number").GetInt32();
+                var issue = await _gitHubClient.Issue.Get(owner, repository, linkedIssueNumber).ConfigureAwait(false);
+                return _mapper.Map<Issue>(issue);
+            }
+
+            // We found a linked issue and a disconnection event. Check which one is the most recent
+            else if (mostRecentDisconnectedEvent.GetJsonElement("createdAt").GetDateTime() >= mostRecentConnectedEvent.GetJsonElement("createdAt").GetDateTime())
+            {
+                return null;
+            }
+
+            // We found an event indicating that an issue was linked and we determined that it is more recent than any of the "un-link" events
+            else
+            {
+                var linkedIssueNumber = mostRecentConnectedEvent.GetJsonElement("subject.number").GetInt32();
+                var issue = await _gitHubClient.Issue.Get(owner, repository, linkedIssueNumber).ConfigureAwait(false);
+                return _mapper.Map<Issue>(issue);
+            }
+        }
+
         private async Task ExecuteAsync(Func<Task> action)
         {
             try
diff --git a/src/GitReleaseManager.Core/Provider/IVcsProvider.cs b/src/GitReleaseManager.Core/Provider/IVcsProvider.cs
index a7bf82a8..0a91be16 100644
--- a/src/GitReleaseManager.Core/Provider/IVcsProvider.cs
+++ b/src/GitReleaseManager.Core/Provider/IVcsProvider.cs
@@ -49,5 +49,7 @@ public interface IVcsProvider
         string GetMilestoneQueryString();
 
         string GetIssueType(Issue issue);
+
+        Task<Issue> GetLinkedIssueAsync(string owner, string repository, int issueNumber);
     }
 }
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
index ff4584eb..32bb8ded 100644
--- a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
+++ b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
@@ -66,6 +66,11 @@ public async Task<string> BuildReleaseNotesAsync(string user, string repository,
 
             var commitsLink = _vcsProvider.GetCommitsUrl(_user, _repository, _targetMilestone?.Title, previousMilestone?.Title);
 
+            foreach (var issue in issues)
+            {
+                issue.LinkedIssue = await _vcsProvider.GetLinkedIssueAsync(_user, _repository, issue.Number).ConfigureAwait(false);
+            }
+
             var issuesDict = GetIssuesDict(issues);
 
             var milestoneQueryString = _vcsProvider.GetMilestoneQueryString();
diff --git a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
index 6da32374..e0751145 100644
--- a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
@@ -2,5 +2,5 @@
     if issue.is_pull_request
 }}- [__!{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }}
 {{  else
-}}- [__#{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }} raised by [{{ issue.user.login }}]({{ issue.user.html_url }})
+}}- [__#{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }} raised by [{{ issue.user.login }}]({{ issue.user.html_url }}) {{ if issue.linked_issue != null }} resolved in [#{{ issue.linked_issue.number }}]({{ issue.linked_issue.html_url }}) by [{{ issue.linked_issue.user.login }}]({{ issue.linked_issue.user.html_url }}){{ end }}
 {{  end -}}
diff --git a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
index 9c7483ad..27540e0e 100644
--- a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
+++ b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
@@ -101,5 +101,17 @@ public async Task Should_Get_Commits_Count()
             var result = await _gitHubProvider.GetCommitsCountAsync(OWNER, REPOSITORY, _releaseBaseTag, _releaseHeadTag).ConfigureAwait(false);
             result.ShouldBeGreaterThan(0);
         }
+
+        [Test]
+        public async Task GetLinkedIssue()
+        {
+            // Assert that issue 43 is linked to pull request 108
+            var result1 = await _gitHubProvider.GetLinkedIssueAsync("jericho", "_testing", 43).ConfigureAwait(false);
+            Assert.AreEqual(108, result1.Number);
+
+            // Assert that pull request 108 is linked to issue 43
+            var result2 = await _gitHubProvider.GetLinkedIssueAsync("jericho", "_testing", 108).ConfigureAwait(false);
+            Assert.AreEqual(43, result2.Number);
+        }
     }
 }
\ No newline at end of file

From 15877ec218211611fe23fa203cdb3edc3e161d0c Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Sun, 5 Nov 2023 15:13:37 -0500
Subject: [PATCH 03/29] Contributors

---
 .../Extensions/LinqExtensions.cs              | 21 +++++++++++++
 .../ReleaseNotes/ReleaseNotesBuilder.cs       | 31 +++++++++++++++++--
 .../Templates/default/contributor-details.sbn |  1 +
 .../Templates/default/contributors.sbn        | 10 ++++++
 .../Templates/default/index.sbn               |  1 +
 .../ReleaseNotesBuilderIntegrationTests.cs    |  4 ++-
 6 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100644 src/GitReleaseManager.Core/Extensions/LinqExtensions.cs
 create mode 100644 src/GitReleaseManager.Core/Templates/default/contributor-details.sbn
 create mode 100644 src/GitReleaseManager.Core/Templates/default/contributors.sbn

diff --git a/src/GitReleaseManager.Core/Extensions/LinqExtensions.cs b/src/GitReleaseManager.Core/Extensions/LinqExtensions.cs
new file mode 100644
index 00000000..97df78e0
--- /dev/null
+++ b/src/GitReleaseManager.Core/Extensions/LinqExtensions.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+
+namespace GitReleaseManager.Core.Extensions
+{
+    internal static class LinqExtensions
+    {
+        // This is the equivalent of DistinctBy which is available in .NET 6
+        public static IEnumerable<TSource> DistinctBy<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector)
+        {
+            HashSet<TKey> seenKeys = new HashSet<TKey>();
+            foreach (TSource element in source)
+            {
+                if (seenKeys.Add(keySelector(element)))
+                {
+                    yield return element;
+                }
+            }
+        }
+    }
+}
diff --git a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
index 32bb8ded..50377664 100644
--- a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
+++ b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using GitReleaseManager.Core.Configuration;
 using GitReleaseManager.Core.Exceptions;
+using GitReleaseManager.Core.Extensions;
 using GitReleaseManager.Core.Helpers;
 using GitReleaseManager.Core.Model;
 using GitReleaseManager.Core.Provider;
@@ -66,12 +67,19 @@ public async Task<string> BuildReleaseNotesAsync(string user, string repository,
 
             var commitsLink = _vcsProvider.GetCommitsUrl(_user, _repository, _targetMilestone?.Title, previousMilestone?.Title);
 
-            foreach (var issue in issues)
+            var issuesDict = GetIssuesDict(issues);
+
+            // The call to GetIssuesDict above will filter out the issues that are not taged with one of the configured tags.
+            // Therefore it's more efficient to fetch the linked issues AFTER GetIssuesDict has been invoked.
+            foreach (var kvp in issuesDict)
             {
-                issue.LinkedIssue = await _vcsProvider.GetLinkedIssueAsync(_user, _repository, issue.Number).ConfigureAwait(false);
+                foreach (var issue in kvp.Value)
+                {
+                    issue.LinkedIssue = await _vcsProvider.GetLinkedIssueAsync(_user, _repository, issue.Number).ConfigureAwait(false);
+                }
             }
 
-            var issuesDict = GetIssuesDict(issues);
+            var contributors = GetContributors(issues);
 
             var milestoneQueryString = _vcsProvider.GetMilestoneQueryString();
 
@@ -82,6 +90,11 @@ public async Task<string> BuildReleaseNotesAsync(string user, string repository,
                     issues.Count,
                     Items = issuesDict,
                 },
+                Contributors = new
+                {
+                    Count = contributors.Count,
+                    Items = contributors,
+                },
                 Commits = new
                 {
                     Count = numberOfCommits,
@@ -119,6 +132,18 @@ private Dictionary<string, List<Issue>> GetIssuesDict(List<Issue> issues)
             return issuesByLabel;
         }
 
+        private static List<User> GetContributors(List<Issue> issues)
+        {
+            var contributors = issues
+                .Select(i => i.User)
+                .Union(issues.Select(i => i.LinkedIssue?.User))
+                .Where(u => u != null)
+                .DistinctBy(u => u.Login)
+                .ToList();
+
+            return contributors;
+        }
+
         private string GetValidLabel(string label, int issuesCount)
         {
             var alias = _configuration.LabelAliases.FirstOrDefault(x => x.Name.Equals(label, StringComparison.OrdinalIgnoreCase));
diff --git a/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn b/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn
new file mode 100644
index 00000000..0d302673
--- /dev/null
+++ b/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn
@@ -0,0 +1 @@
+<img src="{{contributor.avatar_url}}" alt="{{contributor.login}}" height="32" width="32"/> 
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/Templates/default/contributors.sbn b/src/GitReleaseManager.Core/Templates/default/contributors.sbn
new file mode 100644
index 00000000..90eee669
--- /dev/null
+++ b/src/GitReleaseManager.Core/Templates/default/contributors.sbn
@@ -0,0 +1,10 @@
+
+
+__Contributors__
+
+{{ contributors.count }} contributors made this release possible.
+
+{{ for contributor in contributors.items
+    include 'contributor-details'
+end }}
+
diff --git a/src/GitReleaseManager.Core/Templates/default/index.sbn b/src/GitReleaseManager.Core/Templates/default/index.sbn
index 1a3856e2..587d2bde 100644
--- a/src/GitReleaseManager.Core/Templates/default/index.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/index.sbn
@@ -4,6 +4,7 @@
         include 'milestone'
     end
     include 'issues' | string.rstrip
+    include 'contributors'
     if template_kind == "CREATE"
         include 'create/footer'
     end
diff --git a/src/GitReleaseManager.IntegrationTests/ReleaseNotesBuilderIntegrationTests.cs b/src/GitReleaseManager.IntegrationTests/ReleaseNotesBuilderIntegrationTests.cs
index 11706ee3..d9064e0e 100644
--- a/src/GitReleaseManager.IntegrationTests/ReleaseNotesBuilderIntegrationTests.cs
+++ b/src/GitReleaseManager.IntegrationTests/ReleaseNotesBuilderIntegrationTests.cs
@@ -55,11 +55,13 @@ public async Task SingleMilestone()
             {
                 var fileSystem = new FileSystem(new CreateSubOptions());
                 var currentDirectory = Environment.CurrentDirectory;
+
                 var configuration = ConfigurationProvider.Provide(currentDirectory, fileSystem);
+                configuration.IssueLabelsExclude.Add("Internal Refactoring"); // This is necessary to generate the release notes for GitReleaseManager version 0.12.0
 
                 var vcsProvider = new GitHubProvider(_gitHubClient, _mapper);
                 var releaseNotesBuilder = new ReleaseNotesBuilder(vcsProvider, _logger, fileSystem, configuration, new TemplateFactory(fileSystem, configuration, TemplateKind.Create));
-                var result = await releaseNotesBuilder.BuildReleaseNotesAsync("Chocolatey", "ChocolateyGUI", "0.12.4", ReleaseTemplates.DEFAULT_NAME).ConfigureAwait(false);
+                var result = await releaseNotesBuilder.BuildReleaseNotesAsync("GitTools", "GitReleaseManager", "0.12.0", ReleaseTemplates.DEFAULT_NAME).ConfigureAwait(false); // 0.12.0 contains a mix of issues and PRs
                 Debug.WriteLine(result);
                 ClipBoardHelper.SetClipboard(result);
             }

From 0743437e593186bcc4232173b78f8943901457b3 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Mon, 6 Nov 2023 09:55:06 -0500
Subject: [PATCH 04/29] Guard against null _gitHubClient (which happens during
 unit testing)

---
 src/GitReleaseManager.Core/Provider/GitHubProvider.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/GitReleaseManager.Core/Provider/GitHubProvider.cs b/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
index 2ac322c0..8cee91a0 100644
--- a/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
+++ b/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
@@ -85,7 +85,11 @@ public GitHubProvider(IGitHubClient gitHubClient, IMapper mapper)
             _mapper = mapper;
 
             var graphQLClient = new GraphQLHttpClient(new GraphQLHttpClientOptions { EndPoint = new Uri("https://api.github.com/graphql") }, new SystemTextJsonSerializer());
-            graphQLClient.HttpClient.DefaultRequestHeaders.Add("Authorization", $"bearer {_gitHubClient.Connection.Credentials.Password}");
+            if (!string.IsNullOrEmpty(_gitHubClient?.Connection?.Credentials?.Password))
+            {
+                graphQLClient.HttpClient.DefaultRequestHeaders.Add("Authorization", $"bearer {_gitHubClient.Connection.Credentials.Password}");
+            }
+
             _graphQLClient = graphQLClient;
         }
 

From 0db09e7b05a1246870e6c1b62ba6e33569a868ce Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Mon, 6 Nov 2023 10:25:36 -0500
Subject: [PATCH 05/29] Include contributors section in release notes only if
 there is at least one contributor

---
 src/GitReleaseManager.Core/Templates/default/contributors.sbn | 3 +--
 src/GitReleaseManager.Core/Templates/default/index.sbn        | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/GitReleaseManager.Core/Templates/default/contributors.sbn b/src/GitReleaseManager.Core/Templates/default/contributors.sbn
index 90eee669..d1238cdb 100644
--- a/src/GitReleaseManager.Core/Templates/default/contributors.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/contributors.sbn
@@ -6,5 +6,4 @@ __Contributors__
 
 {{ for contributor in contributors.items
     include 'contributor-details'
-end }}
-
+end }}
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/Templates/default/index.sbn b/src/GitReleaseManager.Core/Templates/default/index.sbn
index 587d2bde..fe306967 100644
--- a/src/GitReleaseManager.Core/Templates/default/index.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/index.sbn
@@ -4,7 +4,9 @@
         include 'milestone'
     end
     include 'issues' | string.rstrip
-    include 'contributors'
+    if contributors.count > 0
+        include 'contributors'
+    end
     if template_kind == "CREATE"
         include 'create/footer'
     end

From 90a9d67c3e8612ef7d86e934b35cd8293649feeb Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Sun, 12 Nov 2023 10:58:24 -0500
Subject: [PATCH 06/29] =?UTF-8?q?=EF=BB=BFFixes=20due=20to=20recent=20reba?=
 =?UTF-8?q?se?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/GitReleaseManager.Core/Provider/GitLabProvider.cs       | 6 ++++++
 .../ReleaseNotes/ReleaseNotesBuilder.cs                     | 2 +-
 src/GitReleaseManager.Core/Templates/default/issue-note.sbn | 4 ++--
 .../GitHubProviderIntegrationTests.cs                       | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/GitReleaseManager.Core/Provider/GitLabProvider.cs b/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
index c2371c72..f16f0c48 100644
--- a/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
+++ b/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
@@ -391,6 +391,12 @@ public string GetIssueType(Issue issue)
             return issue.IsPullRequest ? "Merge Request" : "Issue";
         }
 
+        public async Task<Issue> GetLinkedIssueAsync(string owner, string repository, int issueNumber)
+        {
+            // This is a placeholder until I figure out if GitLab has a something equivalent to GitHub's "linked issue"
+            throw new NotImplementedException();
+        }
+
         private int GetGitLabProjectId(string owner, string repository)
         {
             if (_projectId.HasValue)
diff --git a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
index 50377664..8148a6c3 100644
--- a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
+++ b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
@@ -75,7 +75,7 @@ public async Task<string> BuildReleaseNotesAsync(string user, string repository,
             {
                 foreach (var issue in kvp.Value)
                 {
-                    issue.LinkedIssue = await _vcsProvider.GetLinkedIssueAsync(_user, _repository, issue.Number).ConfigureAwait(false);
+                    issue.LinkedIssue = await _vcsProvider.GetLinkedIssueAsync(_user, _repository, issue.PublicNumber).ConfigureAwait(false);
                 }
             }
 
diff --git a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
index e0751145..3c504928 100644
--- a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
@@ -1,6 +1,6 @@
 {{
     if issue.is_pull_request
-}}- [__!{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }}
+}}- [__!{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }}{{ if issue.user }} by [{{ issue.user.login }}]({{ issue.user.html_url }}){{ end }}{{ if issue.linked_issue }} raised in [#{{ issue.linked_issue.public_number }}]({{ issue.linked_issue.html_url }}) by [{{ issue.linked_issue.user.login }}]({{ issue.linked_issue.user.html_url }}){{ end }}
 {{  else
-}}- [__#{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }} raised by [{{ issue.user.login }}]({{ issue.user.html_url }}) {{ if issue.linked_issue != null }} resolved in [#{{ issue.linked_issue.number }}]({{ issue.linked_issue.html_url }}) by [{{ issue.linked_issue.user.login }}]({{ issue.linked_issue.user.html_url }}){{ end }}
+}}- [__#{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }}{{ if issue.user }} raised by [{{ issue.user.login }}]({{ issue.user.html_url }}){{ end }}{{ if issue.linked_issue != null }} resolved in [#{{ issue.linked_issue.number }}]({{ issue.linked_issue.html_url }}) by [{{ issue.linked_issue.user.login }}]({{ issue.linked_issue.user.html_url }}){{ end }}
 {{  end -}}
diff --git a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
index 27540e0e..35f46e8d 100644
--- a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
+++ b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
@@ -107,11 +107,11 @@ public async Task GetLinkedIssue()
         {
             // Assert that issue 43 is linked to pull request 108
             var result1 = await _gitHubProvider.GetLinkedIssueAsync("jericho", "_testing", 43).ConfigureAwait(false);
-            Assert.AreEqual(108, result1.Number);
+            Assert.AreEqual(108, result1.PublicNumber);
 
             // Assert that pull request 108 is linked to issue 43
             var result2 = await _gitHubProvider.GetLinkedIssueAsync("jericho", "_testing", 108).ConfigureAwait(false);
-            Assert.AreEqual(43, result2.Number);
+            Assert.AreEqual(43, result2.PublicNumber);
         }
     }
 }
\ No newline at end of file

From 1e41fe87ef9673b532b8df6bbc5faa3b51c46aa6 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Sun, 12 Nov 2023 20:04:16 -0500
Subject: [PATCH 07/29] Account for the possibility of multiple linked
 issues/PRs

---
 src/GitReleaseManager.Core/Model/Issue.cs     |  2 +-
 .../Provider/GitHubProvider.cs                | 79 +++++++++++++------
 .../Provider/IVcsProvider.cs                  |  2 +-
 .../ReleaseNotes/ReleaseNotesBuilder.cs       |  3 +-
 .../GitHubProviderIntegrationTests.cs         | 17 ++--
 5 files changed, 68 insertions(+), 35 deletions(-)

diff --git a/src/GitReleaseManager.Core/Model/Issue.cs b/src/GitReleaseManager.Core/Model/Issue.cs
index a4075bd7..5ad73c7c 100644
--- a/src/GitReleaseManager.Core/Model/Issue.cs
+++ b/src/GitReleaseManager.Core/Model/Issue.cs
@@ -18,6 +18,6 @@ public sealed class Issue
 
         public User User { get; set; }
 
-        public Issue LinkedIssue { get; set; }
+        public IReadOnlyList<Issue> LinkedIssues { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/Provider/GitHubProvider.cs b/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
index 8cee91a0..7cdbcb51 100644
--- a/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
+++ b/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
@@ -62,6 +62,29 @@ ... on PullRequest {{
 					}}
 					...on DisconnectedEvent {{
 						createdAt,
+						id,
+						source {{
+							__typename,
+							... on Issue {{
+  								number
+							}}
+							... on PullRequest {{
+  								number,
+                                author {{
+                                    avatarUrl,
+                                    resourcePath,
+                                }}
+							}}
+						}},
+						subject {{
+							__typename 
+							... on Issue {{
+  								number
+							}}
+							... on PullRequest {{
+  								number
+							}}
+						}}
 					}}
 				}}
 			}}
@@ -414,7 +437,7 @@ public string GetIssueType(Issue issue)
             return issue.IsPullRequest ? "Pull Request" : "Issue";
         }
 
-        public async Task<Issue> GetLinkedIssueAsync(string owner, string repository, int issueNumber)
+        public async Task<IEnumerable<Issue>> GetLinkedIssuesAsync(string owner, string repository, Issue issue)
         {
             var graphQLQuery = string.Format(CultureInfo.InvariantCulture, CONNECT_AND_DISCONNECT_EVENTS_GRAPHQL_QUERY,
                     string.Format(CultureInfo.InvariantCulture, CONNECT_AND_DISCONNECT_EVENTS_GRAPHQL_QUERY_FRAGMENT, "issue"),
@@ -428,7 +451,7 @@ public async Task<Issue> GetLinkedIssueAsync(string owner, string repository, in
                     pageSize = PAGE_SIZE,
                     repoName = repository,
                     repoOwner = owner,
-                    issueNumber = issueNumber,
+                    issueNumber = issue.PublicNumber,
                 },
             };
 
@@ -443,41 +466,45 @@ public async Task<Issue> GetLinkedIssueAsync(string owner, string repository, in
 
             if (issueNode.ValueKind == JsonValueKind.Null || issueNode.ValueKind == JsonValueKind.Undefined)
             {
-                throw new NotFoundException($"Unable to find issue/pull request {issueNumber}");
+                throw new NotFoundException($"Unable to find issue/pull request {issue.PublicNumber}");
             }
 
             var nodes = issueNode.GetJsonElement("timelineItems.nodes");
-            var sortedNodes = nodes.EnumerateArray().OrderByDescending(n => n.GetJsonElement("createdAt").GetDateTime());
-            var mostRecentConnectedEvent = sortedNodes.FirstOrDefault(n => n.GetJsonElement("__typename").GetString() == "ConnectedEvent");
-            var mostRecentDisconnectedEvent = sortedNodes.FirstOrDefault(n => n.GetJsonElement("__typename").GetString() == "DisconnectedEvent");
+            var sortedNodes = nodes.EnumerateArray().OrderBy(n => n.GetJsonElement("createdAt").GetDateTime());
+            var connectedEvents = sortedNodes.Where(n => n.GetJsonElement("__typename").GetString() == "ConnectedEvent").ToArray();
+            var disconnectedEvents = sortedNodes.Where(n => n.GetJsonElement("__typename").GetString() == "DisconnectedEvent").ToArray();
 
-            // Make sure we found an event that indicates that an issue/PR was linked to this issue/PR
-            if (mostRecentConnectedEvent.ValueKind == JsonValueKind.Null || mostRecentConnectedEvent.ValueKind == JsonValueKind.Undefined)
+            if (!connectedEvents.Any())
             {
-                return null;
+                return Enumerable.Empty<Issue>();
             }
 
-            // We found an event indicating that an issue was linked. Make sure it wasn't un-linked
-            else if (mostRecentDisconnectedEvent.ValueKind == JsonValueKind.Null || mostRecentDisconnectedEvent.ValueKind == JsonValueKind.Undefined)
+            var linkedIssues = new List<Issue>();
+            foreach (var connectEvent in connectedEvents)
             {
-                var linkedIssueNumber = mostRecentConnectedEvent.GetJsonElement("subject.number").GetInt32();
-                var issue = await _gitHubClient.Issue.Get(owner, repository, linkedIssueNumber).ConfigureAwait(false);
-                return _mapper.Map<Issue>(issue);
-            }
+                var linkedIssueNumber = connectEvent.GetJsonElement("subject.number").GetInt32();
+                var correspondingDisconnectEvent = disconnectedEvents
+                    .FirstOrDefault(e =>
+                        e.GetJsonElement("subject.number").GetInt32() == linkedIssueNumber &&
+                        e.GetJsonElement("createdAt").GetDateTime() >= connectEvent.GetJsonElement("createdAt").GetDateTime());
 
-            // We found a linked issue and a disconnection event. Check which one is the most recent
-            else if (mostRecentDisconnectedEvent.GetJsonElement("createdAt").GetDateTime() >= mostRecentConnectedEvent.GetJsonElement("createdAt").GetDateTime())
-            {
-                return null;
+                if (correspondingDisconnectEvent.ValueKind == JsonValueKind.Null || correspondingDisconnectEvent.ValueKind == JsonValueKind.Undefined)
+                {
+                    var linkedIssue = await _gitHubClient.Issue.Get(owner, repository, linkedIssueNumber).ConfigureAwait(false);
+                    linkedIssues.Add(_mapper.Map<Issue>(linkedIssue));
+                }
+                else if (correspondingDisconnectEvent.GetJsonElement("createdAt").GetDateTime() >= connectEvent.GetJsonElement("createdAt").GetDateTime())
+                {
+                    continue;
+                }
+                else
+                {
+                    var linkedIssue = await _gitHubClient.Issue.Get(owner, repository, linkedIssueNumber).ConfigureAwait(false);
+                    linkedIssues.Add(_mapper.Map<Issue>(linkedIssue));
+                }
             }
 
-            // We found an event indicating that an issue was linked and we determined that it is more recent than any of the "un-link" events
-            else
-            {
-                var linkedIssueNumber = mostRecentConnectedEvent.GetJsonElement("subject.number").GetInt32();
-                var issue = await _gitHubClient.Issue.Get(owner, repository, linkedIssueNumber).ConfigureAwait(false);
-                return _mapper.Map<Issue>(issue);
-            }
+            return linkedIssues;
         }
 
         private async Task ExecuteAsync(Func<Task> action)
diff --git a/src/GitReleaseManager.Core/Provider/IVcsProvider.cs b/src/GitReleaseManager.Core/Provider/IVcsProvider.cs
index 0a91be16..60386d6a 100644
--- a/src/GitReleaseManager.Core/Provider/IVcsProvider.cs
+++ b/src/GitReleaseManager.Core/Provider/IVcsProvider.cs
@@ -50,6 +50,6 @@ public interface IVcsProvider
 
         string GetIssueType(Issue issue);
 
-        Task<Issue> GetLinkedIssueAsync(string owner, string repository, int issueNumber);
+        Task<IEnumerable<Issue>> GetLinkedIssuesAsync(string owner, string repository, Issue issue);
     }
 }
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
index 8148a6c3..48694630 100644
--- a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
+++ b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
@@ -75,7 +75,8 @@ public async Task<string> BuildReleaseNotesAsync(string user, string repository,
             {
                 foreach (var issue in kvp.Value)
                 {
-                    issue.LinkedIssue = await _vcsProvider.GetLinkedIssueAsync(_user, _repository, issue.PublicNumber).ConfigureAwait(false);
+                    var linkedIssues = await _vcsProvider.GetLinkedIssuesAsync(_user, _repository, issue).ConfigureAwait(false);
+                    issue.LinkedIssues = linkedIssues?.ToList().AsReadOnly() ?? Array.AsReadOnly(Array.Empty<Issue>());
                 }
             }
 
diff --git a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
index 35f46e8d..773478be 100644
--- a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
+++ b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
@@ -103,15 +103,20 @@ public async Task Should_Get_Commits_Count()
         }
 
         [Test]
-        public async Task GetLinkedIssue()
+        public async Task GetLinkedIssues()
         {
-            // Assert that issue 43 is linked to pull request 108
-            var result1 = await _gitHubProvider.GetLinkedIssueAsync("jericho", "_testing", 43).ConfigureAwait(false);
-            Assert.AreEqual(108, result1.PublicNumber);
+            // Assert that issue 43 is linked to pull requests 107 and 108
+            var result1 = await _gitHubProvider.GetLinkedIssuesAsync("jericho", "_testing", new Issue() { PublicNumber = 43 }).ConfigureAwait(false);
+            Assert.IsNotNull(result1);
+            Assert.AreEqual(2, result1.Count());
+            Assert.AreEqual(1, result1.Count(r => r.PublicNumber == 107));
+            Assert.AreEqual(1, result1.Count(r => r.PublicNumber == 108));
 
             // Assert that pull request 108 is linked to issue 43
-            var result2 = await _gitHubProvider.GetLinkedIssueAsync("jericho", "_testing", 108).ConfigureAwait(false);
-            Assert.AreEqual(43, result2.PublicNumber);
+            var result2 = await _gitHubProvider.GetLinkedIssuesAsync("jericho", "_testing", new Issue() { PublicNumber = 108 }).ConfigureAwait(false);
+            Assert.IsNotNull(result2);
+            Assert.AreEqual(1, result2.Count());
+            Assert.AreEqual(1, result2.Count(r => r.PublicNumber == 43));
         }
     }
 }
\ No newline at end of file

From 65ae43757a0651b2ecbbf62617aeafc217315747 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Sun, 12 Nov 2023 20:05:36 -0500
Subject: [PATCH 08/29] Implement GetLinkedIssuesAsync in GitLab provider

---
 .../Provider/GitLabProvider.cs                | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/GitReleaseManager.Core/Provider/GitLabProvider.cs b/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
index f16f0c48..0a4b5a4a 100644
--- a/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
+++ b/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
@@ -391,10 +391,23 @@ public string GetIssueType(Issue issue)
             return issue.IsPullRequest ? "Merge Request" : "Issue";
         }
 
-        public async Task<Issue> GetLinkedIssueAsync(string owner, string repository, int issueNumber)
+        public Task<IEnumerable<Issue>> GetLinkedIssuesAsync(string owner, string repository, Issue issue)
         {
-            // This is a placeholder until I figure out if GitLab has a something equivalent to GitHub's "linked issue"
-            throw new NotImplementedException();
+            return ExecuteAsync(() =>
+            {
+                if (issue.IsPullRequest)
+                {
+                    var closes = _gitLabClient.MergeRequests.ClosesIssues(issue.PublicNumber);
+                    var issues = _mapper.Map<IEnumerable<Issue>>(closes);
+                    return Task.FromResult(issues);
+                }
+                else
+                {
+                    var closedBy = _gitLabClient.Issues.ClosedBy(GetGitLabProjectId(owner, repository), issue.PublicNumber);
+                    var issues = _mapper.Map<IEnumerable<Issue>>(closedBy);
+                    return Task.FromResult(issues);
+                }
+            });
         }
 
         private int GetGitLabProjectId(string owner, string repository)

From 73d4283d7d351cca9c231c3bfae564f63e58a96c Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Sun, 12 Nov 2023 20:07:04 -0500
Subject: [PATCH 09/29] Get contributors from multiple linked issues/PRs

---
 .../ReleaseNotes/ReleaseNotesBuilder.cs              | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
index 48694630..fb345566 100644
--- a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
+++ b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
@@ -133,16 +133,18 @@ private Dictionary<string, List<Issue>> GetIssuesDict(List<Issue> issues)
             return issuesByLabel;
         }
 
-        private static List<User> GetContributors(List<Issue> issues)
+        private static List<User> GetContributors(IEnumerable<Issue> issues)
         {
-            var contributors = issues
-                .Select(i => i.User)
-                .Union(issues.Select(i => i.LinkedIssue?.User))
+            var contributors = issues.Select(i => i.User);
+            var linkedContributors = issues.SelectMany(i => i.LinkedIssues).Select(i => i.User);
+
+            var allContributors = contributors
+                .Union(linkedContributors)
                 .Where(u => u != null)
                 .DistinctBy(u => u.Login)
                 .ToList();
 
-            return contributors;
+            return allContributors;
         }
 
         private string GetValidLabel(string label, int issuesCount)

From 0e8ca36a4238aaebad481bcc16c75c89801f6e24 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Wed, 15 Nov 2023 12:38:08 -0500
Subject: [PATCH 10/29] Linq extension method no longer necessary since the
 switch to .NET 6

---
 .../Extensions/LinqExtensions.cs              | 21 -------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 src/GitReleaseManager.Core/Extensions/LinqExtensions.cs

diff --git a/src/GitReleaseManager.Core/Extensions/LinqExtensions.cs b/src/GitReleaseManager.Core/Extensions/LinqExtensions.cs
deleted file mode 100644
index 97df78e0..00000000
--- a/src/GitReleaseManager.Core/Extensions/LinqExtensions.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace GitReleaseManager.Core.Extensions
-{
-    internal static class LinqExtensions
-    {
-        // This is the equivalent of DistinctBy which is available in .NET 6
-        public static IEnumerable<TSource> DistinctBy<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector)
-        {
-            HashSet<TKey> seenKeys = new HashSet<TKey>();
-            foreach (TSource element in source)
-            {
-                if (seenKeys.Add(keySelector(element)))
-                {
-                    yield return element;
-                }
-            }
-        }
-    }
-}

From da5dee30de31c914fe08178d11d8f3f2157faaba Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Wed, 15 Nov 2023 12:39:23 -0500
Subject: [PATCH 11/29] Fix the issue where contributors associated with
 filtered-out issues were included in release notes

---
 .../ReleaseNotes/ReleaseNotesBuilder.cs           | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
index fb345566..f9a220ec 100644
--- a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
+++ b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using GitReleaseManager.Core.Configuration;
 using GitReleaseManager.Core.Exceptions;
-using GitReleaseManager.Core.Extensions;
 using GitReleaseManager.Core.Helpers;
 using GitReleaseManager.Core.Model;
 using GitReleaseManager.Core.Provider;
@@ -68,19 +67,15 @@ public async Task<string> BuildReleaseNotesAsync(string user, string repository,
             var commitsLink = _vcsProvider.GetCommitsUrl(_user, _repository, _targetMilestone?.Title, previousMilestone?.Title);
 
             var issuesDict = GetIssuesDict(issues);
+            var distinctValidIssues = issuesDict.SelectMany(kvp => kvp.Value).DistinctBy(i => i.PublicNumber);
 
-            // The call to GetIssuesDict above will filter out the issues that are not taged with one of the configured tags.
-            // Therefore it's more efficient to fetch the linked issues AFTER GetIssuesDict has been invoked.
-            foreach (var kvp in issuesDict)
+            foreach (var issue in distinctValidIssues)
             {
-                foreach (var issue in kvp.Value)
-                {
-                    var linkedIssues = await _vcsProvider.GetLinkedIssuesAsync(_user, _repository, issue).ConfigureAwait(false);
-                    issue.LinkedIssues = linkedIssues?.ToList().AsReadOnly() ?? Array.AsReadOnly(Array.Empty<Issue>());
-                }
+                var linkedIssues = await _vcsProvider.GetLinkedIssuesAsync(_user, _repository, issue).ConfigureAwait(false);
+                issue.LinkedIssues = linkedIssues?.ToList().AsReadOnly() ?? Array.AsReadOnly(Array.Empty<Issue>());
             }
 
-            var contributors = GetContributors(issues);
+            var contributors = GetContributors(distinctValidIssues);
 
             var milestoneQueryString = _vcsProvider.GetMilestoneQueryString();
 

From 133afc84a5562356257791e727d1cba6a3d68932 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Wed, 15 Nov 2023 16:21:18 -0500
Subject: [PATCH 12/29] Include linked issues in an issue's notes

---
 .../Templates/default/issue-details.sbn       |  2 +-
 .../Templates/default/issue-note.sbn          | 49 +++++++++++++++++--
 .../Templates/default/issues.sbn              |  3 +-
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/src/GitReleaseManager.Core/Templates/default/issue-details.sbn b/src/GitReleaseManager.Core/Templates/default/issue-details.sbn
index 8e049a29..70183381 100644
--- a/src/GitReleaseManager.Core/Templates/default/issue-details.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/issue-details.sbn
@@ -1,5 +1,5 @@
-__{{ issue_label }}__
 
+__{{ issue_label }}__
 {{ for issue in issues.items[issue_label]
     include 'issue-note'
 end }}
diff --git a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
index 3c504928..ce0bbdb1 100644
--- a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
@@ -1,6 +1,45 @@
 {{
-    if issue.is_pull_request
-}}- [__!{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }}{{ if issue.user }} by [{{ issue.user.login }}]({{ issue.user.html_url }}){{ end }}{{ if issue.linked_issue }} raised in [#{{ issue.linked_issue.public_number }}]({{ issue.linked_issue.html_url }}) by [{{ issue.linked_issue.user.login }}]({{ issue.linked_issue.user.html_url }}){{ end }}
-{{  else
-}}- [__#{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }}{{ if issue.user }} raised by [{{ issue.user.login }}]({{ issue.user.html_url }}){{ end }}{{ if issue.linked_issue != null }} resolved in [#{{ issue.linked_issue.number }}]({{ issue.linked_issue.html_url }}) by [{{ issue.linked_issue.user.login }}]({{ issue.linked_issue.user.html_url }}){{ end }}
-{{  end -}}
+func IssueDescription
+    if $0.is_pull_request
+        $description = "[__!" + $0.public_number + "__]"
+    else
+        $description = "[__#" + $0.public_number + "__]"
+    end
+    $description = $description + "(" + $0.html_url + ")"
+    if $1
+        $description = $description + " " + $0.title
+    end
+    if $0.user
+        $description = $description + " by [" + $0.user.login + "](" + $0.user.html_url + ")"
+    end
+    if $0.linked_issues
+        $description = $description + LinkedIssuesDescription($0.linked_issues)
+    end
+    ret $description
+end
+func LinkedIssuesDescription
+    $countPRs = 0
+    $countIssues = 0
+    for linkedIssue in $0
+        if linkedIssue.is_pull_request
+            if $countPRs == 0
+                $resolvedBy = " resolved by "
+            else
+                $resolvedBy = $resolvedBy + ", "
+            end
+            $resolvedBy = $resolvedBy + IssueDescription(linkedIssue, false)
+            ++ $countPRs
+        else
+            if $countIssues == 0
+                $raisedIn = " raised in "
+            else
+                $raisedIn = $raisedIn + ", "
+            end
+            $raisedIn = $raisedIn + IssueDescription(linkedIssue, false)
+            ++ $countIssues
+        end
+    end
+    ret $raisedIn + $resolvedBy
+end
+}}
+- {{ IssueDescription(issue, true) }}
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/Templates/default/issues.sbn b/src/GitReleaseManager.Core/Templates/default/issues.sbn
index 307b6080..d8f323f4 100644
--- a/src/GitReleaseManager.Core/Templates/default/issues.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/issues.sbn
@@ -1,4 +1,3 @@
-
 {{ for issue_label in issue_labels
     include 'issue-details'
-end }}
+end }}
\ No newline at end of file

From 04ccc8ff49945eff2b63f0b2fe7736f3691ccd27 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Wed, 15 Nov 2023 22:18:47 -0500
Subject: [PATCH 13/29] Fix issue in Scriban script that caused the number of
 linked issues to be printed in the resulting markdown text

---
 src/GitReleaseManager.Core/Templates/default/issue-note.sbn | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
index ce0bbdb1..3f6de56f 100644
--- a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
@@ -28,7 +28,7 @@ func LinkedIssuesDescription
                 $resolvedBy = $resolvedBy + ", "
             end
             $resolvedBy = $resolvedBy + IssueDescription(linkedIssue, false)
-            ++ $countPRs
+            $countPRs = $countPRs + 1
         else
             if $countIssues == 0
                 $raisedIn = " raised in "
@@ -36,7 +36,7 @@ func LinkedIssuesDescription
                 $raisedIn = $raisedIn + ", "
             end
             $raisedIn = $raisedIn + IssueDescription(linkedIssue, false)
-            ++ $countIssues
+            $countIssues = $countIssues + 1
         end
     end
     ret $raisedIn + $resolvedBy

From bba1b73d152aa240d93f38d6adb6b7694dc1ac08 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Fri, 8 Dec 2023 10:07:49 -0500
Subject: [PATCH 14/29] Improve the contributor-details template to make the
 contributors avatar clickable

---
 .../Templates/default/contributor-details.sbn                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn b/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn
index 0d302673..7c265926 100644
--- a/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn
@@ -1 +1 @@
-<img src="{{contributor.avatar_url}}" alt="{{contributor.login}}" height="32" width="32"/> 
\ No newline at end of file
+<a href="{{contributor.html_url}}"><img src="{{contributor.avatar_url}}" alt="{{contributor.login}}" height="32" width="32"/></a>

From 23b43c9d2ded1d11fb700fc5a5a2918fe3315184 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Fri, 8 Dec 2023 10:09:06 -0500
Subject: [PATCH 15/29] Improve issue-note template: "resolved in XXX by XYZ"
 rather than "resolved by XXX by XYZ"

---
 src/GitReleaseManager.Core/Templates/default/issue-note.sbn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
index 3f6de56f..ac7a11a1 100644
--- a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
@@ -23,7 +23,7 @@ func LinkedIssuesDescription
     for linkedIssue in $0
         if linkedIssue.is_pull_request
             if $countPRs == 0
-                $resolvedBy = " resolved by "
+                $resolvedBy = " resolved in "
             else
                 $resolvedBy = $resolvedBy + ", "
             end

From f1f80ab2710a20d3320952569ad05708a391b64d Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Fri, 8 Dec 2023 10:25:28 -0500
Subject: [PATCH 16/29] Restore the space separator between collaborators

---
 .../Templates/default/contributor-details.sbn                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn b/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn
index 7c265926..e824fcec 100644
--- a/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn
@@ -1 +1 @@
-<a href="{{contributor.html_url}}"><img src="{{contributor.avatar_url}}" alt="{{contributor.login}}" height="32" width="32"/></a>
+<a href="{{contributor.html_url}}"><img src="{{contributor.avatar_url}}" alt="{{contributor.login}}" height="32" width="32"/></a> 

From e712f24095c75317bbe1d472cc62c135fc1a3a79 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Fri, 8 Dec 2023 10:34:27 -0500
Subject: [PATCH 17/29] Remove unnecessary line feed at the end of the
 contributor-details template

---
 .../Templates/default/contributor-details.sbn                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn b/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn
index e824fcec..bd21d0a8 100644
--- a/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn
@@ -1 +1 @@
-<a href="{{contributor.html_url}}"><img src="{{contributor.avatar_url}}" alt="{{contributor.login}}" height="32" width="32"/></a> 
+<a href="{{contributor.html_url}}"><img src="{{contributor.avatar_url}}" alt="{{contributor.login}}" height="32" width="32"/></a> 
\ No newline at end of file

From 1c602839243402daa65f3d54eae3b409ea89e97a Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Wed, 10 Jul 2024 10:24:24 -0400
Subject: [PATCH 18/29] Use NUnit's new assertion syntax

This is necessary because I merged the develop branch earlier today where the reference to NUnit's NuGet package was upgraded to version 4.x. If I understand the situation correctly, the 'legacy' assertion syntax was supported until version 3.x and was removed in 4.x. That's why my unit tests with the old syntax worked until I rebased my branch earlier today.
---
 .../GitHubProviderIntegrationTests.cs              | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
index 773478be..a92b0fa2 100644
--- a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
+++ b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
@@ -107,16 +107,16 @@ public async Task GetLinkedIssues()
         {
             // Assert that issue 43 is linked to pull requests 107 and 108
             var result1 = await _gitHubProvider.GetLinkedIssuesAsync("jericho", "_testing", new Issue() { PublicNumber = 43 }).ConfigureAwait(false);
-            Assert.IsNotNull(result1);
-            Assert.AreEqual(2, result1.Count());
-            Assert.AreEqual(1, result1.Count(r => r.PublicNumber == 107));
-            Assert.AreEqual(1, result1.Count(r => r.PublicNumber == 108));
+            Assert.That(result1, Is.Not.Null);
+            Assert.That(result1.Count(), Is.EqualTo(2));
+            Assert.That(result1.Count(r => r.PublicNumber == 107), Is.EqualTo(1));
+            Assert.That(result1.Count(r => r.PublicNumber == 108), Is.EqualTo(1));
 
             // Assert that pull request 108 is linked to issue 43
             var result2 = await _gitHubProvider.GetLinkedIssuesAsync("jericho", "_testing", new Issue() { PublicNumber = 108 }).ConfigureAwait(false);
-            Assert.IsNotNull(result2);
-            Assert.AreEqual(1, result2.Count());
-            Assert.AreEqual(1, result2.Count(r => r.PublicNumber == 43));
+            Assert.That(result2, Is.Not.Null);
+            Assert.That(result2.Count(), Is.EqualTo(1));
+            Assert.That(result2.Count(r => r.PublicNumber == 43), Is.EqualTo(1));
         }
     }
 }
\ No newline at end of file

From 272bd031023272dfa73cd07eb5cd2fc9086530b0 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Sun, 14 Jul 2024 10:36:35 -0400
Subject: [PATCH 19/29] Revert changes made to the default template and instead
 create a distinct template called "contributors".

---
 .../Configuration/Config.cs                   |  1 +
 .../Configuration/CreateConfig.cs             |  3 ++
 .../ReleaseNotes/ReleaseNotesBuilder.cs       |  4 +-
 .../contributor-details.sbn                   |  0
 .../contributors.sbn                          |  0
 .../Templates/contributors/create/footer.sbn  | 10 ++++
 .../Templates/contributors/index.sbn          | 13 +++++
 .../Templates/contributors/issue-details.sbn  |  5 ++
 .../Templates/contributors/issue-note.sbn     | 45 +++++++++++++++++
 .../Templates/contributors/issues.sbn         |  3 ++
 .../Templates/contributors/milestone.sbn      |  2 +
 .../Templates/contributors/release-info.sbn   | 10 ++++
 .../Templates/default/index.sbn               |  3 --
 .../Templates/default/issue-details.sbn       |  2 +-
 .../Templates/default/issue-note.sbn          | 49 ++-----------------
 .../Templates/default/issues.sbn              |  3 +-
 src/GitReleaseManager.Core/VcsService.cs      |  4 +-
 17 files changed, 105 insertions(+), 52 deletions(-)
 rename src/GitReleaseManager.Core/Templates/{default => contributors}/contributor-details.sbn (100%)
 rename src/GitReleaseManager.Core/Templates/{default => contributors}/contributors.sbn (100%)
 create mode 100644 src/GitReleaseManager.Core/Templates/contributors/create/footer.sbn
 create mode 100644 src/GitReleaseManager.Core/Templates/contributors/index.sbn
 create mode 100644 src/GitReleaseManager.Core/Templates/contributors/issue-details.sbn
 create mode 100644 src/GitReleaseManager.Core/Templates/contributors/issue-note.sbn
 create mode 100644 src/GitReleaseManager.Core/Templates/contributors/issues.sbn
 create mode 100644 src/GitReleaseManager.Core/Templates/contributors/milestone.sbn
 create mode 100644 src/GitReleaseManager.Core/Templates/contributors/release-info.sbn

diff --git a/src/GitReleaseManager.Core/Configuration/Config.cs b/src/GitReleaseManager.Core/Configuration/Config.cs
index 15083cc2..eee6d8ce 100644
--- a/src/GitReleaseManager.Core/Configuration/Config.cs
+++ b/src/GitReleaseManager.Core/Configuration/Config.cs
@@ -27,6 +27,7 @@ public Config()
                 ShaSectionHeading = "SHA256 Hashes of the release artifacts",
                 ShaSectionLineFormat = "- `{1}\t{0}`",
                 AllowUpdateToPublishedRelease = false,
+                IncludeContributors = true,
             };
 
             Export = new ExportConfig
diff --git a/src/GitReleaseManager.Core/Configuration/CreateConfig.cs b/src/GitReleaseManager.Core/Configuration/CreateConfig.cs
index 512e4a28..00baed7d 100644
--- a/src/GitReleaseManager.Core/Configuration/CreateConfig.cs
+++ b/src/GitReleaseManager.Core/Configuration/CreateConfig.cs
@@ -34,5 +34,8 @@ public class CreateConfig
 
         [YamlMember(Alias = "allow-update-to-published")]
         public bool AllowUpdateToPublishedRelease { get; set; }
+
+        [YamlMember(Alias = "include-contributors")]
+        public bool IncludeContributors { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
index f9a220ec..304af73a 100644
--- a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
+++ b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
@@ -75,7 +75,7 @@ public async Task<string> BuildReleaseNotesAsync(string user, string repository,
                 issue.LinkedIssues = linkedIssues?.ToList().AsReadOnly() ?? Array.AsReadOnly(Array.Empty<Issue>());
             }
 
-            var contributors = GetContributors(distinctValidIssues);
+            var contributors = _configuration.Create.IncludeContributors ? GetContributors(distinctValidIssues) : Enumerable.Empty<User>();
 
             var milestoneQueryString = _vcsProvider.GetMilestoneQueryString();
 
@@ -88,7 +88,7 @@ public async Task<string> BuildReleaseNotesAsync(string user, string repository,
                 },
                 Contributors = new
                 {
-                    Count = contributors.Count,
+                    Count = contributors.Count(),
                     Items = contributors,
                 },
                 Commits = new
diff --git a/src/GitReleaseManager.Core/Templates/default/contributor-details.sbn b/src/GitReleaseManager.Core/Templates/contributors/contributor-details.sbn
similarity index 100%
rename from src/GitReleaseManager.Core/Templates/default/contributor-details.sbn
rename to src/GitReleaseManager.Core/Templates/contributors/contributor-details.sbn
diff --git a/src/GitReleaseManager.Core/Templates/default/contributors.sbn b/src/GitReleaseManager.Core/Templates/contributors/contributors.sbn
similarity index 100%
rename from src/GitReleaseManager.Core/Templates/default/contributors.sbn
rename to src/GitReleaseManager.Core/Templates/contributors/contributors.sbn
diff --git a/src/GitReleaseManager.Core/Templates/contributors/create/footer.sbn b/src/GitReleaseManager.Core/Templates/contributors/create/footer.sbn
new file mode 100644
index 00000000..b1b08303
--- /dev/null
+++ b/src/GitReleaseManager.Core/Templates/contributors/create/footer.sbn
@@ -0,0 +1,10 @@
+{{ if config.create.include_footer }}
+
+### {{ config.create.footer_heading }}
+
+{{  if config.create.milestone_replace_text
+        replace_milestone_title config.create.footer_content config.create.milestone_replace_text milestone.target.title
+    else
+        config.create.footer_content
+    end
+end }}
diff --git a/src/GitReleaseManager.Core/Templates/contributors/index.sbn b/src/GitReleaseManager.Core/Templates/contributors/index.sbn
new file mode 100644
index 00000000..fe306967
--- /dev/null
+++ b/src/GitReleaseManager.Core/Templates/contributors/index.sbn
@@ -0,0 +1,13 @@
+{{-
+    include 'release-info'
+    if milestone.target.description
+        include 'milestone'
+    end
+    include 'issues' | string.rstrip
+    if contributors.count > 0
+        include 'contributors'
+    end
+    if template_kind == "CREATE"
+        include 'create/footer'
+    end
+~}}
diff --git a/src/GitReleaseManager.Core/Templates/contributors/issue-details.sbn b/src/GitReleaseManager.Core/Templates/contributors/issue-details.sbn
new file mode 100644
index 00000000..70183381
--- /dev/null
+++ b/src/GitReleaseManager.Core/Templates/contributors/issue-details.sbn
@@ -0,0 +1,5 @@
+
+__{{ issue_label }}__
+{{ for issue in issues.items[issue_label]
+    include 'issue-note'
+end }}
diff --git a/src/GitReleaseManager.Core/Templates/contributors/issue-note.sbn b/src/GitReleaseManager.Core/Templates/contributors/issue-note.sbn
new file mode 100644
index 00000000..ac7a11a1
--- /dev/null
+++ b/src/GitReleaseManager.Core/Templates/contributors/issue-note.sbn
@@ -0,0 +1,45 @@
+{{
+func IssueDescription
+    if $0.is_pull_request
+        $description = "[__!" + $0.public_number + "__]"
+    else
+        $description = "[__#" + $0.public_number + "__]"
+    end
+    $description = $description + "(" + $0.html_url + ")"
+    if $1
+        $description = $description + " " + $0.title
+    end
+    if $0.user
+        $description = $description + " by [" + $0.user.login + "](" + $0.user.html_url + ")"
+    end
+    if $0.linked_issues
+        $description = $description + LinkedIssuesDescription($0.linked_issues)
+    end
+    ret $description
+end
+func LinkedIssuesDescription
+    $countPRs = 0
+    $countIssues = 0
+    for linkedIssue in $0
+        if linkedIssue.is_pull_request
+            if $countPRs == 0
+                $resolvedBy = " resolved in "
+            else
+                $resolvedBy = $resolvedBy + ", "
+            end
+            $resolvedBy = $resolvedBy + IssueDescription(linkedIssue, false)
+            $countPRs = $countPRs + 1
+        else
+            if $countIssues == 0
+                $raisedIn = " raised in "
+            else
+                $raisedIn = $raisedIn + ", "
+            end
+            $raisedIn = $raisedIn + IssueDescription(linkedIssue, false)
+            $countIssues = $countIssues + 1
+        end
+    end
+    ret $raisedIn + $resolvedBy
+end
+}}
+- {{ IssueDescription(issue, true) }}
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/Templates/contributors/issues.sbn b/src/GitReleaseManager.Core/Templates/contributors/issues.sbn
new file mode 100644
index 00000000..d8f323f4
--- /dev/null
+++ b/src/GitReleaseManager.Core/Templates/contributors/issues.sbn
@@ -0,0 +1,3 @@
+{{ for issue_label in issue_labels
+    include 'issue-details'
+end }}
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/Templates/contributors/milestone.sbn b/src/GitReleaseManager.Core/Templates/contributors/milestone.sbn
new file mode 100644
index 00000000..b3459681
--- /dev/null
+++ b/src/GitReleaseManager.Core/Templates/contributors/milestone.sbn
@@ -0,0 +1,2 @@
+
+{{ milestone.target.description }}
diff --git a/src/GitReleaseManager.Core/Templates/contributors/release-info.sbn b/src/GitReleaseManager.Core/Templates/contributors/release-info.sbn
new file mode 100644
index 00000000..c8f7e8e2
--- /dev/null
+++ b/src/GitReleaseManager.Core/Templates/contributors/release-info.sbn
@@ -0,0 +1,10 @@
+{{
+    if issues.count > 0
+        if commits.count > 0
+}}As part of this release we had [{{ commits.count }} {{ commits.count | string.pluralize "commit" "commits" }}]({{ commits.html_url }}) which resulted in [{{ issues.count }} {{ issues.count | string.pluralize "issue" "issues" }}]({{ milestone.target.html_url }}?{{ milestone.query_string }}) being closed.
+{{      else
+}}As part of this release we had [{{ issues.count }} {{ issues.count | string.pluralize "issue" "issues" }}]({{ milestone.target.html_url }}?{{ milestone.query_string }}) closed.
+{{      end
+    else if commits.count > 0
+}}As part of this release we had [{{ commits.count }} {{ commits.count | string.pluralize "commit" "commits" }}]({{ commits.html_url }}).
+{{  end -}}
diff --git a/src/GitReleaseManager.Core/Templates/default/index.sbn b/src/GitReleaseManager.Core/Templates/default/index.sbn
index fe306967..1a3856e2 100644
--- a/src/GitReleaseManager.Core/Templates/default/index.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/index.sbn
@@ -4,9 +4,6 @@
         include 'milestone'
     end
     include 'issues' | string.rstrip
-    if contributors.count > 0
-        include 'contributors'
-    end
     if template_kind == "CREATE"
         include 'create/footer'
     end
diff --git a/src/GitReleaseManager.Core/Templates/default/issue-details.sbn b/src/GitReleaseManager.Core/Templates/default/issue-details.sbn
index 70183381..8e049a29 100644
--- a/src/GitReleaseManager.Core/Templates/default/issue-details.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/issue-details.sbn
@@ -1,5 +1,5 @@
-
 __{{ issue_label }}__
+
 {{ for issue in issues.items[issue_label]
     include 'issue-note'
 end }}
diff --git a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
index ac7a11a1..218ae3cb 100644
--- a/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/issue-note.sbn
@@ -1,45 +1,6 @@
 {{
-func IssueDescription
-    if $0.is_pull_request
-        $description = "[__!" + $0.public_number + "__]"
-    else
-        $description = "[__#" + $0.public_number + "__]"
-    end
-    $description = $description + "(" + $0.html_url + ")"
-    if $1
-        $description = $description + " " + $0.title
-    end
-    if $0.user
-        $description = $description + " by [" + $0.user.login + "](" + $0.user.html_url + ")"
-    end
-    if $0.linked_issues
-        $description = $description + LinkedIssuesDescription($0.linked_issues)
-    end
-    ret $description
-end
-func LinkedIssuesDescription
-    $countPRs = 0
-    $countIssues = 0
-    for linkedIssue in $0
-        if linkedIssue.is_pull_request
-            if $countPRs == 0
-                $resolvedBy = " resolved in "
-            else
-                $resolvedBy = $resolvedBy + ", "
-            end
-            $resolvedBy = $resolvedBy + IssueDescription(linkedIssue, false)
-            $countPRs = $countPRs + 1
-        else
-            if $countIssues == 0
-                $raisedIn = " raised in "
-            else
-                $raisedIn = $raisedIn + ", "
-            end
-            $raisedIn = $raisedIn + IssueDescription(linkedIssue, false)
-            $countIssues = $countIssues + 1
-        end
-    end
-    ret $raisedIn + $resolvedBy
-end
-}}
-- {{ IssueDescription(issue, true) }}
\ No newline at end of file
+    if issue.is_pull_request
+}}- [__!{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }}
+{{  else
+}}- [__#{{ issue.public_number }}__]({{ issue.html_url }}) {{ issue.title }}
+{{  end -}}
diff --git a/src/GitReleaseManager.Core/Templates/default/issues.sbn b/src/GitReleaseManager.Core/Templates/default/issues.sbn
index d8f323f4..307b6080 100644
--- a/src/GitReleaseManager.Core/Templates/default/issues.sbn
+++ b/src/GitReleaseManager.Core/Templates/default/issues.sbn
@@ -1,3 +1,4 @@
+
 {{ for issue_label in issue_labels
     include 'issue-details'
-end }}
\ No newline at end of file
+end }}
diff --git a/src/GitReleaseManager.Core/VcsService.cs b/src/GitReleaseManager.Core/VcsService.cs
index 601a20b3..6f972a4c 100644
--- a/src/GitReleaseManager.Core/VcsService.cs
+++ b/src/GitReleaseManager.Core/VcsService.cs
@@ -46,7 +46,9 @@ public async Task<Release> CreateEmptyReleaseAsync(string owner, string reposito
 
         public async Task<Release> CreateReleaseFromMilestoneAsync(string owner, string repository, string milestone, string releaseName, string targetCommitish, IList<string> assets, bool prerelease, string templateFilePath)
         {
-            var templatePath = ReleaseTemplates.DEFAULT_NAME;
+            var templatePath = _configuration.Create.IncludeContributors
+                ? ReleaseTemplates.CONTRIBUTORS_NAME
+                : ReleaseTemplates.DEFAULT_NAME;
 
             if (!string.IsNullOrWhiteSpace(templateFilePath))
             {

From 44d7c93079d52ed7ed2d99484d13fc313c75cd77 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Sun, 14 Jul 2024 10:59:29 -0400
Subject: [PATCH 20/29] Make sure the SingleMilestone integration test is
 sensitive to the fact that we want contributors to be included in the release
 notes or not.

---
 .../ReleaseNotesBuilderIntegrationTests.cs             | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/GitReleaseManager.IntegrationTests/ReleaseNotesBuilderIntegrationTests.cs b/src/GitReleaseManager.IntegrationTests/ReleaseNotesBuilderIntegrationTests.cs
index 605524e2..e03abc30 100644
--- a/src/GitReleaseManager.IntegrationTests/ReleaseNotesBuilderIntegrationTests.cs
+++ b/src/GitReleaseManager.IntegrationTests/ReleaseNotesBuilderIntegrationTests.cs
@@ -66,9 +66,17 @@ public async Task SingleMilestone()
                 var configuration = ConfigurationProvider.Provide(currentDirectory, fileSystem);
                 configuration.IssueLabelsExclude.Add("Internal Refactoring"); // This is necessary to generate the release notes for GitReleaseManager version 0.12.0
 
+                // Indicate whether you want to include the 'Contributors' section in the release notes
+                configuration.Create.IncludeContributors = true;
+
+                // Pick the template based on whether you want to include the 'Contributors' section in the release notes
+                var templatePath = configuration.Create.IncludeContributors
+                    ? ReleaseTemplates.CONTRIBUTORS_NAME
+                    : ReleaseTemplates.DEFAULT_NAME;
+
                 var vcsProvider = new GitHubProvider(_gitHubClient, _mapper);
                 var releaseNotesBuilder = new ReleaseNotesBuilder(vcsProvider, _logger, fileSystem, configuration, new TemplateFactory(fileSystem, configuration, TemplateKind.Create));
-                var result = await releaseNotesBuilder.BuildReleaseNotesAsync("GitTools", "GitReleaseManager", "0.12.0", ReleaseTemplates.DEFAULT_NAME).ConfigureAwait(false); // 0.12.0 contains a mix of issues and PRs
+                var result = await releaseNotesBuilder.BuildReleaseNotesAsync("GitTools", "GitReleaseManager", "0.12.0", templatePath).ConfigureAwait(false); // 0.12.0 contains a mix of issues and PRs
                 Debug.WriteLine(result);
                 ClipBoardHelper.SetClipboard(result);
             }

From 18ccbbd5469c983c2c5424ea699ddf910dcbd31d Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Sun, 14 Jul 2024 16:53:17 -0400
Subject: [PATCH 21/29] Set IncludeContributors to false by default

---
 src/GitReleaseManager.Core/Configuration/Config.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitReleaseManager.Core/Configuration/Config.cs b/src/GitReleaseManager.Core/Configuration/Config.cs
index eee6d8ce..69e237f4 100644
--- a/src/GitReleaseManager.Core/Configuration/Config.cs
+++ b/src/GitReleaseManager.Core/Configuration/Config.cs
@@ -27,7 +27,7 @@ public Config()
                 ShaSectionHeading = "SHA256 Hashes of the release artifacts",
                 ShaSectionLineFormat = "- `{1}\t{0}`",
                 AllowUpdateToPublishedRelease = false,
-                IncludeContributors = true,
+                IncludeContributors = false,
             };
 
             Export = new ExportConfig

From a1f450881bb2fded78663592d16c9a70dfc7c0fe Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Tue, 16 Jul 2024 21:43:28 -0400
Subject: [PATCH 22/29] Fix incorrect XML comment comments

---
 .../GitHubProviderIntegrationTests.cs                         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
index a92b0fa2..47e34478 100644
--- a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
+++ b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
@@ -105,14 +105,14 @@ public async Task Should_Get_Commits_Count()
         [Test]
         public async Task GetLinkedIssues()
         {
-            // Assert that issue 43 is linked to pull requests 107 and 108
+            // Assert that pull request 43 is linked to issues 107 and 108
             var result1 = await _gitHubProvider.GetLinkedIssuesAsync("jericho", "_testing", new Issue() { PublicNumber = 43 }).ConfigureAwait(false);
             Assert.That(result1, Is.Not.Null);
             Assert.That(result1.Count(), Is.EqualTo(2));
             Assert.That(result1.Count(r => r.PublicNumber == 107), Is.EqualTo(1));
             Assert.That(result1.Count(r => r.PublicNumber == 108), Is.EqualTo(1));
 
-            // Assert that pull request 108 is linked to issue 43
+            // Assert that issue 108 is linked to pull request 43
             var result2 = await _gitHubProvider.GetLinkedIssuesAsync("jericho", "_testing", new Issue() { PublicNumber = 108 }).ConfigureAwait(false);
             Assert.That(result2, Is.Not.Null);
             Assert.That(result2.Count(), Is.EqualTo(1));

From e6a02c400ea0aeb45dba2dec1fe89823bfff7b05 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Fri, 19 Jul 2024 13:40:03 -0400
Subject: [PATCH 23/29] Convenient extension method to search for a node in a
 json doc that corresponds to a certain path. If the node is not present in
 the doc, fallback to a second path. If this second path is not present,
 fallback to a third path and so on.

---
 .../Extensions/JsonExtensions.cs              | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/GitReleaseManager.Core/Extensions/JsonExtensions.cs b/src/GitReleaseManager.Core/Extensions/JsonExtensions.cs
index 20368c0d..d8920c65 100644
--- a/src/GitReleaseManager.Core/Extensions/JsonExtensions.cs
+++ b/src/GitReleaseManager.Core/Extensions/JsonExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 
@@ -6,6 +7,12 @@ namespace GitReleaseManager.Core.Extensions
 {
     internal static class JsonExtensions
     {
+        /// <summary>
+        /// Get a JsonElement from a path. Each level in the path is seperated by a dot.
+        /// </summary>
+        /// <param name="jsonElement">The parent Json element.</param>
+        /// <param name="path">The path of the desired child element.</param>
+        /// <returns>The child element.</returns>
         public static JsonElement GetJsonElement(this JsonElement jsonElement, string path)
         {
             if (jsonElement.ValueKind is JsonValueKind.Null || jsonElement.ValueKind is JsonValueKind.Undefined)
@@ -39,6 +46,36 @@ public static JsonElement GetJsonElement(this JsonElement jsonElement, string pa
             return jsonElement;
         }
 
+        /// <summary>
+        /// Get the first JsonElement matching a path from the provided list of paths.
+        /// </summary>
+        /// <param name="jsonElement">The parent Json element.</param>
+        /// <param name="paths">The path of the desired child element.</param>
+        /// <returns>The child element.</returns>
+        public static JsonElement GetFirstJsonElement(this JsonElement jsonElement, IEnumerable<string> paths)
+        {
+            if (jsonElement.ValueKind is JsonValueKind.Null || jsonElement.ValueKind is JsonValueKind.Undefined)
+            {
+                return default(JsonElement);
+            }
+
+            var element = default(JsonElement);
+
+            foreach (var path in paths)
+            {
+                element = jsonElement.GetJsonElement(path);
+
+                if (element.ValueKind is JsonValueKind.Null || element.ValueKind is JsonValueKind.Undefined)
+                {
+                    continue;
+                }
+
+                break;
+            }
+
+            return element;
+        }
+
         public static string GetJsonElementValue(this JsonElement jsonElement) => jsonElement.ValueKind != JsonValueKind.Null &&
                                                                                    jsonElement.ValueKind != JsonValueKind.Undefined
             ? jsonElement.ToString()

From e1889ba2a3aff191985042c95c35aa04cbc09eac Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Fri, 19 Jul 2024 15:46:42 -0400
Subject: [PATCH 24/29] Improve GraphQL query

---
 .../MappingProfiles/GitHubProfile.cs          |  26 +++
 .../Provider/GitHubProvider.cs                | 159 ++++++------------
 .../Provider/GitLabProvider.cs                |   1 +
 .../GitHubProviderIntegrationTests.cs         |  16 +-
 4 files changed, 95 insertions(+), 107 deletions(-)

diff --git a/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs b/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs
index 6420ce9a..3fa9b67f 100644
--- a/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs
+++ b/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Text.Json;
 using AutoMapper;
 using GitReleaseManager.Core.Extensions;
 
@@ -8,6 +9,7 @@ public class GitHubProfile : Profile
     {
         public GitHubProfile()
         {
+            // These mappings convert the result of Octokit queries to model classes
             CreateMap<Octokit.Issue, Model.Issue>()
                 .ForMember(dest => dest.PublicNumber, act => act.MapFrom(src => src.Number))
                 .ForMember(dest => dest.InternalNumber, act => act.MapFrom(src => src.Id))
@@ -29,6 +31,30 @@ public GitHubProfile()
                 .ForMember(dest => dest.PublicNumber, act => act.MapFrom(src => src.Number))
                 .ForMember(dest => dest.InternalNumber, act => act.MapFrom(src => src.Number))
                 .AfterMap((src, dest) => dest.Version = src.Version());
+
+            // These mappings convert the result of GraphQL queries to model classes
+            CreateMap<JsonElement, Model.Issue>()
+                .ForMember(dest => dest.PublicNumber, act => act.MapFrom(src => src.GetProperty("number").GetInt32()))
+                .ForMember(dest => dest.InternalNumber, act => act.MapFrom(src => -1)) // Not available in graphQL (there's a "id" property but it contains a string which represents the Node ID of the object).
+                .ForMember(dest => dest.Title, act => act.MapFrom(src => src.GetProperty("title").GetString()))
+                .ForMember(dest => dest.HtmlUrl, act => act.MapFrom(src => src.GetProperty("url").GetString()))
+                .ForMember(dest => dest.IsPullRequest, act => act.MapFrom(src => src.GetProperty("url").GetString().Contains("/pull/", StringComparison.OrdinalIgnoreCase)))
+                .ForMember(dest => dest.User, act => act.MapFrom(src => src.GetProperty("author")))
+                .ForMember(dest => dest.Labels, act => act.MapFrom(src => src.GetProperty("labels")))
+                .ForMember(dest => dest.LinkedIssues, act => act.MapFrom(src => src.GetProperty("linked_issues")))
+                .ReverseMap();
+
+            CreateMap<JsonElement, Model.Label>()
+                .ForMember(dest => dest.Name, act => act.MapFrom(src => src.GetProperty("name").GetString()))
+                .ForMember(dest => dest.Color, act => act.MapFrom(src => src.GetProperty("color").GetString()))
+                .ForMember(dest => dest.Description, act => act.MapFrom(src => src.GetProperty("description").GetString()))
+                .ReverseMap();
+
+            CreateMap<JsonElement, Model.User>()
+                .ForMember(dest => dest.Login, act => act.MapFrom(src => src.GetProperty("login").GetString()))
+                .ForMember(dest => dest.HtmlUrl, act => act.MapFrom(src => src.GetProperty("resourcePath").GetString()))
+                .ForMember(dest => dest.AvatarUrl, act => act.MapFrom(src => src.GetProperty("avatarUrl").GetString()))
+                .ReverseMap();
         }
     }
 }
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/Provider/GitHubProvider.cs b/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
index 7cdbcb51..d398a939 100644
--- a/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
+++ b/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
@@ -33,70 +33,56 @@ public class GitHubProvider : IVcsProvider
 
         // This query fragment will be executed for issues and pull requests
         // because we don't know whether issueNumber refers to an issue or a PR
-        private const string CONNECT_AND_DISCONNECT_EVENTS_GRAPHQL_QUERY_FRAGMENT = @"
-		{0}(number: $issueNumber) {{
-			timelineItems(first: $pageSize, itemTypes: [CONNECTED_EVENT, DISCONNECTED_EVENT]) {{
-				nodes {{
-					__typename,
-					...on ConnectedEvent {{
-						createdAt,
-						id,
-						source {{
-							__typename,
-							... on Issue {{
-  								number
-							}}
-							... on PullRequest {{
-  								number
-							}}
-						}},
-						subject {{
-							__typename 
-							... on Issue {{
-  								number
-							}}
-							... on PullRequest {{
-  								number
-							}}
-						}}
-					}}
-					...on DisconnectedEvent {{
-						createdAt,
-						id,
-						source {{
-							__typename,
-							... on Issue {{
-  								number
-							}}
-							... on PullRequest {{
-  								number,
-                                author {{
-                                    avatarUrl,
-                                    resourcePath,
-                                }}
-							}}
-						}},
-						subject {{
-							__typename 
-							... on Issue {{
-  								number
-							}}
-							... on PullRequest {{
-  								number
-							}}
-						}}
-					}}
-				}}
-			}}
-		}}";
-
-        private const string CONNECT_AND_DISCONNECT_EVENTS_GRAPHQL_QUERY = @"
-query ConnectAndDisconnectEvents($repoName: String!, $repoOwner: String!, $issueNumber: Int!, $pageSize: Int!) {{
-	repository(name: $repoName, owner: $repoOwner) {{
-		{0},
-		{1}
-	}}
-}}";
+        private const string CLOSING_ISSUES_AND_PULLREQUESTS_GRAPHQL_QUERY = @"
+        query ClosingIssuesAndPullRequests($repoName: String!, $repoOwner: String!, $issueNumber: Int!, $pageSize: Int!) {
+	        repository(name: $repoName, owner: $repoOwner) {
+                issue(number: $issueNumber) {
+                    title
+                    id
+                    number
+                    url
+                    labels(first: 100) {
+                        nodes {
+                            name
+                            color
+                            description
+                        }
+                    }
+                    author {
+                        login
+                        avatarUrl
+                        resourcePath
+                    }
+                    closedByPullRequestsReferences(includeClosedPrs: true, first: $pageSize) {
+                        nodes {
+                            number
+                            id
+                            title
+                            author {
+                                login
+                                avatarUrl
+                                resourcePath
+                            }
+                        }
+                    }
+                }
+                pullRequest(number: $issueNumber) {
+                    number
+                    title
+                    closingIssuesReferences(first: $pageSize) {
+                        nodes {
+                            number
+                            title
+                            author {
+                                login
+                                avatarUrl
+                                resourcePath
+                            }
+                        }
+                    }
+                }
+    	    }
+        }";
 
         private readonly IGitHubClient _gitHubClient;
         private readonly IMapper _mapper;
@@ -439,13 +425,11 @@ public string GetIssueType(Issue issue)
 
         public async Task<IEnumerable<Issue>> GetLinkedIssuesAsync(string owner, string repository, Issue issue)
         {
-            var graphQLQuery = string.Format(CultureInfo.InvariantCulture, CONNECT_AND_DISCONNECT_EVENTS_GRAPHQL_QUERY,
-                    string.Format(CultureInfo.InvariantCulture, CONNECT_AND_DISCONNECT_EVENTS_GRAPHQL_QUERY_FRAGMENT, "issue"),
-                    string.Format(CultureInfo.InvariantCulture, CONNECT_AND_DISCONNECT_EVENTS_GRAPHQL_QUERY_FRAGMENT, "pullRequest"));
+            ArgumentNullException.ThrowIfNull(issue, nameof(issue));
 
             var request = new GraphQLHttpRequest
             {
-                Query = graphQLQuery.Replace("\r\n", string.Empty),
+                Query = CLOSING_ISSUES_AND_PULLREQUESTS_GRAPHQL_QUERY.Replace("\r\n", string.Empty, StringComparison.OrdinalIgnoreCase),
                 Variables = new
                 {
                     pageSize = PAGE_SIZE,
@@ -458,50 +442,19 @@ public async Task<IEnumerable<Issue>> GetLinkedIssuesAsync(string owner, string
             var graphQLResponse = await _graphQLClient.SendQueryAsync<dynamic>(request).ConfigureAwait(false);
 
             var rootNode = (JsonElement)graphQLResponse.Data;
-            var issueNode = rootNode.GetJsonElement("repository.issue");
-            if (issueNode.ValueKind == JsonValueKind.Null || issueNode.ValueKind == JsonValueKind.Undefined)
-            {
-                issueNode = rootNode.GetJsonElement("repository.pullRequest");
-            }
+            var issueNode = rootNode.GetFirstJsonElement(new[] { "repository.issue", "repository.pullRequest" });
 
             if (issueNode.ValueKind == JsonValueKind.Null || issueNode.ValueKind == JsonValueKind.Undefined)
             {
                 throw new NotFoundException($"Unable to find issue/pull request {issue.PublicNumber}");
             }
 
-            var nodes = issueNode.GetJsonElement("timelineItems.nodes");
-            var sortedNodes = nodes.EnumerateArray().OrderBy(n => n.GetJsonElement("createdAt").GetDateTime());
-            var connectedEvents = sortedNodes.Where(n => n.GetJsonElement("__typename").GetString() == "ConnectedEvent").ToArray();
-            var disconnectedEvents = sortedNodes.Where(n => n.GetJsonElement("__typename").GetString() == "DisconnectedEvent").ToArray();
-
-            if (!connectedEvents.Any())
-            {
-                return Enumerable.Empty<Issue>();
-            }
+            var nodes = issueNode.GetFirstJsonElement(new[] { "closedByPullRequestsReferences.nodes", "closingIssuesReferences.nodes" });
 
             var linkedIssues = new List<Issue>();
-            foreach (var connectEvent in connectedEvents)
+            foreach (var node in nodes.EnumerateArray())
             {
-                var linkedIssueNumber = connectEvent.GetJsonElement("subject.number").GetInt32();
-                var correspondingDisconnectEvent = disconnectedEvents
-                    .FirstOrDefault(e =>
-                        e.GetJsonElement("subject.number").GetInt32() == linkedIssueNumber &&
-                        e.GetJsonElement("createdAt").GetDateTime() >= connectEvent.GetJsonElement("createdAt").GetDateTime());
-
-                if (correspondingDisconnectEvent.ValueKind == JsonValueKind.Null || correspondingDisconnectEvent.ValueKind == JsonValueKind.Undefined)
-                {
-                    var linkedIssue = await _gitHubClient.Issue.Get(owner, repository, linkedIssueNumber).ConfigureAwait(false);
-                    linkedIssues.Add(_mapper.Map<Issue>(linkedIssue));
-                }
-                else if (correspondingDisconnectEvent.GetJsonElement("createdAt").GetDateTime() >= connectEvent.GetJsonElement("createdAt").GetDateTime())
-                {
-                    continue;
-                }
-                else
-                {
-                    var linkedIssue = await _gitHubClient.Issue.Get(owner, repository, linkedIssueNumber).ConfigureAwait(false);
-                    linkedIssues.Add(_mapper.Map<Issue>(linkedIssue));
-                }
+                linkedIssues.Add(_mapper.Map<Issue>(node));
             }
 
             return linkedIssues;
diff --git a/src/GitReleaseManager.Core/Provider/GitLabProvider.cs b/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
index 0a4b5a4a..a0d19792 100644
--- a/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
+++ b/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
@@ -404,6 +404,7 @@ public Task<IEnumerable<Issue>> GetLinkedIssuesAsync(string owner, string reposi
                 else
                 {
                     var closedBy = _gitLabClient.Issues.ClosedBy(GetGitLabProjectId(owner, repository), issue.PublicNumber);
+                    var relatedTo = _gitLabClient.Issues.RelatedTo(GetGitLabProjectId(owner, repository), issue.PublicNumber);
                     var issues = _mapper.Map<IEnumerable<Issue>>(closedBy);
                     return Task.FromResult(issues);
                 }
diff --git a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
index 47e34478..60ede0c7 100644
--- a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
+++ b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
@@ -33,7 +33,7 @@ public class GitHubProviderIntegrationTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            _token = Environment.GetEnvironmentVariable("GITTOOLS_GITHUB_TOKEN");
+            _token = Environment.GetEnvironmentVariable("GITHUB_TOKEN");
 
             if (string.IsNullOrWhiteSpace(_token))
             {
@@ -105,18 +105,26 @@ public async Task Should_Get_Commits_Count()
         [Test]
         public async Task GetLinkedIssues()
         {
-            // Assert that pull request 43 is linked to issues 107 and 108
+            // Assert that issue 113 in the GitTools/GitReleaseManager repo is linked to pull request 369
+            var result0 = await _gitHubProvider.GetLinkedIssuesAsync("GitTools", "GitReleaseManager", new Issue() { PublicNumber = 113 }).ConfigureAwait(false);
+            Assert.That(result0, Is.Not.Null);
+            Assert.That(result0.Count(), Is.EqualTo(1));
+            Assert.That(result0.Count(r => r.PublicNumber == 369), Is.EqualTo(1));
+
+            // Assert that pull request 43 in the jericho/_testing repo is linked to issues 107 and 108
             var result1 = await _gitHubProvider.GetLinkedIssuesAsync("jericho", "_testing", new Issue() { PublicNumber = 43 }).ConfigureAwait(false);
             Assert.That(result1, Is.Not.Null);
             Assert.That(result1.Count(), Is.EqualTo(2));
             Assert.That(result1.Count(r => r.PublicNumber == 107), Is.EqualTo(1));
             Assert.That(result1.Count(r => r.PublicNumber == 108), Is.EqualTo(1));
 
-            // Assert that issue 108 is linked to pull request 43
+            // Assert that issue 108 in the jericho/_testing repo is linked to pull request 7, 43 and 109
             var result2 = await _gitHubProvider.GetLinkedIssuesAsync("jericho", "_testing", new Issue() { PublicNumber = 108 }).ConfigureAwait(false);
             Assert.That(result2, Is.Not.Null);
-            Assert.That(result2.Count(), Is.EqualTo(1));
+            Assert.That(result2.Count(), Is.EqualTo(3));
+            Assert.That(result2.Count(r => r.PublicNumber == 7), Is.EqualTo(1));
             Assert.That(result2.Count(r => r.PublicNumber == 43), Is.EqualTo(1));
+            Assert.That(result2.Count(r => r.PublicNumber == 109), Is.EqualTo(1));
         }
     }
 }
\ No newline at end of file

From 8b0ed6c1179c45643a1394c52e894a1202de2d9d Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Fri, 19 Jul 2024 15:50:04 -0400
Subject: [PATCH 25/29] Implement suggestion from the code quality analyzer:
 Calls to 'string.IndexOf' where the result is used to check for the
 presence/absence of a substring can be replaced by 'string.Contains'

---
 src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs b/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs
index 3fa9b67f..576a99d4 100644
--- a/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs
+++ b/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs
@@ -13,7 +13,7 @@ public GitHubProfile()
             CreateMap<Octokit.Issue, Model.Issue>()
                 .ForMember(dest => dest.PublicNumber, act => act.MapFrom(src => src.Number))
                 .ForMember(dest => dest.InternalNumber, act => act.MapFrom(src => src.Id))
-                .ForMember(dest => dest.IsPullRequest, act => act.MapFrom(src => src.HtmlUrl.IndexOf("/pull/", StringComparison.OrdinalIgnoreCase) >= 0))
+                .ForMember(dest => dest.IsPullRequest, act => act.MapFrom(src => src.HtmlUrl.Contains("/pull/", StringComparison.OrdinalIgnoreCase)))
                 .ReverseMap();
             CreateMap<Model.IssueComment, Octokit.IssueComment>().ReverseMap();
             CreateMap<Model.ItemState, Octokit.ItemState>().ReverseMap();

From 016f5dcee753445f8dd89f821dbecfee54bfa2e6 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Fri, 19 Jul 2024 15:52:19 -0400
Subject: [PATCH 26/29] Fix typo

---
 src/GitReleaseManager.Core/Provider/IVcsProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitReleaseManager.Core/Provider/IVcsProvider.cs b/src/GitReleaseManager.Core/Provider/IVcsProvider.cs
index 60386d6a..2309893c 100644
--- a/src/GitReleaseManager.Core/Provider/IVcsProvider.cs
+++ b/src/GitReleaseManager.Core/Provider/IVcsProvider.cs
@@ -16,7 +16,7 @@ public interface IVcsProvider
 
         Task CreateIssueCommentAsync(string owner, string repository, Issue issue, string comment);
 
-        Task<IEnumerable<Issue>> GetIssuesAsync(string owner, string repository, Milestone milstone, ItemStateFilter itemStateFilter = ItemStateFilter.All);
+        Task<IEnumerable<Issue>> GetIssuesAsync(string owner, string repository, Milestone milestone, ItemStateFilter itemStateFilter = ItemStateFilter.All);
 
         Task<IEnumerable<IssueComment>> GetIssueCommentsAsync(string owner, string repository, Issue issue);
 

From 677cecd9b74a112cee6636eb61776ecee2df341c Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Fri, 19 Jul 2024 15:54:03 -0400
Subject: [PATCH 27/29] No need to check IncludeContributors to execute simple
 Linq query

---
 .../ReleaseNotes/ReleaseNotesBuilder.cs                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
index 304af73a..f9a220ec 100644
--- a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
+++ b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
@@ -75,7 +75,7 @@ public async Task<string> BuildReleaseNotesAsync(string user, string repository,
                 issue.LinkedIssues = linkedIssues?.ToList().AsReadOnly() ?? Array.AsReadOnly(Array.Empty<Issue>());
             }
 
-            var contributors = _configuration.Create.IncludeContributors ? GetContributors(distinctValidIssues) : Enumerable.Empty<User>();
+            var contributors = GetContributors(distinctValidIssues);
 
             var milestoneQueryString = _vcsProvider.GetMilestoneQueryString();
 
@@ -88,7 +88,7 @@ public async Task<string> BuildReleaseNotesAsync(string user, string repository,
                 },
                 Contributors = new
                 {
-                    Count = contributors.Count(),
+                    Count = contributors.Count,
                     Items = contributors,
                 },
                 Commits = new

From 358075469dfa138e043bcbe7ddf9c3c2ce7bbba2 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Fri, 19 Jul 2024 15:56:09 -0400
Subject: [PATCH 28/29] Implement @gep13 suggestion when fetching related
 issues/PRs in the GitLeb provider

---
 src/GitReleaseManager.Core/Provider/GitLabProvider.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/GitReleaseManager.Core/Provider/GitLabProvider.cs b/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
index a0d19792..82b350bc 100644
--- a/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
+++ b/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
@@ -403,9 +403,8 @@ public Task<IEnumerable<Issue>> GetLinkedIssuesAsync(string owner, string reposi
                 }
                 else
                 {
-                    var closedBy = _gitLabClient.Issues.ClosedBy(GetGitLabProjectId(owner, repository), issue.PublicNumber);
                     var relatedTo = _gitLabClient.Issues.RelatedTo(GetGitLabProjectId(owner, repository), issue.PublicNumber);
-                    var issues = _mapper.Map<IEnumerable<Issue>>(closedBy);
+                    var issues = _mapper.Map<IEnumerable<Issue>>(relatedTo);
                     return Task.FromResult(issues);
                 }
             });

From cc33ed048aae58b80f4a02722d3f09d760680194 Mon Sep 17 00:00:00 2001
From: jericho <desautelsj@hotmail.com>
Date: Sat, 20 Jul 2024 10:27:32 -0400
Subject: [PATCH 29/29] Injectable GraphQlClient

---
 src/GitReleaseManager.Cli/Program.cs          |  8 +++
 .../MappingProfiles/GitHubProfile.cs          |  5 +-
 .../Provider/GitHubProvider.cs                | 62 +++++++++++--------
 .../Provider/GitLabProvider.cs                |  6 +-
 .../Provider/IVcsProvider.cs                  |  2 +-
 .../ReleaseNotes/ReleaseNotesBuilder.cs       | 23 +++++--
 .../GitHubProviderIntegrationTests.cs         | 26 ++++++--
 .../ReleaseNotesBuilderIntegrationTests.cs    | 11 +++-
 8 files changed, 96 insertions(+), 47 deletions(-)

diff --git a/src/GitReleaseManager.Cli/Program.cs b/src/GitReleaseManager.Cli/Program.cs
index dc44e89c..96280e1c 100644
--- a/src/GitReleaseManager.Cli/Program.cs
+++ b/src/GitReleaseManager.Cli/Program.cs
@@ -13,6 +13,8 @@
 using GitReleaseManager.Core.Provider;
 using GitReleaseManager.Core.ReleaseNotes;
 using GitReleaseManager.Core.Templates;
+using GraphQL.Client.Http;
+using GraphQL.Client.Serializer.SystemTextJson;
 using Microsoft.Extensions.DependencyInjection;
 using NGitLab;
 using Octokit;
@@ -211,6 +213,12 @@ private static void RegisterVcsProvider(BaseVcsOptions vcsOptions, IServiceColle
                 // default to Github
                 serviceCollection
                     .AddSingleton<IGitHubClient>((_) => new GitHubClient(new ProductHeaderValue("GitReleaseManager")) { Credentials = new Credentials(vcsOptions.Token) })
+                    .AddSingleton<GraphQL.Client.Abstractions.IGraphQLClient>(_ =>
+                    {
+                        var client = new GraphQLHttpClient(new GraphQLHttpClientOptions { EndPoint = new Uri("https://api.github.com/graphql") }, new SystemTextJsonSerializer());
+                        client.HttpClient.DefaultRequestHeaders.Add("Authorization", $"bearer {vcsOptions.Token}");
+                        return client;
+                    })
                     .AddSingleton<IVcsProvider, GitHubProvider>();
             }
         }
diff --git a/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs b/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs
index 576a99d4..11e90526 100644
--- a/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs
+++ b/src/GitReleaseManager.Core/MappingProfiles/GitHubProfile.cs
@@ -40,8 +40,7 @@ public GitHubProfile()
                 .ForMember(dest => dest.HtmlUrl, act => act.MapFrom(src => src.GetProperty("url").GetString()))
                 .ForMember(dest => dest.IsPullRequest, act => act.MapFrom(src => src.GetProperty("url").GetString().Contains("/pull/", StringComparison.OrdinalIgnoreCase)))
                 .ForMember(dest => dest.User, act => act.MapFrom(src => src.GetProperty("author")))
-                .ForMember(dest => dest.Labels, act => act.MapFrom(src => src.GetProperty("labels")))
-                .ForMember(dest => dest.LinkedIssues, act => act.MapFrom(src => src.GetProperty("linked_issues")))
+                .ForMember(dest => dest.Labels, act => act.MapFrom(src => src.GetJsonElement("labels.nodes").EnumerateArray()))
                 .ReverseMap();
 
             CreateMap<JsonElement, Model.Label>()
@@ -52,7 +51,7 @@ public GitHubProfile()
 
             CreateMap<JsonElement, Model.User>()
                 .ForMember(dest => dest.Login, act => act.MapFrom(src => src.GetProperty("login").GetString()))
-                .ForMember(dest => dest.HtmlUrl, act => act.MapFrom(src => src.GetProperty("resourcePath").GetString()))
+                .ForMember(dest => dest.HtmlUrl, act => act.MapFrom(src => $"https://github.com{src.GetProperty("resourcePath").GetString()}")) // The resourcePath contains a value similar to "/jericho". That's why we must manually prepend "https://github.com
                 .ForMember(dest => dest.AvatarUrl, act => act.MapFrom(src => src.GetProperty("avatarUrl").GetString()))
                 .ReverseMap();
         }
diff --git a/src/GitReleaseManager.Core/Provider/GitHubProvider.cs b/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
index d398a939..eb8853bc 100644
--- a/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
+++ b/src/GitReleaseManager.Core/Provider/GitHubProvider.cs
@@ -8,7 +8,6 @@
 using GitReleaseManager.Core.Extensions;
 using GraphQL.Client.Abstractions;
 using GraphQL.Client.Http;
-using GraphQL.Client.Serializer.SystemTextJson;
 using Octokit;
 using ApiException = GitReleaseManager.Core.Exceptions.ApiException;
 using ForbiddenException = GitReleaseManager.Core.Exceptions.ForbiddenException;
@@ -53,11 +52,19 @@ query ClosingIssuesAndPullRequests($repoName: String!, $repoOwner: String!, $iss
                         avatarUrl
                         resourcePath
                     }
-                    closedByPullRequestsReferences(includeClosedPrs: true, first: $pageSize) {
+                    closedByPullRequestsReferences(userLinkedOnly: false, includeClosedPrs: true, first: $pageSize) {
                         nodes {
-                            number
-                            id
                             title
+                            id
+                            number
+                            url
+                            labels(first: 100) {
+                                nodes {
+                                    name
+                                    color
+                                    description
+                                }
+                            }
                             author {
                                 login
                                 avatarUrl
@@ -69,10 +76,19 @@ query ClosingIssuesAndPullRequests($repoName: String!, $repoOwner: String!, $iss
                 pullRequest(number: $issueNumber) {
                     number
                     title
-                    closingIssuesReferences(first: $pageSize) {
+                    closingIssuesReferences(userLinkedOnly: false, first: $pageSize) {
                         nodes {
-                            number
                             title
+                            id
+                            number
+                            url
+                            labels(first: 100) {
+                                nodes {
+                                    name
+                                    color
+                                    description
+                                }
+                            }
                             author {
                                 login
                                 avatarUrl
@@ -92,13 +108,11 @@ public GitHubProvider(IGitHubClient gitHubClient, IMapper mapper)
         {
             _gitHubClient = gitHubClient;
             _mapper = mapper;
+        }
 
-            var graphQLClient = new GraphQLHttpClient(new GraphQLHttpClientOptions { EndPoint = new Uri("https://api.github.com/graphql") }, new SystemTextJsonSerializer());
-            if (!string.IsNullOrEmpty(_gitHubClient?.Connection?.Credentials?.Password))
-            {
-                graphQLClient.HttpClient.DefaultRequestHeaders.Add("Authorization", $"bearer {_gitHubClient.Connection.Credentials.Password}");
-            }
-
+        public GitHubProvider(IGitHubClient gitHubClient, IMapper mapper, IGraphQLClient graphQLClient)
+            : this(gitHubClient, mapper)
+        {
             _graphQLClient = graphQLClient;
         }
 
@@ -423,8 +437,9 @@ public string GetIssueType(Issue issue)
             return issue.IsPullRequest ? "Pull Request" : "Issue";
         }
 
-        public async Task<IEnumerable<Issue>> GetLinkedIssuesAsync(string owner, string repository, Issue issue)
+        public async Task<Issue[]> GetLinkedIssuesAsync(string owner, string repository, Issue issue)
         {
+            ArgumentNullException.ThrowIfNull(_graphQLClient, nameof(_graphQLClient));
             ArgumentNullException.ThrowIfNull(issue, nameof(issue));
 
             var request = new GraphQLHttpRequest
@@ -441,21 +456,16 @@ public async Task<IEnumerable<Issue>> GetLinkedIssuesAsync(string owner, string
 
             var graphQLResponse = await _graphQLClient.SendQueryAsync<dynamic>(request).ConfigureAwait(false);
 
-            var rootNode = (JsonElement)graphQLResponse.Data;
-            var issueNode = rootNode.GetFirstJsonElement(new[] { "repository.issue", "repository.pullRequest" });
-
-            if (issueNode.ValueKind == JsonValueKind.Null || issueNode.ValueKind == JsonValueKind.Undefined)
+            var nodes = ((JsonElement)graphQLResponse.Data).GetFirstJsonElement(new[]
             {
-                throw new NotFoundException($"Unable to find issue/pull request {issue.PublicNumber}");
-            }
-
-            var nodes = issueNode.GetFirstJsonElement(new[] { "closedByPullRequestsReferences.nodes", "closingIssuesReferences.nodes" });
+                "repository.issue.closedByPullRequestsReferences.nodes", // If issue.PublicNumber represents an issue, retrieve the linked PRs
+                "repository.pullRequest.closingIssuesReferences.nodes", // If issue.PublicNumber represents a PR, retrieve the linked issues
+            });
 
-            var linkedIssues = new List<Issue>();
-            foreach (var node in nodes.EnumerateArray())
-            {
-                linkedIssues.Add(_mapper.Map<Issue>(node));
-            }
+            using var enumerator = nodes.EnumerateArray();
+            var linkedIssues = enumerator
+                .Select(element => _mapper.Map<Issue>(element))
+                .ToArray();
 
             return linkedIssues;
         }
diff --git a/src/GitReleaseManager.Core/Provider/GitLabProvider.cs b/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
index 82b350bc..07ee95ab 100644
--- a/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
+++ b/src/GitReleaseManager.Core/Provider/GitLabProvider.cs
@@ -391,7 +391,7 @@ public string GetIssueType(Issue issue)
             return issue.IsPullRequest ? "Merge Request" : "Issue";
         }
 
-        public Task<IEnumerable<Issue>> GetLinkedIssuesAsync(string owner, string repository, Issue issue)
+        public Task<Issue[]> GetLinkedIssuesAsync(string owner, string repository, Issue issue)
         {
             return ExecuteAsync(() =>
             {
@@ -399,13 +399,13 @@ public Task<IEnumerable<Issue>> GetLinkedIssuesAsync(string owner, string reposi
                 {
                     var closes = _gitLabClient.MergeRequests.ClosesIssues(issue.PublicNumber);
                     var issues = _mapper.Map<IEnumerable<Issue>>(closes);
-                    return Task.FromResult(issues);
+                    return Task.FromResult(issues.ToArray());
                 }
                 else
                 {
                     var relatedTo = _gitLabClient.Issues.RelatedTo(GetGitLabProjectId(owner, repository), issue.PublicNumber);
                     var issues = _mapper.Map<IEnumerable<Issue>>(relatedTo);
-                    return Task.FromResult(issues);
+                    return Task.FromResult(issues.ToArray());
                 }
             });
         }
diff --git a/src/GitReleaseManager.Core/Provider/IVcsProvider.cs b/src/GitReleaseManager.Core/Provider/IVcsProvider.cs
index 2309893c..ea2523cd 100644
--- a/src/GitReleaseManager.Core/Provider/IVcsProvider.cs
+++ b/src/GitReleaseManager.Core/Provider/IVcsProvider.cs
@@ -50,6 +50,6 @@ public interface IVcsProvider
 
         string GetIssueType(Issue issue);
 
-        Task<IEnumerable<Issue>> GetLinkedIssuesAsync(string owner, string repository, Issue issue);
+        Task<Issue[]> GetLinkedIssuesAsync(string owner, string repository, Issue issue);
     }
 }
\ No newline at end of file
diff --git a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
index f9a220ec..9153d7e6 100644
--- a/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
+++ b/src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs
@@ -71,11 +71,22 @@ public async Task<string> BuildReleaseNotesAsync(string user, string repository,
 
             foreach (var issue in distinctValidIssues)
             {
-                var linkedIssues = await _vcsProvider.GetLinkedIssuesAsync(_user, _repository, issue).ConfigureAwait(false);
-                issue.LinkedIssues = linkedIssues?.ToList().AsReadOnly() ?? Array.AsReadOnly(Array.Empty<Issue>());
+                // Linked issues are only necessary for figuring out who contributed to a given issue.
+                // Therefore, we only need to fetch linked issues if IncludeContributors is enabled.
+                if (_configuration.Create.IncludeContributors)
+                {
+                    var linkedIssues = await _vcsProvider.GetLinkedIssuesAsync(_user, _repository, issue).ConfigureAwait(false);
+                    issue.LinkedIssues = Array.AsReadOnly(linkedIssues ?? Array.Empty<Issue>());
+                }
+                else
+                {
+                    issue.LinkedIssues = Array.AsReadOnly(Array.Empty<Issue>());
+                }
             }
 
-            var contributors = GetContributors(distinctValidIssues);
+            var contributors = _configuration.Create.IncludeContributors
+                ? GetContributors(distinctValidIssues)
+                : Array.Empty<User>();
 
             var milestoneQueryString = _vcsProvider.GetMilestoneQueryString();
 
@@ -88,7 +99,7 @@ public async Task<string> BuildReleaseNotesAsync(string user, string repository,
                 },
                 Contributors = new
                 {
-                    Count = contributors.Count,
+                    Count = contributors.Length,
                     Items = contributors,
                 },
                 Commits = new
@@ -128,7 +139,7 @@ private Dictionary<string, List<Issue>> GetIssuesDict(List<Issue> issues)
             return issuesByLabel;
         }
 
-        private static List<User> GetContributors(IEnumerable<Issue> issues)
+        private static User[] GetContributors(IEnumerable<Issue> issues)
         {
             var contributors = issues.Select(i => i.User);
             var linkedContributors = issues.SelectMany(i => i.LinkedIssues).Select(i => i.User);
@@ -137,7 +148,7 @@ private static List<User> GetContributors(IEnumerable<Issue> issues)
                 .Union(linkedContributors)
                 .Where(u => u != null)
                 .DistinctBy(u => u.Login)
-                .ToList();
+                .ToArray();
 
             return allContributors;
         }
diff --git a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
index 60ede0c7..8fa9691f 100644
--- a/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
+++ b/src/GitReleaseManager.IntegrationTests/GitHubProviderIntegrationTests.cs
@@ -4,6 +4,9 @@
 using AutoMapper;
 using GitReleaseManager.Core;
 using GitReleaseManager.Core.Provider;
+using GraphQL.Client.Abstractions;
+using GraphQL.Client.Http;
+using GraphQL.Client.Serializer.SystemTextJson;
 using NUnit.Framework;
 using Octokit;
 using Shouldly;
@@ -22,6 +25,7 @@ public class GitHubProviderIntegrationTests
 
         private GitHubProvider _gitHubProvider;
         private IGitHubClient _gitHubClient;
+        private IGraphQLClient _graphQlClient;
         private IMapper _mapper;
 
         private string _token;
@@ -33,16 +37,25 @@ public class GitHubProviderIntegrationTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            _token = Environment.GetEnvironmentVariable("GITHUB_TOKEN");
+            _token = Environment.GetEnvironmentVariable("GITTOOLS_GITHUB_TOKEN");
 
             if (string.IsNullOrWhiteSpace(_token))
             {
                 Assert.Inconclusive("Unable to locate credentials for accessing GitHub API");
             }
 
+            _graphQlClient = new GraphQLHttpClient(new GraphQLHttpClientOptions { EndPoint = new Uri("https://api.github.com/graphql") }, new SystemTextJsonSerializer());
+            ((GraphQLHttpClient)_graphQlClient).HttpClient.DefaultRequestHeaders.Add("Authorization", $"bearer {_token}");
+
             _mapper = AutoMapperConfiguration.Configure();
             _gitHubClient = new GitHubClient(new ProductHeaderValue("GitReleaseManager")) { Credentials = new Credentials(_token) };
-            _gitHubProvider = new GitHubProvider(_gitHubClient, _mapper);
+            _gitHubProvider = new GitHubProvider(_gitHubClient, _mapper, _graphQlClient);
+        }
+
+        [OneTimeTearDown]
+        public void OneTimeTearDown()
+        {
+            ((IDisposable)_graphQlClient)?.Dispose();
         }
 
         [Test]
@@ -108,20 +121,21 @@ public async Task GetLinkedIssues()
             // Assert that issue 113 in the GitTools/GitReleaseManager repo is linked to pull request 369
             var result0 = await _gitHubProvider.GetLinkedIssuesAsync("GitTools", "GitReleaseManager", new Issue() { PublicNumber = 113 }).ConfigureAwait(false);
             Assert.That(result0, Is.Not.Null);
-            Assert.That(result0.Count(), Is.EqualTo(1));
+            Assert.That(result0.Length, Is.EqualTo(1));
             Assert.That(result0.Count(r => r.PublicNumber == 369), Is.EqualTo(1));
 
-            // Assert that pull request 43 in the jericho/_testing repo is linked to issues 107 and 108
+            // Assert that pull request 43 in the jericho/_testing repo is linked to issues 42, 107 and 108
             var result1 = await _gitHubProvider.GetLinkedIssuesAsync("jericho", "_testing", new Issue() { PublicNumber = 43 }).ConfigureAwait(false);
             Assert.That(result1, Is.Not.Null);
-            Assert.That(result1.Count(), Is.EqualTo(2));
+            Assert.That(result1.Length, Is.EqualTo(3));
+            Assert.That(result1.Count(r => r.PublicNumber == 42), Is.EqualTo(1));
             Assert.That(result1.Count(r => r.PublicNumber == 107), Is.EqualTo(1));
             Assert.That(result1.Count(r => r.PublicNumber == 108), Is.EqualTo(1));
 
             // Assert that issue 108 in the jericho/_testing repo is linked to pull request 7, 43 and 109
             var result2 = await _gitHubProvider.GetLinkedIssuesAsync("jericho", "_testing", new Issue() { PublicNumber = 108 }).ConfigureAwait(false);
             Assert.That(result2, Is.Not.Null);
-            Assert.That(result2.Count(), Is.EqualTo(3));
+            Assert.That(result2.Length, Is.EqualTo(3));
             Assert.That(result2.Count(r => r.PublicNumber == 7), Is.EqualTo(1));
             Assert.That(result2.Count(r => r.PublicNumber == 43), Is.EqualTo(1));
             Assert.That(result2.Count(r => r.PublicNumber == 109), Is.EqualTo(1));
diff --git a/src/GitReleaseManager.IntegrationTests/ReleaseNotesBuilderIntegrationTests.cs b/src/GitReleaseManager.IntegrationTests/ReleaseNotesBuilderIntegrationTests.cs
index e03abc30..b5dc2206 100644
--- a/src/GitReleaseManager.IntegrationTests/ReleaseNotesBuilderIntegrationTests.cs
+++ b/src/GitReleaseManager.IntegrationTests/ReleaseNotesBuilderIntegrationTests.cs
@@ -9,6 +9,9 @@
 using GitReleaseManager.Core.Provider;
 using GitReleaseManager.Core.ReleaseNotes;
 using GitReleaseManager.Core.Templates;
+using GraphQL.Client.Abstractions;
+using GraphQL.Client.Http;
+using GraphQL.Client.Serializer.SystemTextJson;
 using NUnit.Framework;
 using Octokit;
 using Serilog;
@@ -20,6 +23,7 @@ namespace GitReleaseManager.IntegrationTests
     public class ReleaseNotesBuilderIntegrationTests
     {
         private IGitHubClient _gitHubClient;
+        private IGraphQLClient _graphQlClient;
 #pragma warning disable NUnit1032 // An IDisposable field/property should be Disposed in a TearDown method
         private ILogger _logger;
 #pragma warning restore NUnit1032 // An IDisposable field/property should be Disposed in a TearDown method
@@ -42,6 +46,8 @@ public void Configure()
             }
 
             _gitHubClient = new GitHubClient(new ProductHeaderValue("GitReleaseManager")) { Credentials = new Credentials(_token) };
+            _graphQlClient = new GraphQLHttpClient(new GraphQLHttpClientOptions { EndPoint = new Uri("https://api.github.com/graphql") }, new SystemTextJsonSerializer());
+            ((GraphQLHttpClient)_graphQlClient).HttpClient.DefaultRequestHeaders.Add("Authorization", $"bearer {_token}");
         }
 
         [OneTimeTearDown]
@@ -49,6 +55,7 @@ public void TearDown()
         {
             Log.CloseAndFlush();
             (_logger as IDisposable)?.Dispose();
+            ((IDisposable)_graphQlClient)?.Dispose();
         }
 
         [Test]
@@ -74,7 +81,7 @@ public async Task SingleMilestone()
                     ? ReleaseTemplates.CONTRIBUTORS_NAME
                     : ReleaseTemplates.DEFAULT_NAME;
 
-                var vcsProvider = new GitHubProvider(_gitHubClient, _mapper);
+                var vcsProvider = new GitHubProvider(_gitHubClient, _mapper, _graphQlClient);
                 var releaseNotesBuilder = new ReleaseNotesBuilder(vcsProvider, _logger, fileSystem, configuration, new TemplateFactory(fileSystem, configuration, TemplateKind.Create));
                 var result = await releaseNotesBuilder.BuildReleaseNotesAsync("GitTools", "GitReleaseManager", "0.12.0", templatePath).ConfigureAwait(false); // 0.12.0 contains a mix of issues and PRs
                 Debug.WriteLine(result);
@@ -90,7 +97,7 @@ public async Task SingleMilestone3()
             var currentDirectory = Environment.CurrentDirectory;
             var configuration = ConfigurationProvider.Provide(currentDirectory, fileSystem);
 
-            var vcsProvider = new GitHubProvider(_gitHubClient, _mapper);
+            var vcsProvider = new GitHubProvider(_gitHubClient, _mapper, _graphQlClient);
             var releaseNotesBuilder = new ReleaseNotesBuilder(vcsProvider, _logger, fileSystem, configuration, new TemplateFactory(fileSystem, configuration, TemplateKind.Create));
             var result = await releaseNotesBuilder.BuildReleaseNotesAsync("Chocolatey", "ChocolateyGUI", "0.13.0", ReleaseTemplates.DEFAULT_NAME).ConfigureAwait(false);
             Debug.WriteLine(result);