Skip to content

Commit 4dc1ded

Browse files
colinangusmackaycolinangusmackay
authored
Merge pull request #116 from Stravaig-Projects/#114-multi-targetting
#114 Support multi-targeting
2 parents 951a428 + 6a96ac2 commit 4dc1ded

File tree

14 files changed

+263
-50
lines changed

14 files changed

+263
-50
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ jobs:
6969
with:
7070
dotnet-version: 3.1.x # Always the latest patch version.
7171

72+
- uses: actions/setup-dotnet@v1
73+
name: Setup .NET 5.0
74+
with:
75+
dotnet-version: 5.0.x # Always the latest patch version.
76+
7277
- name: Build Solution
7378
run: dotnet build $STRAVAIG_SOLUTION --configuration Release
7479

‎Reset-WipReleaseNotes.ps1‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,16 @@ $content = @(
1111
"",
1212
"### Miscellaneous",
1313
"",
14-
"### Dependabot",
14+
"### Dependent Packages",
1515
"",
16+
"- .NET 5.0",
17+
" - No changes",
18+
"- .NET Core 3.1",
19+
" - No changes",
20+
"- General",
21+
" - No changes",
22+
"",
23+
"---",
1624
"",
1725
""
1826
)

‎release-notes/full-release-notes.md‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ Date: Sunday, 14 March, 2021 at 21:25:19 +00:00
66

77
**THIS RELEASE CONTAINS BREAKING CHANGES**
88

9-
10-
### Bugs
11-
129
### Features
1310

1411
- #87 Serilog extensions.
@@ -35,12 +32,11 @@ Date: Sunday, 14 March, 2021 at 21:25:19 +00:00
3532
- Bump Microsoft.NET.Test.Sdk from 16.8.3 to 16.9.1
3633
- Bump nunit from 3.13.0 to 3.13.1
3734
- Bump Stravaig.Extensions.Logging.Diagnostics from 0.3.1 to 0.3.2
35+
3836
## Version 0.5.0
3937

4038
Date: Saturday, 23 January, 2021 at 14:31:04 +00:00
4139

42-
### Bugs
43-
4440
### Features
4541

4642
* #34: Create Func obfuscator Can now obfuscate based on a user defined function.
@@ -82,9 +78,6 @@ Date: Saturday, 23 January, 2021 at 14:31:04 +00:00
8278
* from 0.2.2 to 0.3.0
8379
* from 0.3.0 to 0.3.1
8480

85-
86-
87-
8881
## Version 0.4.0
8982

9083
Date: Sunday, 29 November, 2020 at 22:52:54 +00:00

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,22 @@ Date: ???
1010

1111
### Miscellaneous
1212

13-
### Dependabot
14-
15-
13+
#114: Multi-targeting .NET Core 3.1 and .NET 5.0
14+
15+
### Dependent Packages
16+
17+
- .NET 5.0
18+
- Microsoft.Extensions.Configuration 5.0.0
19+
- Microsoft.Extensions.Configuration.Abstractions 5.0.0
20+
- Microsoft.Extensions.Configuration.EnvironmentVariables 5.0.0
21+
- Microsoft.Extensions.Configuration.Json 5.0.0
22+
- Microsoft.Extensions.DependencyInjection 5.0.1
23+
- Microsoft.Extensions.Logging.Abstractions 5.0.0
24+
- Microsoft.Extensions.Logging.Console 5.0.0
25+
- .NET Core 3.1
26+
- No changes
27+
- General
28+
- Bump Stravaig.Extensions.Logging.Diagnostics from 0.3.2. to 0.4.0
29+
30+
---
1631

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

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
4+
<TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
65
<IsPackable>false</IsPackable>
7-
86
<RootNamespace>Stravaig.Extensions.Configuration.Diagnostics.AdHocTests</RootNamespace>
97
</PropertyGroup>
108

11-
<ItemGroup>
9+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
1210
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.13" />
1311
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.13" />
1412
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.13" />
1513
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.13" />
1614
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.13" />
1715
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.13" />
16+
</ItemGroup>
17+
18+
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
19+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
23+
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
25+
</ItemGroup>
26+
27+
<ItemGroup>
1828
<PackageReference Include="NUnit" Version="3.13.1" />
1929
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
2030
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />

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

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
55
<Title>Stravaig Configuration Diagnostics Core</Title>
66
<Authors>Stravaig Projects</Authors>
77
<Description>The core functionality of a set of diagnostics extensions for enumerating details of the app's configuration.</Description>
@@ -19,8 +19,12 @@
1919
<None Include="stravaig-icon.png" Pack="true" PackagePath="" />
2020
</ItemGroup>
2121

