Skip to content

chore: remove .NET7, bump packages #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Apr 23, 2025
Merged

chore: remove .NET7, bump packages #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
64f549b
start upgrading some packages
followynne Apr 6, 2025
6b77b4f
bump others pkgs
followynne Apr 7, 2025
4737d7a
try removing mssql image override
followynne Apr 7, 2025
db502b5
Update Serilog.Ui.SqliteProvider.Tests.csproj
followynne Apr 7, 2025
e75c46b
Update Serilog.Ui.SqliteProvider.Tests.csproj
followynne Apr 7, 2025
13b8b06
upgrade other pkgs
followynne Apr 7, 2025
e5bb831
try upgrading xunit
followynne Apr 7, 2025
45f6c69
revert xunit
followynne Apr 7, 2025
a179b7c
upd test prj
followynne Apr 10, 2025
1999116
reenable mongo
followynne Apr 10, 2025
3c22e4b
Merge branch 'master' into chore/remove-net7-bump-pkgs
followynne Apr 16, 2025
d01d377
fix: revert back sqlite core package due to old sqlite sink
followynne Apr 16, 2025
874a286
fix (raven-db): use latest stable version
followynne Apr 16, 2025
e6f6744
chore: fix mongodb
followynne Apr 19, 2025
fc08d4d
chore: bump npm
followynne Apr 19, 2025
839cfd8
chore: bump packages
followynne Apr 19, 2025
6a52427
don't bump packages without updated dependencies
followynne Apr 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/_build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
<ItemGroup>
<PackageDownload Include="dotnet-coverage" Version="[17.14.2]"/>
<PackageDownload Include="dotnet-reportgenerator-globaltool" Version="[5.4.5]"/>
<PackageDownload Include="dotnet-sonarscanner" Version="[10.1.1]" />
<PackageDownload Include="dotnet-sonarscanner" Version="[10.1.2]" />
</ItemGroup>
</Project>
14 changes: 7 additions & 7 deletions samples/WebApi/WebApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.*"/>
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1"/>
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.*"/>
<PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.*"/>
<PackageReference Include="Serilog.Sinks.Map" Version="2.0.0"/>
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="7.0.1" />
<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="10.0.0"/>
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1"/>
<PackageReference Include="Testcontainers" Version="3.10.0"/>
<PackageReference Include="Testcontainers.MsSql" Version="3.10.0"/>
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.1"/>
<PackageReference Include="Testcontainers" Version="4.4.0"/>
<PackageReference Include="Testcontainers.MsSql" Version="4.4.0"/>
</ItemGroup>

<!-- Serilog UI packages -->
<ItemGroup>
<!-- comment/uncomment to directly reference Nuget release
<PackageReference Include="Serilog.UI" Version="3.1.1"/>
<PackageReference Include="Serilog.UI.MsSqlServerProvider" Version="3.1.0"/>
<PackageReference Include="Serilog.UI.ElasticSearchProvider" Version="3.1.0"/>
<PackageReference Include="Serilog.UI" Version="3.2.0"/>
<PackageReference Include="Serilog.UI.MsSqlServerProvider" Version="3.2.0"/>
<PackageReference Include="Serilog.UI.ElasticSearchProvider" Version="3.2.0"/>
-->

<!-- comment/uncomment to directly reference solution projects -->
Expand Down
21 changes: 4 additions & 17 deletions samples/WebApp/HostedServices/MongoDbService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,13 @@ public class MongoDbService : IHostedService, IAsyncDisposable
{
private static IMongoRunner? _runner;

public Task StartAsync(CancellationToken cancellationToken)
public async Task StartAsync(CancellationToken cancellationToken)
{
_runner ??= MongoRunner.Run(new MongoRunnerOptions
_runner ??= await MongoRunner.RunAsync(new()
{
UseSingleNodeReplicaSet = true,
StandardOuputLogger = Console.WriteLine, // Default: null
StandardErrorLogger = Console.WriteLine, // Default: null
ConnectionTimeout = TimeSpan.FromSeconds(10), // Default: 30 seconds
ReplicaSetSetupTimeout = TimeSpan.FromSeconds(5), // Default: 10 seconds
AdditionalArguments = "--quiet", // Default: null
MongoPort = 27099, // Default: random available port

// EXPERIMENTAL - Only works on Windows and modern .NET (netcoreapp3.1, net5.0, net6.0, net7.0 and so on):
// Ensures that all MongoDB child processes are killed when the current process is prematurely killed,
// for instance when killed from the task manager or the IDE unit tests window. Processes are managed as a unit using
// job objects: https://learn.microsoft.com/en-us/windows/win32/procthread/job-objects
KillMongoProcessesWhenCurrentProcessExits = true // Default: false
});

return Task.CompletedTask;
MongoPort = 27099
}, cancellationToken);
}

