Merge pull request #175 from cnblogs/go-net8

ikesnowy · web-flow · commit 19962e39de3a · 2023-11-16T17:52:41.000+08:00
chore: go net8
diff --git 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
@@ -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
@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <Authors>Cnblogs</Authors>
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
@@ -16,8 +16,8 @@
 
   <ItemGroup>
     <PackageReference Include="Mapster" Version="7.4.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git 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;
 /// <typeparam name="TError">The error type for this handler.</typeparam>
 public interface ICommandHandler<TCommand, TView, TError> : IRequestHandler<TCommand, CommandResponse<TView, TError>>
     where TCommand : ICommand<TView, TError>
-    where TError : Enumeration
-{
-}
+    where TError : Enumeration;
diff --git 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;
 /// <typeparam name="TError">The error type for this handler.</typeparam>
 public interface ICommandHandler<TCommand, TError> : IRequestHandler<TCommand, CommandResponse<TError>>
     where TCommand : ICommand<TError>
-    where TError : Enumeration
-{
-}
+    where TError : Enumeration;
diff --git 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;
 /// </summary>
 /// <typeparam name="TDomainEvent">The domain event type for this handler to handle.</typeparam>
 public interface IDomainEventHandler<TDomainEvent> : INotificationHandler<TDomainEvent>
-    where TDomainEvent : DomainEvent
-{
-}
+    where TDomainEvent : DomainEvent;
diff --git 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.
 /// </summary>
 /// <typeparam name="TList">The list to return, usually a <see cref="List{T}"/>.</typeparam>
-public interface IListQuery<TList> : IRequest<TList>
-{
-}
+public interface IListQuery<TList> : IRequest<TList>;
diff --git 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;
 /// <typeparam name="TQuery">The <see cref="IListQuery{TList}" /> been handled.</typeparam>
 /// <typeparam name="TList">The result type of <typeparamref name="TQuery"/>.</typeparam>
 public interface IListQueryHandler<TQuery, TList> : IRequestHandler<TQuery, TList>
-    where TQuery : IListQuery<TList>
-{
-}
+    where TQuery : IListQuery<TList>;
diff --git 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;
 /// <typeparam name="TQuery">The <see cref="IPageableQuery{TElement}" /> to handle.</typeparam>
 /// <typeparam name="TView">The type for each item in <see cref="PagedList{T}"/>.</typeparam>
 public interface IPageableQueryHandler<TQuery, TView> : IListQueryHandler<TQuery, PagedList<TView>>
-    where TQuery : IPageableQuery<TView>
-{
-}
+    where TQuery : IPageableQuery<TView>;
diff --git 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.
 /// </summary>
 /// <typeparam name="TView">The type of item to query.</typeparam>
-public interface IQuery<TView> : IRequest<TView?>
-{
-}
+public interface IQuery<TView> : IRequest<TView?>;
diff --git 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;
 /// <typeparam name="TQuery">The <see cref="IQuery{TView}" /> type to handle.</typeparam>
 /// <typeparam name="TView">The type of item to query.</typeparam>
 public interface IQueryHandler<TQuery, TView> : IRequestHandler<TQuery, TView?>
-    where TQuery : IQuery<TView>
-{
-}
+    where TQuery : IQuery<TView>;
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
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="7.1.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cnblogs.Architecture.Ddd.Cqrs.Abstractions\Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj" />
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
@@ -8,7 +8,7 @@
     <ProjectReference Include="..\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.12" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IAggregateRoot.cs b/src/Cnblogs.Architecture.Ddd.Domain.Abstractions/IAggregateRoot.cs
@@ -3,6 +3,4 @@
 /// <summary>
 ///     聚合根标记。
 /// </summary>
-public interface IAggregateRoot
-{
-}
+public interface IAggregateRoot;
diff --git 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;
 /// <summary>
 ///     领域事件标记。
 /// </summary>
-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
@@ -3,6 +3,4 @@ namespace Cnblogs.Architecture.Ddd.EventBus.Abstractions;
 /// <summary>
 /// The empty interface as a generic type constraint
 /// </summary>
-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
@@ -7,6 +7,4 @@ namespace Cnblogs.Architecture.Ddd.EventBus.Abstractions;
 /// </summary>
 /// <typeparam name="TEvent">集成事件。</typeparam>
 public interface IIntegrationEventHandler<TEvent> : INotificationHandler<TEvent>, 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
@@ -3,6 +3,4 @@
 /// <summary>
 ///     本地缓存提供器，<see cref="ICacheProvider" /> 的一个别名。
 /// </summary>
-public interface ILocalCacheProvider : ICacheProvider
-{
-}
+public interface ILocalCacheProvider : ICacheProvider;
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/IRemoteCacheProvider.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.Abstractions/IRemoteCacheProvider.cs
@@ -3,6 +3,4 @@
 /// <summary>
 ///     远程缓存提供器，<see cref="ICacheProvider" /> 的一个别名。
 /// </summary>
-public interface IRemoteCacheProvider : ICacheProvider
-{
-}
+public interface IRemoteCacheProvider : ICacheProvider;
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
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git 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<T>(IEnumerable<T> 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
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ClickHouse.Client" Version="6.7.5" />
+    <PackageReference Include="ClickHouse.Client" Version="6.8.1" />
   </ItemGroup>
 
 </Project>
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
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.1.15" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
+    <PackageReference Include="Dapper" Version="2.1.21" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
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
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.13" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git 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
         </PackageReleaseNotes>
     </PropertyGroup>
-    
+
     <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
     </ItemGroup>
 
 </Project>
diff --git 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
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
     <PackageReference Include="Cnblogs.Serilog.Extensions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.12" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="xunit" Version="2.6.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -26,7 +26,7 @@
   <ItemGroup>
     <PackageReference Include="Serilog.Sinks.InMemory" Version="0.11.0" />
     <PackageReference Include="Serilog.Sinks.InMemory.Assertions" Version="0.11.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git 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<Program>
-{
-}
+public class IntegrationTestFactory : WebApplicationFactory<Program>;
diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.13" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
         <PackageReference Include="xunit" Version="2.6.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
