Merge pull request #855 from Y2zz/master

use Pomelo.EntityFrameworkCore.MySql
abpframework · Mar 4, 2019 · 6871371 · 6871371
2 parents fcb90ff + 0cc649d
commit 6871371
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
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
@@ -16,9 +16,9 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.EntityFrameworkCore\Volo.Abp.EntityFrameworkCore.csproj" />
   </ItemGroup>
-   
+
   <ItemGroup>
-    <PackageReference Include="MySql.Data.EntityFrameworkCore" Version="8.0.13" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/...ore.MySQL/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextMySQLExtensions.cs b/...ore.MySQL/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextMySQLExtensions.cs
@@ -1,7 +1,7 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
-using MySql.Data.EntityFrameworkCore.Infraestructure;
 using System;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Volo.Abp.EntityFrameworkCore.DependencyInjection;
 
 namespace Volo.Abp.EntityFrameworkCore
@@ -10,15 +10,15 @@ public static class AbpDbContextConfigurationContextMySQLExtensions
     {
         public static DbContextOptionsBuilder UseMySQL(
            [NotNull] this AbpDbContextConfigurationContext context,
-           [CanBeNull] Action<MySQLDbContextOptionsBuilder> mySQLOptionsAction = null)
+           [CanBeNull] Action<MySqlDbContextOptionsBuilder> mySQLOptionsAction = null)
         {
             if (context.ExistingConnection != null)
             {
-                return context.DbContextOptions.UseMySQL(context.ExistingConnection, mySQLOptionsAction);
+                return context.DbContextOptions.UseMySql(context.ExistingConnection, mySQLOptionsAction);
             }
             else
             {
-                return context.DbContextOptions.UseMySQL(context.ConnectionString, mySQLOptionsAction);
+                return context.DbContextOptions.UseMySql(context.ConnectionString, mySQLOptionsAction);
             }
         }
     }

diff --git a/...ityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsMySQLExtensions.cs b/...ityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsMySQLExtensions.cs
@@ -1,14 +1,14 @@
 using JetBrains.Annotations;
-using MySql.Data.EntityFrameworkCore.Infraestructure;
 using System;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace Volo.Abp.EntityFrameworkCore
 {
     public static class AbpDbContextOptionsMySQLExtensions
     {
         public static void UseMySQL(
                 [NotNull] this AbpDbContextOptions options,
-                [CanBeNull] Action<MySQLDbContextOptionsBuilder> mySQLOptionsAction = null)
+                [CanBeNull] Action<MySqlDbContextOptionsBuilder> mySQLOptionsAction = null)
         {
             options.Configure(context =>
             {
@@ -18,7 +18,7 @@ public static class AbpDbContextOptionsMySQLExtensions
 
         public static void UseMySQL<TDbContext>(
             [NotNull] this AbpDbContextOptions options,
-            [CanBeNull] Action<MySQLDbContextOptionsBuilder> mySQLOptionsAction = null)
+            [CanBeNull] Action<MySqlDbContextOptionsBuilder> mySQLOptionsAction = null)
             where TDbContext : AbpDbContext<TDbContext>
         {
             options.Configure<TDbContext>(context =>