Skip to content

Commit a8f0cee

Browse files
JerichoJericho
authored
Merge branch 'develop' into collaborators
2 parents e712f24 + 8987ebd commit a8f0cee

File tree

15 files changed

+97
-76
lines changed

15 files changed

+97
-76
lines changed

‎recipe.cake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ BuildParameters.SetParameters(context: Context,
1818
integrationTestScriptPath: "./tests/integration/tests.cake",
1919
twitterMessage: standardNotificationMessage,
2020
preferredBuildProviderType: BuildProviderType.GitHubActions,
21-
gitterMessage: "@/all " + standardNotificationMessage);
21+
gitterMessage: "@/all " + standardNotificationMessage,
22+
shouldRunCodecov: false);
2223

2324
BuildParameters.PackageSources.Add(new PackageSourceData(Context, "GPR", "https://nuget.pkg.github.com/GitTools/index.json", FeedType.NuGet, false));
2425

‎src/Directory.Build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.4">
17+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>
21-
<PackageReference Include="Serilog" Version="3.0.1" />
21+
<PackageReference Include="Serilog" Version="4.0.0" />
2222
<PackageReference Include="IDisposableAnalyzers" Version="4.0.7">
2323
<PrivateAssets>all</PrivateAssets>
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -27,7 +27,7 @@
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
<PrivateAssets>all</PrivateAssets>
2929
</PackageReference>
30-
<PackageReference Include="Roslynator.Analyzers" Version="4.6.2">
30+
<PackageReference Include="Roslynator.Analyzers" Version="4.12.4">
3131
<PrivateAssets>All</PrivateAssets>
3232
</PackageReference>
3333
</ItemGroup>

‎src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
</ItemGroup>
1818
<ItemGroup>
1919
<PackageReference Include="CommandLineParser" Version="2.9.1" />
20-
<PackageReference Include="Destructurama.Attributed" Version="3.1.0" />
21-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
22-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
20+
<PackageReference Include="Destructurama.Attributed" Version="4.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
22+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
<PrivateAssets>all</PrivateAssets>
2525
</PackageReference>
26-
<PackageReference Include="Octokit" Version="10.0.0" />
27-
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
26+
<PackageReference Include="Octokit" Version="12.0.0" />
27+
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
2828
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" PrivateAssets="All" />
2929
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
3030
<PackageReference Include="seriloganalyzer" Version="0.15.0" />

‎src/GitReleaseManager.Core.Tests/GitReleaseManager.Core.Tests.csproj‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,19 @@
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
21-
<PackageReference Include="ApprovalTests" Version="5.9.0" />
22-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
21+
<PackageReference Include="ApprovalTests" Version="6.0.0" />
22+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
<PrivateAssets>all</PrivateAssets>
2525
</PackageReference>
2626
<PackageReference Include="NSubstitute" Version="5.1.0" />
27-
<PackageReference Include="NUnit" Version="3.14.0" />
27+
<PackageReference Include="NUnit" Version="4.1.0" />
28+
<PackageReference Include="NUnit.Analyzers" Version="4.2.0">
29+
<PrivateAssets>all</PrivateAssets>
30+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
31+
</PackageReference>
2832
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
29-
<PackageReference Include="Octokit" Version="10.0.0" />
33+
<PackageReference Include="Octokit" Version="12.0.0" />
3034
<PackageReference Include="Shouldly" Version="4.2.1" />
3135
</ItemGroup>
3236
</Project>

‎src/GitReleaseManager.Core/GitReleaseManager.Core.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="CommandLineParser" Version="2.9.1" />
21-
<PackageReference Include="Destructurama.Attributed" Version="3.1.0" />
21+
<PackageReference Include="Destructurama.Attributed" Version="4.0.0" />
2222
<PackageReference Include="GraphQL.Client" Version="6.0.1" />
2323
<PackageReference Include="GraphQL.Client.Serializer.SystemTextJson" Version="6.0.1" />
24-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
24+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
<PrivateAssets>all</PrivateAssets>
2727
</PackageReference>
28-
<PackageReference Include="NGitLab" Version="6.39.0" />
29-
<PackageReference Include="Octokit" Version="10.0.0" />
30-
<PackageReference Include="Scriban" Version="5.9.0" />
28+
<PackageReference Include="NGitLab" Version="6.51.1" />
29+
<PackageReference Include="Octokit" Version="12.0.0" />
30+
<PackageReference Include="Scriban" Version="5.10.0" />
3131
<PackageReference Include="seriloganalyzer" Version="0.15.0" />
3232
<PackageReference Include="YamlDotNet" Version="13.7.1" />
3333
<PackageReference Include="AutoMapper" Version="12.0.1" />

