Skip to content

Commit bbd7012

Browse files
followynnefollowynne
authored
chore: remove .NET7 support, release new SDK-compliant major versions for Postgres-Mongo-RavenDB
1 parent 84c1025 commit bbd7012

File tree

28 files changed

+501
-352
lines changed

28 files changed

+501
-352
lines changed

‎build/_build.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
<ItemGroup>
2929
<PackageDownload Include="dotnet-coverage" Version="[17.14.2]"/>
3030
<PackageDownload Include="dotnet-reportgenerator-globaltool" Version="[5.4.5]"/>
31-
<PackageDownload Include="dotnet-sonarscanner" Version="[10.1.1]" />
31+
<PackageDownload Include="dotnet-sonarscanner" Version="[10.1.2]" />
3232
</ItemGroup>
3333
</Project>

‎samples/WebApi/WebApi.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@
1010
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.*"/>
1111
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
1212
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1"/>
13-
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.*"/>
13+
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.*"/>
1414
<PackageReference Include="Serilog.Sinks.Map" Version="2.0.0"/>
1515
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="7.0.1" />
1616
<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="10.0.0"/>
17-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1"/>
18-
<PackageReference Include="Testcontainers" Version="3.10.0"/>
19-
<PackageReference Include="Testcontainers.MsSql" Version="3.10.0"/>
17+
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1"/>
18+
<PackageReference Include="Testcontainers" Version="4.4.0"/>
19+
<PackageReference Include="Testcontainers.MsSql" Version="4.4.0"/>
2020
</ItemGroup>
2121

2222
<!-- Serilog UI packages -->
2323
<ItemGroup>
2424
<!-- comment/uncomment to directly reference Nuget release
25-
<PackageReference Include="Serilog.UI" Version="3.1.1"/>
26-
<PackageReference Include="Serilog.UI.MsSqlServerProvider" Version="3.1.0"/>
27-
<PackageReference Include="Serilog.UI.ElasticSearchProvider" Version="3.1.0"/>
25+
<PackageReference Include="Serilog.UI" Version="3.2.0"/>
26+
<PackageReference Include="Serilog.UI.MsSqlServerProvider" Version="3.2.0"/>
27+
<PackageReference Include="Serilog.UI.ElasticSearchProvider" Version="3.2.0"/>
2828
-->
2929

3030
<!-- comment/uncomment to directly reference solution projects -->

‎samples/WebApp/HostedServices/MongoDbService.cs‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,13 @@ public class MongoDbService : IHostedService, IAsyncDisposable
66
{
77
private static IMongoRunner? _runner;
88

9-
public Task StartAsync(CancellationToken cancellationToken)
9+
public async Task StartAsync(CancellationToken cancellationToken)
1010
{
11-
_runner ??= MongoRunner.Run(new MongoRunnerOptions
11+
_runner ??= await MongoRunner.RunAsync(new()
1212
{
1313
UseSingleNodeReplicaSet = true,
14-
StandardOuputLogger = Console.WriteLine, // Default: null
15-
StandardErrorLogger = Console.WriteLine, // Default: null
16-
ConnectionTimeout = TimeSpan.FromSeconds(10), // Default: 30 seconds
17-
ReplicaSetSetupTimeout = TimeSpan.FromSeconds(5), // Default: 10 seconds
18-
AdditionalArguments = "--quiet", // Default: null
19-
MongoPort = 27099, // Default: random available port
20-
21-
// EXPERIMENTAL - Only works on Windows and modern .NET (netcoreapp3.1, net5.0, net6.0, net7.0 and so on):
22-
// Ensures that all MongoDB child processes are killed when the current process is prematurely killed,
23-
// for instance when killed from the task manager or the IDE unit tests window. Processes are managed as a unit using
24-
// job objects: https://learn.microsoft.com/en-us/windows/win32/procthread/job-objects
25-
KillMongoProcessesWhenCurrentProcessExits = true // Default: false
26-
});
27-
28-
return Task.CompletedTask;
14+
MongoPort = 27099
15+
}, cancellationToken);
2916
}
3017

3118
public Task StopAsync(CancellationToken cancellationToken)

‎samples/WebApp/WebApp.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
55
<!-- change this target to test the sample on another framework-->
66
<TargetFramework>net8.0</TargetFramework>
77
<ImplicitUsings>enable</ImplicitUsings>
@@ -13,33 +13,28 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="EphemeralMongo.Core" Version="1.1.3"/>
17-
<PackageReference Include="EphemeralMongo6.runtime.linux-x64" Version="1.0.0" Condition="$([MSBuild]::IsOSPlatform('Linux'))"/>
18-
<PackageReference Include="EphemeralMongo6.runtime.osx-x64" Version="1.0.0" Condition="$([MSBuild]::IsOSPlatform('OSX'))"/>
19-
<PackageReference Include="EphemeralMongo6.runtime.win-x64" Version="1.1.3" Condition="$([MSBuild]::IsOSPlatform('Windows'))"/>
20-
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2"/>
21-
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4"/>
16+
<PackageReference Include="EphemeralMongo" Version="3.0.0" />
2217
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
23-
<PackageReference Include="Serilog.Sinks.MongoDB" Version="6.0.0" />
18+
<PackageReference Include="Serilog.Sinks.MongoDB" Version="7.0.0" />
2419
</ItemGroup>
2520

2621
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
27-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.3*"/>
28-
</ItemGroup>
29-
30-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
31-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.*"/>
22+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.*"/>
23+
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3"/>
24+
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4"/>
3225
</ItemGroup>
3326

