Added CastleProxyHelper.

Author: hikalkan

src/Abp.EntityFramework.GraphDiff/GraphDiff/Extensions/GraphDiffExtensions.cs

@@ -25,9 +25,7 @@ public static class GraphDiffExtensions
         public static TEntity AttachGraph<TEntity, TPrimaryKey>(this IRepository<TEntity, TPrimaryKey> repository, TEntity entity)
             where TEntity : class, IEntity<TPrimaryKey>, new()
         {
-            var iocResolver = ((AbpRepositoryBase<TEntity, TPrimaryKey>)repository).IocResolver;
-
-            using (var mappingManager = iocResolver.ResolveAsDisposable<IEntityMappingManager>())
+            using (var mappingManager = repository.GetIocResolver().ResolveAsDisposable<IEntityMappingManager>())
             {
                 var mapping = mappingManager.Object.GetEntityMappingOrNull<TEntity>();
                 return repository

src/Abp.EntityFramework/EntityFramework/Repositories/EfRepositoryExtensions.cs

@@ -11,19 +11,13 @@ public static class EfRepositoryExtensions
         public static DbContext GetDbContext<TEntity, TPrimaryKey>(this IRepository<TEntity, TPrimaryKey> repository)
             where TEntity : class, IEntity<TPrimaryKey>
         {
-            var repositoryWithDbContext = repository as IRepositoryWithDbContext;
-            if (repositoryWithDbContext == null)
+            var repositoryWithDbContext = ProxyHelper.UnProxy(repository) as IRepositoryWithDbContext;
+            if (repositoryWithDbContext != null)
             {
-                throw new ArgumentException("Given repository does not implement IRepositoryWithDbContext", nameof(repository));
+                return repositoryWithDbContext.GetDbContext();
             }
 
-            var targetWithDbContext = CastleProxyHelper.GetProxyTargetOrNull(repository) as IRepositoryWithDbContext;
-            if (targetWithDbContext != null)
-            {
-                return targetWithDbContext.GetDbContext();
-            }
-
-            return repositoryWithDbContext.GetDbContext();
+            throw new ArgumentException("Given repository does not implement IRepositoryWithDbContext", nameof(repository));
         }
 
         public static void DetachFromDbContext<TEntity, TPrimaryKey>(this IRepository<TEntity, TPrimaryKey> repository, TEntity entity)

src/Abp.EntityFrameworkCore/EntityFrameworkCore/Repositories/EfCoreRepositoryExtensions.cs

@@ -11,18 +11,12 @@ public static class EfCoreRepositoryExtensions
         public static DbContext GetDbContext<TEntity, TPrimaryKey>(this IRepository<TEntity, TPrimaryKey> repository)
             where TEntity : class, IEntity<TPrimaryKey>
         {
-            var repositoryWithDbContext = repository as IRepositoryWithDbContext;
+            var repositoryWithDbContext = ProxyHelper.UnProxy(repository) as IRepositoryWithDbContext;
             if (repositoryWithDbContext != null)
             {
                 return repositoryWithDbContext.GetDbContext();
             }
 
-            var targetWithDbContext = CastleProxyHelper.GetProxyTargetOrNull(repository) as IRepositoryWithDbContext;
-            if (targetWithDbContext != null)
-            {
-                return targetWithDbContext.GetDbContext();
-            }
-
             throw new ArgumentException("Given repository does not implement IRepositoryWithDbContext", nameof(repository));
         }
 

src/Abp/Domain/Repositories/RepositoryExtensions.cs

@@ -3,7 +3,9 @@
 using System.Linq.Expressions;
 using System.Threading;
 using System.Threading.Tasks;
+using Abp.Dependency;
 using Abp.Domain.Entities;
+using Abp.Reflection;
 
 namespace Abp.Domain.Repositories
 {
@@ -13,14 +15,28 @@ public static async Task EnsureLoadedAsync<TEntity, TPrimaryKey, TProperty>(
             this IRepository<TEntity, TPrimaryKey> repository,
             TEntity entity,
             Expression<Func<TEntity, IEnumerable<TProperty>>> propertyExpression,
-            CancellationToken cancellationToken = default(CancellationToken))
+            CancellationToken cancellationToken = default(CancellationToken)
+        )
             where TEntity : class, IEntity<TPrimaryKey>
             where TProperty : class
         {
-            if (repository is ISupportsExplicitLoading<TEntity, TPrimaryKey>)
+            var repo = ProxyHelper.UnProxy(repository) as ISupportsExplicitLoading<TEntity, TPrimaryKey>;
+            if (repo != null)
             {
-                await (repository as ISupportsExplicitLoading<TEntity, TPrimaryKey>).EnsureLoadedAsync(entity, propertyExpression, cancellationToken);
+                await repo.EnsureLoadedAsync(entity, propertyExpression, cancellationToken);
             }
         }
+
+        public static IIocResolver GetIocResolver<TEntity, TPrimaryKey>(this IRepository<TEntity, TPrimaryKey> repository)
+            where TEntity : class, IEntity<TPrimaryKey>
+        {
+            var repo = ProxyHelper.UnProxy(repository) as AbpRepositoryBase<TEntity, TPrimaryKey>;
+            if (repo != null)
+            {
+                return repo.IocResolver;
+            }
+
+            throw new ArgumentException($"Given {nameof(repository)} is not inherited from {typeof(AbpRepositoryBase<TEntity, TPrimaryKey>).AssemblyQualifiedName}");
+        }
     }
 }

