diff --git a/src/Cnblogs.Architecture.Tool/Cnblogs.Architecture.Tool.csproj b/src/Cnblogs.Architecture.Tool/Cnblogs.Architecture.Tool.csproj
index 6b5e775..25f03f8 100644
--- a/src/Cnblogs.Architecture.Tool/Cnblogs.Architecture.Tool.csproj
+++ b/src/Cnblogs.Architecture.Tool/Cnblogs.Architecture.Tool.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <PackAsTool>true</PackAsTool>
-    <ToolCommandName>cnb</ToolCommandName>
+    <ToolCommandName>dotnet-cnb</ToolCommandName>
     <PackageId>cnb-arch-tool</PackageId>
     <Description>
       dotnet-cnblogs-sa: generates strongly-typed CQRS service agents (IXxxService / XxxService) from a
diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs
index 8b20abd..0c66d2b 100644
--- a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs
+++ b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs
@@ -13,15 +13,12 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
-var cqrs = builder.Services.AddCqrs(Assembly.GetExecutingAssembly(), typeof(TestIntegrationEvent).Assembly)
+builder.Services.AddCqrs(Assembly.GetExecutingAssembly(), typeof(TestIntegrationEvent).Assembly)
     .AddLongToStringJsonConverter()
     .AddDefaultIdProvider(0)
+    .AddEventBus(o => o.UseDapr(Constants.AppName))
     .AddEnrichers()
     .AddDefaultDateTimeAndRandomProvider();
-if (!ServiceAgentGeneration.IsActive)
-{
-    cqrs.AddEventBus(o => o.UseDapr(Constants.AppName));
-}
 
 builder.Services.AddControllers().AddCqrsModelBinderProvider().AddLongToStringJsonConverter();
 
@@ -33,11 +30,6 @@
 
 app.MapControllers();
 
-if (!ServiceAgentGeneration.IsActive)
-{
-    app.Subscribe<TestIntegrationEvent>();
-}
-
 var apis = app.NewVersionedApi();
 var v1 = apis.MapGroup("/api/v{version:apiVersion}").HasApiVersion(1);
 v1.MapQuery<GetStringQuery>(
@@ -68,6 +60,7 @@
 v1.MapPutCommand<UpdateCommand>("generic-map/strings");
 v1.MapDeleteCommand<DeleteCommand>("generic-map/strings/{id:int}");
 
+app.Subscribe<TestIntegrationEvent>();
 app.Run();
 
 namespace Cnblogs.Architecture.IntegrationTestProject
diff --git a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj
index b9135da..64427f1 100644
--- a/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj
+++ b/test/Cnblogs.Architecture.UnitTests/Cnblogs.Architecture.UnitTests.csproj
@@ -17,7 +17,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.10" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.6.0" />
     <PackageReference Include="coverlet.collector" Version="10.0.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>