‎src/GitReleaseManager.Core/Model/IssueComment.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ public class IssueComment
55
/// <summary>
66
/// Gets or sets the issue comment Id.
77
/// </summary>
8-
public int Id { get; set; }
8+
public long Id { get; set; }
99

1010
/// <summary>
1111
/// Gets or sets details about the issue comment.

‎src/GitReleaseManager.IntegrationTests/GitLabProviderIntegrationTests.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ public class GitLabProviderIntegrationTests
2424
private GitLabProvider _gitLabProvider;
2525
private IGitLabClient _gitLabClient;
2626
private IMapper _mapper;
27+
#pragma warning disable NUnit1032 // An IDisposable field/property should be Disposed in a TearDown method
2728
private ILogger _logger;
29+
#pragma warning restore NUnit1032 // An IDisposable field/property should be Disposed in a TearDown method
2830

2931
private string _token;
3032
private string _releaseBaseTag;
@@ -48,6 +50,12 @@ public void OneTimeSetUp()
4850
_gitLabProvider = new GitLabProvider(_gitLabClient, _mapper, _logger);
4951
}
5052

53+
[OneTimeTearDown]
54+
public void OneTimeTearDown()
55+
{
56+
(_logger as IDisposable)?.Dispose();
57+
}
58+
5159
[Test]
5260
[Order(1)]
5361
public async Task Should_Get_Milestones()

‎src/GitReleaseManager.IntegrationTests/GitReleaseManager.IntegrationTests.csproj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,19 @@
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
20-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
20+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>
24-
<PackageReference Include="nunit" Version="3.14.0" />
24+
<PackageReference Include="NUnit" Version="4.1.0" />
25+
<PackageReference Include="NUnit.Analyzers" Version="4.2.0">
26+
<PrivateAssets>all</PrivateAssets>
27+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
28+
</PackageReference>
2529
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
2630
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
2731
<PackageReference Include="Shouldly" Version="4.2.1" />
28-
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
32+
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
2933
<PackageReference Include="TextCopy" Version="6.2.1" />
3034
<PackageReference Include="System.Net.Http" Version="4.3.4" />
3135
</ItemGroup>

‎src/GitReleaseManager.IntegrationTests/ReleaseNotesBuilderIntegrationTests.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ namespace GitReleaseManager.IntegrationTests
2020
public class ReleaseNotesBuilderIntegrationTests
2121
{
2222
private IGitHubClient _gitHubClient;
23+
#pragma warning disable NUnit1032 // An IDisposable field/property should be Disposed in a TearDown method
2324
private ILogger _logger;
25+
#pragma warning restore NUnit1032 // An IDisposable field/property should be Disposed in a TearDown method
2426
private IMapper _mapper;
2527
private string _token;
2628

@@ -34,13 +36,19 @@ public void Configure()
3436
Log.Logger = _logger;
3537

3638
_token = Environment.GetEnvironmentVariable("GITTOOLS_GITHUB_TOKEN");
39+
if (string.IsNullOrWhiteSpace(_token))
40+
{
41+
Assert.Inconclusive("Unable to locate credentials for accessing GitHub API");
42+
}
43+
3744
_gitHubClient = new GitHubClient(new ProductHeaderValue("GitReleaseManager")) { Credentials = new Credentials(_token) };
3845
}
3946

4047
[OneTimeTearDown]
4148
public void TearDown()
4249
{
4350
Log.CloseAndFlush();
51+
(_logger as IDisposable)?.Dispose();
4452
}
4553

