refactor!: move dependency injector to feature project

ikesnowy · ikesnowy · commit 15b02bc0b1bd · 2023-04-07T14:51:11.000+08:00
diff --git a/Cnblogs.Architecture.sln b/Cnblogs.Architecture.sln
@@ -28,8 +28,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Cq
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Infrastructure.RedLock", "src\Cnblogs.Architecture.Ddd.Infrastructure.RedLock\Cnblogs.Architecture.Ddd.Infrastructure.RedLock.csproj", "{98B77844-CBA5-4E57-96B1-AD538788EA6D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.RedLock", "src\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.RedLock\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.RedLock.csproj", "{AAF07CE2-7124-4A19-BA2B-361506FA54CC}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.EventBus.Abstractions", "src\Cnblogs.Architecture.Ddd.EventBus.Abstractions\Cnblogs.Architecture.Ddd.EventBus.Abstractions.csproj", "{D4894BA9-BFFB-4731-A12D-C742C8308F8C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.EventBus.Dapr", "src\Cnblogs.Architecture.Ddd.EventBus.Dapr\Cnblogs.Architecture.Ddd.EventBus.Dapr.csproj", "{5B20CD42-148C-440E-A961-9909CC1517E7}"
@@ -42,12 +40,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Integr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory", "src\Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory\Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj", "{749EA5B9-69BE-44E0-802D-8BEAE2EA5E77}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.CacheProviders.InMemory", "src\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.CacheProviders.InMemory\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.CacheProviders.InMemory.csproj", "{ACE6DB92-C943-4D99-909E-DCEC551E4394}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer", "src\Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer\Cnblogs.Architecture.Ddd.Cqrs.MongoDb.Analyzer.csproj", "{AC1BB624-1B37-4A21-9CA4-FB79E4D30C43}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr", "src\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr.csproj", "{5AE74304-8F14-4CF7-9BA7-89AB345AFE29}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent", "src\Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent\Cnblogs.Architecture.Ddd.Cqrs.ServiceAgent.csproj", "{F2B0D83B-9A90-4FA4-A407-3B0708731903}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cnblogs.Architecture.TestIntegrationEvents", "test\Cnblogs.Architecture.TestIntegrationEvents\Cnblogs.Architecture.TestIntegrationEvents.csproj", "{FCAE0DFB-1585-4ABA-A6FC-6A78311E3FE6}"
@@ -81,16 +75,13 @@ Global
 		{92E2453C-2A6A-43E2-978C-C28E9025D0D9} = {772497F8-2CB1-4EA6-AEB8-482C3ECD0A9D}
 		{870A738A-19CD-43D9-986A-D696263E3254} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
 		{98B77844-CBA5-4E57-96B1-AD538788EA6D} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
-		{AAF07CE2-7124-4A19-BA2B-361506FA54CC} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
 		{D4894BA9-BFFB-4731-A12D-C742C8308F8C} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
 		{5B20CD42-148C-440E-A961-9909CC1517E7} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
 		{A9983E36-786D-4273-98EA-DD5FB410C206} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
 		{0114DFFF-47DB-4D01-A88F-8812672A5B4D} = {772497F8-2CB1-4EA6-AEB8-482C3ECD0A9D}
 		{F150EBB2-8237-4C68-B2DC-B86E6A9F7444} = {772497F8-2CB1-4EA6-AEB8-482C3ECD0A9D}
 		{749EA5B9-69BE-44E0-802D-8BEAE2EA5E77} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
-		{ACE6DB92-C943-4D99-909E-DCEC551E4394} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
 		{AC1BB624-1B37-4A21-9CA4-FB79E4D30C43} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
-		{5AE74304-8F14-4CF7-9BA7-89AB345AFE29} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
 		{F2B0D83B-9A90-4FA4-A407-3B0708731903} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
 		{FCAE0DFB-1585-4ABA-A6FC-6A78311E3FE6} = {772497F8-2CB1-4EA6-AEB8-482C3ECD0A9D}
 		{2D8FE8C4-EA9A-4232-8767-6FFC68C87816} = {D3A6DF01-017E-4088-936C-B3791F41DF53}
@@ -138,10 +129,6 @@ Global
 		{98B77844-CBA5-4E57-96B1-AD538788EA6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{98B77844-CBA5-4E57-96B1-AD538788EA6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{98B77844-CBA5-4E57-96B1-AD538788EA6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AAF07CE2-7124-4A19-BA2B-361506FA54CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAF07CE2-7124-4A19-BA2B-361506FA54CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAF07CE2-7124-4A19-BA2B-361506FA54CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AAF07CE2-7124-4A19-BA2B-361506FA54CC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D4894BA9-BFFB-4731-A12D-C742C8308F8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D4894BA9-BFFB-4731-A12D-C742C8308F8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D4894BA9-BFFB-4731-A12D-C742C8308F8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -166,18 +153,10 @@ Global
 		{749EA5B9-69BE-44E0-802D-8BEAE2EA5E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{749EA5B9-69BE-44E0-802D-8BEAE2EA5E77}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{749EA5B9-69BE-44E0-802D-8BEAE2EA5E77}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACE6DB92-C943-4D99-909E-DCEC551E4394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACE6DB92-C943-4D99-909E-DCEC551E4394}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACE6DB92-C943-4D99-909E-DCEC551E4394}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACE6DB92-C943-4D99-909E-DCEC551E4394}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AC1BB624-1B37-4A21-9CA4-FB79E4D30C43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC1BB624-1B37-4A21-9CA4-FB79E4D30C43}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AC1BB624-1B37-4A21-9CA4-FB79E4D30C43}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC1BB624-1B37-4A21-9CA4-FB79E4D30C43}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5AE74304-8F14-4CF7-9BA7-89AB345AFE29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5AE74304-8F14-4CF7-9BA7-89AB345AFE29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5AE74304-8F14-4CF7-9BA7-89AB345AFE29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5AE74304-8F14-4CF7-9BA7-89AB345AFE29}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F2B0D83B-9A90-4FA4-A407-3B0708731903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F2B0D83B-9A90-4FA4-A407-3B0708731903}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F2B0D83B-9A90-4FA4-A407-3B0708731903}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.CacheProviders.InMemory.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.CacheProviders.InMemory.csproj
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr.csproj
diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.RedLock/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.RedLock.csproj b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.RedLock/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.RedLock.csproj
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
@@ -5,10 +5,11 @@
     </Description>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Cnblogs.Architecture.Ddd.EventBus.Abstractions\Cnblogs.Architecture.Ddd.EventBus.Abstractions.csproj"/>
