Skip to content
This repository was archived by the owner on Aug 29, 2020. It is now read-only.

Commit f629217

Browse files
author
Greg Bielleman
committed
Merge pull request #28 from Particular/update-octokit
Thanks @SzymonPobiega and @SimonCropp. Merging it
2 parents 51abaa9 + 5600ada commit f629217

13 files changed

+195
-49
lines changed

‎src/App/Program.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,11 @@ private static async Task CreateRelease(GitHubClient github, string owner, strin
166166

167167
var result = await releaseNotesBuilder.BuildReleaseNotes();
168168

169-
var releaseUpdate = new ReleaseUpdate(milestone)
169+
var releaseUpdate = new NewRelease(milestone)
170170
{
171171
Draft = true,
172172
Body = result,
173-
Name = milestone
173+
Name = milestone,
174174
};
175175
if (!string.IsNullOrEmpty(targetCommitish))
176176
releaseUpdate.TargetCommitish = targetCommitish;
@@ -203,7 +203,7 @@ private static async Task AttachToRelease(GitHubClient github, string owner, str
203203
private static async Task CloseMilestone(GitHubClient github, string owner, string repository, string milestoneTitle)
204204
{
205205
var milestoneClient = github.Issue.Milestone;
206-
var openMilestones = await milestoneClient.GetForRepository(owner, repository, new MilestoneRequest { State = ItemState.Open });
206+
var openMilestones = await milestoneClient.GetAllForRepository(owner, repository, new MilestoneRequest { State = ItemState.Open });
207207
var milestone = openMilestones.FirstOrDefault(m => m.Title == milestoneTitle);
208208
if (milestone == null)
209209
return;
@@ -218,9 +218,10 @@ private static async Task PublishRelease(GitHubClient github, string owner, stri
218218
if (release == null)
219219
return;
220220

221-
var releaseUpdate = new ReleaseUpdate(milestone)
221+
var releaseUpdate = new ReleaseUpdate
222222
{
223-
Draft = false
223+
Draft = false,
224+
224225
};
225226

226227
await github.Release.Edit(owner, repository, release.Id, releaseUpdate);

‎src/App/ReleaseNotesCompiler.CLI.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@
3838
<Reference Include="CommandLine">
3939
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Octokit">
42-
<HintPath>..\packages\Octokit.0.4.1\lib\net45\Octokit.dll</HintPath>
41+
<Reference Include="Octokit, Version=0.16.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Octokit.0.16.0\lib\net45\Octokit.dll</HintPath>
43+
<Private>True</Private>
4344
</Reference>
4445
<Reference Include="System" />
4546
<Reference Include="System.Core" />

‎src/App/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
<package id="Fody" version="1.28.3" targetFramework="net45" developmentDependency="true" />
66
<package id="GitVersionTask" version="1.2.0" targetFramework="net45" developmentDependency="true" />
77
<package id="NuGetPackager" version="0.1.3" targetFramework="net45" />
8-
<package id="Octokit" version="0.4.1" targetFramework="net45" />
8+
<package id="Octokit" version="0.16.0" targetFramework="net45" />
99
</packages>

‎src/Compiler/DefaultGitHubClient.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ public async Task<List<Issue>> GetIssues(Milestone targetMilestone)
4848
public List<Milestone> GetMilestones()
4949
{
5050
var milestonesClient = gitHubClient.Issue.Milestone;
51-
var closed = milestonesClient.GetForRepository(user, repository, new MilestoneRequest
51+
var closed = milestonesClient.GetAllForRepository(user, repository, new MilestoneRequest
5252
{
5353
State = ItemState.Closed
5454
}).Result;
55-
var open = milestonesClient.GetForRepository(user, repository, new MilestoneRequest
55+
var open = milestonesClient.GetAllForRepository(user, repository, new MilestoneRequest
5656
{
5757
State = ItemState.Open
5858
}).Result;

‎src/Compiler/OctokitExtensions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public static async Task<IEnumerable<Issue>> AllIssuesForMilestone(this GitHubCl
2727
var parts = milestone.Url.AbsolutePath.Split('/');
2828
var user = parts[2];
2929
var repository = parts[3];
30-
var closedIssues = await gitHubClient.Issue.GetForRepository(user, repository, closedIssueRequest);
31-
var openIssues = await gitHubClient.Issue.GetForRepository(user, repository, openIssueRequest);
30+
var closedIssues = await gitHubClient.Issue.GetAllForRepository(user, repository, closedIssueRequest);
31+
var openIssues = await gitHubClient.Issue.GetAllForRepository(user, repository, openIssueRequest);
3232
return openIssues.Union(closedIssues);
3333
}
3434

‎src/Compiler/ReleaseManager.cs‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,24 @@ public async Task<List<ReleaseUpdateRequired>> GetReleasesInNeedOfUpdates()
4343

4444
if (release != null)
4545
{
46-
4746
var releaseUpdatedAt = GetUpdatedAt(release).ToUniversalTime();
4847

4948
var allIssues = await gitHubClient.AllIssuesForMilestone(milestone);
5049

51-
var latestIssueModification =
52-
allIssues.Where(i => i.State == ItemState.Closed).Max(i => i.ClosedAt.Value).UtcDateTime;
53-
54-
Console.Out.WriteLine("Release exists for milestone {0} - Last updated at: {1}, Issues updated at:{2}", potentialRelease, releaseUpdatedAt, latestIssueModification);
55-
56-
if (releaseUpdatedAt < latestIssueModification)
50+
var allClosedIssues = allIssues.Where(i => i.State == ItemState.Closed).ToList();
51+
if (allClosedIssues.Count > 0)
5752
{
58-
59-
releases.Add(new ReleaseUpdateRequired
53+
var latestIssueModification = allClosedIssues.Max(i => i.ClosedAt.Value).UtcDateTime;
54+
Console.Out.WriteLine("Release exists for milestone {0} - Last updated at: {1}, Issues updated at:{2}", potentialRelease, releaseUpdatedAt, latestIssueModification);
55+
if (releaseUpdatedAt < latestIssueModification)
6056
{
61-
Release = release.Name,
62-
Repository = repository.Name,
63-
NeedsToBeCreated = true
64-
});
57+
releases.Add(new ReleaseUpdateRequired
58+
{
59+
Release = release.Name,
60+
Repository = repository.Name,
61+
NeedsToBeCreated = true
62+
});
63+
}
6564
}
6665
}
6766
else
@@ -107,7 +106,7 @@ DateTime GetUpdatedAt(Release release)
107106
async Task<List<Milestone>> GetMilestones(string repository)
108107
{
109108
var milestonesClient = gitHubClient.Issue.Milestone;
110-
var openList = await milestonesClient.GetForRepository(organization, repository, new MilestoneRequest { State = ItemState.Open });
109+
var openList = await milestonesClient.GetAllForRepository(organization, repository, new MilestoneRequest { State = ItemState.Open });
111110

112111
return openList.ToList();
113112
}

‎src/Compiler/ReleaseNotesCompiler.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="Octokit, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
37-
<SpecificVersion>False</SpecificVersion>
38-
<HintPath>..\packages\Octokit.0.4.1\lib\net45\Octokit.dll</HintPath>
36+
<Reference Include="Octokit, Version=0.16.0.0, Culture=neutral, processorArchitecture=MSIL">
37+
<HintPath>..\packages\Octokit.0.16.0\lib\net45\Octokit.dll</HintPath>
38+
<Private>True</Private>
3939
</Reference>
4040
<Reference Include="System" />
4141
<Reference Include="System.Core" />

‎src/Compiler/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<package id="Caseless.Fody" version="1.3.3.0" targetFramework="net45" developmentDependency="true" />
44
<package id="Fody" version="1.28.3" targetFramework="net45" developmentDependency="true" />
55
<package id="GitVersionTask" version="1.2.0" targetFramework="net45" />
6-
<package id="Octokit" version="0.4.1" targetFramework="net45" />
6+
<package id="Octokit" version="0.16.0" targetFramework="net45" />
77
</packages>

‎src/GitHubReleaseNotes.sln.DotSettings‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,144 @@
144144
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE/@EntryValue">CHOP_ALWAYS</s:String>
145145
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
146146
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/JavaScriptFormatOther/ALIGN_MULTIPLE_DECLARATION/@EntryValue">True</s:Boolean>
147+
<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
148+
&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
149+
&lt;TypePattern Priority="100" DisplayName="Type Pattern"&gt;&#xD;
150+
&lt;TypePattern.Match&gt;&#xD;
151+
&lt;Or&gt;&#xD;
152+
&lt;And&gt;&#xD;
153+
&lt;Kind Is="Interface" /&gt;&#xD;
154+
&lt;Or&gt;&#xD;
155+
&lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
156+
&lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
157+
&lt;/Or&gt;&#xD;
158+
&lt;/And&gt;&#xD;
159+
&lt;HasAttribute Name="System.Runtime.InteropServices.StructLayoutAttribute" /&gt;&#xD;
160+
&lt;/Or&gt;&#xD;
161+
&lt;/TypePattern.Match&gt;&#xD;
162+
&lt;/TypePattern&gt;&#xD;
163+
&lt;TypePattern Priority="100" DisplayName="Type Pattern"&gt;&#xD;
164+
&lt;TypePattern.Match&gt;&#xD;
165+
&lt;And&gt;&#xD;
166+
&lt;Kind Is="Class" /&gt;&#xD;
167+
&lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
168+
&lt;/And&gt;&#xD;
169+
&lt;/TypePattern.Match&gt;&#xD;
170+
&lt;Entry DisplayName="Entry"&gt;&#xD;
171+
&lt;Entry.Match&gt;&#xD;
172+
&lt;And&gt;&#xD;
173+
&lt;Kind Is="Method" /&gt;&#xD;
174+
&lt;Or&gt;&#xD;
175+
&lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
176+
&lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
177+
&lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
178+
&lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
179+
&lt;/Or&gt;&#xD;
180+
&lt;/And&gt;&#xD;
181+
&lt;/Entry.Match&gt;&#xD;
182+
&lt;/Entry&gt;&#xD;
183+
&lt;Entry DisplayName="Entry" /&gt;&#xD;
184+
&lt;Entry Priority="100" DisplayName="Entry"&gt;&#xD;
185+
&lt;Entry.Match&gt;&#xD;
186+
&lt;And&gt;&#xD;
187+
&lt;Kind Is="Method" /&gt;&#xD;
188+
&lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
189+
&lt;/And&gt;&#xD;
190+
&lt;/Entry.Match&gt;&#xD;
191+
&lt;Entry.SortBy&gt;&#xD;
192+
&lt;Name /&gt;&#xD;
193+
&lt;/Entry.SortBy&gt;&#xD;
194+
&lt;/Entry&gt;&#xD;
195+
&lt;/TypePattern&gt;&#xD;
196+
&lt;TypePattern DisplayName="Type Pattern"&gt;&#xD;
197+
&lt;Entry Priority="100" DisplayName="Entry"&gt;&#xD;
198+
&lt;Entry.Match&gt;&#xD;
199+
&lt;And&gt;&#xD;
200+
&lt;Access Is="Public" /&gt;&#xD;
201+
&lt;Kind Is="Delegate" /&gt;&#xD;
202+
&lt;/And&gt;&#xD;
203+
&lt;/Entry.Match&gt;&#xD;
204+
&lt;Entry.SortBy&gt;&#xD;
205+
&lt;Name /&gt;&#xD;
206+
&lt;/Entry.SortBy&gt;&#xD;
207+
&lt;/Entry&gt;&#xD;
208+
&lt;Entry Priority="100" DisplayName="Entry"&gt;&#xD;
209+
&lt;Entry.Match&gt;&#xD;
210+
&lt;And&gt;&#xD;
211+
&lt;Access Is="Public" /&gt;&#xD;
212+
&lt;Kind Is="Enum" /&gt;&#xD;
213+
&lt;/And&gt;&#xD;
214+
&lt;/Entry.Match&gt;&#xD;
215+
&lt;Entry.SortBy&gt;&#xD;
216+
&lt;Name /&gt;&#xD;
217+
&lt;/Entry.SortBy&gt;&#xD;
218+
&lt;/Entry&gt;&#xD;
219+
&lt;Entry DisplayName="Entry"&gt;&#xD;
220+
&lt;Entry.Match&gt;&#xD;
221+
&lt;Kind Is="Constructor" /&gt;&#xD;
222+
&lt;/Entry.Match&gt;&#xD;
223+
&lt;Entry.SortBy&gt;&#xD;
224+
&lt;Static /&gt;&#xD;
225+
&lt;/Entry.SortBy&gt;&#xD;
226+
&lt;/Entry&gt;&#xD;
227+
&lt;Entry DisplayName="Entry"&gt;&#xD;
228+
&lt;Entry.Match&gt;&#xD;
229+
&lt;Or&gt;&#xD;
230+
&lt;Kind Is="Property" /&gt;&#xD;
231+
&lt;Kind Is="Indexer" /&gt;&#xD;
232+
&lt;/Or&gt;&#xD;
233+
&lt;/Entry.Match&gt;&#xD;
234+
&lt;/Entry&gt;&#xD;
235+
&lt;Entry Priority="100" DisplayName="Entry"&gt;&#xD;
236+
&lt;Entry.Match&gt;&#xD;
237+
&lt;And&gt;&#xD;
238+
&lt;Kind Is="Member" /&gt;&#xD;
239+
&lt;ImplementsInterface /&gt;&#xD;
240+
&lt;/And&gt;&#xD;
241+
&lt;/Entry.Match&gt;&#xD;
242+
&lt;Entry.SortBy&gt;&#xD;
243+
&lt;ImplementsInterface Immediate="True" /&gt;&#xD;
244+
&lt;/Entry.SortBy&gt;&#xD;
245+
&lt;/Entry&gt;&#xD;
246+
&lt;Entry DisplayName="Entry" /&gt;&#xD;
247+
&lt;Entry DisplayName="Entry"&gt;&#xD;
248+
&lt;Entry.Match&gt;&#xD;
249+
&lt;Or&gt;&#xD;
250+
&lt;Kind Is="Constant" /&gt;&#xD;
251+
&lt;And&gt;&#xD;
252+
&lt;Kind Is="Field" /&gt;&#xD;
253+
&lt;Static /&gt;&#xD;
254+
&lt;/And&gt;&#xD;
255+
&lt;/Or&gt;&#xD;
256+
&lt;/Entry.Match&gt;&#xD;
257+
&lt;Entry.SortBy&gt;&#xD;
258+
&lt;Kind Order="Constant Field" /&gt;&#xD;
259+
&lt;/Entry.SortBy&gt;&#xD;
260+
&lt;/Entry&gt;&#xD;
261+
&lt;Entry DisplayName="Entry"&gt;&#xD;
262+
&lt;Entry.Match&gt;&#xD;
263+
&lt;And&gt;&#xD;
264+
&lt;Kind Is="Field" /&gt;&#xD;
265+
&lt;Not&gt;&#xD;
266+
&lt;Static /&gt;&#xD;
267+
&lt;/Not&gt;&#xD;
268+
&lt;/And&gt;&#xD;
269+
&lt;/Entry.Match&gt;&#xD;
270+
&lt;Entry.SortBy&gt;&#xD;
271+
&lt;Readonly /&gt;&#xD;
272+
&lt;Name /&gt;&#xD;
273+
&lt;/Entry.SortBy&gt;&#xD;
274+
&lt;/Entry&gt;&#xD;
275+
&lt;Entry DisplayName="Entry"&gt;&#xD;
276+
&lt;Entry.Match&gt;&#xD;
277+
&lt;Kind Is="Type" /&gt;&#xD;
278+
&lt;/Entry.Match&gt;&#xD;
279+
&lt;Entry.SortBy&gt;&#xD;
280+
&lt;Name /&gt;&#xD;
281+
&lt;/Entry.SortBy&gt;&#xD;
282+
&lt;/Entry&gt;&#xD;
283+
&lt;/TypePattern&gt;&#xD;
284+
&lt;/Patterns&gt;</s:String>
147285
<s:String x:Key="/Default/CodeStyle/CSharpMemberOrderPattern/CustomPattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-8" ?&gt;&#xD;
148286
&#xD;
149287
&lt;!--&#xD;
@@ -408,7 +546,11 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
408546
<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=StaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
409547
<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=TypeParameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
410548
<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/PredefinedNamingRules/=TypesAndNamespaces/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
549+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpFileLayoutPatternsUpgrade/@EntryIndexedValue">True</s:Boolean>
550+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
551+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
411552
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
553+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
412554
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
413555

414556

‎src/Tests/ClientBuilder.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ public static class ClientBuilder
88
public static GitHubClient Build()
99
{
1010
var credentialStore = new InMemoryCredentialStore(Helper.Credentials);
11-
12-
var httpClient = new HttpClientAdapter(Helper.Proxy);
11+
var httpClient = new HttpClientAdapter(HttpMessageHandlerFactory.CreateDefault);
1312

1413
var connection = new Connection(
1514
new ProductHeaderValue("ReleaseNotesCompiler"),

0 commit comments

Comments
 (0)