Skip to content
This repository was archived by the owner on Sep 20, 2022. It is now read-only.

Commit 4f8f1e0

Browse files
committed
Merge pull request #90 from JakeGinnivan/RestoringExe
[WIP] First pass at restoring old exe's functionality
2 parents 306ca23 + 6afb4c9 commit 4f8f1e0

29 files changed

Lines changed: 264 additions & 523 deletions

src/GitReleaseNotes.Tests/ArgumentTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public void VerifyProviderDescriptions()
1616
var propertyInfo = typeof(GitReleaseNotesArguments).GetProperty("IssueTracker");
1717
var description = propertyInfo.GetCustomAttribute<DescriptionAttribute>();
1818

19-
var issueTrackers = Enum.GetValues(typeof(IssueTracker)).Cast<IssueTracker>().Except(new[] { IssueTracker.Unknown });
19+
var issueTrackers = Enum.GetValues(typeof(IssueTrackerType)).Cast<IssueTrackerType>();
2020
foreach (var issueTracker in issueTrackers)
2121
{
2222
description.Description.ShouldContain(issueTracker.ToString());

src/GitReleaseNotes.Tests/GitReleaseNotes.Tests.csproj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,16 @@
4444
<Reference Include="ApprovalUtilities.Net45">
4545
<HintPath>..\packages\ApprovalUtilities.3.0.8\lib\net45\ApprovalUtilities.Net45.dll</HintPath>
4646
</Reference>
47+
<Reference Include="Atlassian.Jira, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Atlassian.SDK.2.5.0\lib\Atlassian.Jira.dll</HintPath>
49+
<Private>True</Private>
50+
</Reference>
4751
<Reference Include="GitTools.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
4852
<HintPath>..\packages\GitTools.Core.1.0.0-unstable0043\lib\net45\GitTools.Core.dll</HintPath>
4953
<Private>True</Private>
5054
</Reference>
51-
<Reference Include="GitTools.IssueTrackers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
52-
<HintPath>..\packages\GitTools.IssueTrackers.1.0.0-unstable0043\lib\net45\GitTools.IssueTrackers.dll</HintPath>
55+
<Reference Include="GitTools.IssueTrackers, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\packages\GitTools.IssueTrackers.0.1.0-beta0002\lib\net45\GitTools.IssueTrackers.dll</HintPath>
5357
<Private>True</Private>
5458
</Reference>
5559
<Reference Include="LibGit2Sharp, Version=0.21.0.176, Culture=neutral, processorArchitecture=MSIL">
@@ -63,8 +67,8 @@
6367
<Reference Include="NSubstitute">
6468
<HintPath>..\packages\NSubstitute.1.8.1.0\lib\net45\NSubstitute.dll</HintPath>
6569
</Reference>
66-
<Reference Include="Octokit, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
67-
<HintPath>..\packages\Octokit.0.9.0\lib\net45\Octokit.dll</HintPath>
70+
<Reference Include="Octokit, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
71+
<HintPath>..\packages\Octokit.0.15.0\lib\net45\Octokit.dll</HintPath>
6872
<Private>True</Private>
6973
</Reference>
7074
<Reference Include="Shouldly, Version=2.6.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">
@@ -73,6 +77,7 @@
7377
</Reference>
7478
<Reference Include="System" />
7579
<Reference Include="System.Core" />
80+
<Reference Include="System.Net.Http" />
7681
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
7782
<HintPath>D:\_code\GitReleaseNotes\src\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
7883
<Private>True</Private>
@@ -94,7 +99,6 @@
9499
<Compile Include="ReleaseNotesGeneratorTests.cs" />
95100
<Compile Include="SemanticReleaseNotesTests.cs" />
96101
<Compile Include="TestDataCreator.cs" />
97-
<Compile Include="TestGitRepoUtils.cs" />
98102
</ItemGroup>
99103
<ItemGroup>
100104
<None Include="packages.config" />

src/GitReleaseNotes.Tests/TestGitRepoUtils.cs

Lines changed: 0 additions & 73 deletions
This file was deleted.

src/GitReleaseNotes.Tests/packages.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
<packages>
33
<package id="ApprovalTests" version="3.0.8" targetFramework="net45" />
44
<package id="ApprovalUtilities" version="3.0.8" targetFramework="net45" />
5+
<package id="Atlassian.SDK" version="2.5.0" targetFramework="net45" />
56
<package id="GitTools.Core" version="1.0.0-unstable0043" targetFramework="net45" />
6-
<package id="GitTools.IssueTrackers" version="1.0.0-unstable0043" targetFramework="net45" />
7+
<package id="GitTools.IssueTrackers" version="0.1.0-beta0002" targetFramework="net45" />
78
<package id="LibGit2Sharp" version="0.21.0.176" targetFramework="net45" />
89
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
910
<package id="NSubstitute" version="1.8.1.0" targetFramework="net45" />
10-
<package id="Octokit" version="0.9.0" targetFramework="net45" />
11+
<package id="Octokit" version="0.15.0" targetFramework="net45" />
1112
<package id="Shouldly" version="2.6.0" targetFramework="net45" />
1213
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
1314
<package id="xunit.core" version="2.0.0" targetFramework="net45" />

src/GitReleaseNotes.Website/Controllers/Api/ReleaseNotesController.cs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using System.Net.Http;
22
using System.Threading.Tasks;
3-
using System.Web;
43
using Catel;
5-
using GitReleaseNotes.Website.Models;
64
using GitReleaseNotes.Website.Models.Api;
75
using GitReleaseNotes.Website.Services;
86

@@ -13,13 +11,13 @@ namespace GitReleaseNotes.Website.Controllers.Api
1311
[RoutePrefix("api/releasenotes")]
1412
public class ReleaseNotesController : ApiControllerBase
1513
{
16-
private readonly IReleaseNotesService _releaseNotesService;
14+
private readonly IReleaseNotesService releaseNotesService;
1715

1816
public ReleaseNotesController(IReleaseNotesService releaseNotesService)
1917
{
2018
Argument.IsNotNull(() => releaseNotesService);
2119

22-
_releaseNotesService = releaseNotesService;
20+
this.releaseNotesService = releaseNotesService;
2321
}
2422

2523
[HttpPost]
@@ -28,10 +26,19 @@ public async Task<HttpResponseMessage> Generate([FromBody] ReleaseNotesRequest r
2826
{
2927
Argument.IsNotNull(() => releaseNotesRequest);
3028

31-
var context = releaseNotesRequest.ToContext();
32-
context.AllTags = true;
29+
var context1 = new ReleaseNotesGenerationParameters
30+
{
31+
RepositorySettings =
32+
{
33+
Url = releaseNotesRequest.RepositoryUrl,
34+
Branch = releaseNotesRequest.RepositoryBranch
35+
},
36+
IssueTracker = {ProjectId = releaseNotesRequest.IssueTrackerProjectId}
37+
};
3338

34-
var releaseNotes = await _releaseNotesService.GetReleaseNotesAsync(context);
39+
var context = context1;
40+
context.AllTags = true;
41+
var releaseNotes = await releaseNotesService.GetReleaseNotesAsync(context);
3542

3643
return new HttpResponseMessage
3744
{

src/GitReleaseNotes.Website/GitReleaseNotes.Website.csproj

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@
4646
<HintPath>..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
4747
<Private>True</Private>
4848
</Reference>
49+
<Reference Include="Atlassian.Jira, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50+
<HintPath>..\packages\Atlassian.SDK.2.5.0\lib\Atlassian.Jira.dll</HintPath>
51+
<Private>True</Private>
52+
</Reference>
4953
<Reference Include="Catel.Core, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
5054
<HintPath>..\packages\Catel.Core.4.1.0\lib\net45\Catel.Core.dll</HintPath>
5155
<Private>True</Private>
@@ -58,8 +62,8 @@
5862
<HintPath>..\packages\GitTools.Core.1.0.0-unstable0043\lib\net45\GitTools.Core.dll</HintPath>
5963
<Private>True</Private>
6064
</Reference>
61-
<Reference Include="GitTools.IssueTrackers, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
62-
<HintPath>..\packages\GitTools.IssueTrackers.1.0.0-unstable0043\lib\net45\GitTools.IssueTrackers.dll</HintPath>
65+
<Reference Include="GitTools.IssueTrackers, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
66+
<HintPath>..\packages\GitTools.IssueTrackers.0.1.0-beta0002\lib\net45\GitTools.IssueTrackers.dll</HintPath>
6367
<Private>True</Private>
6468
</Reference>
6569
<Reference Include="LibGit2Sharp, Version=0.21.0.176, Culture=neutral, processorArchitecture=MSIL">
@@ -79,6 +83,10 @@
7983
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
8084
<Private>True</Private>
8185
</Reference>
86+
<Reference Include="Octokit, Version=0.15.0.0, Culture=neutral, processorArchitecture=MSIL">
87+
<HintPath>..\packages\Octokit.0.15.0\lib\net45\Octokit.dll</HintPath>
88+
<Private>True</Private>
89+
</Reference>
8290
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
8391
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
8492
<Private>True</Private>
@@ -214,12 +222,10 @@
214222
</Compile>
215223
<Compile Include="IoC\CatelWebApiDependencyResolver.cs" />
216224
<Compile Include="Logging\GitReleaseNotesLogger.cs" />
217-
<Compile Include="Models\Api\Extensions\ReleaseNotesRequestExtensions.cs" />
218225
<Compile Include="Models\Api\Response.cs" />
219226
<Compile Include="Models\Api\ReleaseNotesRequest.cs" />
220227
<Compile Include="ModuleInitializer.cs" />
221228
<Compile Include="Properties\AssemblyInfo.cs" />
222-
<Compile Include="Services\FileSystem.cs" />
223229
<Compile Include="Services\Interfaces\IReleaseNotesService.cs" />
224230
<Compile Include="Services\ReleaseNotesService.cs" />
225231
</ItemGroup>
@@ -242,7 +248,6 @@
242248
</None>
243249
</ItemGroup>
244250
<ItemGroup>
245-
<Folder Include="App_Data\" />
246251
<Folder Include="content\angular\directives\" />
247252
<Folder Include="content\angular\mixins\" />
248253
<Folder Include="content\img\" />

src/GitReleaseNotes.Website/Models/Api/Extensions/ReleaseNotesRequestExtensions.cs

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/GitReleaseNotes.Website/ModuleInitializer.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
using Catel.IoC;
2-
using GitReleaseNotes;
32
using GitReleaseNotes.FileSystem;
4-
using GitReleaseNotes.IssueTrackers;
53
using GitReleaseNotes.Website.Services;
6-
using GitTools.IssueTrackers;
7-
using FileSystem = GitReleaseNotes.Website.Services.FileSystem;
84

95
/// <summary>
106
/// Used by the ModuleInit. All code inside the Initialize method is ran as soon as the assembly is loaded.
@@ -20,6 +16,5 @@ public static void Initialize()
2016

2117
serviceLocator.RegisterType<IReleaseNotesService, ReleaseNotesService>();
2218
serviceLocator.RegisterType<IFileSystem, FileSystem>();
23-
serviceLocator.RegisterType<IIssueTrackerFactory, IssueTrackerFactory>();
2419
}
2520
}

src/GitReleaseNotes.Website/Services/FileSystem.cs

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/GitReleaseNotes.Website/Services/Interfaces/IReleaseNotesService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ namespace GitReleaseNotes.Website.Services
44
{
55
public interface IReleaseNotesService
66
{
7-
Task<SemanticReleaseNotes> GetReleaseNotesAsync(Context context);
7+
Task<SemanticReleaseNotes> GetReleaseNotesAsync(ReleaseNotesGenerationParameters generationParameters);
88
}
99
}

0 commit comments

Comments
 (0)