From fea7ff05139e9ff50c8097fa5389b4ef9ad21a15 Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 10 Nov 2021 07:53:08 +0000 Subject: [PATCH] fix: :bug: Fixed the MySQL issue after .net 6 upgrade #4393 * Update pomelo framework for net 6 support * Aspnetcore v6 * Revert spaservices * Update all references to old pomelo * Note problem line * Disable charsetoption in databaseextensions, version left * fix: fixed the compiler error Co-authored-by: Dyson Parkes --- src/Ombi.Store/Ombi.Store.csproj | 2 +- src/Ombi/Extensions/DatabaseExtensions.cs | 4 ++-- src/Ombi/Ombi.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Ombi.Store/Ombi.Store.csproj b/src/Ombi.Store/Ombi.Store.csproj index 7149b366e..f35da548f 100644 --- a/src/Ombi.Store/Ombi.Store.csproj +++ b/src/Ombi.Store/Ombi.Store.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Ombi/Extensions/DatabaseExtensions.cs b/src/Ombi/Extensions/DatabaseExtensions.cs index 70bd8c70e..a96011f1c 100644 --- a/src/Ombi/Extensions/DatabaseExtensions.cs +++ b/src/Ombi/Extensions/DatabaseExtensions.cs @@ -120,9 +120,9 @@ namespace Ombi.Extensions public static void ConfigureMySql(DbContextOptionsBuilder options, PerDatabaseConfiguration config) { - options.UseMySql(config.ConnectionString, b => + options.UseMySql(config.ConnectionString, ServerVersion.AutoDetect(config.ConnectionString), b => { - b.CharSetBehavior(Pomelo.EntityFrameworkCore.MySql.Infrastructure.CharSetBehavior.NeverAppend); + //b.CharSetBehavior(Pomelo.EntityFrameworkCore.MySql.Infrastructure.CharSetBehavior.NeverAppend); // ##ISSUE, link to migrations? b.EnableRetryOnFailure(); }); } diff --git a/src/Ombi/Ombi.csproj b/src/Ombi/Ombi.csproj index 615f36466..1f10c1058 100644 --- a/src/Ombi/Ombi.csproj +++ b/src/Ombi/Ombi.csproj @@ -74,7 +74,7 @@ - +