public Task StopAsync(CancellationToken cancellationToken)
Expand Down
25 changes: 10 additions & 15 deletions samples/WebApp/WebApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

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

<ItemGroup>
<PackageReference Include="EphemeralMongo.Core" Version="1.1.3"/>
<PackageReference Include="EphemeralMongo6.runtime.linux-x64" Version="1.0.0" Condition="$([MSBuild]::IsOSPlatform('Linux'))"/>
<PackageReference Include="EphemeralMongo6.runtime.osx-x64" Version="1.0.0" Condition="$([MSBuild]::IsOSPlatform('OSX'))"/>
<PackageReference Include="EphemeralMongo6.runtime.win-x64" Version="1.1.3" Condition="$([MSBuild]::IsOSPlatform('Windows'))"/>
<PackageReference Include="Serilog.AspNetCore" Version="8.0.2"/>
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4"/>
<PackageReference Include="EphemeralMongo" Version="3.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageReference Include="Serilog.Sinks.MongoDB" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.MongoDB" Version="7.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.3*"/>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.*"/>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.*"/>
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3"/>
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4"/>
</ItemGroup>

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

<!-- Serilog UI packages -->
<ItemGroup>
<!-- comment/uncomment to directly reference Nuget release
<PackageReference Include="Serilog.UI" Version="3.1.1"/>
<PackageReference Include="Serilog.UI.MongoDbProvider" Version="3.1.0"/>
<PackageReference Include="Serilog.UI" Version="3.2.0"/>
<PackageReference Include="Serilog.UI.MongoDbProvider" Version="4.0.0"/>
-->

<!-- comment/uncomment to directly reference solution projects -->
Expand Down
6 changes: 3 additions & 3 deletions src/Serilog.Ui.MongoDbProvider/Serilog.Ui.MongoDbProvider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<PackageId>Serilog.UI.MongoDbProvider</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<LangVersion>latest</LangVersion>
<Version>3.1.0</Version>
<Version>4.0.0</Version>

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

<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="MongoDB.Driver" Version="2.30.0" />
<PackageReference Include="MongoDB.Driver" Version="3.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Serilog.Ui.MsSqlServerProvider/Serilog.Ui.MsSqlServerProvider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Version>3.1.0</Version>
<Version>3.2.0</Version>

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

<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.35" />
<PackageReference Include="Dapper" Version="2.1.66" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions src/Serilog.Ui.MySqlProvider/Serilog.Ui.MySqlProvider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<PackageId>Serilog.UI.MySqlProvider</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Version>3.1.0</Version>
<Version>3.2.0</Version>

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

<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.35" />
<PackageReference Include="MySqlConnector" Version="2.3.7" />
<PackageReference Include="Dapper" Version="2.1.66" />
<PackageReference Include="MySqlConnector" Version="2.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/Serilog.Ui.PostgreSqlProvider/Serilog.Ui.PostgreSqlProvider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

<PropertyGroup>
<PackageId>Serilog.UI.PostgreSqlProvider</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Version>3.1.0</Version>
<Version>4.0.0</Version>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<Description>PostgreSQL data provider for Serilog UI.</Description>
<PackageTags>serilog serilog-ui serilog.sinks.postgresql postgresql</PackageTags>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.35" />
<PackageReference Include="Npgsql" Version="8.0.4" />
<PackageReference Include="Dapper" Version="2.1.66" />
<PackageReference Include="Npgsql" Version="9.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Serilog.Ui.RavenDbProvider/Serilog.Ui.RavenDbProvider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<PackageId>Serilog.Ui.RavenDbProvider</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Version>2.1.0</Version>
<Version>3.0.0</Version>

