diff --git a/.github/workflows/vsix.yml b/.github/workflows/vsix.yml index e9051a445..07be27207 100644 --- a/.github/workflows/vsix.yml +++ b/.github/workflows/vsix.yml @@ -67,7 +67,7 @@ jobs: mkdir vsix 7z x src/GUI/lib/efreveng90.exe.zip -oefreveng90 -y dir /a:-d /s /b "efreveng90" | find /c ":\" > filecount.txt - findstr "144" filecount.txt + findstr "147" filecount.txt - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v2 diff --git a/src/Core/RevEng.Core.80/ConnectionStringResolver.cs b/src/Core/RevEng.Core.80/ConnectionStringResolver.cs index 663e431c0..4e25795a7 100644 --- a/src/Core/RevEng.Core.80/ConnectionStringResolver.cs +++ b/src/Core/RevEng.Core.80/ConnectionStringResolver.cs @@ -4,11 +4,11 @@ using System.IO; using Microsoft.Data.SqlClient; using Microsoft.Data.Sqlite; +using MySqlConnector; using Npgsql; using Oracle.ManagedDataAccess.Client; #if !CORE90 using FirebirdSql.Data.FirebirdClient; -using MySqlConnector; #endif namespace RevEng.Core @@ -75,7 +75,7 @@ public IList ResolveAlias() { // Ignore } -#if !CORE90 + try { var a = new MySqlConnectionStringBuilder(connectionString); @@ -85,7 +85,7 @@ public IList ResolveAlias() { // Ignore } - +#if !CORE90 try { var a = new FbConnectionStringBuilder(connectionString); diff --git a/src/Core/RevEng.Core.80/ServiceProviderBuilder.cs b/src/Core/RevEng.Core.80/ServiceProviderBuilder.cs index 9620f14bf..a3d5de820 100644 --- a/src/Core/RevEng.Core.80/ServiceProviderBuilder.cs +++ b/src/Core/RevEng.Core.80/ServiceProviderBuilder.cs @@ -20,9 +20,7 @@ using Microsoft.Extensions.DependencyInjection; using Npgsql.EntityFrameworkCore.PostgreSQL.Design.Internal; using Oracle.EntityFrameworkCore.Design.Internal; -#if !CORE90 using Pomelo.EntityFrameworkCore.MySql.Design.Internal; -#endif using RevEng.Common; using RevEng.Core.Routines.Extensions; using SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime.Design; @@ -110,7 +108,7 @@ public static IServiceCollection AddEfpt(this IServiceCollection serviceCollecti AddPostgresProviderServices(serviceCollection, options); break; -#if !CORE90 + case DatabaseType.Mysql: var mysqlProvider = new MySqlDesignTimeServices(); mysqlProvider.ConfigureDesignTimeServices(serviceCollection); @@ -122,7 +120,7 @@ public static IServiceCollection AddEfpt(this IServiceCollection serviceCollecti } break; -#endif + case DatabaseType.Oracle: var oracleProvider = new OracleDesignTimeServices(); oracleProvider.ConfigureDesignTimeServices(serviceCollection); diff --git a/src/Core/RevEng.Core.90/RevEng.Core.90.csproj b/src/Core/RevEng.Core.90/RevEng.Core.90.csproj index f38046d83..d4a946640 100644 --- a/src/Core/RevEng.Core.90/RevEng.Core.90.csproj +++ b/src/Core/RevEng.Core.90/RevEng.Core.90.csproj @@ -41,7 +41,7 @@ - + diff --git a/src/GUI/lib/efreveng90.exe.zip b/src/GUI/lib/efreveng90.exe.zip index a6cecee3a..d45a0007b 100644 Binary files a/src/GUI/lib/efreveng90.exe.zip and b/src/GUI/lib/efreveng90.exe.zip differ