Skip to content

Commit 994dc1a

Browse files
gep13gep13
committed
Merge branch 'release/0.13.0'
* release/0.13.0: (27 commits) Bump ApprovalTests from 5.5.0 to 5.7.1 in /src Bump coverlet.msbuild from 3.1.0 to 3.1.1 in /src Bump TextCopy from 6.0.0 to 6.1.0 in /src Bump Roslynator.Analyzers from 4.0.0 to 4.0.2 in /src (#412) Add support for .NET 6.0 Bump Microsoft.Extensions.DependencyInjection in /src (build) Turn of DupFinder (build) Update to latest build image (#427) Remove .netcoreapp2.1 target framework [skip ci] Bump TextCopy from 4.3.0 to 6.0.0 in /src [skip ci] Bump coverlet.msbuild from 3.0.3 to 3.1.0 in /src [skip ci] Bump IDisposableAnalyzers from 3.4.13 to 4.0.1 in /src [skip ci] Bump ApprovalTests from 5.5.0 to 5.7.1 in /src [skip ci] Bump Microsoft.CodeAnalysis.NetAnalyzers from 5.0.3 to 6.0.0 in /src [skip ci] Bump Microsoft.NET.Test.Sdk from 16.9.4 to 17.0.0 in /src Bump Microsoft.SourceLink.GitHub from 1.0.0 to 1.1.1 in /src [skip ci] Bump NSubstitute from 4.2.2 to 4.3.0 in /src [skip ci] Bump Scriban from 3.6.0 to 5.0.0 in /src [skip ci] Bump Destructurama.Attributed from 2.0.0 to 3.0.0 in /src [skip ci] Bump Serilog.Sinks.Console from 3.1.1 to 4.0.1 in /src ...
2 parents 0ecce1f + c0d8b8e commit 994dc1a

File tree

9 files changed

+52
-45
lines changed

9 files changed

+52
-45
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818
strategy:
1919
matrix:
20-
os: [ windows-2019 ]
20+
os: [ windows-2022 ]
2121

2222
steps:
2323
- name: Checkout the repository

‎recipe.cake

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#load nuget:?package=Cake.Recipe&version=2.2.1
2-
#tool dotnet:?package=dotnet-t4&version=2.0.5
2+
#tool dotnet:?package=dotnet-t4&version=2.2.1
33

44
Environment.SetVariableNames(githubTokenVariable: "GITTOOLS_GITHUB_TOKEN");
55

6+
var standardNotificationMessage = "A new version, {0} of {1} has just been released. Get it from Chocolatey, NuGet, or as a .Net Global Tool.";
7+
68
BuildParameters.SetParameters(context: Context,
79
buildSystem: BuildSystem,
810
sourceDirectoryPath: "./src",
@@ -12,9 +14,10 @@ BuildParameters.SetParameters(context: Context,
1214
appVeyorAccountName: "GitTools",
1315
shouldRunDotNetCorePack: true,
1416
shouldRunIntegrationTests: true,
17+
shouldRunDupFinder: false,
1518
integrationTestScriptPath: "./tests/integration/tests.cake",
16-
twitterMessage: "A new version of GitReleaseManager has just been released. Get it from Chocolatey, NuGet, or as a .Net Global Tool.",
17-
gitterMessage: "@/all A new version of GitReleaseManager has just been released. Get it from Chocolatey, NuGet, or as a .Net Global Tool.");
19+
twitterMessage: standardNotificationMessage,
20+
gitterMessage: "@/all " + standardNotificationMessage);
1821

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

‎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="5.0.3">
17+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
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="3.4.13">
22+
<PackageReference Include="IDisposableAnalyzers" Version="4.0.1">
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="3.1.0">
30+
<PackageReference Include="Roslynator.Analyzers" Version="4.0.2">
3131
<PrivateAssets>All</PrivateAssets>
3232
</PackageReference>
3333
</ItemGroup>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<LangVersion>8.0</LangVersion>
44
<OutputType>Exe</OutputType>
55
<AssemblyName>GitReleaseManager</AssemblyName>
6-
<TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
77
<Title>GitReleaseManager.Cli</Title>
88
<Description>Create release notes in markdown given a milestone</Description>
99
<IsPackable>false</IsPackable>
@@ -14,16 +14,16 @@
1414
</ItemGroup>
1515
<ItemGroup>
1616
<PackageReference Include="CommandLineParser" Version="2.8.0" />
17-
<PackageReference Include="Destructurama.Attributed" Version="2.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
19-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
17+
<PackageReference Include="Destructurama.Attributed" Version="3.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
19+
<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="3.1.1" />
24+
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
2525
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" PrivateAssets="All" />
26-
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
26+
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
2727
<PackageReference Include="seriloganalyzer" Version="0.15.0" />
2828
</ItemGroup>
2929
</Project>

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<LangVersion>8.0</LangVersion>
4-
<TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
55
<Title>GitReleaseManager.Core.Tests</Title>
66
<Description>Test Project for GitReleaseManager.Core</Description>
77
<NoWarn>$(NoWarn);CA1707;Serilog004;</NoWarn>
@@ -13,19 +13,21 @@
1313
<ProjectReference Include="..\GitReleaseManager.Core\GitReleaseManager.Core.csproj" />
1414
</ItemGroup>
1515
<ItemGroup>
16-
<PackageReference Include="coverlet.msbuild" Version="3.0.3">
16+
<PackageReference Include="coverlet.msbuild" Version="3.1.1">
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" />
2022
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
21-
<PackageReference Include="ApprovalTests" Version="5.5.0" />
22-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
23+
<PackageReference Include="ApprovalTests" Version="5.7.1" />
24+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
2325
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2426
<PrivateAssets>all</PrivateAssets>
2527
</PackageReference>
26-
<PackageReference Include="NSubstitute" Version="4.2.2" />
27-
<PackageReference Include="NUnit" Version="3.13.1" />
28-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
28+
<PackageReference Include="NSubstitute" Version="4.3.0" />
29+
<PackageReference Include="NUnit" Version="3.13.2" />
30+
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
2931
<PackageReference Include="Octokit" Version="0.50.0" />
3032
<PackageReference Include="Shouldly" Version="4.0.3" />
3133
</ItemGroup>

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

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

1919
<ItemGroup>
2020
<PackageReference Include="CommandLineParser" Version="2.8.0" />
21-
<PackageReference Include="Destructurama.Attributed" Version="2.0.0" />
22-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
21+
<PackageReference Include="Destructurama.Attributed" Version="3.0.0" />
22+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
<PrivateAssets>all</PrivateAssets>
2525
</PackageReference>
2626
<PackageReference Include="Octokit" Version="0.50.0" />
27-
<PackageReference Include="Scriban" Version="3.6.0" />
27+
<PackageReference Include="Scriban" Version="5.0.0" />
2828
<PackageReference Include="seriloganalyzer" Version="0.15.0" />
29-
<PackageReference Include="YamlDotNet" Version="11.1.1" />
29+
<PackageReference Include="YamlDotNet" Version="11.2.1" />
3030
<PackageReference Include="AutoMapper" Version="10.1.1" />
3131
</ItemGroup>
3232
<ItemGroup>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<LangVersion>8.0</LangVersion>
4-
<TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
55
<Title>GitReleaseManager.IntegrationTests</Title>
66
<Description>Integration Test Project for GitReleaseManager</Description>
77
<NoWarn>$(NoWarn);CA1707;Serilog004;</NoWarn>
@@ -13,19 +13,19 @@
1313
<ProjectReference Include="..\GitReleaseManager.Core\GitReleaseManager.Core.csproj" />
1414
</ItemGroup>
1515
<ItemGroup>
16-
<PackageReference Include="coverlet.msbuild" Version="3.0.3">
16+
<PackageReference Include="coverlet.msbuild" Version="3.1.1">
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
20-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
20+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>
24-
<PackageReference Include="nunit" Version="3.13.1" />
25-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
26-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
27-
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
24+
<PackageReference Include="nunit" Version="3.13.2" />
25+
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
27+
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
2828
<PackageReference Include="Shouldly" Version="4.0.3" />
29-
<PackageReference Include="TextCopy" Version="4.3.0" />
29+
<PackageReference Include="TextCopy" Version="6.1.0" />
3030
</ItemGroup>
3131
</Project>

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<LangVersion>8.0</LangVersion>
4-
<TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
55
<Title>GitReleaseManager.Tests</Title>
66
<Description>Test Project for GitReleaseManager</Description>
77
<NoWarn>$(NoWarn);CA1707;Serilog004;</NoWarn>
@@ -13,19 +13,21 @@
1313
<ProjectReference Include="..\GitReleaseManager.Core\GitReleaseManager.Core.csproj" />
1414
</ItemGroup>
1515
<ItemGroup>
16-
<PackageReference Include="coverlet.msbuild" Version="3.0.3">
16+
<PackageReference Include="coverlet.msbuild" Version="3.1.1">
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" />
2022
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
21-
<PackageReference Include="ApprovalTests" Version="5.5.0" />
22-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
23+
<PackageReference Include="ApprovalTests" Version="5.7.1" />
24+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
2325
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2426
<PrivateAssets>all</PrivateAssets>
2527
</PackageReference>
26-
<PackageReference Include="NSubstitute" Version="4.2.2" />
27-
<PackageReference Include="NUnit" Version="3.13.1" />
28-
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
28+
<PackageReference Include="NSubstitute" Version="4.3.0" />
29+
<PackageReference Include="NUnit" Version="3.13.2" />
30+
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
2931
<PackageReference Include="Octokit" Version="0.50.0" />
3032
</ItemGroup>
3133
</Project>

‎src/GitReleaseManager.Tool/GitReleaseManager.Tool.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<AssemblyName>GitReleaseManager</AssemblyName>
77

88
<PackAsTool>true</PackAsTool>
9-
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
9+
<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
1010
<ToolCommandName>dotnet-gitreleasemanager</ToolCommandName>
1111
<PackageId>GitReleaseManager.Tool</PackageId>
1212

@@ -32,16 +32,16 @@
3232
</ItemGroup>
3333
<ItemGroup>
3434
<PackageReference Include="CommandLineParser" Version="2.8.0" />
35-
<PackageReference Include="Destructurama.Attributed" Version="2.0.0" />
36-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
37-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
35+
<PackageReference Include="Destructurama.Attributed" Version="3.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
37+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3939
<PrivateAssets>all</PrivateAssets>
4040
</PackageReference>
4141
<PackageReference Include="Octokit" Version="0.50.0" />
42-
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
42+
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
4343
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" PrivateAssets="All" />
44-
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
44+
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
4545
<PackageReference Include="seriloganalyzer" Version="0.15.0" />
4646
</ItemGroup>
4747
<ItemGroup>

0 commit comments

Comments
 (0)