From 0cc649d9ba314150c4a14c8f9824f84fb169286c Mon Sep 17 00:00:00 2001
From: Y2zz <yangyunzhou@foxmail.com>
Date: Sun, 3 Mar 2019 22:15:42 +0800
Subject: [PATCH] Change MySql.Data.EntityFrameworkCore To
 Pomelo.EntityFrameworkCore.MySql

---
 .../Volo.Abp.EntityFrameworkCore.MySQL.csproj             | 4 ++--
 .../AbpDbContextConfigurationContextMySQLExtensions.cs    | 8 ++++----
 .../AbpDbContextOptionsMySQLExtensions.cs                 | 6 +++---
 3 files changed, 9 insertions(+), 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
index 52d430bbaa..5e9c7a91fb 100644
--- 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/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextMySQLExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextMySQLExtensions.cs
index 35afda3d1e..542bf9e19e 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextMySQLExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.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 @@ namespace Volo.Abp.EntityFrameworkCore
     {
         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/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsMySQLExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsMySQLExtensions.cs
index f71bc631ec..3e2dd911be 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsMySQLExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsMySQLExtensions.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
-using MySql.Data.EntityFrameworkCore.Infraestructure;
 using System;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 
 namespace Volo.Abp.EntityFrameworkCore
 {
@@ -8,7 +8,7 @@ namespace Volo.Abp.EntityFrameworkCore
     {
         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 @@ namespace Volo.Abp.EntityFrameworkCore
 
         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 =>