Merge pull request abpframework#14711 from abpframework/auto-merge/re…

…l-7-0/1465 Merge branch dev with rel-7.0
stormwild · Nov 17, 2022 · 65ab755 · 65ab755
2 parents 7b8af2b + 02a12ed
commit 65ab755
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...nts.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/ApplicationConfigurationCache.cs b/...nts.MauiBlazor/Volo/Abp/AspNetCore/Components/MauiBlazor/ApplicationConfigurationCache.cs
@@ -9,7 +9,7 @@ public class ApplicationConfigurationCache : ISingletonDependency
 {
     protected ApplicationConfigurationDto Configuration { get; set; }
 
-    public event Func<Action> ApplicationConfigurationChanged;
+    public event Action ApplicationConfigurationChanged;
 
     public virtual ApplicationConfigurationDto Get()
     {

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <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>
 
 </Project>