From 521b3ac89c020f92496b9cab998b4bbe62daed4e Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 14:54:52 +0300 Subject: [PATCH] UnitOfWorkOptions to AbpUnitOfWorkOptions --- .../Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs | 4 ++-- ...tOfWorkOptions.cs => AbpUnitOfWorkOptions.cs} | 6 +++--- .../Volo.Abp.Uow/Volo/Abp/Uow/ChildUnitOfWork.cs | 4 ++-- ...OfWorkOptions.cs => IAbpUnitOfWorkOptions.cs} | 2 +- .../src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWork.cs | 4 ++-- .../Volo/Abp/Uow/IUnitOfWorkManager.cs | 6 +++--- .../src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs | 4 ++-- .../Volo/Abp/Uow/UnitOfWorkAttribute.cs | 2 +- .../Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs | 2 +- .../Volo/Abp/Uow/UnitOfWorkInterceptor.cs | 4 ++-- .../Volo/Abp/Uow/UnitOfWorkManager.cs | 6 +++--- .../Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs | 6 +++--- .../Repositories/PersonDapperRepository_Tests.cs | 2 +- .../Transactions/Transaction_Tests.cs | 6 +++--- .../Volo/Abp/TestApp/Testing/TestAppTestBase.cs | 16 ++++++++-------- .../AbpPermissionManagementDomainSharedModule.cs | 2 +- .../AbpPermissionManagementWebModule.cs | 2 +- .../AbpSettingManagementDomainSharedModule.cs | 2 +- .../AbpSettingManagementWebModule.cs | 2 +- .../AbpTenantManagementDomainSharedModule.cs | 2 +- .../AbpTenantManagementWebModule.cs | 2 +- .../BookStoreDomainSharedModule.cs | 2 +- .../BookStoreHttpApiHostModule.cs | 2 +- .../Acme.BookStore.TestBase/BookStoreTestBase.cs | 16 ++++++++-------- .../BookStoreDomainSharedModule.cs | 2 +- .../src/Acme.BookStore.Web/BookStoreWebModule.cs | 2 +- .../Acme.BookStore.TestBase/BookStoreTestBase.cs | 16 ++++++++-------- .../BookManagementHttpApiHostModule.cs | 2 +- .../BookManagementWebHostModule.cs | 2 +- .../BookManagementWebUnifiedModule.cs | 2 +- .../BookManagementApplicationContractsModule.cs | 2 +- .../BookManagementDomainSharedModule.cs | 2 +- .../BookManagementWebModule.cs | 2 +- .../BookManagementTestBase.cs | 16 ++++++++-------- .../BookStoreDomainSharedModule.cs | 2 +- .../src/Acme.BookStore.Web/BookStoreWebModule.cs | 2 +- .../Acme.BookStore.TestBase/BookStoreTestBase.cs | 16 ++++++++-------- .../DashboardDemoDomainSharedModule.cs | 2 +- .../DashboardDemo.Web/DashboardDemoWebModule.cs | 2 +- .../DashboardDemoTestBase.cs | 16 ++++++++-------- ...roductManagementApplicationContractsModule.cs | 2 +- .../ProductManagementDomainModule.cs | 2 +- .../ProductManagementWebModule.cs | 2 +- .../ProductManagementDomainTestBase.cs | 16 ++++++++-------- .../MyProjectNameDomainSharedModule.cs | 2 +- .../MyProjectNameHttpApiHostModule.cs | 2 +- .../MyProjectNameHttpApiHostModule.cs | 2 +- .../MyProjectNameIdentityServerModule.cs | 2 +- .../MyProjectNameWebModule.cs | 2 +- .../MyProjectNameWebModule.cs | 2 +- .../MyProjectNameTestBase.cs | 16 ++++++++-------- .../MyProjectNameHttpApiHostModule.cs | 2 +- .../MyProjectNameWebHostModule.cs | 2 +- .../MyProjectNameWebUnifiedModule.cs | 2 +- .../MyProjectNameApplicationContractsModule.cs | 2 +- .../MyProjectNameDomainSharedModule.cs | 2 +- .../MyProjectNameWebModule.cs | 2 +- .../MyProjectNameTestBase.cs | 16 ++++++++-------- 58 files changed, 136 insertions(+), 136 deletions(-) rename framework/src/Volo.Abp.Uow/Volo/Abp/Uow/{UnitOfWorkOptions.cs => AbpUnitOfWorkOptions.cs} (76%) rename framework/src/Volo.Abp.Uow/Volo/Abp/Uow/{IUnitOfWorkOptions.cs => IAbpUnitOfWorkOptions.cs} (81%) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs index 0a03a0dc67..c459982007 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Uow/AbpUowActionFilter.cs @@ -68,9 +68,9 @@ namespace Volo.Abp.AspNetCore.Mvc.Uow } } - private UnitOfWorkOptions CreateOptions(ActionExecutingContext context, UnitOfWorkAttribute unitOfWorkAttribute) + private AbpUnitOfWorkOptions CreateOptions(ActionExecutingContext context, UnitOfWorkAttribute unitOfWorkAttribute) { - var options = new UnitOfWorkOptions(); + var options = new AbpUnitOfWorkOptions(); unitOfWorkAttribute?.SetOptions(options); diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkOptions.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkOptions.cs similarity index 76% rename from framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkOptions.cs rename to framework/src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkOptions.cs index 3d433f3738..dd39612921 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkOptions.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkOptions.cs @@ -3,7 +3,7 @@ using System.Data; namespace Volo.Abp.Uow { - public class UnitOfWorkOptions : IUnitOfWorkOptions + public class AbpUnitOfWorkOptions : IAbpUnitOfWorkOptions { /// /// Default: false. @@ -14,9 +14,9 @@ namespace Volo.Abp.Uow public TimeSpan? Timeout { get; set; } - public UnitOfWorkOptions Clone() + public AbpUnitOfWorkOptions Clone() { - return new UnitOfWorkOptions + return new AbpUnitOfWorkOptions { IsTransactional = IsTransactional, IsolationLevel = IsolationLevel, diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ChildUnitOfWork.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ChildUnitOfWork.cs index 508fb1db4f..0d2686cdfe 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ChildUnitOfWork.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/ChildUnitOfWork.cs @@ -9,7 +9,7 @@ namespace Volo.Abp.Uow { public Guid Id => _parent.Id; - public IUnitOfWorkOptions Options => _parent.Options; + public IAbpUnitOfWorkOptions Options => _parent.Options; public IUnitOfWork Outer => _parent.Outer; @@ -43,7 +43,7 @@ namespace Volo.Abp.Uow _parent.SetOuter(outer); } - public void Initialize(UnitOfWorkOptions options) + public void Initialize(AbpUnitOfWorkOptions options) { _parent.Initialize(options); } diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkOptions.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IAbpUnitOfWorkOptions.cs similarity index 81% rename from framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkOptions.cs rename to framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IAbpUnitOfWorkOptions.cs index b79b7112b8..1f63a12b6d 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkOptions.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IAbpUnitOfWorkOptions.cs @@ -3,7 +3,7 @@ using System.Data; namespace Volo.Abp.Uow { - public interface IUnitOfWorkOptions + public interface IAbpUnitOfWorkOptions { bool IsTransactional { get; } diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWork.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWork.cs index cdf1a505b8..cf65ca69e7 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWork.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWork.cs @@ -14,7 +14,7 @@ namespace Volo.Abp.Uow event EventHandler Disposed; - IUnitOfWorkOptions Options { get; } + IAbpUnitOfWorkOptions Options { get; } IUnitOfWork Outer { get; } @@ -28,7 +28,7 @@ namespace Volo.Abp.Uow void SetOuter([CanBeNull] IUnitOfWork outer); - void Initialize([NotNull] UnitOfWorkOptions options); + void Initialize([NotNull] AbpUnitOfWorkOptions options); void Reserve([NotNull] string reservationName); diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkManager.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkManager.cs index 264390fbbe..b997cb6970 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkManager.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkManager.cs @@ -8,13 +8,13 @@ namespace Volo.Abp.Uow IUnitOfWork Current { get; } [NotNull] - IUnitOfWork Begin([NotNull] UnitOfWorkOptions options, bool requiresNew = false); + IUnitOfWork Begin([NotNull] AbpUnitOfWorkOptions options, bool requiresNew = false); [NotNull] IUnitOfWork Reserve([NotNull] string reservationName, bool requiresNew = false); - void BeginReserved([NotNull] string reservationName, [NotNull] UnitOfWorkOptions options); + void BeginReserved([NotNull] string reservationName, [NotNull] AbpUnitOfWorkOptions options); - bool TryBeginReserved([NotNull] string reservationName, [NotNull] UnitOfWorkOptions options); + bool TryBeginReserved([NotNull] string reservationName, [NotNull] AbpUnitOfWorkOptions options); } } \ 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 0270e04d50..f3b30cf388 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs @@ -13,7 +13,7 @@ namespace Volo.Abp.Uow { public Guid Id { get; } = Guid.NewGuid(); - public IUnitOfWorkOptions Options { get; private set; } + public IAbpUnitOfWorkOptions Options { get; private set; } public IUnitOfWork Outer { get; private set; } @@ -49,7 +49,7 @@ namespace Volo.Abp.Uow _transactionApis = new Dictionary(); } - public virtual void Initialize(UnitOfWorkOptions options) + public virtual void Initialize(AbpUnitOfWorkOptions options) { Check.NotNull(options, nameof(options)); diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkAttribute.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkAttribute.cs index 26a7ca51f4..2dee2cd390 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkAttribute.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkAttribute.cs @@ -62,7 +62,7 @@ namespace Volo.Abp.Uow //TODO: More constructors! - public virtual void SetOptions(UnitOfWorkOptions options) + public virtual void SetOptions(AbpUnitOfWorkOptions options) { if (IsTransactional.HasValue) { diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs index 49ff633a5e..a13c77be33 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs @@ -16,7 +16,7 @@ namespace Volo.Abp.Uow public TimeSpan? Timeout { get; set; } - internal UnitOfWorkOptions Normalize(UnitOfWorkOptions options) + internal AbpUnitOfWorkOptions Normalize(AbpUnitOfWorkOptions options) { if (options.IsolationLevel == null) { diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs index 12a6f0e101..7e04c2b808 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs @@ -48,9 +48,9 @@ namespace Volo.Abp.Uow } } - private UnitOfWorkOptions CreateOptions(IAbpMethodInvocation invocation, [CanBeNull] UnitOfWorkAttribute unitOfWorkAttribute) + private AbpUnitOfWorkOptions CreateOptions(IAbpMethodInvocation invocation, [CanBeNull] UnitOfWorkAttribute unitOfWorkAttribute) { - var options = new UnitOfWorkOptions(); + var options = new AbpUnitOfWorkOptions(); unitOfWorkAttribute?.SetOptions(options); diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManager.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManager.cs index 73f9956876..479cf45117 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManager.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManager.cs @@ -19,7 +19,7 @@ namespace Volo.Abp.Uow _serviceScopeFactory = serviceScopeFactory; } - public IUnitOfWork Begin(UnitOfWorkOptions options, bool requiresNew = false) + public IUnitOfWork Begin(AbpUnitOfWorkOptions options, bool requiresNew = false) { Check.NotNull(options, nameof(options)); @@ -52,7 +52,7 @@ namespace Volo.Abp.Uow return unitOfWork; } - public void BeginReserved(string reservationName, UnitOfWorkOptions options) + public void BeginReserved(string reservationName, AbpUnitOfWorkOptions options) { if (!TryBeginReserved(reservationName, options)) { @@ -60,7 +60,7 @@ namespace Volo.Abp.Uow } } - public bool TryBeginReserved(string reservationName, UnitOfWorkOptions options) + public bool TryBeginReserved(string reservationName, AbpUnitOfWorkOptions options) { Check.NotNull(reservationName, nameof(reservationName)); diff --git a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs index c9f888f275..bf8859d6ac 100644 --- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs +++ b/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs @@ -9,7 +9,7 @@ namespace Volo.Abp.Uow { Check.NotNull(unitOfWorkManager, nameof(unitOfWorkManager)); - return unitOfWorkManager.Begin(new UnitOfWorkOptions(), requiresNew); + return unitOfWorkManager.Begin(new AbpUnitOfWorkOptions(), requiresNew); } public static void BeginReserved([NotNull] this IUnitOfWorkManager unitOfWorkManager, [NotNull] string reservationName) @@ -17,7 +17,7 @@ namespace Volo.Abp.Uow Check.NotNull(unitOfWorkManager, nameof(unitOfWorkManager)); Check.NotNull(reservationName, nameof(reservationName)); - unitOfWorkManager.BeginReserved(reservationName, new UnitOfWorkOptions()); + unitOfWorkManager.BeginReserved(reservationName, new AbpUnitOfWorkOptions()); } public static void TryBeginReserved([NotNull] this IUnitOfWorkManager unitOfWorkManager, [NotNull] string reservationName) @@ -25,7 +25,7 @@ namespace Volo.Abp.Uow Check.NotNull(unitOfWorkManager, nameof(unitOfWorkManager)); Check.NotNull(reservationName, nameof(reservationName)); - unitOfWorkManager.TryBeginReserved(reservationName, new UnitOfWorkOptions()); + unitOfWorkManager.TryBeginReserved(reservationName, new AbpUnitOfWorkOptions()); } } } \ No newline at end of file diff --git a/framework/test/Volo.Abp.Dapper.Tests/Volo/Abp/Dapper/Repositories/PersonDapperRepository_Tests.cs b/framework/test/Volo.Abp.Dapper.Tests/Volo/Abp/Dapper/Repositories/PersonDapperRepository_Tests.cs index 3b5a7a4dd3..28734c1fd0 100644 --- a/framework/test/Volo.Abp.Dapper.Tests/Volo/Abp/Dapper/Repositories/PersonDapperRepository_Tests.cs +++ b/framework/test/Volo.Abp.Dapper.Tests/Volo/Abp/Dapper/Repositories/PersonDapperRepository_Tests.cs @@ -36,7 +36,7 @@ namespace Volo.Abp.Dapper.Repositories var unitOfWorkManager = GetRequiredService(); var personDapperRepository = GetRequiredService(); - using (var uow = unitOfWorkManager.Begin(new UnitOfWorkOptions + using (var uow = unitOfWorkManager.Begin(new AbpUnitOfWorkOptions { IsTransactional = true })) diff --git a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Transactions/Transaction_Tests.cs b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Transactions/Transaction_Tests.cs index 613c42894c..7d89da1a08 100644 --- a/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Transactions/Transaction_Tests.cs +++ b/framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Transactions/Transaction_Tests.cs @@ -32,7 +32,7 @@ namespace Volo.Abp.EntityFrameworkCore.Transactions try { - await WithUnitOfWorkAsync(new UnitOfWorkOptions { IsTransactional = true }, async () => + await WithUnitOfWorkAsync(new AbpUnitOfWorkOptions { IsTransactional = true }, async () => { await _personRepository.InsertAsync(new Person(personId, "Adam", 42)); throw new Exception(exceptionMessage); @@ -52,7 +52,7 @@ namespace Volo.Abp.EntityFrameworkCore.Transactions { var personId = Guid.NewGuid(); - await WithUnitOfWorkAsync(new UnitOfWorkOptions { IsTransactional = true }, async () => + await WithUnitOfWorkAsync(new AbpUnitOfWorkOptions { IsTransactional = true }, async () => { _unitOfWorkManager.Current.ShouldNotBeNull(); @@ -75,7 +75,7 @@ namespace Volo.Abp.EntityFrameworkCore.Transactions { var uowManager = scope.ServiceProvider.GetRequiredService(); - using (uowManager.Begin(new UnitOfWorkOptions { IsTransactional = true })) + using (uowManager.Begin(new AbpUnitOfWorkOptions { IsTransactional = true })) { _unitOfWorkManager.Current.ShouldNotBeNull(); diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/TestAppTestBase.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/TestAppTestBase.cs index 0f4af6666a..647e5eaa03 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/TestAppTestBase.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/TestAppTestBase.cs @@ -18,10 +18,10 @@ namespace Volo.Abp.TestApp.Testing protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -38,10 +38,10 @@ namespace Volo.Abp.TestApp.Testing protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -58,10 +58,10 @@ namespace Volo.Abp.TestApp.Testing protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -78,10 +78,10 @@ namespace Volo.Abp.TestApp.Testing protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs index adae510945..210ff6affc 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Domain.Shared/Volo/Abp/PermissionManagement/AbpPermissionManagementDomainSharedModule.cs @@ -13,7 +13,7 @@ namespace Volo.Abp.PermissionManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs index 38fd9827a1..cf1c3f13b1 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/AbpPermissionManagementWebModule.cs @@ -32,7 +32,7 @@ namespace Volo.Abp.PermissionManagement.Web public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp.PermissionManagement.Web"); }); diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/AbpSettingManagementDomainSharedModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/AbpSettingManagementDomainSharedModule.cs index 5f6f174f82..d6b6ba065e 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/AbpSettingManagementDomainSharedModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/AbpSettingManagementDomainSharedModule.cs @@ -10,7 +10,7 @@ namespace Volo.Abp.SettingManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs index a99317daa4..a9043eb115 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs @@ -28,7 +28,7 @@ namespace Volo.Abp.SettingManagement.Web options.MenuContributors.Add(new SettingManagementMainMenuContributor()); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp.SettingManagement.Web"); }); diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs index 873593f9ca..2058ae5425 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/AbpTenantManagementDomainSharedModule.cs @@ -10,7 +10,7 @@ namespace Volo.Abp.TenantManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs index 626970a1a9..dacf80475a 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebModule.cs @@ -42,7 +42,7 @@ namespace Volo.Abp.TenantManagement.Web options.MenuContributors.Add(new AbpTenantManagementWebMainMenuContributor()); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Volo.Abp.TenantManagement.Web"); }); diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs index f0a6ad7964..e7f8fc146a 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs @@ -28,7 +28,7 @@ namespace Acme.BookStore { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Acme.BookStore"); }); diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs index 1ab494026d..e0e96da5b6 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs @@ -69,7 +69,7 @@ namespace Acme.BookStore if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}Acme.BookStore.Domain.Shared")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}Acme.BookStore.Domain")); diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.TestBase/BookStoreTestBase.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.TestBase/BookStoreTestBase.cs index ba9d7c6b57..225ab01776 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.TestBase/BookStoreTestBase.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.TestBase/BookStoreTestBase.cs @@ -19,10 +19,10 @@ namespace Acme.BookStore protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -39,10 +39,10 @@ namespace Acme.BookStore protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -59,10 +59,10 @@ namespace Acme.BookStore protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -79,10 +79,10 @@ namespace Acme.BookStore protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs index 85cda77f69..fe94f9d80d 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs @@ -30,7 +30,7 @@ namespace Acme.BookStore { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Acme.BookStore"); }); diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs index 2b78cb9cab..89c3264848 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -115,7 +115,7 @@ namespace Acme.BookStore.Web { if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}..{Path.DirectorySeparatorChar}modules{Path.DirectorySeparatorChar}book-management{Path.DirectorySeparatorChar}src{Path.DirectorySeparatorChar}Acme.BookStore.BookManagement.Web")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}Acme.BookStore.Domain.Shared")); diff --git a/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/BookStoreTestBase.cs b/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/BookStoreTestBase.cs index ba9d7c6b57..225ab01776 100644 --- a/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/BookStoreTestBase.cs +++ b/samples/BookStore-Modular/application/test/Acme.BookStore.TestBase/BookStoreTestBase.cs @@ -19,10 +19,10 @@ namespace Acme.BookStore protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -39,10 +39,10 @@ namespace Acme.BookStore protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -59,10 +59,10 @@ namespace Acme.BookStore protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -79,10 +79,10 @@ namespace Acme.BookStore protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs index 6eddcf5707..3c45ec7c8f 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs @@ -54,7 +54,7 @@ namespace Acme.BookStore.BookManagement if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain", Path.DirectorySeparatorChar))); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs index 78072c9fe1..5a1fca1dc8 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs @@ -153,7 +153,7 @@ namespace Acme.BookStore.BookManagement { if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Application.Contracts", Path.DirectorySeparatorChar))); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs index bb4ec08c12..0449d0a372 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/BookManagementWebUnifiedModule.cs @@ -68,7 +68,7 @@ namespace Acme.BookStore.BookManagement if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain", Path.DirectorySeparatorChar))); diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/BookManagementApplicationContractsModule.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/BookManagementApplicationContractsModule.cs index be7f25cce2..9672318d88 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/BookManagementApplicationContractsModule.cs +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Application.Contracts/BookManagementApplicationContractsModule.cs @@ -12,7 +12,7 @@ namespace Acme.BookStore.BookManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Acme.BookStore.BookManagement"); }); diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs index 9cd37017c1..b64b359004 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Domain.Shared/BookManagementDomainSharedModule.cs @@ -14,7 +14,7 @@ namespace Acme.BookStore.BookManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Acme.BookStore.BookManagement"); }); diff --git a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs index 6aa4763cbf..e038ca13d8 100644 --- a/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs +++ b/samples/BookStore-Modular/modules/book-management/src/Acme.BookStore.BookManagement.Web/BookManagementWebModule.cs @@ -32,7 +32,7 @@ namespace Acme.BookStore.BookManagement.Web options.MenuContributors.Add(new BookManagementMenuContributor()); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Acme.BookStore.BookManagement.Web"); }); diff --git a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.TestBase/BookManagementTestBase.cs b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.TestBase/BookManagementTestBase.cs index 38f82684ad..d4a4de4ea9 100644 --- a/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.TestBase/BookManagementTestBase.cs +++ b/samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.TestBase/BookManagementTestBase.cs @@ -18,10 +18,10 @@ namespace Acme.BookStore.BookManagement protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -38,10 +38,10 @@ namespace Acme.BookStore.BookManagement protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -58,10 +58,10 @@ namespace Acme.BookStore.BookManagement protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -78,10 +78,10 @@ namespace Acme.BookStore.BookManagement protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/samples/BookStore/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs b/samples/BookStore/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs index f0a6ad7964..e7f8fc146a 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs @@ -28,7 +28,7 @@ namespace Acme.BookStore { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("Acme.BookStore"); }); diff --git a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs index 767b3ca138..06662e9b5f 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -108,7 +108,7 @@ namespace Acme.BookStore.Web { if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}Acme.BookStore.Domain.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}Acme.BookStore.Domain", Path.DirectorySeparatorChar))); diff --git a/samples/BookStore/test/Acme.BookStore.TestBase/BookStoreTestBase.cs b/samples/BookStore/test/Acme.BookStore.TestBase/BookStoreTestBase.cs index ba9d7c6b57..225ab01776 100644 --- a/samples/BookStore/test/Acme.BookStore.TestBase/BookStoreTestBase.cs +++ b/samples/BookStore/test/Acme.BookStore.TestBase/BookStoreTestBase.cs @@ -19,10 +19,10 @@ namespace Acme.BookStore protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -39,10 +39,10 @@ namespace Acme.BookStore protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -59,10 +59,10 @@ namespace Acme.BookStore protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -79,10 +79,10 @@ namespace Acme.BookStore protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain.Shared/DashboardDemoDomainSharedModule.cs b/samples/DashboardDemo/src/DashboardDemo.Domain.Shared/DashboardDemoDomainSharedModule.cs index b72a92121a..4b7195bb94 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Domain.Shared/DashboardDemoDomainSharedModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Domain.Shared/DashboardDemoDomainSharedModule.cs @@ -28,7 +28,7 @@ namespace DashboardDemo { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("DashboardDemo"); }); diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs index c599ee0ac4..77177b4aa5 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs @@ -114,7 +114,7 @@ namespace DashboardDemo.Web { if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}DashboardDemo.Domain.Shared", Path.DirectorySeparatorChar))); diff --git a/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemoTestBase.cs b/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemoTestBase.cs index 996a19aaf1..6cb687f0b9 100644 --- a/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemoTestBase.cs +++ b/samples/DashboardDemo/test/DashboardDemo.TestBase/DashboardDemoTestBase.cs @@ -19,10 +19,10 @@ namespace DashboardDemo protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -39,10 +39,10 @@ namespace DashboardDemo protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -59,10 +59,10 @@ namespace DashboardDemo protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -79,10 +79,10 @@ namespace DashboardDemo protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementApplicationContractsModule.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementApplicationContractsModule.cs index fedac990be..cb6ba03047 100644 --- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementApplicationContractsModule.cs +++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Application.Contracts/ProductManagement/ProductManagementApplicationContractsModule.cs @@ -16,7 +16,7 @@ namespace ProductManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs index 3dcd5c6f13..c1f4aebf55 100644 --- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs +++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Domain/ProductManagement/ProductManagementDomainModule.cs @@ -18,7 +18,7 @@ namespace ProductManagement { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded(); }); diff --git a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs index 16e7cf0c76..a544b49644 100644 --- a/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs +++ b/samples/MicroserviceDemo/modules/product/src/ProductManagement.Web/ProductManagementWebModule.cs @@ -33,7 +33,7 @@ namespace ProductManagement options.MenuContributors.Add(new ProductManagementMenuContributor()); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("ProductManagement"); }); diff --git a/samples/MicroserviceDemo/modules/product/test/ProductManagement.Domain.Tests/ProductManagement/ProductManagementDomainTestBase.cs b/samples/MicroserviceDemo/modules/product/test/ProductManagement.Domain.Tests/ProductManagement/ProductManagementDomainTestBase.cs index 7ad63742ba..062c57b44b 100644 --- a/samples/MicroserviceDemo/modules/product/test/ProductManagement.Domain.Tests/ProductManagement/ProductManagementDomainTestBase.cs +++ b/samples/MicroserviceDemo/modules/product/test/ProductManagement.Domain.Tests/ProductManagement/ProductManagementDomainTestBase.cs @@ -11,10 +11,10 @@ namespace ProductManagement protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -31,10 +31,10 @@ namespace ProductManagement protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -51,10 +51,10 @@ namespace ProductManagement protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -71,10 +71,10 @@ namespace ProductManagement protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs index 2de342535f..cb1f23151e 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs @@ -28,7 +28,7 @@ namespace MyCompanyName.MyProjectName { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("MyCompanyName.MyProjectName"); }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 387baee3ea..7eb27fdf2e 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -67,7 +67,7 @@ namespace MyCompanyName.MyProjectName if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain.Shared")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain")); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs index db8f6cf0a4..bfe87f7bcf 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs @@ -69,7 +69,7 @@ namespace MyCompanyName.MyProjectName if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain.Shared")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain")); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs index c083974f12..b06ba2e16f 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs @@ -69,7 +69,7 @@ namespace MyCompanyName.MyProjectName if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain.Shared")); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain")); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs index 5028b6d344..fea25f5908 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs @@ -151,7 +151,7 @@ namespace MyCompanyName.MyProjectName.Web { if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { // options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index 25a59a3d07..547dabe001 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -115,7 +115,7 @@ namespace MyCompanyName.MyProjectName.Web { if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { // options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs index f8248c5690..5cb98cde0c 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs @@ -19,10 +19,10 @@ namespace MyCompanyName.MyProjectName protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -39,10 +39,10 @@ namespace MyCompanyName.MyProjectName protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -59,10 +59,10 @@ namespace MyCompanyName.MyProjectName protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -79,10 +79,10 @@ namespace MyCompanyName.MyProjectName protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) { diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs index 84517aacc3..29c3f37b2a 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs @@ -53,7 +53,7 @@ namespace MyCompanyName.MyProjectName if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Domain.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Domain", Path.DirectorySeparatorChar))); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs index ef0e9556fd..2f7a728a3c 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs @@ -153,7 +153,7 @@ namespace MyCompanyName.MyProjectName { if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { // options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar))); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs index 0999f1d3b2..8f68ec5de4 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs @@ -67,7 +67,7 @@ namespace MyCompanyName.MyProjectName if (hostingEnvironment.IsDevelopment()) { - Configure(options => + Configure(options => { options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Domain.Shared", Path.DirectorySeparatorChar))); options.FileSets.ReplaceEmbeddedByPhysical(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Domain", Path.DirectorySeparatorChar))); diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs index 947e42f33a..5df67ff031 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyProjectNameApplicationContractsModule.cs @@ -14,7 +14,7 @@ namespace MyCompanyName.MyProjectName { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("MyCompanyName.MyProjectName"); }); diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs index 0141c3acb9..18d257c65b 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyProjectNameDomainSharedModule.cs @@ -14,7 +14,7 @@ namespace MyCompanyName.MyProjectName { public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("MyCompanyName.MyProjectName"); }); diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs index ec4ffacad5..c48e57542c 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs @@ -37,7 +37,7 @@ namespace MyCompanyName.MyProjectName.Web options.MenuContributors.Add(new MyProjectNameMenuContributor()); }); - Configure(options => + Configure(options => { options.FileSets.AddEmbedded("MyCompanyName.MyProjectName.Web"); }); diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs index 93304dfaeb..638ef8d4a3 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyProjectNameTestBase.cs @@ -18,10 +18,10 @@ namespace MyCompanyName.MyProjectName protected virtual void WithUnitOfWork(Action action) { - WithUnitOfWork(new UnitOfWorkOptions(), action); + WithUnitOfWork(new AbpUnitOfWorkOptions(), action); } - protected virtual void WithUnitOfWork(UnitOfWorkOptions options, Action action) + protected virtual void WithUnitOfWork(AbpUnitOfWorkOptions options, Action action) { using (var scope = ServiceProvider.CreateScope()) { @@ -38,10 +38,10 @@ namespace MyCompanyName.MyProjectName protected virtual Task WithUnitOfWorkAsync(Func func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func action) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func action) { using (var scope = ServiceProvider.CreateScope()) { @@ -58,10 +58,10 @@ namespace MyCompanyName.MyProjectName protected virtual TResult WithUnitOfWork(Func func) { - return WithUnitOfWork(new UnitOfWorkOptions(), func); + return WithUnitOfWork(new AbpUnitOfWorkOptions(), func); } - protected virtual TResult WithUnitOfWork(UnitOfWorkOptions options, Func func) + protected virtual TResult WithUnitOfWork(AbpUnitOfWorkOptions options, Func func) { using (var scope = ServiceProvider.CreateScope()) { @@ -78,10 +78,10 @@ namespace MyCompanyName.MyProjectName protected virtual Task WithUnitOfWorkAsync(Func> func) { - return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func); + return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func); } - protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func> func) + protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func> func) { using (var scope = ServiceProvider.CreateScope()) {