From 54f33891db443cfa5f975df9e0ca6e2293f46b89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 25 Mar 2020 16:50:55 +0300
Subject: [PATCH] Configure entity extensions by convention.

---
 .../Modeling/AbpEntityTypeBuilderExtensions.cs             | 7 +++++--
 .../Abp/EntityFrameworkCore/TestMigrationsDbContext.cs     | 2 +-
 .../Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs    | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs
index 3c54044bd2..eca8831e35 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/Modeling/AbpEntityTypeBuilderExtensions.cs
@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Volo.Abp.Auditing;
 using Volo.Abp.Data;
 using Volo.Abp.Domain.Entities;
+using Volo.Abp.EntityFrameworkCore.Extensions;
 using Volo.Abp.EntityFrameworkCore.ValueComparers;
 using Volo.Abp.EntityFrameworkCore.ValueConverters;
 using Volo.Abp.MultiTenancy;
@@ -25,7 +26,7 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling
             b.TryConfigureCreationTime();
             b.TryConfigureLastModificationTime();
             b.TryConfigureModificationAudited();
-            b.TryConfigureMultiTenant(); 
+            b.TryConfigureMultiTenant();
         }
 
         public static void ConfigureConcurrencyStamp<T>(this EntityTypeBuilder<T> b)
@@ -60,6 +61,8 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling
                     .HasColumnName(nameof(IHasExtraProperties.ExtraProperties))
                     .HasConversion(new ExtraPropertiesValueConverter(b.Metadata.ClrType))
                     .Metadata.SetValueComparer(new AbpDictionaryValueComparer<string, object>());
+
+                EntityExtensionManager.ConfigureExtensions(b.Metadata.ClrType, b);
             }
         }
 
@@ -276,7 +279,7 @@ namespace Volo.Abp.EntityFrameworkCore.Modeling
         }
 
         public static void ConfigureFullAuditedAggregateRoot<T>(this EntityTypeBuilder<T> b)
-            where T : class 
+            where T : class
         {
             b.As<EntityTypeBuilder>().TryConfigureFullAudited();
             b.As<EntityTypeBuilder>().TryConfigureExtraProperties();
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/TestMigrationsDbContext.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/TestMigrationsDbContext.cs
index 83e6d407a4..6293e21716 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/TestMigrationsDbContext.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/TestMigrationsDbContext.cs
@@ -37,7 +37,7 @@ namespace Volo.Abp.EntityFrameworkCore
 
             modelBuilder.Entity<City>(b =>
             {
-                b.ConfigureExtensions();
+                //b.ConfigureExtensions();
 
                 b.OwnsMany(c => c.Districts, d =>
                 {
diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs
index 701aff4307..3bc1678764 100644
--- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs
+++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs
@@ -44,7 +44,7 @@ namespace Volo.Abp.TestApp.EntityFrameworkCore
 
             modelBuilder.Entity<City>(b =>
             {
-                b.ConfigureExtensions();
+                //b.ConfigureExtensions();
 
                 b.OwnsMany(c => c.Districts, d =>
                 {