Skip to content

Commit fe7c8ac

Browse files
gep13gep13
committed
Merge pull request #70 from gep13/feature/GH-64
Correct issue with Adding Assets
2 parents f1f6947 + d5aae1a commit fe7c8ac

12 files changed

+75
-81
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<AssemblyName>GitReleaseManager</AssemblyName>
1212
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14-
<NuGetPackageImportStamp>02f0b04c</NuGetPackageImportStamp>
14+
<NuGetPackageImportStamp>
15+
</NuGetPackageImportStamp>
1516
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1617
<RestorePackages>true</RestorePackages>
1718
<BuildToolsFxCopVersion>1.0.1</BuildToolsFxCopVersion>
@@ -61,8 +62,9 @@
6162
<Reference Include="CommandLine">
6263
<HintPath>..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll</HintPath>
6364
</Reference>
64-
<Reference Include="Octokit">
65-
<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>
6668
</Reference>
6769
<Reference Include="System" />
6870
<Reference Include="System.Core" />
@@ -133,11 +135,11 @@
133135
</PropertyGroup>
134136
<Error Condition="!Exists('..\packages\StyleCop.MSBuild.4.7.49.1\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.MSBuild.4.7.49.1\build\StyleCop.MSBuild.Targets'))" />
135137
<Error Condition="!Exists('..\packages\StyleCop.Error.MSBuild.1.0.0\build\StyleCop.Error.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\StyleCop.Error.MSBuild.1.0.0\build\StyleCop.Error.MSBuild.Targets'))" />
136-
<Error Condition="!Exists('..\packages\Fody.1.28.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.28.3\build\Fody.targets'))" />
138+
<Error Condition="!Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.3\build\dotnet\Fody.targets'))" />
137139
</Target>
138140
<Import Project="..\..\BuildScripts\CodeAnalysis.props" Condition="Exists('..\..\BuildScripts\CodeAnalysis.props')" />
139141
<Import Project="..\..\BuildScripts\StyleCop.props" Condition="Exists('..\..\BuildScripts\StyleCop.props')" />
140142
<Import Project="..\packages\StyleCop.MSBuild.4.7.49.1\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.1\build\StyleCop.MSBuild.Targets')" />
141143
<Import Project="..\packages\StyleCop.Error.MSBuild.1.0.0\build\StyleCop.Error.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.Error.MSBuild.1.0.0\build\StyleCop.Error.MSBuild.Targets')" />
142-
<Import Project="..\packages\Fody.1.28.3\build\Fody.targets" Condition="Exists('..\packages\Fody.1.28.3\build\Fody.targets')" />
144+
<Import Project="..\packages\Fody.1.29.3\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.3\build\dotnet\Fody.targets')" />
143145
</Project>

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<package id="BuildTools.FxCop" version="1.0.1" targetFramework="net45" />
44
<package id="CommandLineParser" version="1.9.71" targetFramework="net45" />
55
<package id="Costura.Fody" version="1.3.3.0" targetFramework="net451" developmentDependency="true" />
6-
<package id="Fody" version="1.28.3" targetFramework="net451" developmentDependency="true" />
7-
<package id="Octokit" version="0.4.1" targetFramework="net45" />
6+
<package id="Fody" version="1.29.3" targetFramework="net451" developmentDependency="true" />
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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,24 @@
3535
</PropertyGroup>
3636
<ItemGroup>
3737
<Reference Include="ApprovalTests, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
38-
<SpecificVersion>False</SpecificVersion>
39-
<HintPath>..\packages\ApprovalTests.3.0.8\lib\net40\ApprovalTests.dll</HintPath>
38+
<HintPath>..\packages\ApprovalTests.3.0.10\lib\net40\ApprovalTests.dll</HintPath>
39+
<Private>True</Private>
4040
</Reference>
4141
<Reference Include="ApprovalUtilities, Version=3.0.0.0, Culture=neutral, PublicKeyToken=11bd7d124fc62e0f, processorArchitecture=MSIL">
42-
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\packages\ApprovalUtilities.3.0.8\lib\net45\ApprovalUtilities.dll</HintPath>
42+
<HintPath>..\packages\ApprovalUtilities.3.0.10\lib\net45\ApprovalUtilities.dll</HintPath>
43+
<Private>True</Private>
4444
</Reference>
4545
<Reference Include="ApprovalUtilities.Net45, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\packages\ApprovalUtilities.3.0.8\lib\net45\ApprovalUtilities.Net45.dll</HintPath>
46+
<HintPath>..\packages\ApprovalUtilities.3.0.10\lib\net45\ApprovalUtilities.Net45.dll</HintPath>
47+
<Private>True</Private>
4848
</Reference>
49-
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
50-
<SpecificVersion>False</SpecificVersion>
51-
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
49+
<Reference Include="nunit.framework, Version=3.0.5813.39031, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
50+
<HintPath>..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll</HintPath>
51+
<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: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,15 @@ public void SomeCommitsSingularIssues()
7373
}
7474