4654
[Test]
@@ -55,7 +63,6 @@ public async Task SingleMilestone()
5563
{
5664
var fileSystem = new FileSystem(new CreateSubOptions());
5765
var currentDirectory = Environment.CurrentDirectory;
58-
5966
var configuration = ConfigurationProvider.Provide(currentDirectory, fileSystem);
6067
configuration.IssueLabelsExclude.Add("Internal Refactoring"); // This is necessary to generate the release notes for GitReleaseManager version 0.12.0
6168

@@ -71,22 +78,15 @@ public async Task SingleMilestone()
7178
[Explicit]
7279
public async Task SingleMilestone3()
7380
{
74-
if (string.IsNullOrWhiteSpace(_token))
75-
{
76-
Assert.Inconclusive("Unable to locate credentials for accessing GitHub API");
77-
}
78-
else
79-
{
80-
var fileSystem = new FileSystem(new CreateSubOptions());
81-
var currentDirectory = Environment.CurrentDirectory;
82-
var configuration = ConfigurationProvider.Provide(currentDirectory, fileSystem);
81+
var fileSystem = new FileSystem(new CreateSubOptions());
82+
var currentDirectory = Environment.CurrentDirectory;
83+
var configuration = ConfigurationProvider.Provide(currentDirectory, fileSystem);
8384

84-
var vcsProvider = new GitHubProvider(_gitHubClient, _mapper);
85-
var releaseNotesBuilder = new ReleaseNotesBuilder(vcsProvider, _logger, fileSystem, configuration, new TemplateFactory(fileSystem, configuration, TemplateKind.Create));
86-
var result = await releaseNotesBuilder.BuildReleaseNotesAsync("Chocolatey", "ChocolateyGUI", "0.13.0", ReleaseTemplates.DEFAULT_NAME).ConfigureAwait(false);
87-
Debug.WriteLine(result);
88-
ClipBoardHelper.SetClipboard(result);
89-
}
85+
var vcsProvider = new GitHubProvider(_gitHubClient, _mapper);
86+
var releaseNotesBuilder = new ReleaseNotesBuilder(vcsProvider, _logger, fileSystem, configuration, new TemplateFactory(fileSystem, configuration, TemplateKind.Create));
87+
var result = await releaseNotesBuilder.BuildReleaseNotesAsync("Chocolatey", "ChocolateyGUI", "0.13.0", ReleaseTemplates.DEFAULT_NAME).ConfigureAwait(false);
88+
Debug.WriteLine(result);
89+
ClipBoardHelper.SetClipboard(result);
9090
}
9191

9292
[Test]

‎src/GitReleaseManager.Tests/ConfigurationTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ public void Should_Read_Label_Aliases()
2020
var config = ConfigSerializer.Read(stringReader);
2121

2222
// Then
23-
Assert.AreEqual(2, config.LabelAliases.Count);
24-
Assert.AreEqual("Bug", config.LabelAliases[0].Name);
25-
Assert.AreEqual("Foo", config.LabelAliases[0].Header);
26-
Assert.AreEqual("Bar", config.LabelAliases[0].Plural);
27-
Assert.AreEqual("Improvement", config.LabelAliases[1].Name);
28-
Assert.AreEqual("Baz", config.LabelAliases[1].Header);
29-
Assert.AreEqual("Qux", config.LabelAliases[1].Plural);
23+
Assert.That(2, Is.EqualTo(config.LabelAliases.Count));
24+
Assert.That("Bug", Is.EqualTo(config.LabelAliases[0].Name));
25+
Assert.That("Foo", Is.EqualTo(config.LabelAliases[0].Header));
26+
Assert.That("Bar", Is.EqualTo(config.LabelAliases[0].Plural));
27+
Assert.That("Improvement", Is.EqualTo(config.LabelAliases[1].Name));
28+
Assert.That("Baz", Is.EqualTo(config.LabelAliases[1].Header));
29+
Assert.That("Qux", Is.EqualTo(config.LabelAliases[1].Plural));
3030
}
3131
}
3232

0 commit comments

Comments
 (0)