-    <FrameworkReference Include="Microsoft.AspNetCore.App"/>
+    <ProjectReference Include="..\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.csproj" />
+    <ProjectReference Include="..\Cnblogs.Architecture.Ddd.EventBus.Abstractions\Cnblogs.Architecture.Ddd.EventBus.Abstractions.csproj" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Dapr.AspNetCore" Version="1.10.0"/>
+    <PackageReference Include="Dapr.AspNetCore" Version="1.10.0" />
   </ItemGroup>
 </Project>
diff --git a/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/CqrsInjectorExtensions.cs b/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/CqrsInjectorExtensions.cs
@@ -1,8 +1,9 @@
 ﻿using System.Reflection;
+using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection;
 using Cnblogs.Architecture.Ddd.EventBus.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr;
+namespace Cnblogs.Architecture.Ddd.EventBus.Dapr;
 
 /// <summary>
 ///     添加 Dapr 到 <see cref="CqrsInjector"/>
diff --git a/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/DaprEventBusServiceCollectionExtensions.cs b/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/DaprEventBusServiceCollectionExtensions.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr;
 using Cnblogs.Architecture.Ddd.EventBus.Abstractions;
 using Cnblogs.Architecture.Ddd.EventBus.Dapr;
 using Dapr.Client;
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
@@ -7,11 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions.csproj"/>
+    <ProjectReference Include="..\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.csproj" />
+    <ProjectReference Include="..\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0"/>
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Injectors.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Injectors.cs
@@ -1,7 +1,7 @@
 ﻿using Cnblogs.Architecture.Ddd.Cqrs.Abstractions;
