Merge branch 'dev' into IsChangeTrackingEnabled

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/ISupportsExplicitLoading.cs

@@ -7,8 +7,8 @@ using Volo.Abp.Domain.Entities;
 
 namespace Volo.Abp.Domain.Repositories;
 
-public interface ISupportsExplicitLoading<TEntity, TKey>
-    where TEntity : class, IEntity<TKey>
+public interface ISupportsExplicitLoading<TEntity>
+    where TEntity : class, IEntity
 {
     Task EnsureCollectionLoadedAsync<TProperty>(
         TEntity entity,

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryExtensions.cs

@@ -15,16 +15,16 @@ namespace Volo.Abp.Domain.Repositories;
 
 public static class RepositoryExtensions
 {
-    public async static Task EnsureCollectionLoadedAsync<TEntity, TKey, TProperty>(
-        this IBasicRepository<TEntity, TKey> repository,
+    public async static Task EnsureCollectionLoadedAsync<TEntity, TProperty>(
+        this IBasicRepository<TEntity> repository,
         TEntity entity,
         Expression<Func<TEntity, IEnumerable<TProperty>>> propertyExpression,
         CancellationToken cancellationToken = default
     )
-        where TEntity : class, IEntity<TKey>
+        where TEntity : class, IEntity
         where TProperty : class
     {
-        var repo = ProxyHelper.UnProxy(repository) as ISupportsExplicitLoading<TEntity, TKey>;
+        var repo = ProxyHelper.UnProxy(repository) as ISupportsExplicitLoading<TEntity>;
         if (repo != null)
         {
             await repo.EnsureCollectionLoadedAsync(entity, propertyExpression, cancellationToken);
@@ -40,7 +40,7 @@ public static class RepositoryExtensions
         where TEntity : class, IEntity<TKey>
         where TProperty : class
     {
-        var repo = ProxyHelper.UnProxy(repository) as ISupportsExplicitLoading<TEntity, TKey>;
+        var repo = ProxyHelper.UnProxy(repository) as ISupportsExplicitLoading<TEntity>;
         if (repo != null)
         {
             await repo.EnsurePropertyLoadedAsync(entity, propertyExpression, cancellationToken);
@@ -60,12 +60,12 @@ public static class RepositoryExtensions
         }
     }
 
-    public async static Task EnsureExistsAsync<TEntity, TKey>(
-        this IRepository<TEntity, TKey> repository,
+    public async static Task EnsureExistsAsync<TEntity>(
+        this IRepository<TEntity> repository,
         Expression<Func<TEntity, bool>> expression,
         CancellationToken cancellationToken = default
     )
-        where TEntity : class, IEntity<TKey>
+        where TEntity : class, IEntity
     {
         if (!await repository.AnyAsync(expression, cancellationToken))
         {

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs

@@ -441,7 +441,7 @@ public class EfCoreRepository<TDbContext, TEntity> : RepositoryBase<TEntity>, IE
 
 public class EfCoreRepository<TDbContext, TEntity, TKey> : EfCoreRepository<TDbContext, TEntity>,
     IEfCoreRepository<TEntity, TKey>,
-    ISupportsExplicitLoading<TEntity, TKey>
+    ISupportsExplicitLoading<TEntity>
 
     where TDbContext : IEfCoreDbContext
     where TEntity : class, IEntity<TKey>