Browse Source

Handling conflicts.

pull/23802/head
Ma Liming 11 months ago
committed by GitHub
parent
commit
c1b6557b7e
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      framework/Volo.Abp.slnx
  2. 1
      framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs
  3. 1
      framework/src/Volo.Abp.TickerQ/Volo.Abp.TickerQ.csproj

2
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" />

1
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);

1
framework/src/Volo.Abp.TickerQ/Volo.Abp.TickerQ.csproj

@ -18,7 +18,6 @@
<ItemGroup>
<PackageReference Include="TickerQ" />
<PackageReference Include="TickerQ.Dashboard" />
</ItemGroup>
<ItemGroup>

Loading…
Cancel
Save