-using Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory;
+using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection;
 
-namespace Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.CacheProviders.InMemory;
+namespace Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory;
 
 /// <summary>
 /// <see cref="CqrsInjector"/> 的扩展方法。
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/ClickhouseContextOptions.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/ClickhouseContextOptions.cs
@@ -4,6 +4,7 @@ namespace Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse;
 ///     The options for clickhouse context.
 /// </summary>
 /// <typeparam name="TContext">The type of <see cref="ClickhouseDapperContext"/> been configured.</typeparam>
+// ReSharper disable once UnusedTypeParameter
 public class ClickhouseContextOptions<TContext> : ClickhouseContextOptions
     where TContext : ClickhouseDapperContext
 {
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/ClickhouseModelBuilder.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/ClickhouseModelBuilder.cs
@@ -16,7 +16,7 @@ internal ClickhouseModelBuilder()
     {
         _tableName = typeof(T).Name;
         _propertyBuilders = typeof(T).GetProperties().Where(x => x.GetGetMethod() != null)
-            .Select(x => new ClickhouseModelPropertyBuilder<T>(this, x)).ToDictionary(x => x.PropertyInfo.Name, x => x);
+            .Select(x => new ClickhouseModelPropertyBuilder<T>(x)).ToDictionary(x => x.PropertyInfo.Name, x => x);
     }
 
     /// <summary>
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/ClickhouseModelPropertyBuilder.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse/ClickhouseModelPropertyBuilder.cs
@@ -11,9 +11,8 @@ public class ClickhouseModelPropertyBuilder<TEntity>
     /// <summary>
     ///     Create a ClickhouseModelPropertyBuilder from entity builder.
     /// </summary>
-    /// <param name="entityBuilder">The parent entity builder.</param>
     /// <param name="propertyInfo">The property been configured.</param>
-    public ClickhouseModelPropertyBuilder(ClickhouseModelBuilder<TEntity> entityBuilder, PropertyInfo propertyInfo)
+    public ClickhouseModelPropertyBuilder(PropertyInfo propertyInfo)
     {
         PropertyInfo = propertyInfo;
         ColumnName = propertyInfo.Name;
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.0.123"/>
-    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1"/>
+    <PackageReference Include="Dapper" Version="2.0.123" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/MongoBaseRepository.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/MongoBaseRepository.cs
@@ -186,14 +186,7 @@ public TEntity Update(TEntity entity)
         }
 
         _toUpdate ??= new Dictionary<TKey, TEntity>();
-        if (_toUpdate.ContainsKey(entity.Id))
-        {
-            _toUpdate[entity.Id] = entity;
-        }
-        else
-        {
-            _toUpdate.Add(entity.Id, entity);
-        }
+        _toUpdate[entity.Id] = entity;
 
         return entity;
     }
@@ -209,14 +202,7 @@ public TEntity Delete(TEntity entity)
         }
 
         _toDelete ??= new Dictionary<TKey, TEntity>();
