From 3b265ddd0913f27ef57abb8a4dcab6caecb76c40 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 7 Dec 2020 10:41:39 +0800
Subject: [PATCH] Devart.Data.Oracle.EFCore is supported net 5.

---
 .../AbpOracleModelBuilderExtensions.cs        | 26 ++++----
 ...p.EntityFrameworkCore.Oracle.Devart.csproj |  2 +-
 ...figurationContextOracleDevartExtensions.cs | 61 ++++++++++--------
 ...pDbContextOptionsOracleDevartExtensions.cs | 64 +++++++++----------
 ...bpEntityFrameworkCoreOracleDevartModule.cs | 44 ++++++-------
 nupkg/common.ps1                              |  2 +-
 6 files changed, 103 insertions(+), 96 deletions(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Microsoft/EntityFrameworkCore/AbpOracleModelBuilderExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Microsoft/EntityFrameworkCore/AbpOracleModelBuilderExtensions.cs
index 23943873c3..eaf6d94a83 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Microsoft/EntityFrameworkCore/AbpOracleModelBuilderExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Microsoft/EntityFrameworkCore/AbpOracleModelBuilderExtensions.cs
@@ -1,13 +1,13 @@
-// using Volo.Abp.EntityFrameworkCore;
-//
-// namespace Microsoft.EntityFrameworkCore
-// {
-//     public static class AbpOracleModelBuilderExtensions
-//     {
-//         public static void UseOracle(
-//             this ModelBuilder modelBuilder)
-//         {
-//             modelBuilder.SetDatabaseProvider(EfCoreDatabaseProvider.Oracle);
-//         }
-//     }
-// }
+using Volo.Abp.EntityFrameworkCore;
+
+namespace Microsoft.EntityFrameworkCore
+{
+    public static class AbpOracleModelBuilderExtensions
+    {
+        public static void UseOracle(
+            this ModelBuilder modelBuilder)
+        {
+            modelBuilder.SetDatabaseProvider(EfCoreDatabaseProvider.Oracle);
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
index f42981a9ae..3d4e83e2ad 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
@@ -19,7 +19,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <!--<PackageReference Include="Devart.Data.Oracle.EFCore" Version="9.11.1034" />-->
+        <PackageReference Include="Devart.Data.Oracle.EFCore" Version="9.14.1150" />
     </ItemGroup>
 
 </Project>
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs
index eaaed380af..43c4c178ee 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs
@@ -1,27 +1,34 @@
-// using JetBrains.Annotations;
-// using Microsoft.EntityFrameworkCore;
-// using System;
-// using Devart.Data.Oracle.Entity;
-// using Volo.Abp.EntityFrameworkCore.DependencyInjection;
-//
-// namespace Volo.Abp.EntityFrameworkCore
-// {
-//     public static class AbpDbContextConfigurationContextOracleDevartExtensions
-//     {
-//         public static DbContextOptionsBuilder UseOracle(
-//            [NotNull] this AbpDbContextConfigurationContext context,
-//            [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
-//            bool useExistingConnectionIfAvailable = false)
-//         {
-//             TODO: UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
-//             if (useExistingConnectionIfAvailable && context.ExistingConnection != null)
-//             {
-//                 return context.DbContextOptions.UseOracle(context.ExistingConnection, oracleOptionsAction);
-//             }
-//             else
-//             {
-//                 return context.DbContextOptions.UseOracle(context.ConnectionString, oracleOptionsAction);
-//             }
-//         }
-//     }
-// }
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore;
+using System;
+using Devart.Data.Oracle.Entity;
+using Volo.Abp.EntityFrameworkCore.DependencyInjection;
+
+namespace Volo.Abp.EntityFrameworkCore
+{
+    public static class AbpDbContextConfigurationContextOracleDevartExtensions
+    {
+        public static DbContextOptionsBuilder UseOracle(
+           [NotNull] this AbpDbContextConfigurationContext context,
+           [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
+           bool useExistingConnectionIfAvailable = false)
+        {
+            if (useExistingConnectionIfAvailable && context.ExistingConnection != null)
+            {
+                return context.DbContextOptions.UseOracle(context.ExistingConnection, optionsBuilder =>
+                {
+                    optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+                    oracleOptionsAction?.Invoke(optionsBuilder);
+                });
+            }
+            else
+            {
+                return context.DbContextOptions.UseOracle(context.ConnectionString, optionsBuilder =>
+                {
+                    optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+                    oracleOptionsAction?.Invoke(optionsBuilder);
+                });
+            }
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs
index 99cfc84b8e..20887ceb79 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs
@@ -1,32 +1,32 @@
-// using JetBrains.Annotations;
-// using System;
-// using Devart.Data.Oracle.Entity;
-//
-// namespace Volo.Abp.EntityFrameworkCore
-// {
-//     public static class AbpDbContextOptionsOracleDevartExtensions
-//     {
-//         public static void UseOracle(
-//                 [NotNull] this AbpDbContextOptions options,
-//                 [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
-//                 bool useExistingConnectionIfAvailable = false)
-//         {
-//             options.Configure(context =>
-//             {
-//                 context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
-//             });
-//         }
-//
-//         public static void UseOracle<TDbContext>(
-//             [NotNull] this AbpDbContextOptions options,
-//             [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
-//             bool useExistingConnectionIfAvailable = false)
-//             where TDbContext : AbpDbContext<TDbContext>
-//         {
-//             options.Configure<TDbContext>(context =>
-//             {
-//                 context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
-//             });
-//         }
-//     }
-// }
+using JetBrains.Annotations;
+using System;
+using Devart.Data.Oracle.Entity;
+
+namespace Volo.Abp.EntityFrameworkCore
+{
+    public static class AbpDbContextOptionsOracleDevartExtensions
+    {
+        public static void UseOracle(
+                [NotNull] this AbpDbContextOptions options,
+                [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
+                bool useExistingConnectionIfAvailable = false)
+        {
+            options.Configure(context =>
+            {
+                context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
+            });
+        }
+
+        public static void UseOracle<TDbContext>(
+            [NotNull] this AbpDbContextOptions options,
+            [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
+            bool useExistingConnectionIfAvailable = false)
+            where TDbContext : AbpDbContext<TDbContext>
+        {
+            options.Configure<TDbContext>(context =>
+            {
+                context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
+            });
+        }
+    }
+}
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs
index 3b1b9cc337..9580219cfc 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs
@@ -1,22 +1,22 @@
-// using Volo.Abp.Guids;
-// using Volo.Abp.Modularity;
-//
-// namespace Volo.Abp.EntityFrameworkCore.Oracle.Devart
-// {
-//     [DependsOn(
-//         typeof(AbpEntityFrameworkCoreModule)
-//         )]
-//     public class AbpEntityFrameworkCoreOracleDevartModule : AbpModule
-//     {
-//         public override void ConfigureServices(ServiceConfigurationContext context)
-//         {
-//             Configure<AbpSequentialGuidGeneratorOptions>(options =>
-//             {
-//                 if (options.DefaultSequentialGuidType == null)
-//                 {
-//                     options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary;
-//                 }
-//             });
-//         }
-//     }
-// }
+using Volo.Abp.Guids;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.EntityFrameworkCore.Oracle.Devart
+{
+    [DependsOn(
+        typeof(AbpEntityFrameworkCoreModule)
+        )]
+    public class AbpEntityFrameworkCoreOracleDevartModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpSequentialGuidGeneratorOptions>(options =>
+            {
+                if (options.DefaultSequentialGuidType == null)
+                {
+                    options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary;
+                }
+            });
+        }
+    }
+}
diff --git a/nupkg/common.ps1 b/nupkg/common.ps1
index 98effbe598..29249ef3f4 100644
--- a/nupkg/common.ps1
+++ b/nupkg/common.ps1
@@ -87,7 +87,7 @@ $projects = (
     "framework/src/Volo.Abp.EntityFrameworkCore",
     "framework/src/Volo.Abp.EntityFrameworkCore.MySQL",
     # "framework/src/Volo.Abp.EntityFrameworkCore.Oracle",
-    # "framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart",
+    "framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart",
     "framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql",
     "framework/src/Volo.Abp.EntityFrameworkCore.Sqlite",
     "framework/src/Volo.Abp.EntityFrameworkCore.SqlServer",