7575
[Test]
76-
[ExpectedException(typeof(AggregateException))]
7776
public void NoCommitsWrongIssueLabel()
7877
{
79-
AcceptTest(0, CreateIssue(1, "Test"));
78+
Assert.Throws<AggregateException>(() => AcceptTest(0, CreateIssue(1, "Test")));
8079
}
8180

8281
[Test]
83-
[ExpectedException(typeof(AggregateException))]
8482
public void SomeCommitsWrongIssueLabel()
8583
{
86-
AcceptTest(5, CreateIssue(1, "Test"));
84+
Assert.Throws<AggregateException>(() => AcceptTest(5, CreateIssue(1, "Test")));
8785
}
8886

8987
private static void AcceptTest(int commits, params Issue[] issues)
@@ -110,23 +108,29 @@ private static void AcceptTest(int commits, params Issue[] issues)
110108

111109
private static Milestone CreateMilestone(string version)
112110
{
113-
return new Milestone
114-
{
115-
Title = version,
116-
Url = new Uri("https://github.com/gep13/FakeRepository/issues?q=milestone%3A" + version)
117-
};
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);
118112
}
119113

120114
private static Issue CreateIssue(int number, params string[] labels)
121115
{
122-
return new Issue
123-
{
124-
Number = number,
125-
Title = "Issue " + number,
126-
HtmlUrl = new Uri("http://example.com/" + number),
127-
Body = "Some issue",
128-
Labels = labels.Select(x => new Label { Name = x }).ToArray(),
129-
};
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);
130134
}
131135
}
132136
}

‎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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ApprovalTests" version="3.0.8" targetFramework="net451" />
4-
<package id="ApprovalUtilities" version="3.0.8" targetFramework="net451" />
5-
<package id="NUnit" version="2.6.4" targetFramework="net451" />
6-
<package id="Octokit" version="0.4.1" targetFramework="net45" />
7-
</packages>
3+
<package id="ApprovalTests" version="3.0.10" targetFramework="net451" />
4+
<package id="ApprovalUtilities" version="3.0.10" targetFramework="net451" />
5+
<package id="NUnit" version="3.0.1" targetFramework="net451" />
6+
<package id="Octokit" version="0.17.0" targetFramework="net451" />
7+
</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: 6 additions & 6 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" />
@@ -53,9 +53,9 @@
5353
<Reference Include="Microsoft.CSharp" />
5454
<Reference Include="System.Data" />
5555
<Reference Include="System.Xml" />
56-
<Reference Include="YamlDotNet, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
57-
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\packages\YamlDotNet.3.6.1\lib\net35\YamlDotNet.dll</HintPath>
56+
<Reference Include="YamlDotNet, Version=3.7.0.0, Culture=neutral, processorArchitecture=MSIL">
57+
<HintPath>..\packages\YamlDotNet.3.7.0\lib\net35\YamlDotNet.dll</HintPath>
58+
<Private>True</Private>
5959
</Reference>
6060
</ItemGroup>
6161
<ItemGroup>

0 commit comments

Comments
 (0)