From d0bb25ec43d80c6b5e4c68a513719a6973114395 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 02:19:30 +0000 Subject: [PATCH 01/45] chore(deps): bump ClickHouse.Client from 7.6.1 to 7.6.2 Bumps [ClickHouse.Client](https://github.com/DarkWanderer/ClickHouse.Client) from 7.6.1 to 7.6.2. - [Release notes](https://github.com/DarkWanderer/ClickHouse.Client/releases) - [Commits](https://github.com/DarkWanderer/ClickHouse.Client/compare/7.6.1...7.6.2) --- updated-dependencies: - dependency-name: ClickHouse.Client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- ...ogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj index 0c760d4..2aeb79e 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj @@ -13,7 +13,7 @@ - + From 4e1c049da9423fc16de574980b60e732456c1054 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 02:51:05 +0000 Subject: [PATCH 02/45] chore(deps): bump Swashbuckle.AspNetCore, Microsoft.Extensions.Logging.Abstractions and Microsoft.Extensions.Options Bumps [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore), [Microsoft.Extensions.Logging.Abstractions](https://github.com/aspnet/Logging) and [Microsoft.Extensions.Options](https://github.com/aspnet/Options). These dependencies needed to be updated together. Updates `Swashbuckle.AspNetCore` from 6.7.0 to 6.7.1 - [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases) - [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v6.7.0...v6.7.1) Updates `Microsoft.Extensions.Logging.Abstractions` from 2.0.0 to 2.1.0 - [Release notes](https://github.com/aspnet/Logging/releases) - [Commits](https://github.com/aspnet/Logging/compare/rel/2.0.0...2.1.0) Updates `Microsoft.Extensions.Options` from 2.0.0 to 2.1.0 - [Release notes](https://github.com/aspnet/Options/releases) - [Commits](https://github.com/aspnet/Options/compare/rel/2.0.0...2.1.0) --- updated-dependencies: - dependency-name: Swashbuckle.AspNetCore dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Microsoft.Extensions.Options dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.IntegrationTestProject.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj b/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj index 367ea74..30e7b2b 100644 --- a/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj @@ -1,7 +1,7 @@  - + From a1bc685aae0794138d771bc67b6cc2b76b827e5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 02:51:25 +0000 Subject: [PATCH 03/45] chore(deps): bump Dapr.AspNetCore and Microsoft.Extensions.Logging.Abstractions Bumps [Dapr.AspNetCore](https://github.com/dapr/dotnet-sdk) and [Microsoft.Extensions.Logging.Abstractions](https://github.com/aspnet/Extensions). These dependencies needed to be updated together. Updates `Dapr.AspNetCore` from 1.13.1 to 1.14.0 - [Release notes](https://github.com/dapr/dotnet-sdk/releases) - [Commits](https://github.com/dapr/dotnet-sdk/compare/v1.13.1...v1.14.0) Updates `Microsoft.Extensions.Logging.Abstractions` from 2.0.0 to 3.0.3 - [Release notes](https://github.com/aspnet/Extensions/releases) - [Commits](https://github.com/aspnet/Extensions/compare/2.0.0...v3.0.3) --- updated-dependencies: - dependency-name: Dapr.AspNetCore dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj b/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj index c72b727..18d6fcb 100644 --- a/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj +++ b/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj @@ -9,6 +9,6 @@ - + From 86efc18cbdca16b33ea86a775d6dac597a7dcc13 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 02:51:46 +0000 Subject: [PATCH 04/45] chore(deps): bump Microsoft.Extensions.Http.Polly, Microsoft.Extensions.Logging.Abstractions and Microsoft.Extensions.Options Bumps [Microsoft.Extensions.Http.Polly](https://github.com/dotnet/aspnetcore), [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/runtime) and [Microsoft.Extensions.Options](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `Microsoft.Extensions.Http.Polly` from 8.0.7 to 8.0.8 - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v8.0.7...v8.0.8) Updates `Microsoft.Extensions.Logging.Abstractions` from 2.0.0 to 8.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits/v8.0.0) Updates `Microsoft.Extensions.Options` from 2.0.0 to 8.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits/v8.0.0) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Http.Polly dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Options dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj index 5cf112a..fee9cc7 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj @@ -9,7 +9,7 @@ - + From 63f9b9dd346f131cb7eb734cff7f67204d10c8f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 02:52:02 +0000 Subject: [PATCH 05/45] chore(deps): bump Microsoft.EntityFrameworkCore.Relational, Microsoft.Extensions.Logging.Abstractions and Microsoft.Extensions.Options Bumps [Microsoft.EntityFrameworkCore.Relational](https://github.com/dotnet/efcore), [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/runtime) and [Microsoft.Extensions.Options](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `Microsoft.EntityFrameworkCore.Relational` from 8.0.7 to 8.0.8 - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v8.0.7...v8.0.8) Updates `Microsoft.Extensions.Logging.Abstractions` from 2.0.0 to 8.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits/v8.0.0) Updates `Microsoft.Extensions.Options` from 2.0.0 to 8.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits/v8.0.0) --- updated-dependencies: - dependency-name: Microsoft.EntityFrameworkCore.Relational dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Options dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- ...blogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj index 09ab697..30ed7b2 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj @@ -9,7 +9,7 @@ - + From 7a8220b29826efffc867d9df4d8766bc3fc4bab2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 02:52:20 +0000 Subject: [PATCH 06/45] chore(deps): bump Microsoft.EntityFrameworkCore.InMemory, Microsoft.Extensions.Logging.Abstractions and Microsoft.Extensions.Options Bumps [Microsoft.EntityFrameworkCore.InMemory](https://github.com/dotnet/efcore), [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/runtime) and [Microsoft.Extensions.Options](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `Microsoft.EntityFrameworkCore.InMemory` from 8.0.7 to 8.0.8 - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v8.0.7...v8.0.8) Updates `Microsoft.Extensions.Logging.Abstractions` from 2.0.0 to 8.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits/v8.0.0) Updates `Microsoft.Extensions.Options` from 2.0.0 to 8.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/commits/v8.0.0) --- updated-dependencies: - dependency-name: Microsoft.EntityFrameworkCore.InMemory dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Options dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.UnitTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index 825d04e..776977e 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -1,7 +1,7 @@ - + From 216c238b4dc72eb0af30be7920953ebed8106558 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 03:03:48 +0000 Subject: [PATCH 07/45] chore(deps): bump Microsoft.AspNetCore.Mvc.Testing and Microsoft.Extensions.Logging.Abstractions Bumps [Microsoft.AspNetCore.Mvc.Testing](https://github.com/dotnet/aspnetcore) and [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `Microsoft.AspNetCore.Mvc.Testing` from 8.0.7 to 8.0.10 - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v8.0.7...v8.0.10) Updates `Microsoft.Extensions.Logging.Abstractions` from 8.0.1 to 8.0.2 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.1...v8.0.2) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.IntegrationTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index d0dcead..82c07aa 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -1,7 +1,7 @@ - + From 0b09ed7af46b8c7ffb56d3afb748d5759d2665f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 03:04:10 +0000 Subject: [PATCH 08/45] chore(deps): bump Swashbuckle.AspNetCore from 6.7.1 to 6.8.1 Bumps [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 6.7.1 to 6.8.1. - [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases) - [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v6.7.1...v6.8.1) --- updated-dependencies: - dependency-name: Swashbuckle.AspNetCore dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.IntegrationTestProject.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj b/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj index 30e7b2b..5cc6354 100644 --- a/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj @@ -1,7 +1,7 @@  - + From 5b1adf0a1c2f958e7c0306bee0af170418bf9831 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 03:04:29 +0000 Subject: [PATCH 09/45] chore(deps): bump Microsoft.EntityFrameworkCore.Relational, Microsoft.Extensions.Caching.Memory and Microsoft.Extensions.Logging.Abstractions Bumps [Microsoft.EntityFrameworkCore.Relational](https://github.com/dotnet/efcore), [Microsoft.Extensions.Caching.Memory](https://github.com/dotnet/runtime) and [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `Microsoft.EntityFrameworkCore.Relational` from 8.0.8 to 8.0.10 - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v8.0.8...v8.0.10) Updates `Microsoft.Extensions.Caching.Memory` from 8.0.0 to 8.0.1 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.0...v8.0.1) Updates `Microsoft.Extensions.Logging.Abstractions` from 8.0.1 to 8.0.2 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.1...v8.0.2) --- updated-dependencies: - dependency-name: Microsoft.EntityFrameworkCore.Relational dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Caching.Memory dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- ...blogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj index 30ed7b2..c86356a 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj @@ -9,7 +9,7 @@ - + From a1e44a47a2e4c5c479a242b1dfc478e1d6b2d6e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 03:04:54 +0000 Subject: [PATCH 10/45] chore(deps): bump StackExchange.Redis from 2.8.0 to 2.8.16 Bumps [StackExchange.Redis](https://github.com/StackExchange/StackExchange.Redis) from 2.8.0 to 2.8.16. - [Release notes](https://github.com/StackExchange/StackExchange.Redis/releases) - [Changelog](https://github.com/StackExchange/StackExchange.Redis/blob/main/docs/ReleaseNotes.md) - [Commits](https://github.com/StackExchange/StackExchange.Redis/compare/2.8.0...2.8.16) --- updated-dependencies: - dependency-name: StackExchange.Redis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- ....Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj index 43bbc42..318a3c0 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj @@ -12,7 +12,7 @@ - + From ff3d504c289b98f5b58d7e61536cb7b47eab37c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 03:05:10 +0000 Subject: [PATCH 11/45] chore(deps): bump Microsoft.AspNetCore.OpenApi from 8.0.7 to 8.0.10 Bumps [Microsoft.AspNetCore.OpenApi](https://github.com/dotnet/aspnetcore) from 8.0.7 to 8.0.10. - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v8.0.7...v8.0.10) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.OpenApi dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj index ec2cae3..fb7ac33 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj @@ -8,7 +8,7 @@ - + From 68ed377a0d7471ea5612a293402eeb9eba31410e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 20:43:42 +0000 Subject: [PATCH 12/45] chore(deps): bump Microsoft.Extensions.Caching.Memory Bumps [Microsoft.Extensions.Caching.Memory](https://github.com/dotnet/runtime) from 8.0.0 to 8.0.1. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.0...v8.0.1) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Caching.Memory dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- ...chitecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj index ef303cb..95e0ed4 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj @@ -12,7 +12,7 @@ - + From e09c674fb1a176aced46aa5cf11e6f1b622d9f89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 14:59:15 +0000 Subject: [PATCH 13/45] chore(deps): bump Microsoft.EntityFrameworkCore.Relational and Microsoft.Extensions.Logging.Abstractions Bumps [Microsoft.EntityFrameworkCore.Relational](https://github.com/dotnet/efcore) and [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `Microsoft.EntityFrameworkCore.Relational` from 8.0.8 to 8.0.10 - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v8.0.8...v8.0.10) Updates `Microsoft.Extensions.Logging.Abstractions` from 8.0.1 to 8.0.2 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.1...v8.0.2) --- updated-dependencies: - dependency-name: Microsoft.EntityFrameworkCore.Relational dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- ...blogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj index 30ed7b2..c86356a 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj @@ -9,7 +9,7 @@ - + From 77c52a2365d1ca7db4c495d1a4a7ec5db032120f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 02:14:09 +0000 Subject: [PATCH 14/45] chore(deps): bump ClickHouse.Client and Microsoft.Extensions.Logging.Abstractions Bumps [ClickHouse.Client](https://github.com/DarkWanderer/ClickHouse.Client) and [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `ClickHouse.Client` from 7.6.2 to 7.8.2 - [Release notes](https://github.com/DarkWanderer/ClickHouse.Client/releases) - [Commits](https://github.com/DarkWanderer/ClickHouse.Client/compare/7.6.2...7.8.2) Updates `Microsoft.Extensions.Logging.Abstractions` from 8.0.1 to 8.0.2 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.1...v8.0.2) --- updated-dependencies: - dependency-name: ClickHouse.Client dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- ...ogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj index 2aeb79e..bfd4182 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj @@ -13,7 +13,7 @@ - + From a377614a3e497eddeff7dbdf9cffd5b539cb84da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 02:14:46 +0000 Subject: [PATCH 15/45] chore(deps): bump FluentAssertions from 6.12.0 to 6.12.1 Bumps [FluentAssertions](https://github.com/fluentassertions/fluentassertions) from 6.12.0 to 6.12.1. - [Release notes](https://github.com/fluentassertions/fluentassertions/releases) - [Changelog](https://github.com/fluentassertions/fluentassertions/blob/develop/AcceptApiChanges.ps1) - [Commits](https://github.com/fluentassertions/fluentassertions/compare/6.12.0...6.12.1) --- updated-dependencies: - dependency-name: FluentAssertions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.TestShared.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj index 3694159..9f010e2 100644 --- a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj +++ b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj @@ -1,6 +1,6 @@ - + \ No newline at end of file From 0cc65cfbb575af6eccf4b412438345eb0559aaa5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 02:15:56 +0000 Subject: [PATCH 16/45] chore(deps): bump Microsoft.NET.Test.Sdk from 17.10.0 to 17.11.1 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.10.0 to 17.11.1. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.10.0...v17.11.1) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.IntegrationTests.csproj | 2 +- .../Cnblogs.Architecture.UnitTests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index 82c07aa..f673048 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -2,7 +2,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index 776977e..e4d4960 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -2,7 +2,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive From f6def840728547e5880fb1c13e9f49c7eb7f2347 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 04:05:17 +0000 Subject: [PATCH 17/45] chore(deps): bump xunit from 2.9.0 to 2.9.2 Bumps [xunit](https://github.com/xunit/xunit) from 2.9.0 to 2.9.2. - [Commits](https://github.com/xunit/xunit/compare/v2-2.9.0...v2-2.9.2) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.IntegrationTests.csproj | 2 +- .../Cnblogs.Architecture.UnitTests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index f673048..a90d002 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -3,7 +3,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index e4d4960..d7e714d 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -3,7 +3,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From e8eb62e9f4d743887f7ccdc352474d78679123a9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 04:05:40 +0000 Subject: [PATCH 18/45] chore(deps): bump Microsoft.EntityFrameworkCore.InMemory and Microsoft.Extensions.Logging.Abstractions Bumps [Microsoft.EntityFrameworkCore.InMemory](https://github.com/dotnet/efcore) and [Microsoft.Extensions.Logging.Abstractions](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `Microsoft.EntityFrameworkCore.InMemory` from 8.0.8 to 8.0.10 - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v8.0.8...v8.0.10) Updates `Microsoft.Extensions.Logging.Abstractions` from 8.0.1 to 8.0.2 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v8.0.1...v8.0.2) --- updated-dependencies: - dependency-name: Microsoft.EntityFrameworkCore.InMemory dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Extensions.Logging.Abstractions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.UnitTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index e4d4960..3d29af2 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -1,7 +1,7 @@ - + From 8f21398530a6e1e22a1ef88a59c5dc79a1acb7ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Wed, 23 Oct 2024 12:38:39 +0800 Subject: [PATCH 19/45] chore: upgrade packages --- ....Architecture.Ddd.Cqrs.Abstractions.csproj | 2 +- ...gs.Architecture.Ddd.Cqrs.AspNetCore.csproj | 2 +- ...hitecture.Ddd.Cqrs.Dapper.SqlServer.csproj | 2 +- ...hitecture.Ddd.Cqrs.MongoDb.Analyzer.csproj | 2 +- .../MongoPageableQueryHandler.cs | 7 +++-- .../MongoQueryableExtensions.cs | 26 ------------------- ....Architecture.Ddd.Cqrs.ServiceAgent.csproj | 2 +- ...rchitecture.Ddd.Domain.Abstractions.csproj | 2 +- ...itecture.Ddd.Infrastructure.MongoDb.csproj | 2 +- .../MongoContextOptions.cs | 4 +-- ...Architecture.IntegrationTestProject.csproj | 2 +- ...blogs.Architecture.IntegrationTests.csproj | 2 +- 12 files changed, 13 insertions(+), 42 deletions(-) delete mode 100644 src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb/MongoQueryableExtensions.cs diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj index 4298a09..a3d6d3e 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj index fb7ac33..9069513 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj index 3a66b38..2385ae8 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj index 68b469a..b313693 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb/MongoPageableQueryHandler.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb/MongoPageableQueryHandler.cs index 5f9e6e1..a572c01 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb/MongoPageableQueryHandler.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb/MongoPageableQueryHandler.cs @@ -1,6 +1,5 @@ using Cnblogs.Architecture.Ddd.Cqrs.Abstractions; -using MongoDB.Driver; using MongoDB.Driver.Linq; namespace Cnblogs.Architecture.Ddd.Cqrs.MongoDb; @@ -18,12 +17,12 @@ public abstract class MongoPageableQueryHandler /// protected override Task CountAsync(TQuery query, IQueryable queryable) { - return queryable.AsMongoQueryable().CountAsync(); + return queryable.CountAsync(); } /// protected override Task> ToListAsync(TQuery query, IQueryable queryable) { - return queryable.AsMongoQueryable().ToListAsync(); + return queryable.ToListAsync(); } -} \ No newline at end of file +} diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb/MongoQueryableExtensions.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb/MongoQueryableExtensions.cs deleted file mode 100644 index ba74d14..0000000 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb/MongoQueryableExtensions.cs +++ /dev/null @@ -1,26 +0,0 @@ -using MongoDB.Driver.Linq; - -namespace Cnblogs.Architecture.Ddd.Cqrs.MongoDb; - -/// -/// MongoDb Queryable 扩展方法。 -/// -public static class MongoQueryableExtensions -{ - /// - /// 将 转换为 。 - /// - /// 输入的 IQueryable。 - /// 查询类型。 - /// 转换后的 - /// 输入的 不是 。 - public static IMongoQueryable AsMongoQueryable(this IQueryable queryable) - { - if (queryable is IMongoQueryable mongoQueryable) - { - return mongoQueryable; - } - - throw new InvalidCastException("input is not mongo queryable"); - } -} \ No newline at end of file diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj index fee9cc7..0abf125 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj b/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj index d4cfea7..d5de275 100644 --- a/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj +++ b/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj index 7b9ae97..f4e4317 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/MongoContextOptions.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/MongoContextOptions.cs index 13d13fb..535ad17 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/MongoContextOptions.cs +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/MongoContextOptions.cs @@ -1,5 +1,4 @@ using MongoDB.Driver; -using MongoDB.Driver.Linq; namespace Cnblogs.Architecture.Ddd.Infrastructure.MongoDb; @@ -41,7 +40,6 @@ protected MongoContextOptions(string connectionString, string databaseName) { _databaseName = databaseName; _settings = MongoClientSettings.FromConnectionString(connectionString); - _settings.LinqProvider = LinqProvider.V3; } /// @@ -62,4 +60,4 @@ private IMongoClient GetClient() _mongoClient ??= new MongoClient(_settings); return _mongoClient; } -} \ No newline at end of file +} diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj b/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj index 5cc6354..a8e0376 100644 --- a/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj @@ -1,7 +1,7 @@  - + diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index a90d002..ddc8f48 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -26,7 +26,7 @@ - + From 9585d5c8c4c42cbf74453f489826c9c500accbe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Sun, 27 Oct 2024 15:10:21 +0800 Subject: [PATCH 20/45] feat: add long to string json converter --- .../CommandEndpointHandler.cs | 22 +---- .../ControllerOptionInjector.cs | 13 ++- .../CqrsHttpOptions.cs | 9 ++ .../CqrsHttpOptionsInjector.cs | 12 +++ .../CqrsResult.cs | 7 +- .../CqrsResultExtensions.cs | 6 +- .../LongToStringConverter.cs | 39 ++++++++ .../QueryEndpointHandler.cs | 21 ++-- .../Commands/CreateLongToStringCommand.cs | 7 ++ .../CreateLongToStringCommandHandler.cs | 16 ++++ .../Queries/GetLongToStringQuery.cs | 6 ++ .../Queries/GetLongToStringQueryHandler.cs | 13 +++ .../Controllers/TestController.cs | 26 +++-- .../Models/LongToStringModel.cs | 6 ++ .../Program.cs | 5 +- .../CustomJsonConverterTests.cs | 96 +++++++++++++++++++ 16 files changed, 255 insertions(+), 49 deletions(-) create mode 100644 src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/LongToStringConverter.cs create mode 100644 test/Cnblogs.Architecture.IntegrationTestProject/Application/Commands/CreateLongToStringCommand.cs create mode 100644 test/Cnblogs.Architecture.IntegrationTestProject/Application/Commands/CreateLongToStringCommandHandler.cs create mode 100644 test/Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetLongToStringQuery.cs create mode 100644 test/Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetLongToStringQueryHandler.cs create mode 100644 test/Cnblogs.Architecture.IntegrationTestProject/Models/LongToStringModel.cs create mode 100644 test/Cnblogs.Architecture.IntegrationTests/CustomJsonConverterTests.cs diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CommandEndpointHandler.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CommandEndpointHandler.cs index 0b3b675..41b628c 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CommandEndpointHandler.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CommandEndpointHandler.cs @@ -8,21 +8,9 @@ namespace Cnblogs.Architecture.Ddd.Cqrs.AspNetCore; /// /// Execute command returned by endpoint handler, and then map command response to HTTP response. /// -public class CommandEndpointHandler : IEndpointFilter +public class CommandEndpointHandler(IMediator mediator, IOptions options) : IEndpointFilter { - private readonly IMediator _mediator; - private readonly CqrsHttpOptions _options; - - /// - /// Create a command endpoint handler. - /// - /// - /// The options for command response handling. - public CommandEndpointHandler(IMediator mediator, IOptions options) - { - _mediator = mediator; - _options = options.Value; - } + private readonly CqrsHttpOptions _options = options.Value; /// public async ValueTask InvokeAsync(EndpointFilterInvocationContext context, EndpointFilterDelegate next) @@ -40,7 +28,7 @@ public CommandEndpointHandler(IMediator mediator, IOptions opti return command; } - var response = await _mediator.Send(command); + var response = await mediator.Send(command); if (response is null) { // should not be null @@ -59,8 +47,8 @@ public CommandEndpointHandler(IMediator mediator, IOptions opti if (commandResponse is IObjectResponse objectResponse) { return context.HttpContext.Request.Headers.CqrsVersion() > 1 - ? Results.Extensions.Cqrs(response) - : Results.Ok(objectResponse.GetResult()); + ? Results.Extensions.Cqrs(response, _options.DefaultJsonSerializerOptions) + : Results.Json(objectResponse.GetResult(), _options.DefaultJsonSerializerOptions); } return Results.NoContent(); diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/ControllerOptionInjector.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/ControllerOptionInjector.cs index b8c8d1a..2b5ebc8 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/ControllerOptionInjector.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/ControllerOptionInjector.cs @@ -23,8 +23,17 @@ public static void AddCqrsModelBinderProvider(this MvcOptions options) /// Add custom model binder used for CQRS, like model binder for . /// /// - public static void AddCqrsModelBinderProvider(this IMvcBuilder builder) + public static IMvcBuilder AddCqrsModelBinderProvider(this IMvcBuilder builder) { - builder.AddMvcOptions(options => options.AddCqrsModelBinderProvider()); + return builder.AddMvcOptions(options => options.AddCqrsModelBinderProvider()); + } + + /// + /// Add long to string json converter. + /// + /// . + public static IMvcBuilder AddLongToStringJsonConverter(this IMvcBuilder builder) + { + return builder.AddJsonOptions(o => o.JsonSerializerOptions.Converters.Add(new LongToStringConverter())); } } diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsHttpOptions.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsHttpOptions.cs index ba5a454..71ea276 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsHttpOptions.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsHttpOptions.cs @@ -1,3 +1,4 @@ +using System.Text.Json; using Cnblogs.Architecture.Ddd.Cqrs.Abstractions; using Microsoft.AspNetCore.Http; @@ -17,4 +18,12 @@ public class CqrsHttpOptions /// Custom logic to handle error command response. /// public Func? CustomCommandErrorResponseMapper { get; set; } + + /// + /// Default json serializer options for minimal api. + /// + /// + /// For Controllers, please use builder.AddControllers().AddLongToStringJsonConverter(); + /// + public JsonSerializerOptions DefaultJsonSerializerOptions { get; set; } = new(JsonSerializerDefaults.Web); } diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsHttpOptionsInjector.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsHttpOptionsInjector.cs index 4b61921..76b0246 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsHttpOptionsInjector.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsHttpOptionsInjector.cs @@ -42,4 +42,16 @@ public static CqrsInjector UseCustomCommandErrorResponseMapper( }); return injector; } + + /// + /// Serialize long to string for all json output. + /// + /// + /// + public static CqrsInjector UseLongToStringJsonConverter(this CqrsInjector injector) + { + injector.Services.Configure( + o => o.DefaultJsonSerializerOptions.Converters.Add(new LongToStringConverter())); + return injector; + } } diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsResult.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsResult.cs index e391fd0..8dfe755 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsResult.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsResult.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Http; +using System.Text.Json; +using Microsoft.AspNetCore.Http; namespace Cnblogs.Architecture.Ddd.Cqrs.AspNetCore; @@ -6,12 +7,12 @@ namespace Cnblogs.Architecture.Ddd.Cqrs.AspNetCore; /// Send object as json and append X-Cqrs-Version header /// /// -public class CqrsResult(object commandResponse) : IResult +public class CqrsResult(object commandResponse, JsonSerializerOptions? options = null) : IResult { /// public Task ExecuteAsync(HttpContext httpContext) { httpContext.Response.Headers.Append("X-Cqrs-Version", "2"); - return httpContext.Response.WriteAsJsonAsync(commandResponse); + return httpContext.Response.WriteAsJsonAsync(commandResponse, options); } } diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsResultExtensions.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsResultExtensions.cs index cb6a2ef..8f46e56 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsResultExtensions.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsResultExtensions.cs @@ -1,3 +1,4 @@ +using System.Text.Json; using Microsoft.AspNetCore.Http; namespace Cnblogs.Architecture.Ddd.Cqrs.AspNetCore; @@ -12,10 +13,11 @@ public static class CqrsResultExtensions /// /// /// The command response. + /// Optional json serializer options. /// - public static IResult Cqrs(this IResultExtensions extensions, object result) + public static IResult Cqrs(this IResultExtensions extensions, object result, JsonSerializerOptions? options = null) { ArgumentNullException.ThrowIfNull(extensions); - return new CqrsResult(result); + return new CqrsResult(result, options); } } diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/LongToStringConverter.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/LongToStringConverter.cs new file mode 100644 index 0000000..6bf7781 --- /dev/null +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/LongToStringConverter.cs @@ -0,0 +1,39 @@ +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Cnblogs.Architecture.Ddd.Cqrs.AspNetCore; + +/// +/// Converter between long and string +/// +internal class LongToStringConverter : JsonConverter +{ + /// + public override long Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) + { + if (reader.TokenType != JsonTokenType.String) + { + return reader.GetInt64(); + } + + var raw = reader.GetString(); + if (string.IsNullOrWhiteSpace(raw)) + { + throw new JsonException("string is empty"); + } + + var success = long.TryParse(raw, out var parsed); + if (success == false) + { + throw new JsonException("string value can't be converted to long"); + } + + return parsed; + } + + /// + public override void Write(Utf8JsonWriter writer, long value, JsonSerializerOptions options) + { + writer.WriteStringValue(value.ToString()); + } +} diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/QueryEndpointHandler.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/QueryEndpointHandler.cs index f16a7e7..0316557 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/QueryEndpointHandler.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/QueryEndpointHandler.cs @@ -1,25 +1,14 @@ using MediatR; - using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Options; namespace Cnblogs.Architecture.Ddd.Cqrs.AspNetCore; /// /// The query executor, auto send query to . /// -public class QueryEndpointHandler : IEndpointFilter +public class QueryEndpointHandler(IMediator mediator, IOptions cqrsHttpOptions) : IEndpointFilter { - private readonly IMediator _mediator; - - /// - /// Create a . - /// - /// The mediator to use. - public QueryEndpointHandler(IMediator mediator) - { - _mediator = mediator; - } - /// public async ValueTask InvokeAsync(EndpointFilterInvocationContext context, EndpointFilterDelegate next) { @@ -34,7 +23,9 @@ public QueryEndpointHandler(IMediator mediator) return query; } - var response = await _mediator.Send(query); - return response == null ? Results.NotFound() : Results.Ok(response); + var response = await mediator.Send(query); + return response == null + ? Results.NotFound() + : Results.Json(response, cqrsHttpOptions.Value.DefaultJsonSerializerOptions); } } diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Application/Commands/CreateLongToStringCommand.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Application/Commands/CreateLongToStringCommand.cs new file mode 100644 index 0000000..4c139a9 --- /dev/null +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Application/Commands/CreateLongToStringCommand.cs @@ -0,0 +1,7 @@ +using Cnblogs.Architecture.Ddd.Cqrs.Abstractions; +using Cnblogs.Architecture.IntegrationTestProject.Application.Errors; +using Cnblogs.Architecture.IntegrationTestProject.Models; + +namespace Cnblogs.Architecture.IntegrationTestProject.Application.Commands; + +public record CreateLongToStringCommand(long Id, bool ValidateOnly = false) : ICommand; diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Application/Commands/CreateLongToStringCommandHandler.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Application/Commands/CreateLongToStringCommandHandler.cs new file mode 100644 index 0000000..830007b --- /dev/null +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Application/Commands/CreateLongToStringCommandHandler.cs @@ -0,0 +1,16 @@ +using Cnblogs.Architecture.Ddd.Cqrs.Abstractions; +using Cnblogs.Architecture.IntegrationTestProject.Application.Errors; +using Cnblogs.Architecture.IntegrationTestProject.Models; + +namespace Cnblogs.Architecture.IntegrationTestProject.Application.Commands; + +public class CreateLongToStringCommandHandler : ICommandHandler +{ + /// + public async Task> Handle( + CreateLongToStringCommand request, + CancellationToken cancellationToken) + { + return CommandResponse.Success(new LongToStringModel() { Id = request.Id }); + } +} diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetLongToStringQuery.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetLongToStringQuery.cs new file mode 100644 index 0000000..ac2ac59 --- /dev/null +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetLongToStringQuery.cs @@ -0,0 +1,6 @@ +using Cnblogs.Architecture.Ddd.Cqrs.Abstractions; +using Cnblogs.Architecture.IntegrationTestProject.Models; + +namespace Cnblogs.Architecture.IntegrationTestProject.Application.Queries; + +public record GetLongToStringQuery(long Id) : IQuery; diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetLongToStringQueryHandler.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetLongToStringQueryHandler.cs new file mode 100644 index 0000000..7e67258 --- /dev/null +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetLongToStringQueryHandler.cs @@ -0,0 +1,13 @@ +using Cnblogs.Architecture.Ddd.Cqrs.Abstractions; +using Cnblogs.Architecture.IntegrationTestProject.Models; + +namespace Cnblogs.Architecture.IntegrationTestProject.Application.Queries; + +public class GetLongToStringQueryHandler : IQueryHandler +{ + /// + public async Task Handle(GetLongToStringQuery request, CancellationToken cancellationToken) + { + return new LongToStringModel() { Id = request.Id }; + } +} diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Controllers/TestController.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Controllers/TestController.cs index 9207d1f..621e2e5 100644 --- a/test/Cnblogs.Architecture.IntegrationTestProject/Controllers/TestController.cs +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Controllers/TestController.cs @@ -2,6 +2,8 @@ using Cnblogs.Architecture.Ddd.Cqrs.AspNetCore; using Cnblogs.Architecture.Ddd.Infrastructure.Abstractions; using Cnblogs.Architecture.IntegrationTestProject.Application.Commands; +using Cnblogs.Architecture.IntegrationTestProject.Application.Queries; +using Cnblogs.Architecture.IntegrationTestProject.Models; using Cnblogs.Architecture.IntegrationTestProject.Payloads; using MediatR; using Microsoft.AspNetCore.Mvc; @@ -10,15 +12,8 @@ namespace Cnblogs.Architecture.IntegrationTestProject.Controllers; [ApiVersion("1")] [Route("/api/v{version:apiVersion}/mvc")] -public class TestController : ApiControllerBase +public class TestController(IMediator mediator) : ApiControllerBase { - private readonly IMediator _mediator; - - public TestController(IMediator mediator) - { - _mediator = mediator; - } - [HttpGet("paging")] public Task PagingParamsAsync([FromQuery] PagingParams? pagingParams) { @@ -29,7 +24,20 @@ public TestController(IMediator mediator) public async Task PutStringAsync(int id, [FromBody] UpdatePayload payload) { var response = - await _mediator.Send(new UpdateCommand(id, payload.NeedValidationError, payload.NeedExecutionError)); + await mediator.Send(new UpdateCommand(id, payload.NeedValidationError, payload.NeedExecutionError)); + return HandleCommandResponse(response); + } + + [HttpGet("json/long-to-string/{id:long}")] + public async Task GetLongToStringModelAsync(long id) + { + return await mediator.Send(new GetLongToStringQuery(id)); + } + + [HttpPost("json/long-to-string")] + public async Task CreateLongToStringModelAsync([FromBody] LongToStringModel model) + { + var response = await mediator.Send(new CreateLongToStringCommand(model.Id)); return HandleCommandResponse(response); } } diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Models/LongToStringModel.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Models/LongToStringModel.cs new file mode 100644 index 0000000..7b543b5 --- /dev/null +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Models/LongToStringModel.cs @@ -0,0 +1,6 @@ +namespace Cnblogs.Architecture.IntegrationTestProject.Models; + +public class LongToStringModel +{ + public long Id { get; set; } +} diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs index 6c9aa95..99d76c1 100644 --- a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs @@ -12,9 +12,10 @@ var builder = WebApplication.CreateBuilder(args); builder.Services.AddCqrs(Assembly.GetExecutingAssembly(), typeof(TestIntegrationEvent).Assembly) + .UseLongToStringJsonConverter() .AddDefaultDateTimeAndRandomProvider() .AddEventBus(o => o.UseDapr(Constants.AppName)); -builder.Services.AddControllers().AddCqrsModelBinderProvider(); +builder.Services.AddControllers().AddCqrsModelBinderProvider().AddLongToStringJsonConverter(); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle builder.Services.AddCnblogsApiVersioning(); @@ -46,6 +47,8 @@ async (int stringId, [FromQuery] bool found = true) => await Task.FromResult(new GetStringQuery(StringId: stringId, Found: found))); v1.MapQuery("strings"); +v1.MapQuery("long-to-string/{id:long}"); +v1.MapCommand("long-to-string"); v1.MapCommand( "strings", (CreatePayload payload) => Task.FromResult(new CreateCommand(payload.NeedError, payload.Data))); diff --git a/test/Cnblogs.Architecture.IntegrationTests/CustomJsonConverterTests.cs b/test/Cnblogs.Architecture.IntegrationTests/CustomJsonConverterTests.cs new file mode 100644 index 0000000..dd7aa41 --- /dev/null +++ b/test/Cnblogs.Architecture.IntegrationTests/CustomJsonConverterTests.cs @@ -0,0 +1,96 @@ +using System.Net.Http.Json; +using System.Text; +using System.Text.Json; +using Cnblogs.Architecture.IntegrationTestProject; +using Cnblogs.Architecture.IntegrationTestProject.Models; +using FluentAssertions; +using Microsoft.AspNetCore.Mvc.Testing; + +namespace Cnblogs.Architecture.IntegrationTests; + +public class CustomJsonConverterTests +{ + private static readonly JsonSerializerOptions WebDefaults = new(JsonSerializerDefaults.Web); + + [Theory] + [InlineData("/api/v1/mvc/json/long-to-string/")] + [InlineData("/api/v1/long-to-string/")] + public async Task LongToJson_WriteLongToString_CanBeParsedByServerAsync(string baseUrl) + { + // Arrange + const long id = 202410267558024668; + var builder = new WebApplicationFactory(); + + // Act + var response = await builder.CreateClient().GetAsync(baseUrl + id); + var serverObject = await response.Content.ReadFromJsonAsync(WebDefaults); + + // Assert + serverObject.Should().BeEquivalentTo(new LongToStringModel() { Id = id }); + } + + [Theory] + [InlineData("/api/v1/mvc/json/long-to-string/")] + [InlineData("/api/v1/long-to-string/")] + public async Task LongToJson_WriteLongToString_IsStringInJsonAsync(string baseUrl) + { + // Arrange + const long id = 202410267558024668; + var builder = new WebApplicationFactory(); + + // Act + var response = await builder.CreateClient().GetAsync(baseUrl + id); + var browserObject = await response.Content.ReadFromJsonAsync(WebDefaults); + + // Assert + browserObject.EnumerateObject().First().Value.GetString().Should().Be(id.ToString()); + } + + [Theory] + [InlineData("/api/v1/mvc/json/long-to-string/")] + [InlineData("/api/v1/long-to-string/")] + public async Task LongToJson_ReadLongFromString_SuccessAsync(string url) + { + // Arrange + const string json = """ + { + "id": "202410267558024668" + } + """; + + var builder = new WebApplicationFactory(); + + // Act + var response = await builder.CreateClient().PostAsync( + url, + new StringContent(json, Encoding.UTF8, "application/json")); + var model = await response.Content.ReadFromJsonAsync(WebDefaults); + + // Assert + model.EnumerateObject().First().Value.GetString().Should().Be("202410267558024668"); + } + + [Theory] + [InlineData("/api/v1/mvc/json/long-to-string/")] + [InlineData("/api/v1/long-to-string/")] + public async Task LongToJson_ReadLongFromNumber_SuccessAsync(string url) + { + // Arrange + const string json = """ + { + "id": 202410267558024668 + } + """; + + var builder = new WebApplicationFactory(); + + // Act + var response = await builder.CreateClient().PostAsync( + url, + new StringContent(json, Encoding.UTF8, "application/json")); + var model = await response.Content.ReadFromJsonAsync(WebDefaults); + + // Assert + model.EnumerateObject().First().Value.GetString().Should().Be("202410267558024668"); + } +} From a2db73fe3d17a6ba58ada6136bbf56df478d98f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Sun, 27 Oct 2024 15:11:08 +0800 Subject: [PATCH 21/45] chore: code clean up --- .../Application/Commands/CreateLongToStringCommandHandler.cs | 4 ++-- .../Application/Queries/GetLongToStringQueryHandler.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Application/Commands/CreateLongToStringCommandHandler.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Application/Commands/CreateLongToStringCommandHandler.cs index 830007b..10a1b3d 100644 --- a/test/Cnblogs.Architecture.IntegrationTestProject/Application/Commands/CreateLongToStringCommandHandler.cs +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Application/Commands/CreateLongToStringCommandHandler.cs @@ -7,10 +7,10 @@ namespace Cnblogs.Architecture.IntegrationTestProject.Application.Commands; public class CreateLongToStringCommandHandler : ICommandHandler { /// - public async Task> Handle( + public Task> Handle( CreateLongToStringCommand request, CancellationToken cancellationToken) { - return CommandResponse.Success(new LongToStringModel() { Id = request.Id }); + return Task.FromResult(CommandResponse.Success(new LongToStringModel() { Id = request.Id })); } } diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetLongToStringQueryHandler.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetLongToStringQueryHandler.cs index 7e67258..3583d8e 100644 --- a/test/Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetLongToStringQueryHandler.cs +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Application/Queries/GetLongToStringQueryHandler.cs @@ -6,8 +6,8 @@ namespace Cnblogs.Architecture.IntegrationTestProject.Application.Queries; public class GetLongToStringQueryHandler : IQueryHandler { /// - public async Task Handle(GetLongToStringQuery request, CancellationToken cancellationToken) + public Task Handle(GetLongToStringQuery request, CancellationToken cancellationToken) { - return new LongToStringModel() { Id = request.Id }; + return Task.FromResult((LongToStringModel?)new LongToStringModel() { Id = request.Id }); } } From 3d8c80d465de6ff2ec5f32ca4e45fdf992f05e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Sun, 27 Oct 2024 15:36:41 +0800 Subject: [PATCH 22/45] refactor: rename extension method --- .../CqrsHttpOptionsInjector.cs | 2 +- test/Cnblogs.Architecture.IntegrationTestProject/Program.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsHttpOptionsInjector.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsHttpOptionsInjector.cs index 76b0246..8de27bc 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsHttpOptionsInjector.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsHttpOptionsInjector.cs @@ -48,7 +48,7 @@ public static CqrsInjector UseCustomCommandErrorResponseMapper( /// /// /// - public static CqrsInjector UseLongToStringJsonConverter(this CqrsInjector injector) + public static CqrsInjector AddLongToStringJsonConverter(this CqrsInjector injector) { injector.Services.Configure( o => o.DefaultJsonSerializerOptions.Converters.Add(new LongToStringConverter())); diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs index 99d76c1..45aef48 100644 --- a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs @@ -12,7 +12,7 @@ var builder = WebApplication.CreateBuilder(args); builder.Services.AddCqrs(Assembly.GetExecutingAssembly(), typeof(TestIntegrationEvent).Assembly) - .UseLongToStringJsonConverter() + .AddLongToStringJsonConverter() .AddDefaultDateTimeAndRandomProvider() .AddEventBus(o => o.UseDapr(Constants.AppName)); builder.Services.AddControllers().AddCqrsModelBinderProvider().AddLongToStringJsonConverter(); From 95d7b93823a9287c23855a2d67d6f9714fe8c46e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Wed, 13 Nov 2024 15:53:26 +0800 Subject: [PATCH 23/45] chore: go net9 --- .github/workflows/ci.yml | 14 +++++++++++++- .github/workflows/pack.yml | 2 +- Directory.Build.props | 2 +- ...blogs.Architecture.Ddd.Cqrs.Abstractions.csproj | 9 +++++++++ ...Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj | 10 +++++++++- ...blogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj | 8 ++++++++ ...d.Infrastructure.CacheProviders.InMemory.csproj | 13 +++++++++---- ...s.Architecture.Ddd.Infrastructure.Dapper.csproj | 7 +++++++ ...cture.Ddd.Infrastructure.EntityFramework.csproj | 2 +- ...logs.Architecture.IntegrationTestProject.csproj | 4 ---- .../Program.cs | 8 -------- .../Cnblogs.Architecture.IntegrationTests.csproj | 10 ++++++++-- .../Cnblogs.Architecture.TestShared.csproj | 4 ++-- .../Cnblogs.Architecture.UnitTests.csproj | 2 +- 14 files changed, 69 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa3c664..ad5ce92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ on: branches: [ "main" ] jobs: - test: + test-net8: runs-on: ubuntu-latest container: mcr.microsoft.com/dotnet/sdk:8.0 @@ -18,4 +18,16 @@ jobs: run: ./build.sh - name: Test run: ./test.sh + + test-net9: + runs-on: ubuntu-latest + container: mcr.microsoft.com/dotnet/sdk:9.0 + + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Build + run: ./build.sh + - name: Test + run: ./test.sh diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml index 0feb310..124a3e3 100644 --- a/.github/workflows/pack.yml +++ b/.github/workflows/pack.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-dotnet@v3 with: - dotnet-version: '8' + dotnet-version: '9' - name: Nuget Push env: nuget_key: ${{ secrets.NUGETAPIKEY }} diff --git a/Directory.Build.props b/Directory.Build.props index e620c99..5b2e9d9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - net8.0 + net8.0;net9.0 enable enable Cnblogs diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj index a3d6d3e..1113372 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj @@ -17,8 +17,17 @@ + + + + + + + + + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj index 9069513..7dbbbcf 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj @@ -8,9 +8,17 @@ - + + + + + + + + + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj index 0abf125..090e93e 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj @@ -9,8 +9,16 @@ + + + + + + + + CqrsHeaderNames.cs diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj index 95e0ed4..32e6024 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj @@ -7,12 +7,17 @@ - - + + - - + + + + + + + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj index 922a3e0..9be1738 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj @@ -10,7 +10,14 @@ + + + + + + + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj index c86356a..dca9848 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj @@ -9,7 +9,7 @@ - + diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj b/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj index a8e0376..9c4c9b5 100644 --- a/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj @@ -1,9 +1,5 @@  - - - - diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs index 45aef48..fed4166 100644 --- a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs @@ -19,17 +19,9 @@ // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle builder.Services.AddCnblogsApiVersioning(); -builder.Services.AddSwaggerGen(); var app = builder.Build(); -// Configure the HTTP request pipeline. -if (app.Environment.IsDevelopment()) -{ - app.UseSwagger(); - app.UseSwaggerUI(); -} - app.UseAuthorization(); app.MapControllers(); diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index ddc8f48..685c378 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -1,7 +1,6 @@ - @@ -14,6 +13,13 @@ + + + + + + + @@ -22,7 +28,7 @@ - + diff --git a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj index 9f010e2..e633a27 100644 --- a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj +++ b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index 1e6dabb..3880bba 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -1,7 +1,7 @@ - + From 48210c3ae078f9da39e0ae1a423ae09b7baa07fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Wed, 13 Nov 2024 16:08:11 +0800 Subject: [PATCH 24/45] ci: specify framework version --- .github/workflows/ci.yml | 10 +++++----- build.sh | 4 ++-- test.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad5ce92..6697e17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,10 +15,10 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Build - run: ./build.sh + run: ./build.sh net8.0 - name: Test - run: ./test.sh - + run: ./test.sh net8.0 + test-net9: runs-on: ubuntu-latest container: mcr.microsoft.com/dotnet/sdk:9.0 @@ -27,7 +27,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Build - run: ./build.sh + run: ./build.sh net9.0 - name: Test - run: ./test.sh + run: ./test.sh net9.0 diff --git a/build.sh b/build.sh index 3b38df0..5c736c2 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -e -dotnet restore -dotnet build -c Release +dotnet restore -p:TargetFramework="$1" +dotnet build -c Release -p:TargetFramework="$1" diff --git a/test.sh b/test.sh index 651757d..6738766 100755 --- a/test.sh +++ b/test.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash set -e -dotnet test -c Release +dotnet test -c Release -p:TargetFramework="$1" From 239ba47efcc0b2017b01cdb2e35a706e2da8f2cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Wed, 13 Nov 2024 16:12:41 +0800 Subject: [PATCH 25/45] ci: skip restore when building --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 5c736c2..6908b50 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash set -e dotnet restore -p:TargetFramework="$1" -dotnet build -c Release -p:TargetFramework="$1" +dotnet build -c Release -p:TargetFramework="$1" --no-restore From 158781824977f04f7b21b19b7c3aa07a96aef8dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Wed, 13 Nov 2024 16:18:24 +0800 Subject: [PATCH 26/45] ci: use -f instead of -p for testing --- test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.sh b/test.sh index 6738766..2c7d4f9 100755 --- a/test.sh +++ b/test.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash set -e -dotnet test -c Release -p:TargetFramework="$1" +dotnet test -c Release -f "$1" From 97fb1794c38c7a221aca990375abef7b6cc6f914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Wed, 13 Nov 2024 16:21:10 +0800 Subject: [PATCH 27/45] ci: do not build or restore when testing --- test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.sh b/test.sh index 2c7d4f9..4c41aad 100755 --- a/test.sh +++ b/test.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash set -e -dotnet test -c Release -f "$1" +dotnet test -c Release -f "$1" --no-build --no-restore From 766acbcad26bfd0bab98fbba1f71b9a9fc0d6448 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 02:06:51 +0000 Subject: [PATCH 28/45] chore(deps): bump Microsoft.NET.Test.Sdk from 17.11.1 to 17.12.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.11.1 to 17.12.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.11.1...v17.12.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.IntegrationTests.csproj | 4 ++-- .../Cnblogs.Architecture.UnitTests.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index 685c378..37b244e 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -1,7 +1,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive @@ -14,7 +14,7 @@ - + diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index 3880bba..ccc537a 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -2,7 +2,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive From a209f240786d4302fa2eac7e6b7fa25b2cf1ebce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 02:07:20 +0000 Subject: [PATCH 29/45] chore(deps): bump ClickHouse.Client from 7.8.2 to 7.9.1 Bumps [ClickHouse.Client](https://github.com/DarkWanderer/ClickHouse.Client) from 7.8.2 to 7.9.1. - [Release notes](https://github.com/DarkWanderer/ClickHouse.Client/releases) - [Commits](https://github.com/DarkWanderer/ClickHouse.Client/compare/7.8.2...7.9.1) --- updated-dependencies: - dependency-name: ClickHouse.Client dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- ...ogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj index bfd4182..31688f7 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj @@ -13,7 +13,7 @@ - + From 227e66f0526fe59da9e9e2d978064a3273f12046 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 02:59:26 +0000 Subject: [PATCH 30/45] chore(deps): bump StackExchange.Redis from 2.8.16 to 2.8.22 Bumps [StackExchange.Redis](https://github.com/StackExchange/StackExchange.Redis) from 2.8.16 to 2.8.22. - [Release notes](https://github.com/StackExchange/StackExchange.Redis/releases) - [Changelog](https://github.com/StackExchange/StackExchange.Redis/blob/main/docs/ReleaseNotes.md) - [Commits](https://github.com/StackExchange/StackExchange.Redis/compare/2.8.16...2.8.22) --- updated-dependencies: - dependency-name: StackExchange.Redis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- ....Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj index 318a3c0..a0fc0fa 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj @@ -12,7 +12,7 @@ - + From fd2f21e9742e6de7a9a6c9506d4ce3661622ec48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Dec 2024 11:03:45 +0800 Subject: [PATCH 31/45] chore(deps): bump FluentAssertions from 6.12.2 to 7.0.0 (#292) Bumps [FluentAssertions](https://github.com/fluentassertions/fluentassertions) from 6.12.2 to 7.0.0. - [Release notes](https://github.com/fluentassertions/fluentassertions/releases) - [Changelog](https://github.com/fluentassertions/fluentassertions/blob/develop/AcceptApiChanges.ps1) - [Commits](https://github.com/fluentassertions/fluentassertions/compare/6.12.2...7.0.0) --- updated-dependencies: - dependency-name: FluentAssertions dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../Cnblogs.Architecture.TestShared.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj index e633a27..e158d3a 100644 --- a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj +++ b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj @@ -1,6 +1,6 @@ - + \ No newline at end of file From d172863389dfe8d012afef97f14d2eb312f36869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Wed, 4 Dec 2024 13:48:14 +0800 Subject: [PATCH 32/45] chore: split testing packages by target frameworks (#293) --- ...gs.Architecture.Ddd.Cqrs.AspNetCore.csproj | 2 +- .../CqrsResult.cs | 3 ++- .../IUnitOfWork.cs | 5 +---- ...blogs.Architecture.IntegrationTests.csproj | 22 +++---------------- .../Cnblogs.Architecture.TestShared.csproj | 20 ++++++++++++----- .../Cnblogs.Architecture.UnitTests.csproj | 2 -- 6 files changed, 22 insertions(+), 32 deletions(-) diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj index 7dbbbcf..806be24 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsResult.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsResult.cs index 8dfe755..1338254 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsResult.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/CqrsResult.cs @@ -6,7 +6,8 @@ namespace Cnblogs.Architecture.Ddd.Cqrs.AspNetCore; /// /// Send object as json and append X-Cqrs-Version header /// -/// +/// Response body. +/// to use. public class CqrsResult(object commandResponse, JsonSerializerOptions? options = null) : IResult { /// diff --git a/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IUnitOfWork.cs b/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IUnitOfWork.cs index 85e2897..d993245 100644 --- a/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IUnitOfWork.cs +++ b/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IUnitOfWork.cs @@ -20,7 +20,6 @@ public interface IUnitOfWork /// 添加实体，调用 或 后才会写入数据库。 /// /// 要添加实体。 - /// 实体类型。 /// 被添加的实体。 TEntity Add(TEntity entity); @@ -28,7 +27,6 @@ public interface IUnitOfWork /// 更新实体，调用 或 后才会写入数据库。 /// /// 要更新的实体。 - /// 实体类型。 /// 被更新的实体。 TEntity Update(TEntity entity); @@ -36,7 +34,6 @@ public interface IUnitOfWork /// 删除实体，调用 或 后才会写入数据库。 /// /// 要删除的实体。 - /// 实体类型。 /// TEntity Delete(TEntity entity); @@ -53,4 +50,4 @@ public interface IUnitOfWork /// 。 /// 提交是否成功。 Task SaveEntitiesAsync(CancellationToken cancellationToken = default); -} \ No newline at end of file +} diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index 37b244e..16d5d1a 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -1,8 +1,6 @@ - - runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -11,13 +9,9 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - - - + + + @@ -29,14 +23,4 @@ - - - - - - - - - - diff --git a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj index e158d3a..d8f6df3 100644 --- a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj +++ b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj @@ -1,6 +1,16 @@ - - - - - \ No newline at end of file + + + + + + + + + + + + + + + diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index ccc537a..7da9e72 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -2,8 +2,6 @@ - - runtime; build; native; contentfiles; analyzers; buildtransitive all From 7eb765e5d9e989bd6cbc8110358a61b988aa41f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 02:38:23 +0000 Subject: [PATCH 33/45] chore(deps): bump MongoDB.Driver from 3.0.0 to 3.1.0 Bumps [MongoDB.Driver](https://github.com/mongodb/mongo-csharp-driver) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/mongodb/mongo-csharp-driver/releases) - [Commits](https://github.com/mongodb/mongo-csharp-driver/compare/v3.0.0...v3.1.0) --- updated-dependencies: - dependency-name: MongoDB.Driver dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj index f4e4317..a294ad9 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj @@ -10,7 +10,7 @@ - + From e921b0260087d772a277b02f1270ffa48e5bb866 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 02:39:20 +0000 Subject: [PATCH 34/45] chore(deps): bump Serilog.AspNetCore from 8.0.3 to 9.0.0 Bumps [Serilog.AspNetCore](https://github.com/serilog/serilog-aspnetcore) from 8.0.3 to 9.0.0. - [Release notes](https://github.com/serilog/serilog-aspnetcore/releases) - [Commits](https://github.com/serilog/serilog-aspnetcore/compare/v8.0.3...v9.0.0) --- updated-dependencies: - dependency-name: Serilog.AspNetCore dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj | 4 ++-- .../Cnblogs.Architecture.IntegrationTests.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj index 806be24..864b0e0 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj @@ -8,11 +8,11 @@ - + - + diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index 16d5d1a..95f5974 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -11,7 +11,7 @@ - + From bbfc07778d8eaecd3b1d33548d9dbb51fabd3486 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 02:17:22 +0000 Subject: [PATCH 35/45] chore(deps): bump StackExchange.Redis from 2.8.22 to 2.8.24 Bumps [StackExchange.Redis](https://github.com/StackExchange/StackExchange.Redis) from 2.8.22 to 2.8.24. - [Release notes](https://github.com/StackExchange/StackExchange.Redis/releases) - [Changelog](https://github.com/StackExchange/StackExchange.Redis/blob/main/docs/ReleaseNotes.md) - [Commits](https://github.com/StackExchange/StackExchange.Redis/compare/2.8.22...2.8.24) --- updated-dependencies: - dependency-name: StackExchange.Redis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- ....Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj index a0fc0fa..d45e4c7 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj @@ -12,7 +12,7 @@ - + From 5092a929534ed16a1885329cd5d44a21b071e9dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 02:18:41 +0000 Subject: [PATCH 36/45] chore(deps): bump xunit.runner.visualstudio from 2.8.2 to 3.0.0 Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.8.2 to 3.0.0. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/2.8.2...3.0.0) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.IntegrationTests.csproj | 2 +- .../Cnblogs.Architecture.UnitTests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index 16d5d1a..6104d10 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -1,7 +1,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index 7da9e72..830594a 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -2,7 +2,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From cfd18b8239e77d71efefcc37b031988a352a2e5d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 02:52:40 +0000 Subject: [PATCH 37/45] chore(deps): bump coverlet.collector from 6.0.2 to 6.0.3 Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 6.0.2 to 6.0.3. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/compare/v6.0.2...v6.0.3) --- updated-dependencies: - dependency-name: coverlet.collector dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../Cnblogs.Architecture.IntegrationTests.csproj | 2 +- .../Cnblogs.Architecture.UnitTests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index 16d5d1a..e0da71d 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -5,7 +5,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index 7da9e72..263dbc9 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -6,7 +6,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 39594ada09d848b3b6a5cb26a1202eae06dae859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Thu, 9 Jan 2025 15:05:15 +0800 Subject: [PATCH 38/45] chore: tweak package version for net8 (#299) --- .../Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj | 2 +- .../Cnblogs.Architecture.TestShared.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj index 864b0e0..b3002d4 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj index d8f6df3..004bb08 100644 --- a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj +++ b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj @@ -2,7 +2,7 @@ - + From 753963167531c81896fdec177eafe12917324d58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Fri, 7 Feb 2025 12:01:57 +0800 Subject: [PATCH 39/45] feat: implement clickhouse connection factory with IClickhouseDataSource (#305) --- .../ClickhouseDbConnectionFactory.cs | 17 +++-------------- .../DapperConfigurationBuilderExtension.cs | 3 ++- .../DapperConfigurationBuilder.cs | 17 +++++++++++++++-- .../ClickhouseDapperContext.cs | 6 ++++-- ....Ddd.Infrastructure.Dapper.Clickhouse.csproj | 2 +- .../DapperContext.cs | 10 +++++++--- .../DbConnectionFactoryCollection.cs | 8 ++++---- 7 files changed, 36 insertions(+), 27 deletions(-) diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.Clickhouse/ClickhouseDbConnectionFactory.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.Clickhouse/ClickhouseDbConnectionFactory.cs index 6021841..e2e43b7 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.Clickhouse/ClickhouseDbConnectionFactory.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.Clickhouse/ClickhouseDbConnectionFactory.cs @@ -1,5 +1,5 @@ using System.Data; -using ClickHouse.Client.ADO; +using ClickHouse.Client; using Cnblogs.Architecture.Ddd.Infrastructure.Dapper; namespace Cnblogs.Architecture.Ddd.Cqrs.Dapper.Clickhouse; @@ -7,22 +7,11 @@ namespace Cnblogs.Architecture.Ddd.Cqrs.Dapper.Clickhouse; /// /// Clickhouse connection factory. /// -public class ClickhouseDbConnectionFactory : IDbConnectionFactory +public class ClickhouseDbConnectionFactory(IClickHouseDataSource dataSource) : IDbConnectionFactory { - private readonly string _connectionString; - - /// - /// Create a clickhouse connection factory. - /// - /// The connection string. - public ClickhouseDbConnectionFactory(string connectionString) - { - _connectionString = connectionString; - } - /// public IDbConnection CreateDbConnection() { - return new ClickHouseConnection(_connectionString); + return dataSource.CreateConnection(); } } diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.Clickhouse/DapperConfigurationBuilderExtension.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.Clickhouse/DapperConfigurationBuilderExtension.cs index 590eace..bf5d921 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.Clickhouse/DapperConfigurationBuilderExtension.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.Clickhouse/DapperConfigurationBuilderExtension.cs @@ -21,7 +21,8 @@ public static void UseClickhouse( string connectionString) where TContext : ClickhouseDapperContext { - builder.UseDbConnectionFactory(new ClickhouseDbConnectionFactory(connectionString)); + builder.UseDbConnectionFactory(); + builder.Services.AddClickHouseDataSource(connectionString); builder.Services.AddSingleton(new ClickhouseContextOptions(connectionString)); builder.Services.Configure(x => x.Add()); builder.Services.AddHostedService(); diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper/DapperConfigurationBuilder.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper/DapperConfigurationBuilder.cs index 95cb79a..62a3542 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper/DapperConfigurationBuilder.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper/DapperConfigurationBuilder.cs @@ -29,10 +29,23 @@ public DapperConfigurationBuilder(IServiceCollection services) /// 工厂对象。 /// 工厂类型。 public void UseDbConnectionFactory(TFactory factory) - where TFactory : IDbConnectionFactory + where TFactory : class, IDbConnectionFactory { + Services.AddSingleton(factory); Services.Configure( - c => c.AddDbConnectionFactory(_dapperContextTypeName, factory)); + c => c.AddDbConnectionFactory(_dapperContextTypeName, typeof(TFactory))); + } + + /// + /// Add as and get instance from DI when used. + /// + /// The factory type. + public void UseDbConnectionFactory() + where TFactory : class, IDbConnectionFactory + { + Services.AddSingleton(); + Services.Configure( + c => c.AddDbConnectionFactory(_dapperContextTypeName, typeof(TFactory))); } /// diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/ClickhouseDapperContext.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/ClickhouseDapperContext.cs index 5d648ba..d95ec15 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/ClickhouseDapperContext.cs +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/ClickhouseDapperContext.cs @@ -15,10 +15,12 @@ public abstract class ClickhouseDapperContext : DapperContext /// /// The underlying collection. /// The options used for this context. + /// The service provider to use. protected ClickhouseDapperContext( IOptions dbConnectionFactoryCollection, - ClickhouseContextOptions options) - : base(dbConnectionFactoryCollection) + ClickhouseContextOptions options, + IServiceProvider serviceProvider) + : base(dbConnectionFactoryCollection, serviceProvider) { _options = options; } diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj index 31688f7..c4692f5 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/DapperContext.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/DapperContext.cs index 77acd16..effe5be 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/DapperContext.cs +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/DapperContext.cs @@ -1,5 +1,5 @@ using System.Data; - +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; namespace Cnblogs.Architecture.Ddd.Infrastructure.Dapper; @@ -13,9 +13,13 @@ public abstract class DapperContext /// 创建一个 DapperContext。 /// /// 数据库连接工厂集合。 - protected DapperContext(IOptions dbConnectionFactoryCollection) + /// The service provider to get connection factory + protected DapperContext(IOptions dbConnectionFactoryCollection, IServiceProvider sp) { - DbConnectionFactory = dbConnectionFactoryCollection.Value.GetFactory(GetType().Name); + var type = dbConnectionFactoryCollection.Value.GetFactory(GetType().Name); + DbConnectionFactory = sp.GetRequiredService(type) as IDbConnectionFactory + ?? throw new InvalidOperationException( + $"No DbConnectionFactory(type: {type.Name}) configured."); } /// diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/DbConnectionFactoryCollection.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/DbConnectionFactoryCollection.cs index 3b25a93..9af85ef 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/DbConnectionFactoryCollection.cs +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/DbConnectionFactoryCollection.cs @@ -5,7 +5,7 @@ /// public class DbConnectionFactoryCollection { - private readonly Dictionary _factories = new(); + private readonly Dictionary _factories = new(); /// /// 添加数据库连接工厂。 @@ -13,12 +13,12 @@ public class DbConnectionFactoryCollection /// 名称。 /// 工厂示例。 /// Throw when already been registered with other factory. - public void AddDbConnectionFactory(string name, IDbConnectionFactory factory) + public void AddDbConnectionFactory(string name, Type factory) { if (_factories.TryGetValue(name, out var value)) { throw new InvalidOperationException( - $"The dapper context already configured with db connection factory: {value.GetType().Name}"); + $"The dapper context already configured with db connection factory: {value.Name}"); } _factories.Add(name, factory); @@ -29,7 +29,7 @@ public void AddDbConnectionFactory(string name, IDbConnectionFactory factory) /// /// 名称。 /// 工厂示例。 - public IDbConnectionFactory GetFactory(string name) + public Type GetFactory(string name) { return _factories[name]; } From 9eb1194cb37d0036230b47b0747a2818e464e9f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2025 12:12:04 +0800 Subject: [PATCH 40/45] chore(deps): bump coverlet.collector from 6.0.3 to 6.0.4 (#303) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [coverlet.collector](https://github.com/coverlet-coverage/coverlet) from 6.0.3 to 6.0.4. - [Release notes](https://github.com/coverlet-coverage/coverlet/releases) - [Commits](https://github.com/coverlet-coverage/coverlet/compare/v6.0.3...v6.0.4) --- updated-dependencies: - dependency-name: coverlet.collector dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: 沈星繁 --- .../Cnblogs.Architecture.IntegrationTests.csproj | 2 +- .../Cnblogs.Architecture.UnitTests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index 720fde1..7ff3c58 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -5,7 +5,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index 3aece59..8eb80cc 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -6,7 +6,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all From b2c034edd7e05c16387b8907b1bac46d4f4fed09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2025 12:12:55 +0800 Subject: [PATCH 41/45] chore(deps): bump xunit.runner.visualstudio from 3.0.0 to 3.0.1 (#300) Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/3.0.0...3.0.1) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../Cnblogs.Architecture.IntegrationTests.csproj | 2 +- .../Cnblogs.Architecture.UnitTests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index 7ff3c58..5c8fb03 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -1,7 +1,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index 8eb80cc..254399e 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -2,7 +2,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From eb0e7e68abec8fe542fe704ce271e18e92504c9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Fri, 7 Feb 2025 12:45:14 +0800 Subject: [PATCH 42/45] feat: upgrade to dotnet 9.0.1 (#306) --- .../Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj | 4 ++-- .../Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj | 2 +- .../Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj | 2 +- .../Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj | 2 +- ...itecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj | 2 +- .../Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj | 4 ++-- ...ogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj | 2 +- .../Cnblogs.Architecture.TestShared.csproj | 4 ++-- .../Cnblogs.Architecture.UnitTests.csproj | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj index 1113372..c53022e 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj index b3002d4..3f50fb9 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj index 2385ae8..d5ac1be 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj index 090e93e..f135b69 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj index 32e6024..e7d4b1e 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj index 9be1738..e2f158b 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj @@ -9,7 +9,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj index dca9848..afb3999 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj @@ -9,7 +9,7 @@ - + diff --git a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj index 004bb08..2022736 100644 --- a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj +++ b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj @@ -1,6 +1,6 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index 254399e..77632a1 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -1,11 +1,11 @@ - runtime; build; native; contentfiles; analyzers; buildtransitive all + runtime; build; native; contentfiles; analyzers; buildtransitive all From 38e8fc0bb24b9a496b9379d4a145a6afa01fc4c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Wed, 12 Mar 2025 16:15:01 +0800 Subject: [PATCH 43/45] chore: upgrade to dotnet 9.0.3 (#313) --- .../Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj | 7 +++---- .../Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj | 4 ++-- .../Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj | 4 ++-- .../Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj | 2 +- ...ture.Ddd.Infrastructure.CacheProviders.InMemory.csproj | 2 +- ...tecture.Ddd.Infrastructure.CacheProviders.Redis.csproj | 2 +- ...chitecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj | 2 +- .../Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj | 2 +- ...Architecture.Ddd.Infrastructure.EntityFramework.csproj | 2 +- ...Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj | 2 +- .../Cnblogs.Architecture.IntegrationTests.csproj | 6 +++--- .../CommandResponseHandlerTests.cs | 6 +++--- .../CqrsRouteMapperTests.cs | 2 +- .../Cnblogs.Architecture.TestShared.csproj | 8 ++++---- .../Cnblogs.Architecture.UnitTests.csproj | 4 ++-- .../Infrastructure/EntityFramework/BaseRepositoryTests.cs | 6 +++--- 16 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj index c53022e..6a50915 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj @@ -17,17 +17,16 @@ - - + - - + + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj index 3f50fb9..7e839fb 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj @@ -12,11 +12,11 @@ - + - + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj index f135b69..7442ed6 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj @@ -12,11 +12,11 @@ - + - + diff --git a/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj b/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj index 18d6fcb..dc2b0f4 100644 --- a/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj +++ b/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj @@ -9,6 +9,6 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj index e7d4b1e..880862e 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj index d45e4c7..9f9c587 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.Redis.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj index c4692f5..56ec001 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj index e2f158b..a645f45 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj index afb3999..1099e56 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj index a294ad9..75df108 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index 5c8fb03..23e5b97 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -1,7 +1,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -9,8 +9,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + diff --git a/test/Cnblogs.Architecture.IntegrationTests/CommandResponseHandlerTests.cs b/test/Cnblogs.Architecture.IntegrationTests/CommandResponseHandlerTests.cs index 28cea2e..6a64974 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/CommandResponseHandlerTests.cs +++ b/test/Cnblogs.Architecture.IntegrationTests/CommandResponseHandlerTests.cs @@ -55,7 +55,7 @@ public async Task MinimalApi_CqrsV2_CommandResponseAsync() // Assert response.Headers.CqrsVersion().Should().BeGreaterThan(1); content.Should().NotBeNull(); - content!.Response.Should().NotBeNullOrEmpty(); + content.Response.Should().NotBeNullOrEmpty(); } [Fact] @@ -162,7 +162,7 @@ public async Task MinimalApi_HavingError_CommandResponseAsync(bool needValidatio // Assert response.Should().HaveClientError(); commandResponse.Should().NotBeNull(); - commandResponse!.IsSuccess().Should().BeFalse(); + commandResponse.IsSuccess().Should().BeFalse(); commandResponse.Should().BeEquivalentTo(new { IsValidationError = needValidationError }); (commandResponse.ErrorCode != null).Should().Be(needExecutionError); } @@ -257,7 +257,7 @@ public async Task Mvc_HavingError_CommandResponseAsync(bool needValidationError, // Assert response.Should().HaveClientError(); content.Should().NotBeNull(); - content!.IsSuccess().Should().BeFalse(); + content.IsSuccess().Should().BeFalse(); content.Should().BeEquivalentTo(new { IsValidationError = needValidationError }); (content.ErrorCode != null).Should().Be(needExecutionError); } diff --git a/test/Cnblogs.Architecture.IntegrationTests/CqrsRouteMapperTests.cs b/test/Cnblogs.Architecture.IntegrationTests/CqrsRouteMapperTests.cs index 7d2daec..1292aa5 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/CqrsRouteMapperTests.cs +++ b/test/Cnblogs.Architecture.IntegrationTests/CqrsRouteMapperTests.cs @@ -51,7 +51,7 @@ public async Task ListItems_SuccessAsync() // Assert response.Should().BeSuccessful(); content.Should().NotBeNull(); - content!.Items.Should().NotBeNullOrEmpty(); + content.Items.Should().NotBeNullOrEmpty(); } [Fact] diff --git a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj index 2022736..65423ef 100644 --- a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj +++ b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj @@ -1,16 +1,16 @@ - + - + - - + + diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index 77632a1..4be1aa2 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -1,11 +1,11 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Cnblogs.Architecture.UnitTests/Infrastructure/EntityFramework/BaseRepositoryTests.cs b/test/Cnblogs.Architecture.UnitTests/Infrastructure/EntityFramework/BaseRepositoryTests.cs index f88c77c..bd412e1 100644 --- a/test/Cnblogs.Architecture.UnitTests/Infrastructure/EntityFramework/BaseRepositoryTests.cs +++ b/test/Cnblogs.Architecture.UnitTests/Infrastructure/EntityFramework/BaseRepositoryTests.cs @@ -34,7 +34,7 @@ public async Task GetEntityAsync_Include_GetEntityAsync() // Assert got.Should().NotBeNull(); - got!.Posts.Should().BeEquivalentTo(entity.Posts); + got.Posts.Should().BeEquivalentTo(entity.Posts); } [Fact] @@ -60,7 +60,7 @@ public async Task GetEntityAsync_StringBasedInclude_NotNullAsync() // Assert got.Should().NotBeNull(); - got!.Posts.Should().BeEquivalentTo(entity.Posts); + got.Posts.Should().BeEquivalentTo(entity.Posts); } [Fact] @@ -87,7 +87,7 @@ public async Task GetEntityAsync_ThenInclude_NotNullAsync() // Assert got.Should().NotBeNull(); - got!.Posts.Should().BeEquivalentTo(entity.Posts); + got.Posts.Should().BeEquivalentTo(entity.Posts); } [Fact] From 6c585fd4736eac3755c88f3f39e193c179611c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Sat, 19 Apr 2025 20:55:49 +0800 Subject: [PATCH 44/45] chore: upgrade m.s.e. to 9.0.4 (#321) --- .../CacheableRequestBehavior.cs | 6 +-- ....Architecture.Ddd.Cqrs.Abstractions.csproj | 4 +- ...gs.Architecture.Ddd.Cqrs.AspNetCore.csproj | 2 +- ....Architecture.Ddd.Cqrs.ServiceAgent.csproj | 2 +- ...rchitecture.Ddd.Domain.Abstractions.csproj | 2 +- ...logs.Architecture.Ddd.EventBus.Dapr.csproj | 2 +- ...rastructure.CacheProviders.InMemory.csproj | 2 +- ...dd.Infrastructure.Dapper.Clickhouse.csproj | 2 +- ...hitecture.Ddd.Infrastructure.Dapper.csproj | 2 +- ....Ddd.Infrastructure.EntityFramework.csproj | 2 +- ...itecture.Ddd.Infrastructure.MongoDb.csproj | 2 +- .../Cnblogs.Architecture.TestShared.csproj | 2 +- .../Cnblogs.Architecture.UnitTests.csproj | 2 +- .../Cqrs/Behaviors/CacheBehaviorTests.cs | 38 +++++++++---------- .../Cqrs/Behaviors/LoggerBehaviorTests.cs | 2 +- .../Cqrs/Behaviors/ValidationBehaviorTests.cs | 4 +- 16 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/CacheableRequestBehavior.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/CacheableRequestBehavior.cs index 63d9bca..20f286a 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/CacheableRequestBehavior.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/CacheableRequestBehavior.cs @@ -71,7 +71,7 @@ public async Task Handle( }) { // cache disabled - return await next(); + return await next(cancellationToken); } CacheEntry? result = null; @@ -92,7 +92,7 @@ public async Task Handle( return result.Value; } - result = new CacheEntry(await next(), _dateTimeProvider.Now().ToUnixTimeSeconds()); + result = new CacheEntry(await next(cancellationToken), _dateTimeProvider.Now().ToUnixTimeSeconds()); if (request.LocalCacheBehavior is CacheBehavior.UpdateCacheIfMiss) { @@ -197,4 +197,4 @@ private async Task UpdateCacheEntryAsync( } } } -} \ No newline at end of file +} diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj index 6a50915..e51bb1b 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj @@ -25,8 +25,8 @@ - - + + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj index 7e839fb..e2a9e3a 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj index 7442ed6..e966319 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj b/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj index d5de275..9c20865 100644 --- a/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj +++ b/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/Cnblogs.Architecture.Ddd.Domain.Abstractions.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj b/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj index dc2b0f4..37b9945 100644 --- a/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj +++ b/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj @@ -9,6 +9,6 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj index 880862e..4354146 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj index 56ec001..9b4fef8 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj index a645f45..d0bdaba 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj index 1099e56..112d612 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj index 75df108..e8f8e52 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj index 65423ef..489aa9e 100644 --- a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj +++ b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index 4be1aa2..d206325 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -5,7 +5,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/CacheBehaviorTests.cs b/test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/CacheBehaviorTests.cs index c08c6cf..82f6644 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/CacheBehaviorTests.cs +++ b/test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/CacheBehaviorTests.cs @@ -24,7 +24,7 @@ public async Task CacheBehavior_DisableCache_NotCacheAsync() local.AddCacheValue("cacheKey", "cacheValue"); var remote = Substitute.For(); remote.AddCacheValue("cacheKey", "cacheValue"); - var behavior = GetBehavior, string>(new List { local, remote }); + var behavior = GetBehavior, string>([local, remote]); // Act var result = await behavior.Handle( @@ -33,7 +33,7 @@ public async Task CacheBehavior_DisableCache_NotCacheAsync() LocalCacheBehavior = CacheBehavior.DisabledCache, RemoteCacheBehavior = CacheBehavior.DisabledCache }, - () => Task.FromResult("noCache"), + _ => Task.FromResult("noCache"), CancellationToken.None); // Assert @@ -45,7 +45,7 @@ public async Task CacheBehavior_EnableLocal_NoCache_UpdateAsync() { // Arrange var local = Substitute.For(); - var behavior = GetBehavior, string>(new List { local }); + var behavior = GetBehavior, string>([local]); // Act var result = await behavior.Handle( @@ -55,7 +55,7 @@ public async Task CacheBehavior_EnableLocal_NoCache_UpdateAsync() LocalExpires = TimeSpan.FromSeconds(1), RemoteCacheBehavior = CacheBehavior.DisabledCache }, - () => Task.FromResult("noCache"), + _ => Task.FromResult("noCache"), CancellationToken.None); // Assert @@ -70,7 +70,7 @@ public async Task CacheBehavior_EnableLocal_HasCache_UseCacheAsync() var local = Substitute.For(); local.AddCacheValue("cacheKey", "cacheValue"); var remote = Substitute.For(); - var behavior = GetBehavior, string>(new List { local, remote }); + var behavior = GetBehavior, string>([local, remote]); // Act var result = await behavior.Handle( @@ -80,7 +80,7 @@ public async Task CacheBehavior_EnableLocal_HasCache_UseCacheAsync() LocalExpires = TimeSpan.FromSeconds(1), RemoteCacheBehavior = CacheBehavior.DisabledCache }, - () => Task.FromResult("noCache"), + _ => Task.FromResult("noCache"), CancellationToken.None); // Assert @@ -95,7 +95,7 @@ public async Task CacheBehavior_EnableRemote_NoCache_UpdateAsync() // Arrange var remote = Substitute.For(); var local = Substitute.For(); - var behavior = GetBehavior, string>(new List { local, remote }); + var behavior = GetBehavior, string>([local, remote]); // Act var result = await behavior.Handle( @@ -105,7 +105,7 @@ public async Task CacheBehavior_EnableRemote_NoCache_UpdateAsync() RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss, RemoteExpires = TimeSpan.FromSeconds(1) }, - () => Task.FromResult("noCache"), + _ => Task.FromResult("noCache"), CancellationToken.None); // Assert @@ -120,7 +120,7 @@ public async Task CacheBehavior_EnableRemote_HasCache_UseCacheAsync() // Arrange var remote = Substitute.For().AddCacheValue("cacheKey", "cacheValue"); var local = Substitute.For(); - var behavior = GetBehavior, string>(new List { local, remote }); + var behavior = GetBehavior, string>([local, remote]); // Act var result = await behavior.Handle( @@ -130,7 +130,7 @@ public async Task CacheBehavior_EnableRemote_HasCache_UseCacheAsync() RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss, RemoteExpires = TimeSpan.FromSeconds(1) }, - () => Task.FromResult("noCache"), + _ => Task.FromResult("noCache"), CancellationToken.None); // Assert @@ -145,7 +145,7 @@ public async Task CacheBehavior_ThrowOnGet_ThrowAsync() var remote = Substitute.For(); remote.GetAsync(Arg.Any()).ThrowsAsync(new Exception("test")); var behavior = GetBehavior, string>( - new List() { remote }, + [remote], o => o.ThrowIfFailedOnGet = true); // Act @@ -156,7 +156,7 @@ public async Task CacheBehavior_ThrowOnGet_ThrowAsync() RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss, RemoteExpires = TimeSpan.FromSeconds(1) }, - () => Task.FromResult("noCache"), + _ => Task.FromResult("noCache"), CancellationToken.None); // Assert @@ -170,7 +170,7 @@ public async Task CacheBehavior_ThrowOnGet_NoThrowAsync() var remote = Substitute.For(); remote.GetAsync(Arg.Any()).ThrowsAsync(new Exception("test")); var behavior = GetBehavior, string>( - new List() { remote }, + [remote], o => o.ThrowIfFailedOnGet = false); // Act @@ -181,7 +181,7 @@ public async Task CacheBehavior_ThrowOnGet_NoThrowAsync() RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss, RemoteExpires = TimeSpan.FromSeconds(1) }, - () => Task.FromResult("noCache"), + _ => Task.FromResult("noCache"), CancellationToken.None); // Assert @@ -196,7 +196,7 @@ public async Task CacheBehavior_ThrowOnUpdate_ThrowAsync() remote.UpdateAsync(Arg.Any(), Arg.Any(), Arg.Any()) .ThrowsAsync(new Exception("test")); var behavior = GetBehavior, string>( - new List { remote }, + [remote], o => o.ThrowIfFailedOnUpdate = true); // Act @@ -207,7 +207,7 @@ public async Task CacheBehavior_ThrowOnUpdate_ThrowAsync() RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss, RemoteExpires = TimeSpan.FromSeconds(1) }, - () => Task.FromResult("noCache"), + _ => Task.FromResult("noCache"), CancellationToken.None); // Assert @@ -222,7 +222,7 @@ public async Task CacheBehavior_NotThrowOnUpdate_NotThrowAsync() remote.UpdateAsync(Arg.Any(), Arg.Any(), Arg.Any()) .ThrowsAsync(new Exception("test")); var behavior = GetBehavior, string>( - new List { remote }, + [remote], o => o.ThrowIfFailedOnUpdate = false); // Act @@ -233,7 +233,7 @@ public async Task CacheBehavior_NotThrowOnUpdate_NotThrowAsync() RemoteCacheBehavior = CacheBehavior.UpdateCacheIfMiss, RemoteExpires = TimeSpan.FromSeconds(1) }, - () => Task.FromResult("noCache"), + _ => Task.FromResult("noCache"), CancellationToken.None); // Assert @@ -244,7 +244,7 @@ public async Task CacheBehavior_NotThrowOnUpdate_NotThrowAsync() public void CacheBehavior_NoProvider_Throw() { // Act - var act = () => GetBehavior, string>(new List()); + var act = () => GetBehavior, string>([]); // Assert act.Should().Throw(); diff --git a/test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/LoggerBehaviorTests.cs b/test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/LoggerBehaviorTests.cs index 292254c..f487c84 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/LoggerBehaviorTests.cs +++ b/test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/LoggerBehaviorTests.cs @@ -18,7 +18,7 @@ public async Task LoggerBehavior_ShouldLogDebugAsync() var request = new FakeQuery(null, "test"); // Act - await behavior.Handle(request, () => Task.FromResult("done"), default); + await behavior.Handle(request, _ => Task.FromResult("done"), CancellationToken.None); // Assert logger.Received(2).Log( diff --git a/test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/ValidationBehaviorTests.cs b/test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/ValidationBehaviorTests.cs index 5c9a8cd..841117c 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/ValidationBehaviorTests.cs +++ b/test/Cnblogs.Architecture.UnitTests/Cqrs/Behaviors/ValidationBehaviorTests.cs @@ -17,7 +17,7 @@ public async Task ValidationBehavior_ValidationFailed_ReturnObjectAsync() NullLogger, FakeResponse>>.Instance); // Act - var result = await behavior.Handle(request, () => Task.FromResult(new FakeResponse()), default); + var result = await behavior.Handle(request, _ => Task.FromResult(new FakeResponse()), CancellationToken.None); // Assert var errors = new ValidationErrors { error }; @@ -33,7 +33,7 @@ public async Task ValidationBehavior_ValidationSuccess_ReturnNextAsync() NullLogger, FakeResponse>>.Instance); // Act - var result = await behavior.Handle(request, () => Task.FromResult(new FakeResponse()), default); + var result = await behavior.Handle(request, _ => Task.FromResult(new FakeResponse()), CancellationToken.None); // Assert result.Should().BeEquivalentTo(new { IsValidationError = false, ValidationErrors = new ValidationErrors() }); From 862b9332aa5d0e5e8a9c26ec66e90771abbdc024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E6=98=9F=E7=B9=81?= Date: Tue, 6 May 2025 13:42:14 +0800 Subject: [PATCH 45/45] feat: upgrade dapr to 1.15.4 (#322) --- .../Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj | 2 +- .../Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj | 2 +- .../Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj | 2 +- .../Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj | 2 +- ...ogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj | 2 +- .../Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj | 2 +- .../Cnblogs.Architecture.IntegrationTests.csproj | 2 +- .../Cnblogs.Architecture.TestShared.csproj | 2 +- .../Cnblogs.Architecture.UnitTests.csproj | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj index d5ac1be..89a9658 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer/Cnblogs.Architecture.Ddd.Cqrs.Dapper.SqlServer.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj index b313693..8bb43b7 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer/Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj index e966319..d96fb77 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent/Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj b/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj index 37b9945..44ef61a 100644 --- a/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj +++ b/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj @@ -9,6 +9,6 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj index 9b4fef8..7966982 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj index e8f8e52..969709c 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index 23e5b97..9ea8bc3 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -1,7 +1,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj index 489aa9e..438360a 100644 --- a/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj +++ b/test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index d206325..477a915 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -1,7 +1,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all