Merge branch 'hotfix/0.10.2'

* hotfix/0.10.2: (maint) Override Twitter and Gitter messages (build) Add override for GitHub Token Variable (GH-199) Fixed incorrect argument being passed to octokit
GitTools · Jan 15, 2020 · ef5383e · ef5383e
2 parents 025afe1 + 050ee00
commit ef5383e
Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/Source/GitReleaseManager/GitHubProvider.cs b/Source/GitReleaseManager/GitHubProvider.cs
@@ -303,7 +303,7 @@ public async Task CloseMilestone(string owner, string repository, string milesto
 
             if (_configuration.Close.IssueComments)
             {
-                await AddIssueCommentsAsync(owner, repository, milestoneTitle).ConfigureAwait(false);
+                await AddIssueCommentsAsync(owner, repository, milestone).ConfigureAwait(false);
             }
         }
 
@@ -411,11 +411,11 @@ private static string ComputeSha256Hash(string asset)
             }
         }
 
-        private async Task AddIssueCommentsAsync(string owner, string repository, string milestone)
+        private async Task AddIssueCommentsAsync(string owner, string repository, Octokit.Milestone milestone)
         {
             const string detectionComment = "<!-- GitReleaseManager release comment -->";
-            var issueComment = detectionComment + "\n" + _configuration.Close.IssueCommentFormat.ReplaceTemplate(new { owner, repository, Milestone = milestone });
-            var issues = await GetIssuesFromMilestoneAsync(owner, repository, milestone).ConfigureAwait(false);
+            var issueComment = detectionComment + "\n" + _configuration.Close.IssueCommentFormat.ReplaceTemplate(new { owner, repository, Milestone = milestone.Title });
+            var issues = await GetIssuesFromMilestoneAsync(owner, repository, milestone.Number).ConfigureAwait(false);
 
             foreach (var issue in issues)
             {
@@ -472,12 +472,12 @@ private async Task<Release> CreateReleaseFromInputFileInternal(string owner, str
             return _mapper.Map<Octokit.Release, Release>(release);
         }
 
-        private Task<IReadOnlyList<Octokit.Issue>> GetIssuesFromMilestoneAsync(string owner, string repository, string milestone, ItemStateFilter state = ItemStateFilter.Closed)
+        private Task<IReadOnlyList<Octokit.Issue>> GetIssuesFromMilestoneAsync(string owner, string repository, int milestoneNumber, ItemStateFilter state = ItemStateFilter.Closed)
         {
-            _logger.Verbose("Finding issues with milestone: '{Milestone}", milestone);
+            _logger.Verbose("Finding issues with milestone: '{Milestone}", milestoneNumber);
             return _gitHubClient.Issue.GetAllForRepository(owner, repository, new RepositoryIssueRequest
             {
-                Milestone = milestone,
+                Milestone = milestoneNumber.ToString(),
                 State = state,
             });
         }

diff --git a/recipe.cake b/recipe.cake
@@ -1,7 +1,8 @@
 #load nuget:https://www.myget.org/F/cake-contrib/api/v2?package=Cake.Recipe&version=2.0.0-unstable0023&prerelease
 
 Environment.SetVariableNames(githubUserNameVariable: "GITTOOLS_GITHUB_USERNAME",
-                            githubPasswordVariable: "GITTOOLS_GITHUB_PASSWORD");
+                            githubPasswordVariable: "GITTOOLS_GITHUB_PASSWORD",
+                            githubTokenVariable: "GITTOOLS_GITHUB_TOKEN");
 
 BuildParameters.SetParameters(context: Context,
                             buildSystem: BuildSystem,
@@ -13,7 +14,9 @@ BuildParameters.SetParameters(context: Context,
                             shouldRunGitVersion: true,
                             shouldRunDotNetCorePack: true,
                             shouldRunIntegrationTests: true,
-                            integrationTestScriptPath: "./tests/integration/tests.cake");
+                            integrationTestScriptPath: "./tests/integration/tests.cake",
+                            twitterMessage: "A new version of GitReleaseManager has just been released.  Get it from Chocolatey, NuGet, or as a .Net Global Tool.",
+                            gitterMessage: "@/all A new version of GitReleaseManager has just been released.  Get it from Chocolatey, NuGet, or as a .Net Global Tool.");
 
 BuildParameters.PackageSources.Add(new PackageSourceData(Context, "GPR", "https://nuget.pkg.github.com/GitTools/index.json", FeedType.NuGet, false));