Skip to content

Commit dd68f2f

Browse files
committed
Merge branch 'release/0.14.0'
* release/0.14.0: (28 commits) (maint) Consolidate and remove duplicates (maint) Update PackageReference (maint) Update PackageReference Bump Serilog.Sinks.Console from 4.0.1 to 4.1.0 in /src Bump Shouldly from 4.0.3 to 4.2.1 in /src Bump Microsoft.Extensions.DependencyInjection in /src Bump TextCopy from 6.1.0 to 6.2.1 in /src Bump Microsoft.CodeAnalysis.NetAnalyzers from 6.0.0 to 7.0.3 in /src Bump NSubstitute from 4.3.0 to 5.0.0 in /src Bump Microsoft.NET.Test.Sdk from 17.0.0 to 17.7.1 in /src Bump Scriban from 5.0.0 to 5.7.0 in /src Bump IDisposableAnalyzers from 4.0.1 to 4.0.6 in /src Bump NUnit from 3.13.2 to 3.13.3 in /src Bump CommandLineParser from 2.8.0 to 2.9.1 in /src Bump coverlet.msbuild from 3.1.1 to 6.0.0 in /src Bump Roslynator.Analyzers from 4.0.2 to 4.4.0 in /src Bump ApprovalTests from 5.7.1 to 5.8.0 in /src (#454) Create test (#454) Fix NullReferenceException on release not found (build) Force building of 0.14.0 ...
2 parents 9d82f41 + 48b6fc1 commit dd68f2f

File tree

18 files changed

+99
-58
lines changed

18 files changed

+99
-58
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "0.38.5",
6+
"version": "1.3.0",
77
"commands": [
88
"dotnet-cake"
99
]

.github/workflows/build.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ jobs:
2626
- name: Fetch all tags and branches
2727
run: git fetch --prune --unshallow
2828

29+
- name: Install .NET SDK 3.1.x and 5.0.x
30+
uses: actions/setup-dotnet@v3
31+
with:
32+
dotnet-version: |
33+
3.1.x
34+
5.0.x
35+
2936
- name: Cache Tools
3037
uses: actions/cache@v2
3138
with:
@@ -38,8 +45,7 @@ jobs:
3845
script-path: recipe.cake
3946
target: CI
4047
verbosity: Normal
41-
cake-version: 0.38.5
42-
cake-bootstrap: true
48+
cake-version: tool-manifest
4349

4450
- name: Upload Issues-Report
4551
uses: actions/upload-artifact@v2

cake.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
[Nuget]
55
Source=https://api.nuget.org/v3/index.json
6-
UseInProcessClient=true
76

87
[Paths]
98
Tools=./tools

gitversion.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
next-version: 0.14.0

recipe.cake

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#load nuget:?package=Cake.Recipe&version=2.2.1
1+
#load nuget:?package=Cake.Recipe&version=3.0.1
22
#tool dotnet:?package=dotnet-t4&version=2.2.1
33

44
Environment.SetVariableNames(githubTokenVariable: "GITTOOLS_GITHUB_TOKEN");
@@ -14,7 +14,6 @@ BuildParameters.SetParameters(context: Context,
1414
appVeyorAccountName: "GitTools",
1515
shouldRunDotNetCorePack: true,
1616
shouldRunIntegrationTests: true,
17-
shouldRunDupFinder: false,
1817
integrationTestScriptPath: "./tests/integration/tests.cake",
1918
twitterMessage: standardNotificationMessage,
2019
gitterMessage: "@/all " + standardNotificationMessage);
@@ -24,12 +23,6 @@ BuildParameters.PackageSources.Add(new PackageSourceData(Context, "GPR", "https:
2423
BuildParameters.PrintParameters(Context);
2524

2625
ToolSettings.SetToolSettings(context: Context,
27-
dupFinderExcludePattern: new string[] {
28-
BuildParameters.RootDirectoryPath + "/src/GitReleaseManager.Core.Tests/**/*.cs",
29-
BuildParameters.RootDirectoryPath + "/src/GitReleaseManager.Tests/**/*.cs",
30-
BuildParameters.RootDirectoryPath + "/src/GitReleaseManager.IntegrationTests/**/*.cs",
31-
BuildParameters.RootDirectoryPath + "/src/GitReleaseManager/AutoMapperConfiguration.cs",
32-
"**/*.AssemblyInfo.cs" },
3326
testCoverageFilter: "+[GitReleaseManager*]* -[GitReleaseManager.Core.Tests*]* -[GitReleaseManager.Tests*]*",
3427
testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
3528
testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");

src/Directory.Build.props

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

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
17+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.3">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>
2121
<PackageReference Include="Serilog" Version="2.10.0" />
22-
<PackageReference Include="IDisposableAnalyzers" Version="4.0.1">
22+
<PackageReference Include="IDisposableAnalyzers" Version="4.0.6">
2323
<PrivateAssets>all</PrivateAssets>
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
</PackageReference>
2626
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
<PrivateAssets>all</PrivateAssets>
2929
</PackageReference>
30-
<PackageReference Include="Roslynator.Analyzers" Version="4.0.2">
30+
<PackageReference Include="Roslynator.Analyzers" Version="4.4.0">
3131
<PrivateAssets>All</PrivateAssets>
3232
</PackageReference>
3333
</ItemGroup>

src/GitReleaseManager.Cli/GitReleaseManager.Cli.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
<ProjectReference Include="..\GitReleaseManager.Core\GitReleaseManager.Core.csproj" />
1414
</ItemGroup>
1515
<ItemGroup>
16-
<PackageReference Include="CommandLineParser" Version="2.8.0" />
17-
<PackageReference Include="Destructurama.Attributed" Version="3.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
16+
<PackageReference Include="CommandLineParser" Version="2.9.1" />
17+
<PackageReference Include="Destructurama.Attributed" Version="3.1.0" />
18+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
1919
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
<PrivateAssets>all</PrivateAssets>
2222
</PackageReference>
2323
<PackageReference Include="Octokit" Version="0.50.0" />
24-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
24+
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
2525
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" PrivateAssets="All" />
2626
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
2727
<PackageReference Include="seriloganalyzer" Version="0.15.0" />
Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<LangVersion>8.0</LangVersion>
44
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
@@ -13,22 +13,20 @@
1313
<ProjectReference Include="..\GitReleaseManager.Core\GitReleaseManager.Core.csproj" />
1414
</ItemGroup>
1515
<ItemGroup>
16-
<PackageReference Include="coverlet.msbuild" Version="3.1.1">
16+
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
21-
<PackageReference Include="ApprovalTests" Version="5.7.1" />
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
23-
<PackageReference Include="ApprovalTests" Version="5.7.1" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
21+
<PackageReference Include="ApprovalTests" Version="5.8.0" />
2422
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
2523
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2624
<PrivateAssets>all</PrivateAssets>
2725
</PackageReference>
28-
<PackageReference Include="NSubstitute" Version="4.3.0" />
29-
<PackageReference Include="NUnit" Version="3.13.2" />
30-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
26+
<PackageReference Include="NSubstitute" Version="5.0.0" />
27+
<PackageReference Include="NUnit" Version="3.13.3" />
28+
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
3129
<PackageReference Include="Octokit" Version="0.50.0" />
32-
<PackageReference Include="Shouldly" Version="4.0.3" />
30+
<PackageReference Include="Shouldly" Version="4.2.1" />
3331
</ItemGroup>
3432
</Project>

src/GitReleaseManager.Core.Tests/VcsServiceTests.cs

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,45 @@ await _vcsProvider.Received(1).CreateReleaseAsync(OWNER, REPOSITORY, Arg.Is<Rele
321321
_logger.Received(1).Debug(Arg.Any<string>(), Arg.Any<Release>());
322322
}
323323

324+
[Test]
325+
public async Task Should_Create_Release_From_Milestone_With_Assets()
326+
{
327+
var release = new Release { Assets = new List<ReleaseAsset>() };
328+
329+
var assetsCount = _assets.Count;
330+
331+
_releaseNotesBuilder.BuildReleaseNotes(OWNER, REPOSITORY, MILESTONE_TITLE, ReleaseTemplates.DEFAULT_NAME)
332+
.Returns(Task.FromResult(RELEASE_NOTES));
333+
334+
_vcsProvider.GetReleaseAsync(OWNER, REPOSITORY, MILESTONE_TITLE)
335+
.Returns(Task.FromResult<Release>(null));
336+
337+
_vcsProvider.CreateReleaseAsync(OWNER, REPOSITORY, Arg.Any<Release>())
338+
.Returns(Task.FromResult(release));
339+
340+
var result = await _vcsService.CreateReleaseFromMilestoneAsync(
341+
OWNER,
342+
REPOSITORY,
343+
MILESTONE_TITLE,
344+
MILESTONE_TITLE,
345+
null,
346+
_assets,
347+
false,
348+
null
349+
).ConfigureAwait(false);
350+
result.ShouldBeSameAs(release);
351+
352+
await _releaseNotesBuilder.Received(1).BuildReleaseNotes(OWNER, REPOSITORY, MILESTONE_TITLE, ReleaseTemplates.DEFAULT_NAME).ConfigureAwait(false);
353+
await _vcsProvider.Received(1).GetReleaseAsync(OWNER, REPOSITORY, MILESTONE_TITLE).ConfigureAwait(false);
354+
await _vcsProvider.Received(1).CreateReleaseAsync(OWNER, REPOSITORY, Arg.Is<Release>(o =>
355+
o.Body == RELEASE_NOTES &&
356+
o.Name == MILESTONE_TITLE &&
357+
o.TagName == MILESTONE_TITLE)).ConfigureAwait(false);
358+
359+
_logger.Received(1).Verbose(Arg.Any<string>(), MILESTONE_TITLE, OWNER, REPOSITORY);
360+
_logger.Received(1).Debug(Arg.Any<string>(), Arg.Any<Release>());
361+
}
362+
324363
[Test]
325364
public async Task Should_Create_Release_From_Milestone_Using_Template_File()
326365
{

src/GitReleaseManager.Core/Configuration/ConfigSerializer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ private static void SetConfigurationSamples(object config, Type configType, Text
9494
{
9595
property.SetValue(config, null);
9696
}
97+
9798
continue;
9899
}
99100
else if (yamlMemberAttribute.DefaultValuesHandling == DefaultValuesHandling.OmitNull)

0 commit comments

Comments
 (0)