diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dda509f..fa3c664 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ on: jobs: test: runs-on: ubuntu-latest - container: mcr.microsoft.com/dotnet/sdk:7.0 + container: mcr.microsoft.com/dotnet/sdk:8.0 steps: - name: Checkout diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml index 7512fe5..0feb310 100644 --- a/.github/workflows/pack.yml +++ b/.github/workflows/pack.yml @@ -11,9 +11,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-dotnet@v3.0.3 + - uses: actions/setup-dotnet@v3 with: - dotnet-version: '7' + dotnet-version: '8' - name: Nuget Push env: nuget_key: ${{ secrets.NUGETAPIKEY }} diff --git a/Directory.Build.props b/Directory.Build.props index da8fabb..2a880a6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - net7.0 + net8.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 e12aa4a..1eb465c 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 @@ -16,8 +16,8 @@ - - + + diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/ICommandHandler.Generic.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/ICommandHandler.Generic.cs index 0cb6fa8..a1005ea 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/ICommandHandler.Generic.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/ICommandHandler.Generic.cs @@ -12,6 +12,4 @@ namespace Cnblogs.Architecture.Ddd.Cqrs.Abstractions; /// The error type for this handler. public interface ICommandHandler : IRequestHandler> where TCommand : ICommand - where TError : Enumeration -{ -} \ No newline at end of file + where TError : Enumeration; \ No newline at end of file diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/ICommandHandler.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/ICommandHandler.cs index 3212703..34bc3a7 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/ICommandHandler.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/ICommandHandler.cs @@ -11,6 +11,4 @@ namespace Cnblogs.Architecture.Ddd.Cqrs.Abstractions; /// The error type for this handler. public interface ICommandHandler : IRequestHandler> where TCommand : ICommand - where TError : Enumeration -{ -} \ No newline at end of file + where TError : Enumeration; diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IDomainEventHandler.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IDomainEventHandler.cs index 47a0f9c..07b6821 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IDomainEventHandler.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IDomainEventHandler.cs @@ -9,6 +9,4 @@ namespace Cnblogs.Architecture.Ddd.Cqrs.Abstractions; /// /// The domain event type for this handler to handle. public interface IDomainEventHandler : INotificationHandler - where TDomainEvent : DomainEvent -{ -} \ No newline at end of file + where TDomainEvent : DomainEvent; \ No newline at end of file diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IListQuery.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IListQuery.cs index 834b4b2..78bb192 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IListQuery.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IListQuery.cs @@ -6,6 +6,4 @@ namespace Cnblogs.Architecture.Ddd.Cqrs.Abstractions; /// Represents a query returns a list of items. /// /// The list to return, usually a . -public interface IListQuery : IRequest -{ -} \ No newline at end of file +public interface IListQuery : IRequest; \ No newline at end of file diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IListQueryHandler.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IListQueryHandler.cs index 981b608..5f6f3f9 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IListQueryHandler.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IListQueryHandler.cs @@ -8,6 +8,4 @@ namespace Cnblogs.Architecture.Ddd.Cqrs.Abstractions; /// The been handled. /// The result type of . public interface IListQueryHandler : IRequestHandler - where TQuery : IListQuery -{ -} \ No newline at end of file + where TQuery : IListQuery; \ No newline at end of file diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IPageableQueryHandler.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IPageableQueryHandler.cs index a3dd8ed..7a4b37a 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IPageableQueryHandler.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IPageableQueryHandler.cs @@ -8,6 +8,4 @@ namespace Cnblogs.Architecture.Ddd.Cqrs.Abstractions; /// The to handle. /// The type for each item in . public interface IPageableQueryHandler : IListQueryHandler> - where TQuery : IPageableQuery -{ -} \ No newline at end of file + where TQuery : IPageableQuery; \ No newline at end of file diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IQuery.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IQuery.cs index a61323a..0df4e00 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IQuery.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IQuery.cs @@ -6,6 +6,4 @@ namespace Cnblogs.Architecture.Ddd.Cqrs.Abstractions; /// Represents query for single item. /// /// The type of item to query. -public interface IQuery : IRequest -{ -} \ No newline at end of file +public interface IQuery : IRequest; \ No newline at end of file diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IQueryHandler.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IQueryHandler.cs index 8a17091..dc16e4e 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IQueryHandler.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/IQueryHandler.cs @@ -8,6 +8,4 @@ namespace Cnblogs.Architecture.Ddd.Cqrs.Abstractions; /// The type to handle. /// The type of item to query. public interface IQueryHandler : IRequestHandler - where TQuery : IQuery -{ -} \ No newline at end of file + where TQuery : IQuery; \ No newline at end of file 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 2b06027..2072c2e 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 @@ - + 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 c5f601b..e340534 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 @@ -8,7 +8,7 @@ - - + + diff --git a/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IAggregateRoot.cs b/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IAggregateRoot.cs index 33b12eb..0a60713 100644 --- a/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IAggregateRoot.cs +++ b/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IAggregateRoot.cs @@ -3,6 +3,4 @@ /// /// 聚合根标记。 /// -public interface IAggregateRoot -{ -} \ No newline at end of file +public interface IAggregateRoot; \ No newline at end of file diff --git a/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IDomainEvent.cs b/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IDomainEvent.cs index 57cdc30..06ee06c 100644 --- a/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IDomainEvent.cs +++ b/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IDomainEvent.cs @@ -5,6 +5,4 @@ namespace Cnblogs.Architecture.Ddd.Domain.Abstractions; /// /// 领域事件标记。 /// -public interface IDomainEvent : INotification -{ -} +public interface IDomainEvent : INotification; diff --git a/src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/IEventBusRequestHandler.cs b/src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/IEventBusRequestHandler.cs index e5dc196..8281513 100644 --- a/src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/IEventBusRequestHandler.cs +++ b/src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/IEventBusRequestHandler.cs @@ -3,6 +3,4 @@ namespace Cnblogs.Architecture.Ddd.EventBus.Abstractions; /// /// The empty interface as a generic type constraint /// -public interface IEventBusRequestHandler -{ -} +public interface IEventBusRequestHandler; diff --git a/src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/IIntegrationEventHandler.cs b/src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/IIntegrationEventHandler.cs index 3968f00..3d116d0 100644 --- a/src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/IIntegrationEventHandler.cs +++ b/src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/IIntegrationEventHandler.cs @@ -7,6 +7,4 @@ namespace Cnblogs.Architecture.Ddd.EventBus.Abstractions; /// /// 集成事件。 public interface IIntegrationEventHandler : INotificationHandler, IEventBusRequestHandler - where TEvent : IntegrationEvent -{ -} + where TEvent : IntegrationEvent; diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/ILocalCacheProvider.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/ILocalCacheProvider.cs index 3c75287..d31d3ff 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/ILocalCacheProvider.cs +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/ILocalCacheProvider.cs @@ -3,6 +3,4 @@ /// /// 本地缓存提供器， 的一个别名。 /// -public interface ILocalCacheProvider : ICacheProvider -{ -} \ No newline at end of file +public interface ILocalCacheProvider : ICacheProvider; \ No newline at end of file diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/IRemoteCacheProvider.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/IRemoteCacheProvider.cs index ee774d2..f5472da 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/IRemoteCacheProvider.cs +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/IRemoteCacheProvider.cs @@ -3,6 +3,4 @@ /// /// 远程缓存提供器， 的一个别名。 /// -public interface IRemoteCacheProvider : ICacheProvider -{ -} \ No newline at end of file +public interface IRemoteCacheProvider : ICacheProvider; \ No newline at end of file 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 e5177f8..ef303cb 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 @@ - + diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/ClickhouseDapperContext.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/ClickhouseDapperContext.cs index bd12207..5d648ba 100644 --- a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/ClickhouseDapperContext.cs +++ b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/ClickhouseDapperContext.cs @@ -57,10 +57,12 @@ public async Task BulkWriteAsync(IEnumerable entities) using var bulkCopyInterface = new ClickHouseBulkCopy(_options.ConnectionString) { - DestinationTableName = configuration.TableName + DestinationTableName = configuration.TableName, + ColumnNames = configuration.ColumnNames }; var objs = entities.Select(x => configuration.ToObjectArray(x)); - await bulkCopyInterface.WriteToServerAsync(objs, configuration.ColumnNames); + await bulkCopyInterface.InitAsync(); + await bulkCopyInterface.WriteToServerAsync(objs); } } 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 358f2ad..d444cad 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 13de2e5..2a9a0f0 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,8 +9,8 @@ - - + + 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 a5bf31e..a800de8 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/Directory.Build.props b/src/Directory.Build.props index 4f3a0f4..ad13ac9 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -11,9 +11,9 @@ Please check release notes at: https://github.com/cnblogs/Architecture/releases - + - + diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs index e6201dc..3d5f4ed 100644 --- a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs @@ -55,7 +55,5 @@ namespace Cnblogs.Architecture.IntegrationTestProject { // ReSharper disable once PartialTypeWithSinglePart - public partial class Program - { - } + public partial class Program; } diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index 984a5bc..aa1bc9b 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -1,8 +1,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive @@ -26,7 +26,7 @@ - + diff --git a/test/Cnblogs.Architecture.IntegrationTests/IntegrationTestFactory.cs b/test/Cnblogs.Architecture.IntegrationTests/IntegrationTestFactory.cs index b638297..a278663 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/IntegrationTestFactory.cs +++ b/test/Cnblogs.Architecture.IntegrationTests/IntegrationTestFactory.cs @@ -3,6 +3,4 @@ namespace Cnblogs.Architecture.IntegrationTests; -public class IntegrationTestFactory : WebApplicationFactory -{ -} +public class IntegrationTestFactory : WebApplicationFactory; diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj index dcb7ac8..cb07346 100644 --- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj +++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj @@ -1,8 +1,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive