From 39732ce14922dacd2654a837db52919e4eded7d3 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Mon, 16 Nov 2020 21:31:59 +0800
Subject: [PATCH 1/3] Upgrade  Pomelo.EntityFrameworkCore.MySql to NET 5

---
 .../Volo.Abp.EntityFrameworkCore.MySQL.csproj                 | 2 +-
 .../AbpDbContextConfigurationContextMySQLExtensions.cs        | 4 ++--
 nupkg/common.ps1                                              | 2 +-
 3 files changed, 4 insertions(+), 4 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 7bf7b5d74f..f8a32c0da7 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
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0-alpha.3.ci.20201114020548" />
   </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 542bf9e19e..60f4337757 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
@@ -14,11 +14,11 @@ namespace Volo.Abp.EntityFrameworkCore
         {
             if (context.ExistingConnection != null)
             {
-                return context.DbContextOptions.UseMySql(context.ExistingConnection, mySQLOptionsAction);
+                return context.DbContextOptions.UseMySql(context.ExistingConnection, ServerVersion.AutoDetect(context.ConnectionString), mySQLOptionsAction);
             }
             else
             {
-                return context.DbContextOptions.UseMySql(context.ConnectionString, mySQLOptionsAction);
+                return context.DbContextOptions.UseMySql(context.ConnectionString, ServerVersion.AutoDetect(context.ConnectionString), mySQLOptionsAction);
             }
         }
     }
diff --git a/nupkg/common.ps1 b/nupkg/common.ps1
index 29cb13d9f3..98effbe598 100644
--- a/nupkg/common.ps1
+++ b/nupkg/common.ps1
@@ -85,7 +85,7 @@ $projects = (
     "framework/src/Volo.Abp.Ddd.Domain",
     "framework/src/Volo.Abp.Emailing",
     "framework/src/Volo.Abp.EntityFrameworkCore",
-    # "framework/src/Volo.Abp.EntityFrameworkCore.MySQL",
+    "framework/src/Volo.Abp.EntityFrameworkCore.MySQL",
     # "framework/src/Volo.Abp.EntityFrameworkCore.Oracle",
     # "framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart",
     "framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql",

From fd80e3cc3a77b829853e2ebedc4c197184e3cb05 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Mon, 16 Nov 2020 22:00:56 +0800
Subject: [PATCH 2/3] Update Volo.Abp.EntityFrameworkCore.MySQL.csproj

---
 .../Volo.Abp.EntityFrameworkCore.MySQL.csproj                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f8a32c0da7..87fd075166 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
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0-alpha.3.ci.20201114020548" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.0-alpha.2" />
   </ItemGroup>
 
 </Project>

From 5004265e7c2129ceef37b638824140e1b53430c8 Mon Sep 17 00:00:00 2001
From: liangshiwei <liangshiw@outlook.com>
Date: Tue, 17 Nov 2020 10:19:33 +0800
Subject: [PATCH 3/3] Change the length of mysql ClientProperty value field

---
 .../IdentityServerDbContextModelCreatingExtensions.cs         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs
index f63109f1f1..1759ce5855 100644
--- a/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs
+++ b/modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs
@@ -176,6 +176,10 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
                 b.HasKey(x => new {x.ClientId, x.Key, x.Value});
 
                 b.Property(x => x.Key).HasMaxLength(ClientPropertyConsts.KeyMaxLength).IsRequired();
+                if (IsDatabaseProvider(builder, options, EfCoreDatabaseProvider.MySql))
+                {
+                    ClientPropertyConsts.ValueMaxLength = 300;
+                }
                 b.Property(x => x.Value).HasMaxLength(ClientPropertyConsts.ValueMaxLength).IsRequired();
             });