Browse Source

Merge pull request #14711 from abpframework/auto-merge/rel-7-0/1465

Merge branch dev with rel-7.0
pull/14713/head
maliming 4 years ago
committed by GitHub
parent
commit
65ab755285
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/ApplicationConfigurationCache.cs
  2. 2
      framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj

2
framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/ApplicationConfigurationCache.cs

@ -9,7 +9,7 @@ public class ApplicationConfigurationCache : ISingletonDependency
{ {
protected ApplicationConfigurationDto Configuration { get; set; } protected ApplicationConfigurationDto Configuration { get; set; }
public event Func<Action> ApplicationConfigurationChanged; public event Action ApplicationConfigurationChanged;
public virtual ApplicationConfigurationDto Get() public virtual ApplicationConfigurationDto Get()
{ {

2
framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj

@ -20,7 +20,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCorePackageVersion)" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCorePackageVersion)" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.0" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0-alpha.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

Loading…
Cancel
Save