fix get previous version

Author: SimonCropp

src/App/Program.cs

@@ -66,7 +66,7 @@ static int Main(string[] args)
  {
  var options = new Options();
 
- int result = 1;
+ var result = 1;
 
  if (!Parser.Default.ParseArgumentsStrict(args, options, (verb, subOptions) =>
  {

src/Compiler/MilestoneExtensions.cs

@@ -0,0 +1,22 @@
+using System;
+
+namespace ReleaseNotesCompiler
+{
+ using Octokit;
+
+ static class MilestoneExtensions
+ {
+ internal static Version Version(this Milestone ver)
+ {
+ var nameWithoutPrerelease = ver.Title.Split('-')[0];
+ Version parsedVersion;
+
+ if (!System.Version.TryParse(nameWithoutPrerelease, out parsedVersion))
+ {
+ return new Version(0, 0);
+ }
+
+ return parsedVersion;
+ }
+ }
+}

src/Compiler/ReleaseNotesBuilder.cs

@@ -28,7 +28,7 @@ public ReleaseNotesBuilder(GitHubClient gitHubClient, string user, string reposi
 
  public async Task<string> BuildReleaseNotes()
  {
- await GetMilestones();
+ GetMilestones();
 
  GetTargetMilestone();
  var issues = await GetIssues(targetMilestone);
@@ -85,24 +85,12 @@ async Task<int> GetNumberOfCommits(Milestone previousMilestone)
 
  Milestone GetPreviousMilestone()
  {
- using (var orderedMilestones = milestones.OrderByDescending(x => x.Title, VersionComparer.Default).GetEnumerator())
- {
- Milestone previousMilestone = null;
-
- while (orderedMilestones.MoveNext())
- {
- if (orderedMilestones.Current.Title == targetMilestone.Title)
- {
- break;
- }
- }
-
- if (orderedMilestones.MoveNext())
- {
- previousMilestone = orderedMilestones.Current;
- }
- return previousMilestone;
- }
+ var currentVersion = targetMilestone.Version();
+ return milestones
+ .OrderByDescending(m => m.Version())
+ .Distinct().ToList()
+ .SkipWhile(x => x.Version() >= currentVersion)
+ .FirstOrDefault();
  }
 
  string GetCommitsLink(Milestone previousMilestone)
@@ -145,10 +133,18 @@ static async Task AddFooter(StringBuilder stringBuilder)
  }
  }
 
- async Task GetMilestones()
+ void GetMilestones()
  {
  var milestonesClient = gitHubClient.Issue.Milestone;
- milestones = (await milestonesClient.GetForRepository(user, repository)).ToList();
+ var closed = milestonesClient.GetForRepository(user, repository,new MilestoneRequest
+ {
+ State = ItemState.Closed
+ }).Result;
+ var open = milestonesClient.GetForRepository(user, repository,new MilestoneRequest
+ {
+ State = ItemState.Open
+ }).Result;
+ milestones = closed.Concat(open).ToList();
  }
 
  async Task<List<Issue>> GetIssues(Milestone milestone)

src/Compiler/ReleaseNotesCompiler.csproj

@@ -52,7 +52,7 @@
  <Compile Include="ReleaseNotesBuilder.cs" />
  <Compile Include="OctokitExtensions.cs" />
  <Compile Include="ReleaseUpdateRequired.cs" />
- <Compile Include="VersionComparer.cs" />
+ <Compile Include="MilestoneExtensions.cs" />
  </ItemGroup>
  <ItemGroup>
  <None Include="packages.config">

src/Compiler/VersionComparer.cs

@@ -13,7 +13,7 @@ public async void SingleMilestone()
  {
  var gitHubClient = ClientBuilder.Build();
 
- var releaseNotesBuilder = new ReleaseNotesBuilder(gitHubClient, "Particular", "NServiceBus", "5.0.0");
+ var releaseNotesBuilder = new ReleaseNotesBuilder(gitHubClient, "Particular", "NServiceBus", "4.6.5");
  var result = await releaseNotesBuilder.BuildReleaseNotes();
  Debug.WriteLine(result);
  ClipBoardHelper.SetClipboard(result);