Skip to content

Commit d5aae1a

Browse files
gep13gep13
committed
(GH-64) Upgrading Octokit NuGet Package
- Which I believe is a first step in getting the Add Asset working again
1 parent 569d1d7 commit d5aae1a

12 files changed

+50
-55
lines changed

‎Source/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@
6262
<Reference Include="CommandLine">
6363
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
6464
</Reference>
65-
<Reference Include="Octokit">
66-
<HintPath>..\packages\Octokit.0.4.1\lib\net45\Octokit.dll</HintPath>
65+
<Reference Include="Octokit, Version=0.17.0.0, Culture=neutral, processorArchitecture=MSIL">
66+
<HintPath>..\packages\Octokit.0.17.0\lib\net45\Octokit.dll</HintPath>
67+
<Private>True</Private>
6768
</Reference>
6869
<Reference Include="System" />
6970
<Reference Include="System.Core" />

‎Source/GitReleaseManager.Cli/Program.cs

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ private static async Task CreateReleaseFromMilestone(GitHubClient github, string
234234

235235
var result = await releaseNotesBuilder.BuildReleaseNotes();
236236

237-
var releaseUpdate = CreateReleaseUpdate(milestone, result, prerelease, targetCommitish);
237+
var releaseUpdate = CreateNewRelease(milestone, result, prerelease, targetCommitish);
238238

239239
var release = await github.Release.Create(owner, repository, releaseUpdate);
240240

@@ -250,7 +250,7 @@ private static async Task CreateReleaseFromInputFile(GitHubClient github, string
250250

251251
var inputFileContents = File.ReadAllText(inputFilePath);
252252

253-
var releaseUpdate = CreateReleaseUpdate(name, inputFileContents, prerelease, targetCommitish);
253+
var releaseUpdate = CreateNewRelease(name, inputFileContents, prerelease, targetCommitish);
254254

255255
var release = await github.Release.Create(owner, repository, releaseUpdate);
256256

@@ -284,7 +284,7 @@ private static async Task<string> ExportReleases(GitHubClient github, string own
284284
private static async Task CloseMilestone(GitHubClient github, string owner, string repository, string milestoneTitle)
285285
{
286286
var milestoneClient = github.Issue.Milestone;
287-
var openMilestones = await milestoneClient.GetForRepository(owner, repository, new MilestoneRequest { State = ItemState.Open });
287+
var openMilestones = await milestoneClient.GetAllForRepository(owner, repository, new MilestoneRequest { State = ItemState.Open });
288288
var milestone = openMilestones.FirstOrDefault(m => m.Title == milestoneTitle);
289289

290290
if (milestone == null)
@@ -305,10 +305,7 @@ private static async Task PublishRelease(GitHubClient github, string owner, stri
305305
return;
306306
}
307307

308-
var releaseUpdate = new ReleaseUpdate(tagName)
309-
{
310-
Draft = false
311-
};
308+
var releaseUpdate = new ReleaseUpdate { TagName = tagName, Draft = false };
312309

313310
await github.Release.Edit(owner, repository, release.Id, releaseUpdate);
314311
}
@@ -325,20 +322,20 @@ private static async Task AddAssets(GitHubClient github, IList<string> assets, R
325322
}
326323

327324
var upload = new ReleaseAssetUpload
328-
{
329-
FileName = Path.GetFileName(asset),
330-
ContentType = "application/octet-stream",
331-
RawData = File.Open(asset, FileMode.Open)
332-
};
325+
{
326+
FileName = Path.GetFileName(asset),
327+
ContentType = "application/octet-stream",
328+
RawData = File.Open(asset, FileMode.Open)
329+
};
333330

334331
await github.Release.UploadAsset(release, upload);
335332
}
336333
}
337334
}
338335

339-
private static ReleaseUpdate CreateReleaseUpdate(string name, string body, bool prerelease, string targetCommitish)
336+
private static NewRelease CreateNewRelease(string name, string body, bool prerelease, string targetCommitish)
340337
{
341-
var releaseUpdate = new ReleaseUpdate(name)
338+
var newRelease = new NewRelease(name)
342339
{
343340
Draft = true,
344341
Body = body,
@@ -348,10 +345,10 @@ private static ReleaseUpdate CreateReleaseUpdate(string name, string body, bool
348345

349346
if (!string.IsNullOrEmpty(targetCommitish))
350347
{
351-
releaseUpdate.TargetCommitish = targetCommitish;
348+
newRelease.TargetCommitish = targetCommitish;
352349
}
353350

354-
return releaseUpdate;
351+
return newRelease;
355352
}
356353

357354
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "Not required.")]

‎Source/GitReleaseManager.Cli/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
55
<package id="Costura.Fody" version="1.3.3.0" targetFramework="net451" developmentDependency="true" />
66
<package id="Fody" version="1.29.3" targetFramework="net451" developmentDependency="true" />
7-
<package id="Octokit" version="0.4.1" targetFramework="net45" />
7+
<package id="Octokit" version="0.17.0" targetFramework="net451" />
88
<package id="StyleCop.Error.MSBuild" version="1.0.0" targetFramework="net45" />
99
<package id="StyleCop.MSBuild" version="4.7.49.1" targetFramework="net45" developmentDependency="true" />
1010
</packages>

