From c1b6557b7eb3d4231eeaa6f022086db6d79eee62 Mon Sep 17 00:00:00 2001
From: Ma Liming <malimings@gmail.com>
Date: Mon, 6 Oct 2025 10:01:57 +0800
Subject: [PATCH] Handling conflicts.

---
 framework/Volo.Abp.slnx                                    | 2 ++
 framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs | 1 +
 framework/src/Volo.Abp.TickerQ/Volo.Abp.TickerQ.csproj     | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/framework/Volo.Abp.slnx b/framework/Volo.Abp.slnx
index 03e76ed766..f4c0d2b373 100644
--- a/framework/Volo.Abp.slnx
+++ b/framework/Volo.Abp.slnx
@@ -164,6 +164,8 @@
     <Project Path="src/Volo.Abp.Validation/Volo.Abp.Validation.csproj" />
     <Project Path="src/Volo.Abp.VirtualFileSystem/Volo.Abp.VirtualFileSystem.csproj" />
     <Project Path="src/Volo.Abp/Volo.Abp.csproj" />
+    <Project Path="src/Volo.Abp.AI.Abstractions/Volo.Abp.AI.Abstractions.csproj" />
+    <Project Path="src/Volo.Abp.AI/Volo.Abp.AI.csproj" />
     <Project Path="src/Volo.Abp.TickerQ/Volo.Abp.TickerQ.csproj" />
     <Project Path="src/Volo.Abp.BackgroundJobs.TickerQ/Volo.Abp.BackgroundJobs.TickerQ.csproj" />
     <Project Path="src/Volo.Abp.BackgroundWorkers.TickerQ/Volo.Abp.BackgroundWorkers.TickerQ.csproj" />
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs
index aa85fabe1c..6811e2a9a1 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs
@@ -45,6 +45,7 @@ public abstract class AbpApplicationBase : IAbpApplication
 
         StartupModuleType = startupModuleType;
         Services = services;
+
         services.TryAddObjectAccessor<IServiceProvider>();
 
         var options = new AbpApplicationCreationOptions(services);
diff --git a/framework/src/Volo.Abp.TickerQ/Volo.Abp.TickerQ.csproj b/framework/src/Volo.Abp.TickerQ/Volo.Abp.TickerQ.csproj
index 0b8172d59f..89a037bab7 100644
--- a/framework/src/Volo.Abp.TickerQ/Volo.Abp.TickerQ.csproj
+++ b/framework/src/Volo.Abp.TickerQ/Volo.Abp.TickerQ.csproj
@@ -18,7 +18,6 @@
 
 <ItemGroup>
     <PackageReference Include="TickerQ" />
-    <PackageReference Include="TickerQ.Dashboard" />
 </ItemGroup>
 
 <ItemGroup>