<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="RavenDB.Client" Version="6.2.0"/>
<PackageReference Include="RavenDB.Client" Version="7.0.1"/>
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions src/Serilog.Ui.SqliteDataProvider/Serilog.Ui.SqliteDataProvider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
<PackageId>Serilog.UI.SqliteProvider</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Version>1.0.0</Version>
<Version>1.1.0</Version>

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

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

Expand Down
4 changes: 2 additions & 2 deletions src/Serilog.Ui.Web/Serilog.Ui.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<PackageId>Serilog.UI</PackageId>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Version>3.1.1</Version>
<Version>3.2.0</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
28 changes: 14 additions & 14 deletions src/Serilog.Ui.Web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,35 @@
},
"dependencies": {
"@fontsource/mononoki": "^5.2.5",
"@mantine/core": "^7.17.3",
"@mantine/dates": "^7.17.3",
"@mantine/hooks": "^7.17.3",
"@mantine/notifications": "^7.17.3",
"@mantine/core": "^7.17.4",
"@mantine/dates": "^7.17.4",
"@mantine/hooks": "^7.17.4",
"@mantine/notifications": "^7.17.4",
"@tabler/icons-react": "^3.31.0",
"@tanstack/react-query": "^5.71.10",
"@tanstack/react-query": "^5.74.4",
"dayjs": "^1.11.13",
"jose": "^6.0.10",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.55.0",
"react-router": "^7.5.0",
"react-router": "^7.5.1",
"xml-formatter": "^3.6.5"
},
"devDependencies": {
"@faker-js/faker": "^9.6.0",
"@faker-js/faker": "^9.7.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.3.0",
"@testing-library/user-event": "^14.6.1",
"@types/node": "^22.14.0",
"@types/node": "^22.14.1",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react-swc": "^3.8.1",
"@vitejs/plugin-react-swc": "^3.9.0",
"@vitest/coverage-istanbul": "^3.1.1",
"@vitest/ui": "^3.1.1",
"@welldone-software/why-did-you-render": "^10.0.1",
"eslint": "^8.57.0",
"eslint-config-prettier": "^10.1.1",
"eslint-config-prettier": "^10.1.2",
"eslint-plugin-html": "^8.1.2",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsx-a11y": "^6.10.2",
Expand All @@ -55,17 +55,17 @@
"eslint-plugin-vitest": "^0.5.4",
"eslint-plugin-vitest-globals": "^1.5.0",
"happy-dom": "^17.4.4",
"msw": "^2.7.3",
"msw": "^2.7.5",
"postcss": "^8.5.3",
"postcss-preset-mantine": "^1.17.0",
"postcss-simple-vars": "^7.0.1",
"prettier": "^3.5.3",
"prettier-plugin-organize-imports": "^4.1.0",
"shiki": "^3.2.1",
"shiki": "^3.2.2",
"testing-library-selector": "^0.3.1",
"typescript": "^5.8.3",
"typescript-eslint": "^8.29.0",
"vite": "^6.2.6",
"typescript-eslint": "^8.30.1",
"vite": "^6.3.2",
"vite-plugin-checker": "^0.9.1",
"vite-plugin-mkcert": "^1.17.8",
"vite-tsconfig-paths": "^5.1.4",
Expand Down
2 changes: 1 addition & 1 deletion src/Serilog.Ui.Web/src/mockServiceWorker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* - Please do NOT serve this file on production.
*/

const PACKAGE_VERSION = '2.7.3'
const PACKAGE_VERSION = '2.7.5'
const INTEGRITY_CHECKSUM = '00729d72e3b82faf54ca8b9621dbb96f'
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
const activeClientIds = new Set()
Expand Down
Loading
Loading