-        if (_toDelete.ContainsKey(entity.Id))
-        {
-            _toDelete[entity.Id] = entity;
-        }
-        else
-        {
-            _toDelete.Add(entity.Id, entity);
-        }
+        _toDelete[entity.Id] = entity;
 
         return entity;
     }
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/MongoContextOptions.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.MongoDb/MongoContextOptions.cs
@@ -51,14 +51,7 @@ protected MongoContextOptions(string connectionString, string databaseName)
     public void MapEntity<TEntity>(string collectionName)
     {
         var type = typeof(TEntity);
-        if (_collectionMap.ContainsKey(type))
-        {
-            _collectionMap[type] = collectionName;
-        }
-        else
-        {
-            _collectionMap.Add(type, collectionName);
-        }
+        _collectionMap[type] = collectionName;
     }
 
     /// <inheritdoc />
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.RedLock/Cnblogs.Architecture.Ddd.Infrastructure.RedLock.csproj b/src/Cnblogs.Architecture.Ddd.Infrastructure.RedLock/Cnblogs.Architecture.Ddd.Infrastructure.RedLock.csproj
@@ -9,6 +9,7 @@
   </PropertyGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.csproj" />
         <ProjectReference Include="..\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions.csproj" />
     </ItemGroup>
 
diff --git a/src/Cnblogs.Architecture.Ddd.Infrastructure.RedLock/CqrsInjectorExtensions.cs b/src/Cnblogs.Architecture.Ddd.Infrastructure.RedLock/CqrsInjectorExtensions.cs
@@ -1,15 +1,12 @@
-﻿using Cnblogs.Architecture.Ddd.Infrastructure.RedLock;
-
+﻿using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-
 using RedLockNet.SERedis;
 using RedLockNet.SERedis.Configuration;
-
 using StackExchange.Redis;
 
-namespace Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.RedLock;
+namespace Cnblogs.Architecture.Ddd.Infrastructure.RedLock;
 
 /// <summary>
 ///     用于向 <see cref="CqrsInjector" /> 注入 RedLock 的扩展方法。
diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj b/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj
@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Cnblogs.Architecture.Ddd.Cqrs.AspNetCore\Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj" />
-    <ProjectReference Include="..\..\src\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr.csproj" />
     <ProjectReference Include="..\Cnblogs.Architecture.TestIntegrationEvents\Cnblogs.Architecture.TestIntegrationEvents.csproj" />
   </ItemGroup>
 
diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs
@@ -1,6 +1,6 @@
 ﻿using System.Reflection;
 using Cnblogs.Architecture.Ddd.Cqrs.AspNetCore;
-using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr;
+using Cnblogs.Architecture.Ddd.EventBus.Dapr;
 using Cnblogs.Architecture.IntegrationTestProject;
 using Cnblogs.Architecture.IntegrationTestProject.Application.Commands;
 using Cnblogs.Architecture.IntegrationTestProject.Application.Queries;
diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj
@@ -15,7 +15,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\src\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr.csproj" />
         <ProjectReference Include="..\..\src\Cnblogs.Architecture.Ddd.Cqrs.EntityFramework\Cnblogs.Architecture.Ddd.Cqrs.EntityFramework.csproj" />
         <ProjectReference Include="..\..\src\Cnblogs.Architecture.Ddd.Cqrs.MongoDb\Cnblogs.Architecture.Ddd.Cqrs.MongoDb.csproj" />
         <ProjectReference Include="..\Cnblogs.Architecture.TestIntegrationEvents\Cnblogs.Architecture.TestIntegrationEvents.csproj" />

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Reflection;`
`2`		`-using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr;`
`3`	`2`	`using Cnblogs.Architecture.Ddd.EventBus.Abstractions;`
`4`	`3`	`using Cnblogs.Architecture.Ddd.EventBus.Dapr;`
`5`	`4`	`using Dapr.Client;`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ namespace Cnblogs.Architecture.Ddd.Infrastructure.Dapper.Clickhouse;`
`4`	`4`	`/// The options for clickhouse context.`
`5`	`5`	`/// </summary>`
`6`	`6`	`/// <typeparam name="TContext">The type of <see cref="ClickhouseDapperContext"/> been configured.</typeparam>`
	`7`	`+// ReSharper disable once UnusedTypeParameter`
`7`	`8`	`public class ClickhouseContextOptions<TContext> : ClickhouseContextOptions`
`8`	`9`	`where TContext : ClickhouseDapperContext`
`9`	`10`	`{`