22-
<ItemGroup>
22+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
2323
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.13" />
2424
</ItemGroup>
25-
25+
26+
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
27+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
28+
</ItemGroup>
29+
2630
</Project>

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

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
55
<Title>Stravaig Configuration Diagnostics (Logging Extensions)</Title>
66
<Authors>Stravaig Projects</Authors>
77
<Description>A set of diagnostics extensions for enumerating details of the app's configuration.</Description>
@@ -17,12 +17,17 @@
1717
<ItemGroup>
1818
<None Include="stravaig-icon.png" Pack="true" PackagePath="" />
1919
</ItemGroup>
20-
21-
<ItemGroup>
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.13" />
23-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.13" />
20+
21+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
22+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.13" />
23+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.13" />
2424
</ItemGroup>
25-
25+
26+
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
27+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
29+
</ItemGroup>
30+
2631
<ItemGroup>
2732
<ProjectReference Include="..\Stravaig.Configuration.Diagnostics.Core\Stravaig.Configuration.Diagnostics.Core.csproj" />
2833
</ItemGroup>

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

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
55
<Title>Stravaig Configuration Diagnostics (Serilog Extensions)</Title>
66
<Authors>Stravaig Projects</Authors>
77
<Description>A set of diagnostics extensions for Serilog for enumerating details of the app's configuration.</Description>
@@ -18,7 +18,6 @@
1818
<None Include="stravaig-icon.png" Pack="true" PackagePath="" />
1919
</ItemGroup>
2020

21-
2221
<ItemGroup>
2322
<ProjectReference Include="..\Stravaig.Configuration.Diagnostics.Core\Stravaig.Configuration.Diagnostics.Core.csproj" />
2423
</ItemGroup>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
using System.Collections.Generic;
22
using Microsoft.Extensions.Logging;
3+
#if NET5_0
4+
using Microsoft.Extensions.Logging.Console;
5+
#endif
36
using Stravaig.Extensions.Logging.Diagnostics;
47
using ILogger = Microsoft.Extensions.Logging.ILogger;
58

@@ -14,10 +17,19 @@ protected void SetupLogger()
1417
CaptureLoggerProvider = new TestCaptureLoggerProvider();
1518
var loggerFactory = LoggerFactory.Create(b =>
1619
{
20+
#if NETCOREAPP3_1
1721
b.AddConsole(o =>
1822
{
1923
o.DisableColors = true;
2024
});
25+
#elif NET5_0
26+
b.AddSimpleConsole(o =>
27+
{
28+
o.ColorBehavior = LoggerColorBehavior.Disabled;
29+
});
30+
#else
31+
Assert.Fail($"Unexpected target framework. Available target frameworks: {PreprocessorSymbols.StringList}");
32+
#endif
2133
b.AddProvider(CaptureLoggerProvider);
2234
b.SetMinimumLevel(LogLevel.Trace);
2335
});

‎src/Stravaig.Configuration.Diagnostics.Tests/LoggingExtensions/ConfigurationProviderTrackingExtensionsTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class ConfigurationProviderTrackingExtensionsTests : LoggerExtensionsTest
2222
[TestCaseSource(typeof(LogLevelSource))]
2323
public void NoProviders_LogsNoProviders(LogLevel level)
2424
{
25-
SetupConfig(b => { });
25+
SetupConfig();
2626
SetupLogger();
2727

2828
Logger.LogConfigurationKeySource(level, ConfigRoot, KeyName);
@@ -270,7 +270,7 @@ public void ThreeProviders_TwoWithValues_LogsTwoProvidersWithCompressedOption(Lo
270270
[Test]
271271
public void CheckInformationSpecificMethod()
272272
{
273-
SetupConfig(b => { });
273+
SetupConfig();
274274
SetupLogger();
275275

276276
Logger.LogConfigurationKeySourceAsInformation(ConfigRoot, KeyName);
@@ -282,7 +282,7 @@ public void CheckInformationSpecificMethod()
282282
[Test]
283283
public void CheckDebugSpecificMethod()
284284
{
285-
SetupConfig(b => { });
285+
SetupConfig();
286286
SetupLogger();
287287

288288
Logger.LogConfigurationKeySourceAsDebug(ConfigRoot, KeyName);
@@ -294,7 +294,7 @@ public void CheckDebugSpecificMethod()
294294
[Test]
295295
public void CheckTraceSpecificMethod()
296296
{
297-
SetupConfig(b => { });
297+
SetupConfig();
298298
SetupLogger();
299299

300300
Logger.LogConfigurationKeySourceAsTrace(ConfigRoot, KeyName);

0 commit comments

Comments
 (0)