From d0b1ce8076b2bd7927683e1e5994d4443540445d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 28 Jul 2020 12:18:21 +0300
Subject: [PATCH] Do not include base properties to type definitions

---
 .../Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs | 2 +-
 .../Volo/Abp/Http/Modeling/TypeApiDescriptionModel.cs           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs
index 3439b744e6..617650d0e2 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs
@@ -252,7 +252,7 @@ namespace Volo.Abp.AspNetCore.Mvc
 
             AddCustomTypesToModel(applicationModel, type.BaseType);
 
-            foreach (var propertyInfo in type.GetProperties())
+            foreach (var propertyInfo in type.GetProperties().Where(p => p.DeclaringType == type))
             {
                 AddCustomTypesToModel(applicationModel, propertyInfo.PropertyType);
             }
diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/TypeApiDescriptionModel.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/TypeApiDescriptionModel.cs
index a73c7dd40d..4b0b0b870c 100644
--- a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/TypeApiDescriptionModel.cs
+++ b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/TypeApiDescriptionModel.cs
@@ -47,6 +47,7 @@ namespace Volo.Abp.Http.Modeling
             {
                 typeModel.Properties = type
                     .GetProperties()
+                    .Where(p => p.DeclaringType == type)
                     .Select(PropertyApiDescriptionModel.Create)
                     .ToArray();