fixes #1967

ErikEJ · Dec 8, 2023 · 75a0bdf · 75a0bdf
1 parent 6c9476c
commit 75a0bdf
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/src/GUI/RevEng.Core.60/ServiceProviderBuilder.cs b/src/GUI/RevEng.Core.60/ServiceProviderBuilder.cs
@@ -14,6 +14,7 @@
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.DependencyInjection;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Design.Internal;
+using Oracle.EntityFrameworkCore.Design.Internal;
 using Pomelo.EntityFrameworkCore.MySql.Design.Internal;
 using RevEng.Common;
 using RevEng.Core.Procedures;
@@ -22,7 +23,6 @@
 #if !CORE80
 using FirebirdSql.EntityFrameworkCore.Firebird.Design.Internal;
 using Microsoft.EntityFrameworkCore.SqlServer.Design;
-using Oracle.EntityFrameworkCore.Design.Internal;
 #endif
 
 namespace RevEng.Core
@@ -217,12 +217,12 @@ public static IServiceCollection AddEfpt(this IServiceCollection serviceCollecti
                     }
 
                     break;
-#if !CORE80
+
                 case DatabaseType.Oracle:
                     var oracleProvider = new OracleDesignTimeServices();
                     oracleProvider.ConfigureDesignTimeServices(serviceCollection);
                     break;
-
+#if !CORE80
                 case DatabaseType.Firebird:
                     var firebirdProvider = new FbDesignTimeServices();
                     firebirdProvider.ConfigureDesignTimeServices(serviceCollection);

diff --git a/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj b/src/GUI/RevEng.Core.80/RevEng.Core.80.csproj
@@ -41,7 +41,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="8.0.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="8.0.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="8.0.0" />
-    <!--<PackageReference Include="Oracle.EntityFrameworkCore" Version="7.21.9" />-->
+    <PackageReference Include="Oracle.EntityFrameworkCore" Version="8.21.121" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="8.0.0-beta.2" />
     <PackageReference Include="SimplerSoftware.EntityFrameworkCore.SqlServer.NodaTime" Version="8.0.0" />
 		<PackageReference Include="System.CodeDom" Version="7.0.0" />

diff --git a/src/GUI/RevEng.Shared/Providers.cs b/src/GUI/RevEng.Shared/Providers.cs
@@ -350,11 +350,14 @@ public static List<NuGetPackage> GetNeededPackages(DatabaseType databaseType, bo
 
             if (databaseType == DatabaseType.Oracle)
             {
-                var pkgVersion = "7.21.9";
+                var pkgVersion = "7.21.12";
                 switch (codeGenerationMode)
                 {
                     case CodeGenerationMode.EFCore6:
-                        pkgVersion = "6.21.90";
+                        pkgVersion = "6.21.120";
+                        break;
+                    case CodeGenerationMode.EFCore8:
+                        pkgVersion = "8.21.121";
                         break;
                 }
 

diff --git a/src/GUI/lib/efreveng60.exe.zip b/src/GUI/lib/efreveng60.exe.zip
diff --git a/src/GUI/lib/efreveng70.exe.zip b/src/GUI/lib/efreveng70.exe.zip
diff --git a/src/GUI/lib/efreveng80.exe.zip b/src/GUI/lib/efreveng80.exe.zip