diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreDatabaseApi.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreDatabaseApi.cs index 767bdf6e27..cffda462b0 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreDatabaseApi.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreDatabaseApi.cs @@ -18,10 +18,5 @@ namespace Volo.Abp.Uow.EntityFrameworkCore { return DbContext.SaveChangesAsync(cancellationToken); } - - public void SaveChanges() - { - DbContext.SaveChanges(); - } } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreTransactionApi.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreTransactionApi.cs index 33f9aca1a7..99622dda96 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreTransactionApi.cs +++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Uow/EntityFrameworkCore/EfCoreTransactionApi.cs @@ -21,7 +21,13 @@ namespace Volo.Abp.Uow.EntityFrameworkCore AttendedDbContexts = new List(); } - public void Commit() + public Task CommitAsync() + { + Commit(); + return Task.CompletedTask; + } + + protected void Commit() { DbContextTransaction.Commit(); @@ -36,12 +42,6 @@ namespace Volo.Abp.Uow.EntityFrameworkCore } } - public Task CommitAsync() - { - Commit(); - return Task.CompletedTask; - } - public void Dispose() { DbContextTransaction.Dispose(); diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ISupportsSavingChanges.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ISupportsSavingChanges.cs index 4665f2a625..c9523bf702 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ISupportsSavingChanges.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ISupportsSavingChanges.cs @@ -5,8 +5,6 @@ namespace Volo.Abp.Uow { public interface ISupportsSavingChanges { - void SaveChanges(); - Task SaveChangesAsync(CancellationToken cancellationToken = default); } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ITransactionApi.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ITransactionApi.cs index 6bd78cc824..01a506abe3 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ITransactionApi.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ITransactionApi.cs @@ -5,8 +5,6 @@ namespace Volo.Abp.Uow { public interface ITransactionApi : IDisposable { - void Commit(); - Task CommitAsync(); } } \ No newline at end of file diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs index 05f49df180..b42b745fb4 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs @@ -302,15 +302,7 @@ namespace Volo.Abp.Uow } } } - - protected virtual void CommitTransactions() - { - foreach (var transaction in GetAllActiveTransactionApis()) - { - transaction.Commit(); - } - } - + protected virtual async Task CommitTransactionsAsync() { foreach (var transaction in GetAllActiveTransactionApis())