src/Abp/Reflection/CastleProxyHelper.cs

@@ -0,0 +1,30 @@
+using System.Linq;
+using System.Reflection;
+
+namespace Abp.Reflection
+{
+    public static class ProxyHelper
+    {
+        /// <summary>
+        /// Returns dynamic proxy target object if this is a proxied object, otherwise returns the given object. 
+        /// </summary>
+        public static object UnProxy(object obj)
+        {
+            if (obj.GetType().Namespace != "Castle.Proxies")
+            {
+                return obj;
+            }
+
+            var targetField = obj.GetType().GetTypeInfo()
+                .GetFields()
+                .FirstOrDefault(f => f.Name == "__target");
+
+            if (targetField == null)
+            {
+                return obj;
+            }
+
+            return targetField.GetValue(obj);
+        }
+    }
+}

src/Abp/Reflection/ProxyHelper.cs

@@ -1,4 +1,5 @@
 using Abp.Domain.Repositories;
+using Abp.Domain.Uow;
 using Abp.EntityFramework.Repositories;
 using Abp.Extensions;
 using Abp.TestBase.SampleApplication.Crm;
@@ -20,13 +21,18 @@ public EfRepositoryExtensions_Tests()
         [Fact]
         public void Should_Get_DbContext()
         {
-            _companyRepository.GetDbContext().ShouldBeOfType<SampleApplicationDbContext>();
+            using (var uow = Resolve<IUnitOfWorkManager>().Begin())
+            {
+                _companyRepository.GetDbContext().ShouldBeOfType<SampleApplicationDbContext>();
+
+                uow.Complete();
+            }
         }
 
         [Fact]
         public void Should_Get_IocResolver()
         {
-            _companyRepository.As<AbpRepositoryBase<Company, int>>().IocResolver.ShouldNotBeNull();
+            _companyRepository.GetIocResolver().ShouldNotBeNull();
         }
     }
 }

test/Abp.TestBase.SampleApplication.Tests/EntityFramework/EfRepositoryExtensions_Tests.cs

@@ -1,6 +1,7 @@
 using System.Linq;
 using Abp.Domain.Repositories;
 using Abp.Domain.Uow;
+using Abp.Reflection;
 using Abp.TestBase.SampleApplication.EntityFramework.Repositories;
 using Abp.TestBase.SampleApplication.People;
 using Shouldly;
@@ -20,7 +21,7 @@ public PersonRepository_General_Tests()
         [Fact]
         public void Should_Use_Custom_Base_Repository_Class()
         {
-            (_personRepository is SampleApplicationEfRepositoryBase<Person>).ShouldBeTrue();
+            (ProxyHelper.UnProxy(_personRepository) is SampleApplicationEfRepositoryBase<Person>).ShouldBeTrue();
         }
 
         [Fact]