From 6f2e0bfff1b64e3a7ef9669e1561b4bc66a7dec3 Mon Sep 17 00:00:00 2001 From: RaidMax Date: Fri, 6 Apr 2018 21:06:43 -0500 Subject: [PATCH] downgrade SQL connector version, context changes --- SharedLibrary/Database/ContextConfiguration.cs | 6 +++--- SharedLibrary/Database/DatabaseContext.cs | 4 ++-- SharedLibrary/Migrations/Configuration.cs | 4 ++++ SharedLibrary/SharedLibrary.csproj | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/SharedLibrary/Database/ContextConfiguration.cs b/SharedLibrary/Database/ContextConfiguration.cs index 3228b25d5..3350071bc 100644 --- a/SharedLibrary/Database/ContextConfiguration.cs +++ b/SharedLibrary/Database/ContextConfiguration.cs @@ -6,7 +6,7 @@ using System.Data.SqlServerCe; namespace SharedLibrary.Database { - class ContextConfiguration : DbConfiguration + public class ContextConfiguration : DbConfiguration { public ContextConfiguration() { @@ -20,10 +20,10 @@ namespace SharedLibrary.Database else { - /* SetExecutionStrategy("MySql.Data.MySqlClient", () => new DefaultExecutionStrategy()); + SetExecutionStrategy("MySql.Data.MySqlClient", () => new DefaultExecutionStrategy()); SetProviderFactory("MySql.Data.MySqlClient", new MySql.Data.MySqlClient.MySqlClientFactory()); SetProviderServices("MySql.Data.MySqlClient", new MySql.Data.MySqlClient.MySqlProviderServices()); - SetDefaultConnectionFactory(new MySql.Data.Entity.MySqlConnectionFactory());*/ + SetDefaultConnectionFactory(new MySql.Data.Entity.MySqlConnectionFactory()); } } } diff --git a/SharedLibrary/Database/DatabaseContext.cs b/SharedLibrary/Database/DatabaseContext.cs index 72dfe1e60..08f0bc44d 100644 --- a/SharedLibrary/Database/DatabaseContext.cs +++ b/SharedLibrary/Database/DatabaseContext.cs @@ -63,12 +63,12 @@ namespace SharedLibrary.Database IEnumerable directoryFiles; try { - directoryFiles = Directory.GetFiles($@"{Environment.CurrentDirectory}\bin\x86\Debug\Plugins").Where(f => f.Contains(".dll")); + directoryFiles = Directory.GetFiles($@"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}bin{Path.DirectorySeparatorChar}x86{Path.DirectorySeparatorChar}Debug{Path.DirectorySeparatorChar}Plugins").Where(f => f.Contains(".dll")); } catch (Exception) { - directoryFiles = Directory.GetFiles($@"{Environment.CurrentDirectory}\Plugins").Where(f => f.Contains(".dll")); + directoryFiles = Directory.GetFiles($@"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}Plugins").Where(f => f.Contains(".dll")); } foreach (string dllPath in directoryFiles) diff --git a/SharedLibrary/Migrations/Configuration.cs b/SharedLibrary/Migrations/Configuration.cs index a34bbebd5..196e788d1 100644 --- a/SharedLibrary/Migrations/Configuration.cs +++ b/SharedLibrary/Migrations/Configuration.cs @@ -11,6 +11,10 @@ namespace SharedLibrary.Migrations { AutomaticMigrationsEnabled = true; AutomaticMigrationDataLossAllowed = true; + if (Utilities.IsRunningOnMono()) + { + SetSqlGenerator("MySql.Data.MySqlClient", new MySql.Data.Entity.MySqlMigrationSqlGenerator()); + } } protected override void Seed(SharedLibrary.Database.DatabaseContext context) diff --git a/SharedLibrary/SharedLibrary.csproj b/SharedLibrary/SharedLibrary.csproj index ea9c8b611..0ba11e67c 100644 --- a/SharedLibrary/SharedLibrary.csproj +++ b/SharedLibrary/SharedLibrary.csproj @@ -244,7 +244,7 @@ 6.10.6 - 6.10.6 + 6.9.11 11.0.1