Skip to content

Commit 529cdcc

Browse files
ckadlubackadluba
committed
Upgraded solution to .NET 8
1 parent cbecaaf commit 529cdcc

File tree

9 files changed

+30
-25
lines changed

9 files changed

+30
-25
lines changed

‎Directory.Packages.props

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,25 @@
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
7-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
8-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
7+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
8+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
99
<PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
1010
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
11-
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.6" />
12-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
13-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
14-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
15-
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
16-
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
11+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
12+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
13+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
14+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
15+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
16+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
1717
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
1818
<PackageVersion Include="FluentAssertions" Version="6.7.0" />
1919
<PackageVersion Include="Dapper.StrongName" Version="2.0.123" />
2020
<PackageVersion Include="Moq" Version="4.18.2" />
21+
<PackageVersion Include="System.Text.Json" Version="6.0.10" />
2122
<PackageVersion Include="xunit" Version="2.9.0" />
2223
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
23-
<PackageVersion Include="Serilog" Version="4.0.0" />
24-
<PackageVersion Include="Serilog.Extensions.Hosting" Version="5.0.1" />
25-
<PackageVersion Include="Serilog.Settings.Configuration" Version="3.4.0" />
24+
<PackageVersion Include="Serilog" Version="4.1.0" />
25+
<PackageVersion Include="Serilog.Extensions.Hosting" Version="8.0.0" />
26+
<PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.4" />
2627
</ItemGroup>
2728
</Project>

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ Because of the way external configuration has been implemented in various .NET f
9191
| .NET Framework 4.6.2+ | `net462` | app or library | _System.Configuration_ |
9292
| .NET Framework 4.6.2+ | `net462` | app or library | _Microsoft.Extensions.Configuration_ |
9393
| .NET Standard 2.0 | `netstandard2.0` | library only | _Microsoft.Extensions.Configuration_ |
94-
| .NET 6.0+ | `net6.0` | app or library | _System.Configuration_ |
95-
| .NET 6.0+ | `net6.0` | app or library | _Microsoft.Extensions.Configuration_ |
94+
| .NET 8.0+ | `net8.0` | app or library | _System.Configuration_ |
95+
| .NET 8.0+ | `net8.0` | app or library | _Microsoft.Extensions.Configuration_ |
9696

9797
Although it's possible to use both XML and _M.E.C_ configuration with certain frameworks, this is not supported, unintended consequences are possible, and a warning will be emitted to `SelfLog`. If you actually require multiple configuration sources, the _M.E.C_ builder-pattern is designed to support this, and your syntax will be consistent across configuration sources.
9898

‎sample/CombinedConfigDemo/CombinedConfigDemo.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎sample/CustomLogEventFormatterDemo/CustomLogEventFormatterDemo.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎sample/NetStandardDemo/NetStandardDemoApp/NetStandardDemoApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎sample/WorkerServiceDemo/WorkerServiceDemo.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<UserSecretsId>dotnet-WorkerServiceDemo-A4DFF8A6-AC69-443B-A3B8-34E284CD1C78</UserSecretsId>
66
</PropertyGroup>
77

‎src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<Description>A Serilog sink that writes events to Microsoft SQL Server and Azure SQL</Description>
5-
<VersionPrefix>7.0.2</VersionPrefix>
6-
<EnablePackageValidation>true</EnablePackageValidation>
5+
<VersionPrefix>8.0.0</VersionPrefix>
6+
<EnablePackageValidation>false</EnablePackageValidation>
77
<PackageValidationBaselineVersion>7.0.0</PackageValidationBaselineVersion>
88
<Authors>Michiel van Oudheusden;Christian Kadluba;Serilog Contributors</Authors>
9-
<TargetFrameworks>netstandard2.0;net462;net472;net6.0</TargetFrameworks>
9+
<TargetFrameworks>netstandard2.0;net462;net472;net8.0</TargetFrameworks>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1111
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1212
<AssemblyName>Serilog.Sinks.MSSqlServer</AssemblyName>
@@ -60,7 +60,7 @@
6060
<Compile Include="Configuration\Implementations\Microsoft.Extensions.Configuration\**\*.cs" />
6161
</ItemGroup>
6262

63-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net462' ">
63+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net462' ">
6464
<PackageReference Include="System.Configuration.ConfigurationManager" />
6565
<Compile Include="Configuration\Extensions\Hybrid\**\*.cs" />
6666
<Compile Include="Configuration\Implementations\Microsoft.Extensions.Configuration\**\*.cs" />

‎test/Serilog.Sinks.MSSqlServer.PerformanceTests/Serilog.Sinks.MSSqlServer.PerformanceTests.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
66
<AssemblyName>Serilog.Sinks.MSSqlServer.PerformanceTests</AssemblyName>
77
<OutputType>Exe</OutputType>

‎test/Serilog.Sinks.MSSqlServer.Tests/Serilog.Sinks.MSSqlServer.Tests.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>net462;net472;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net472;net8.0</TargetFrameworks>
55
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
66
<AssemblyName>Serilog.Sinks.MSSqlServer.Tests</AssemblyName>
77
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
@@ -43,7 +43,7 @@
4343
<Compile Include="Configuration\Implementations\System.Configuration\**\*.cs" />
4444
</ItemGroup>
4545

46-
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
46+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
4747
<PackageReference Include="coverlet.collector">
4848
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4949
<PrivateAssets>all</PrivateAssets>
@@ -53,6 +53,10 @@
5353
<Compile Include="Configuration\Implementations\System.Configuration\**\*.cs" />
5454
</ItemGroup>
5555

56+
<ItemGroup>
57+
<Reference Include="System.Transactions" />
58+
</ItemGroup>
59+
5660
<ItemGroup>
5761
<None Update="App.config">
5862
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

0 commit comments

Comments
 (0)