3427
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
3528
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.*"/>
29+
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0"/>
30+
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0"/>
3631
</ItemGroup>
3732

3833
<!-- Serilog UI packages -->
3934
<ItemGroup>
4035
<!-- comment/uncomment to directly reference Nuget release
41-
<PackageReference Include="Serilog.UI" Version="3.1.1"/>
42-
<PackageReference Include="Serilog.UI.MongoDbProvider" Version="3.1.0"/>
36+
<PackageReference Include="Serilog.UI" Version="3.2.0"/>
37+
<PackageReference Include="Serilog.UI.MongoDbProvider" Version="4.0.0"/>
4338
-->
4439

4540
<!-- comment/uncomment to directly reference solution projects -->

‎src/Serilog.Ui.MongoDbProvider/Serilog.Ui.MongoDbProvider.csproj‎

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

33
<PropertyGroup>
44
<PackageId>Serilog.UI.MongoDbProvider</PackageId>
5-
<TargetFramework>netstandard2.0</TargetFramework>
5+
<TargetFramework>netstandard2.1</TargetFramework>
66
<LangVersion>latest</LangVersion>
7-
<Version>3.1.0</Version>
7+
<Version>4.0.0</Version>
88

99
<Authors>Christian Haase</Authors>
1010
<Description>MongoDB data provider for Serilog UI.</Description>
@@ -13,7 +13,7 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
16-
<PackageReference Include="MongoDB.Driver" Version="2.30.0" />
16+
<PackageReference Include="MongoDB.Driver" Version="3.3.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎src/Serilog.Ui.MsSqlServerProvider/Serilog.Ui.MsSqlServerProvider.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
<TargetFramework>netstandard2.0</TargetFramework>
77
<LangVersion>latest</LangVersion>
8-
<Version>3.1.0</Version>
8+
<Version>3.2.0</Version>
99

1010
<Description>Microsoft SQL Server data provider for Serilog UI.</Description>
1111
<PackageTags>serilog serilog-ui serilog.sinks.mssqlserver mssqlserver</PackageTags>
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Dapper" Version="2.1.35" />
15+
<PackageReference Include="Dapper" Version="2.1.66" />
1616
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
1717
</ItemGroup>
1818

‎src/Serilog.Ui.MySqlProvider/Serilog.Ui.MySqlProvider.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<PackageId>Serilog.UI.MySqlProvider</PackageId>
55
<TargetFramework>netstandard2.0</TargetFramework>
66
<LangVersion>latest</LangVersion>
7-
<Version>3.1.0</Version>
7+
<Version>3.2.0</Version>
88

99
<Description>MySQL and MariaDB data provider for Serilog UI.</Description>
1010
<PackageTags>serilog serilog-ui serilog.sinks.mysql serilog.sinks.mariadb</PackageTags>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Dapper" Version="2.1.35" />
15-
<PackageReference Include="MySqlConnector" Version="2.3.7" />
14+
<PackageReference Include="Dapper" Version="2.1.66" />
15+
<PackageReference Include="MySqlConnector" Version="2.4.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Serilog.Ui.PostgreSqlProvider/Serilog.Ui.PostgreSqlProvider.csproj‎

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

33
<PropertyGroup>
44
<PackageId>Serilog.UI.PostgreSqlProvider</PackageId>
5-
<TargetFramework>netstandard2.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<LangVersion>latest</LangVersion>
7-
<Version>3.1.0</Version>
7+
<Version>4.0.0</Version>
88
<GenerateDocumentationFile>True</GenerateDocumentationFile>
99
<Description>PostgreSQL data provider for Serilog UI.</Description>
1010
<PackageTags>serilog serilog-ui serilog.sinks.postgresql postgresql</PackageTags>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Dapper" Version="2.1.35" />
15-
<PackageReference Include="Npgsql" Version="8.0.4" />
14+
<PackageReference Include="Dapper" Version="2.1.66" />
15+
<PackageReference Include="Npgsql" Version="9.0.3" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Serilog.Ui.RavenDbProvider/Serilog.Ui.RavenDbProvider.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PackageId>Serilog.Ui.RavenDbProvider</PackageId>
55
<TargetFramework>netstandard2.0</TargetFramework>
66
<LangVersion>latest</LangVersion>
7-
<Version>2.1.0</Version>
7+
<Version>3.0.0</Version>
88

99
<Nullable>enable</Nullable>
1010
<ImplicitUsings>enable</ImplicitUsings>
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="RavenDB.Client" Version="6.2.0"/>
18+
<PackageReference Include="RavenDB.Client" Version="7.0.1"/>
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎src/Serilog.Ui.SqliteDataProvider/Serilog.Ui.SqliteDataProvider.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
<PackageId>Serilog.UI.SqliteProvider</PackageId>
55
<TargetFramework>netstandard2.0</TargetFramework>
66
<LangVersion>latest</LangVersion>
7-
<Version>1.0.0</Version>
7+
<Version>1.1.0</Version>
88

99
<Authors>Tech Garage (team)</Authors>
1010
<Description>SQLite data provider for Serilog UI.</Description>
1111
<PackageTags>serilog serilog-ui serilog.sinks.sqlite sqlite</PackageTags>
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Dapper" Version="2.1.35" />
15+
<PackageReference Include="Dapper" Version="2.1.66" />
16+
<!-- cannot upgrade due to old version referenced in sink -->
1617
<PackageReference Include="Microsoft.Data.Sqlite.Core" Version="8.0.*" />
1718
</ItemGroup>
1819

0 commit comments

Comments
 (0)