Skip to content

Commit cfdb61f

Browse files
PawelGerrPawelGerr
committed
Update dependencies to v3.1.x
1 parent ed01aaa commit cfdb61f

File tree

9 files changed

+39
-36
lines changed

9 files changed

+39
-36
lines changed

Diff for: ‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Copyright>(c) 2020, Pawel Gerr. All rights reserved.</Copyright>
5-
<VersionPrefix>1.1.0</VersionPrefix>
5+
<VersionPrefix>2.0.0</VersionPrefix>
66
<Authors>Pawel Gerr</Authors>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageIcon>icon.png</PackageIcon>

Diff for: ‎example/Thinktecture.Extensions.Logging.Configuration.Example/Thinktecture.Extensions.Logging.Configuration.Example.csproj

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
35
<OutputType>Exe</OutputType>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
56
</PropertyGroup>
7+
68
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
8-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="2.2.0" />
10-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
9+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
11+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="3.1.3" />
12+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.3" />
1113
</ItemGroup>
14+
1215
<ItemGroup>
1316
<ProjectReference Include="..\..\src\Thinktecture.Extensions.Logging.Configuration\Thinktecture.Extensions.Logging.Configuration.csproj" />
1417
</ItemGroup>
18+
1519
<ItemGroup>
1620
<None Update="appsettings.json">
1721
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
1822
</None>
1923
</ItemGroup>
24+
2025
</Project>

Diff for: ‎example/Thinktecture.Extensions.Serilog.Configuration.Example/Thinktecture.Extensions.Serilog.Configuration.Example.csproj

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
35
<OutputType>Exe</OutputType>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
56
</PropertyGroup>
7+
68
<ItemGroup>
7-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
9+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
810
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
911
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
1012
</ItemGroup>
1113
<ItemGroup>
1214
<ProjectReference Include="..\..\src\Thinktecture.Extensions.Serilog.Configuration\Thinktecture.Extensions.Serilog.Configuration.csproj" />
1315
</ItemGroup>
16+
1417
<ItemGroup>
1518
<None Update="appsettings.json">
1619
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
1720
</None>
1821
</ItemGroup>
22+
1923
</Project>

Diff for: ‎src/Thinktecture.Extensions.Logging.Configuration/Extensions/Configuration/LoggingConfigurationProvider.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,7 @@ public void ResetAll()
5050

5151
private static string GetLevelName(LogLevel level)
5252
{
53-
if (!Enum.GetValues(typeof(LogLevel)).Cast<LogLevel>().Contains(level))
54-
throw new ArgumentException($"Provided value is not a valid {nameof(LogLevel)}: {level}", nameof(level));
55-
56-
return Enum.GetName(typeof(LogLevel), level);
53+
return Enum.GetName(typeof(LogLevel), level) ?? throw new ArgumentException($"Provided value is not a valid {nameof(LogLevel)}: {level}", nameof(level));
5754
}
5855

5956
private string BuildLogLevelPath(string? category, string? provider)

Diff for: ‎src/Thinktecture.Extensions.Logging.Configuration/Thinktecture.Extensions.Logging.Configuration.csproj

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
3-
<Description>Allows to configure log level of an Microsoft.Extensions.Logging.ILogger at runtime.</Description>
4-
<TargetFrameworks>netstandard1.1;netstandard2.0</TargetFrameworks>
5-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
4+
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
65
<PackageTags>logging;configuration;</PackageTags>
6+
<Description>Allows to configure log level of an Microsoft.Extensions.Logging.ILogger at runtime.</Description>
77
</PropertyGroup>
8-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
9-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
10-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
11-
</ItemGroup>
12-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
13-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.2" />
14-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
8+
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.3" />
11+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
1512
</ItemGroup>
13+
1614
</Project>

Diff for: ‎src/Thinktecture.Extensions.Serilog.Configuration/Extensions/Configuration/SerilogConfigurationProvider.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,7 @@ public void ResetAll()
5858

5959
private static string GetLevelName(LogEventLevel level)
6060
{
61-
if (!Enum.GetValues(typeof(LogEventLevel)).Cast<LogEventLevel>().Contains(level))
62-
throw new ArgumentException($"Provided value is not a valid {nameof(LogEventLevel)}: {level}", nameof(level));
63-
64-
return Enum.GetName(typeof(LogEventLevel), level);
61+
return Enum.GetName(typeof(LogEventLevel), level) ?? throw new ArgumentException($"Provided value is not a valid {nameof(LogEventLevel)}: {level}", nameof(level));
6562
}
6663

6764
private string BuildLogLevelPath(string? category, out string? additionalPath)

Diff for: ‎src/Thinktecture.Extensions.Serilog.Configuration/Thinktecture.Extensions.Serilog.Configuration.csproj

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
3-
<Description>Allows to configure log level of an Serilog.ILogger at runtime.</Description>
4-
<TargetFrameworks>netstandard1.1;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
55
<PackageTags>logging;configuration;serilog</PackageTags>
6+
<Description>Allows to configure log level of an Serilog.ILogger at runtime.</Description>
67
</PropertyGroup>
8+
79
<ItemGroup>
810
<PackageReference Include="Serilog" Version="2.9.0" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.3" />
912
</ItemGroup>
10-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
11-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
12-
</ItemGroup>
13-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
14-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.2" />
15-
</ItemGroup>
13+
1614
</Project>

Diff for: ‎test/Thinktecture.Extensions.Logging.Configuration.Tests/Thinktecture.Extensions.Logging.Configuration.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.2</TargetFramework>
3+
<TargetFramework>netcoreapp3.1</TargetFramework>
44
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
55
</PropertyGroup>
66
<ItemGroup>

Diff for: ‎test/Thinktecture.Extensions.Serilog.Configuration.Tests/Thinktecture.Extensions.Serilog.Configuration.Tests.csproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
45
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
56
</PropertyGroup>
7+
68
<ItemGroup>
79
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0" />
810
<PackageReference Include="xunit" Version="2.4.1" />
911
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
1012
<PackageReference Include="Moq" Version="4.13.1" />
1113
<PackageReference Include="FluentAssertions" Version="5.10.3" />
1214
</ItemGroup>
15+
1316
<ItemGroup>
1417
<ProjectReference Include="..\..\src\Thinktecture.Extensions.Serilog.Configuration\Thinktecture.Extensions.Serilog.Configuration.csproj" />
1518
</ItemGroup>
19+
1620
</Project>

0 commit comments

Comments
 (0)