Skip to content

Commit dce68cd

Browse files
authored
Merge pull request #133 from GitTools/feature/respect-name-with-milestone
Support combination of milestone and release name
2 parents 4c6757c + 995760f commit dce68cd

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

Source/GitReleaseManager.Cli/Program.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,13 @@ private static async Task<int> CreateReleaseAsync(CreateSubOptions subOptions, I
6161
Release release;
6262
if (!string.IsNullOrEmpty(subOptions.Milestone))
6363
{
64-
release = await CreateReleaseFromMilestone(github, subOptions.RepositoryOwner, subOptions.RepositoryName, subOptions.Milestone, subOptions.TargetCommitish, subOptions.AssetPaths, subOptions.Prerelease, configuration);
64+
var releaseName = subOptions.Name;
65+
if (string.IsNullOrWhiteSpace(releaseName))
66+
{
67+
releaseName = subOptions.Milestone;
68+
}
69+
70+
release = await CreateReleaseFromMilestone(github, subOptions.RepositoryOwner, subOptions.RepositoryName, subOptions.Milestone, releaseName, subOptions.TargetCommitish, subOptions.AssetPaths, subOptions.Prerelease, configuration);
6571
}
6672
else
6773
{
@@ -221,13 +227,13 @@ private static async Task<int> CreateLabelsAsync(LabelSubOptions subOptions)
221227
return 1;
222228
}
223229
}
224-
private static async Task<Release> CreateReleaseFromMilestone(GitHubClient github, string owner, string repository, string milestone, string targetCommitish, IList<string> assets, bool prerelease, Config configuration)
230+
private static async Task<Release> CreateReleaseFromMilestone(GitHubClient github, string owner, string repository, string milestone, string releaseName, string targetCommitish, IList<string> assets, bool prerelease, Config configuration)
225231
{
226232
var releaseNotesBuilder = new ReleaseNotesBuilder(new DefaultGitHubClient(github, owner, repository), owner, repository, milestone, configuration);
227233

228234
var result = await releaseNotesBuilder.BuildReleaseNotes();
229235

230-
var releaseUpdate = CreateNewRelease(milestone, result, prerelease, targetCommitish);
236+
var releaseUpdate = CreateNewRelease(releaseName, milestone, result, prerelease, targetCommitish);
231237

232238
var release = await github.Repository.Release.Create(owner, repository, releaseUpdate);
233239

@@ -245,7 +251,7 @@ private static async Task<Release> CreateReleaseFromInputFile(GitHubClient githu
245251

246252
var inputFileContents = File.ReadAllText(inputFilePath);
247253

248-
var releaseUpdate = CreateNewRelease(name, inputFileContents, prerelease, targetCommitish);
254+
var releaseUpdate = CreateNewRelease(name, name, inputFileContents, prerelease, targetCommitish);
249255

250256
var release = await github.Repository.Release.Create(owner, repository, releaseUpdate);
251257

@@ -364,9 +370,9 @@ private static async Task AddAssetsSha256(GitHubClient github, string owner, str
364370
}
365371
}
366372

367-
private static NewRelease CreateNewRelease(string name, string body, bool prerelease, string targetCommitish)
373+
private static NewRelease CreateNewRelease(string name, string tagName, string body, bool prerelease, string targetCommitish)
368374
{
369-
var newRelease = new NewRelease(name)
375+
var newRelease = new NewRelease(tagName)
370376
{
371377
Draft = true,
372378
Body = body,

0 commit comments

Comments
 (0)