Skip to content

Commit 7563b8a

Browse files
colinangusmackaycolinangusmackay
authored
Merge pull request #180 from Stravaig-Projects/#176/support-dotnet-6
#176 Support .NET 6.0
2 parents 56a8497 + f8f3b08 commit 7563b8a

File tree

10 files changed

+76
-32
lines changed

10 files changed

+76
-32
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ jobs:
7474
with:
7575
dotnet-version: 5.0.x # Always the latest patch version.
7676

77+
- uses: actions/setup-dotnet@v1
78+
name: Setup .NET 6.0
79+
with:
80+
dotnet-version: 6.0.x # Always the latest patch version.
81+
7782
- name: Build Solution
7883
run: dotnet build $STRAVAIG_SOLUTION --configuration Release
7984

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ docs/build/
77
docs/_build/
88
docs/source/_build
99

10+
.DS_Store
11+
1012
# User-specific files
1113
*.rsuser
1214
*.suo

‎release-notes/wip-release-notes.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@
44

55
Date: ???
66

7-
### Bugs
8-
9-
### Features
10-
117
### Miscellaneous
128

9+
- #176: Add support for .NET 6.0
10+
1311
### Dependent Packages
1412

13+
- .NET 6.0
14+
- Microsoft.Extensions.Configuration.Abstractions to 6.0.0
15+
- Microsoft.Extensions.Logging.Abstractions to 6.0.0
1516
- .NET 5.0
1617
- No changes
1718
- .NET Core 3.1
18-
- No changes
19+
- Microsoft.Extensions.Configuration.Abstractions to 3.1.22
20+
- Microsoft.Extensions.Logging.Abstractions to 3.1.22
1921
- General
2022
- No changes
2123

‎src/Stravaig.Configuration.Diagnostics.AdHocTests/Stravaig.Configuration.Diagnostics.AdHocTests.csproj‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<RootNamespace>Stravaig.Extensions.Configuration.Diagnostics.AdHocTests</RootNamespace>
77
</PropertyGroup>
88

99
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
10-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.21" />
11-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.21" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.21" />
13-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.21" />
14-
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.21" />
15-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.21" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.22" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.22" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.22" />
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.22" />
14+
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.22" />
15+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.22" />
1616
</ItemGroup>
1717

1818
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
@@ -24,9 +24,18 @@
2424
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
2525
</ItemGroup>
2626

27+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
28+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
30+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
34+
</ItemGroup>
35+
2736
<ItemGroup>
2837
<PackageReference Include="NUnit" Version="3.13.2" />
29-
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
38+
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
3039
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
3140
<PackageReference Include="Seq.Extensions.Logging" Version="6.0.0" />
3241
</ItemGroup>

‎src/Stravaig.Configuration.Diagnostics.Core/Stravaig.Configuration.Diagnostics.Core.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<PropertyGroup>
11-
<TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
11+
<TargetFrameworks>netstandard2.0;net5.0;net6.0</TargetFrameworks>
1212
<Title>Stravaig Configuration Diagnostics Core</Title>
1313
<Authors>Stravaig Projects</Authors>
1414
<Copyright>©2020-$(StravaigCopyrightYear) Stravaig Projects. See licence for more information.</Copyright>
@@ -32,11 +32,15 @@ Release notes at: $(StravaigReleaseNotes)
3232
</ItemGroup>
3333

3434
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
35-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.21" />
35+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.22" />
3636
</ItemGroup>
3737

3838
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
3939
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
4040
</ItemGroup>
4141

42+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
43+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
44+
</ItemGroup>
45+
4246
</Project>

‎src/Stravaig.Configuration.Diagnostics.Logging/Stravaig.Configuration.Diagnostics.Logging.csproj‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<PropertyGroup>
11-
<TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
11+
<TargetFrameworks>netstandard2.0;net5.0;net6.0</TargetFrameworks>
1212
<Title>Stravaig Configuration Diagnostics (Logging Extensions)</Title>
1313
<Authors>Stravaig Projects</Authors>
1414
<Copyright>©2020-$(StravaigCopyrightYear) Stravaig Projects. See licence for more information.</Copyright>
@@ -31,15 +31,20 @@ Release notes at: $(StravaigReleaseNotes)
3131
</ItemGroup>
3232

