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] 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]