‎Source/GitReleaseManager.Tests/ClientBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static GitHubClient Build()
1515
{
1616
var credentialStore = new InMemoryCredentialStore(Helper.Credentials);
1717

18-
var httpClient = new HttpClientAdapter(Helper.Proxy);
18+
var httpClient = new HttpClientAdapter(HttpMessageHandlerFactory.CreateDefault);
1919

2020
var connection = new Connection(
2121
new ProductHeaderValue("GitReleaseManager"),

‎Source/GitReleaseManager.Tests/GitReleaseManager.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
<HintPath>..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
53-
<Reference Include="Octokit, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
54-
<SpecificVersion>False</SpecificVersion>
55-
<HintPath>..\packages\Octokit.0.4.1\lib\net45\Octokit.dll</HintPath>
53+
<Reference Include="Octokit, Version=0.17.0.0, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Octokit.0.17.0\lib\net45\Octokit.dll</HintPath>
55+
<Private>True</Private>
5656
</Reference>
5757
<Reference Include="System" />
5858
<Reference Include="System.Core" />

‎Source/GitReleaseManager.Tests/ReleaseNotesBuilderTests.cs

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,23 +108,29 @@ private static void AcceptTest(int commits, params Issue[] issues)
108108

109109
private static Milestone CreateMilestone(string version)
110110
{
111-
return new Milestone
112-
{
113-
Title = version,
114-
Url = new Uri("https://github.com/gep13/FakeRepository/issues?q=milestone%3A" + version)
115-
};
111+
return new Milestone(new Uri("https://github.com/gep13/FakeRepository/issues?q=milestone%3A" + version), 0, ItemState.Open, version, String.Empty, null, 0, 0, DateTimeOffset.Now, null, null);
116112
}
117113

118114
private static Issue CreateIssue(int number, params string[] labels)
119115
{
120-
return new Issue
121-
{
122-
Number = number,
123-
Title = "Issue " + number,
124-
HtmlUrl = new Uri("http://example.com/" + number),
125-
Body = "Some issue",
126-
Labels = labels.Select(x => new Label { Name = x }).ToArray(),
127-
};
116+
return new Issue(
117+
null,
118+
new Uri("http://example.com/" + number),
119+
null,
120+
null,
121+
number,
122+
ItemState.Open,
123+
"Issue " + number,
124+
"Some issue",
125+
null,
126+
labels.Select(x => new Label (null, x, null)).ToArray(),
127+
null,
128+
null,
129+
0,
130+
null,
131+
null,
132+
DateTimeOffset.Now,
133+
null);
128134
}
129135
}
130136
}

‎Source/GitReleaseManager.Tests/ReleaseNotesExporterTests.cs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,7 @@ private static Release CreateRelease(int id, DateTime createdDateTime, string mi
8686
stringBuilder.AppendLine();
8787
stringBuilder.AppendLine("- [__#3__](http://example.com/3) Issue 3");
8888

89-
return new Release
90-
{
91-
CreatedAt = createdDateTime,
92-
TagName = milestone,
93-
Draft = false,
94-
Name = milestone,
95-
Id = id,
96-
TargetCommitish = "master",
97-
Body = stringBuilder.ToString()
98-
};
89+
return new Release(null, null, null, null, id, milestone, "master", milestone, stringBuilder.ToString(), false, false, createdDateTime, null);
9990
}
10091
}
10192
}

‎Source/GitReleaseManager.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<package id="ApprovalTests" version="3.0.10" targetFramework="net451" />
44
<package id="ApprovalUtilities" version="3.0.10" targetFramework="net451" />
55
<package id="NUnit" version="3.0.1" targetFramework="net451" />
6-
<package id="Octokit" version="0.4.1" targetFramework="net45" />
6+
<package id="Octokit" version="0.17.0" targetFramework="net451" />
77
</packages>

‎Source/GitReleaseManager/DefaultGitHubClient.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ public async Task<Release> GetSpecificRelease(string tagName)
6767
public ReadOnlyCollection<Milestone> GetMilestones()
6868
{
6969
var milestonesClient = this.gitHubClient.Issue.Milestone;
70-
var closed = milestonesClient.GetForRepository(
70+
var closed = milestonesClient.GetAllForRepository(
7171
this.user,
7272
this.repository,
7373
new MilestoneRequest
7474
{
7575
State = ItemState.Closed
7676
}).Result;
7777

78-
var open = milestonesClient.GetForRepository(
78+
var open = milestonesClient.GetAllForRepository(
7979
this.user,
8080
this.repository,
8181
new MilestoneRequest

‎Source/GitReleaseManager/GitReleaseManager.Core.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
<CodeAnalysisTreatWarningsAsErrors>True</CodeAnalysisTreatWarningsAsErrors>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="Octokit, Version=0.4.1.0, Culture=neutral, processorArchitecture=MSIL">
45-
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\packages\Octokit.0.4.1\lib\net45\Octokit.dll</HintPath>
44+
<Reference Include="Octokit, Version=0.17.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Octokit.0.17.0\lib\net45\Octokit.dll</HintPath>
46+
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="System" />
4949
<Reference Include="System.Core" />

0 commit comments

Comments
 (0)