3333
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
34-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.21" />
35-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.21" />
34+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.22" />
35+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.22" />
3636
</ItemGroup>
3737

3838
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
3939
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
4040
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
4141
</ItemGroup>
4242

43+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
44+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
45+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
46+
</ItemGroup>
47+
4348
<ItemGroup>
4449
<ProjectReference Include="..\Stravaig.Configuration.Diagnostics.Core\Stravaig.Configuration.Diagnostics.Core.csproj" />
4550
</ItemGroup>

‎src/Stravaig.Configuration.Diagnostics.Serilog/Stravaig.Configuration.Diagnostics.Serilog.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<PropertyGroup>
11-
<TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
11+
<TargetFrameworks>netstandard2.0;net5.0;net6.0</TargetFrameworks>
1212
<Title>Stravaig Configuration Diagnostics (Serilog Extensions)</Title>
1313
<Authors>Stravaig Projects</Authors>
1414
<Copyright>©2020-$(StravaigCopyrightYear) Stravaig Projects. See licence for more information.</Copyright>

‎src/Stravaig.Configuration.Diagnostics.Tests/LoggerExtensionsTestBase.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Collections.Generic;
22
using Microsoft.Extensions.Logging;
3-
#if NET5_0
3+
using NUnit.Framework;
4+
#if NET5_0_OR_GREATER
45
using Microsoft.Extensions.Logging.Console;
56
#endif
67
using Stravaig.Extensions.Logging.Diagnostics;
@@ -22,7 +23,7 @@ protected void SetupLogger()
2223
{
2324
o.DisableColors = true;
2425
});
25-
#elif NET5_0
26+
#elif NET5_0_OR_GREATER
2627
b.AddSimpleConsole(o =>
2728
{
2829
o.ColorBehavior = LoggerColorBehavior.Disabled;

‎src/Stravaig.Configuration.Diagnostics.Tests/PreprocessorSymbols.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ public static class PreprocessorSymbols
111111
"NET5_0",
112112
#endif
113113

114+
#if NET6_0
115+
"NET6_0",
116+
#endif
114117
#if NETCOREAPP
115118
"NETCOREAPP",
116119
#endif

‎src/Stravaig.Configuration.Diagnostics.Tests/Stravaig.Configuration.Diagnostics.Tests.csproj‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<RootNamespace>Stravaig.Extensions.Configuration.Diagnostics.Tests</RootNamespace>
77
</PropertyGroup>
@@ -21,16 +21,16 @@
2121
</ItemGroup>
2222

2323
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
24-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.21" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.21" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.21" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.21" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.21" />
29-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.21" />
30-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.21" />
31-
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.21" />
32-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.21" />
33-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.21" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.22" />
25+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.22" />
26+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.22" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.22" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.22" />
29+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.22" />
30+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.22" />
31+
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.22" />
32+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.22" />
33+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.22" />
3434
</ItemGroup>
3535

3636
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
@@ -46,6 +46,19 @@
4646
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
4747
</ItemGroup>
4848

49+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
50+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
51+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
52+
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="6.0.0" />
53+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
54+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
55+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0" />
56+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
57+
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
58+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
59+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
60+
</ItemGroup>
61+
4962
<ItemGroup>
5063
<ProjectReference Include="..\Stravaig.Configuration.Diagnostics.Logging\Stravaig.Configuration.Diagnostics.Logging.csproj" />
5164
<ProjectReference Include="..\Stravaig.Configuration.Diagnostics.Serilog\Stravaig.Configuration.Diagnostics.Serilog.csproj" />

0 commit comments

Comments
 (0)