UnitOfWorkOptions to AbpUnitOfWorkOptions

7 years ago · 521b3ac89c
58 changed files with 136 additions and 136 deletions
--- 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);

--- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkOptions.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
    {
        /// <summary>
        /// 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,
--- 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);
        }
--- a/framework/src/Volo.Abp.Uow/Volo/Abp/Uow/IAbpUnitOfWorkOptions.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; }

--- 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<UnitOfWorkEventArgs> 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);

--- 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);
    }
 }
--- 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<string, ITransactionApi>();
        }

-        public virtual void Initialize(UnitOfWorkOptions options)
+        public virtual void Initialize(AbpUnitOfWorkOptions options)
        {
            Check.NotNull(options, nameof(options));

--- 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)
            {
--- 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)
            {
--- 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);

--- 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));

--- 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());
        }
    }
 }
--- 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<IUnitOfWorkManager>();
            var personDapperRepository = GetRequiredService<PersonDapperRepository>();

-            using (var uow = unitOfWorkManager.Begin(new UnitOfWorkOptions
+            using (var uow = unitOfWorkManager.Begin(new AbpUnitOfWorkOptions
            {
                IsTransactional = true
            }))
--- 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<IUnitOfWorkManager>();

-                using (uowManager.Begin(new UnitOfWorkOptions { IsTransactional = true }))
+                using (uowManager.Begin(new AbpUnitOfWorkOptions { IsTransactional = true }))
                {
                    _unitOfWorkManager.Current.ShouldNotBeNull();

--- 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<Task> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func<Task> action)
+        protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func<Task> action)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -58,10 +58,10 @@ namespace Volo.Abp.TestApp.Testing

        protected virtual TResult WithUnitOfWork<TResult>(Func<TResult> func)
        {
-            return WithUnitOfWork(new UnitOfWorkOptions(), func);
+            return WithUnitOfWork(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual TResult WithUnitOfWork<TResult>(UnitOfWorkOptions options, Func<TResult> func)
+        protected virtual TResult WithUnitOfWork<TResult>(AbpUnitOfWorkOptions options, Func<TResult> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -78,10 +78,10 @@ namespace Volo.Abp.TestApp.Testing

        protected virtual Task<TResult> WithUnitOfWorkAsync<TResult>(Func<Task<TResult>> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(UnitOfWorkOptions options, Func<Task<TResult>> func)
+        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(AbpUnitOfWorkOptions options, Func<Task<TResult>> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<AbpPermissionManagementDomainSharedModule>();
            });
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<AbpPermissionManagementWebModule>("Volo.Abp.PermissionManagement.Web");
            });
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<AbpSettingManagementDomainSharedModule>();
            });
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<AbpSettingManagementWebModule>("Volo.Abp.SettingManagement.Web");
            });
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<AbpTenantManagementDomainSharedModule>();
            });
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<AbpTenantManagementWebModule>("Volo.Abp.TenantManagement.Web");
            });
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<BookStoreDomainSharedModule>("Acme.BookStore");
            });
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    options.FileSets.ReplaceEmbeddedByPhysical<BookStoreDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}Acme.BookStore.Domain.Shared"));
                    options.FileSets.ReplaceEmbeddedByPhysical<BookStoreDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}Acme.BookStore.Domain"));
--- 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<Task> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func<Task> action)
+        protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func<Task> action)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -59,10 +59,10 @@ namespace Acme.BookStore

        protected virtual TResult WithUnitOfWork<TResult>(Func<TResult> func)
        {
-            return WithUnitOfWork(new UnitOfWorkOptions(), func);
+            return WithUnitOfWork(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual TResult WithUnitOfWork<TResult>(UnitOfWorkOptions options, Func<TResult> func)
+        protected virtual TResult WithUnitOfWork<TResult>(AbpUnitOfWorkOptions options, Func<TResult> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -79,10 +79,10 @@ namespace Acme.BookStore

        protected virtual Task<TResult> WithUnitOfWorkAsync<TResult>(Func<Task<TResult>> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(UnitOfWorkOptions options, Func<Task<TResult>> func)
+        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(AbpUnitOfWorkOptions options, Func<Task<TResult>> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<BookStoreDomainSharedModule>("Acme.BookStore");
            });
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    options.FileSets.ReplaceEmbeddedByPhysical<BookManagementWebModule>(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<BookStoreDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}Acme.BookStore.Domain.Shared"));
--- 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<Task> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func<Task> action)
+        protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func<Task> action)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -59,10 +59,10 @@ namespace Acme.BookStore

        protected virtual TResult WithUnitOfWork<TResult>(Func<TResult> func)
        {
-            return WithUnitOfWork(new UnitOfWorkOptions(), func);
+            return WithUnitOfWork(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual TResult WithUnitOfWork<TResult>(UnitOfWorkOptions options, Func<TResult> func)
+        protected virtual TResult WithUnitOfWork<TResult>(AbpUnitOfWorkOptions options, Func<TResult> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -79,10 +79,10 @@ namespace Acme.BookStore

        protected virtual Task<TResult> WithUnitOfWorkAsync<TResult>(Func<Task<TResult>> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(UnitOfWorkOptions options, Func<Task<TResult>> func)
+        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(AbpUnitOfWorkOptions options, Func<Task<TResult>> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    options.FileSets.ReplaceEmbeddedByPhysical<BookManagementDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain.Shared", Path.DirectorySeparatorChar)));
                    options.FileSets.ReplaceEmbeddedByPhysical<BookManagementDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain", Path.DirectorySeparatorChar)));
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    options.FileSets.ReplaceEmbeddedByPhysical<BookManagementDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain", Path.DirectorySeparatorChar)));
                    options.FileSets.ReplaceEmbeddedByPhysical<BookManagementApplicationContractsModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Application.Contracts", Path.DirectorySeparatorChar)));
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    options.FileSets.ReplaceEmbeddedByPhysical<BookManagementDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain.Shared", Path.DirectorySeparatorChar)));
                    options.FileSets.ReplaceEmbeddedByPhysical<BookManagementDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}Acme.BookStore.BookManagement.Domain", Path.DirectorySeparatorChar)));
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<BookManagementApplicationContractsModule>("Acme.BookStore.BookManagement");
            });
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<BookManagementDomainSharedModule>("Acme.BookStore.BookManagement");
            });
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<BookManagementWebModule>("Acme.BookStore.BookManagement.Web");
            });
--- 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<Task> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func<Task> action)
+        protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func<Task> action)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -58,10 +58,10 @@ namespace Acme.BookStore.BookManagement

        protected virtual TResult WithUnitOfWork<TResult>(Func<TResult> func)
        {
-            return WithUnitOfWork(new UnitOfWorkOptions(), func);
+            return WithUnitOfWork(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual TResult WithUnitOfWork<TResult>(UnitOfWorkOptions options, Func<TResult> func)
+        protected virtual TResult WithUnitOfWork<TResult>(AbpUnitOfWorkOptions options, Func<TResult> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -78,10 +78,10 @@ namespace Acme.BookStore.BookManagement

        protected virtual Task<TResult> WithUnitOfWorkAsync<TResult>(Func<Task<TResult>> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(UnitOfWorkOptions options, Func<Task<TResult>> func)
+        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(AbpUnitOfWorkOptions options, Func<Task<TResult>> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<BookStoreDomainSharedModule>("Acme.BookStore");
            });
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    options.FileSets.ReplaceEmbeddedByPhysical<BookStoreDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}Acme.BookStore.Domain.Shared", Path.DirectorySeparatorChar)));
                    options.FileSets.ReplaceEmbeddedByPhysical<BookStoreDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}Acme.BookStore.Domain", Path.DirectorySeparatorChar)));
--- 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<Task> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func<Task> action)
+        protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func<Task> action)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -59,10 +59,10 @@ namespace Acme.BookStore

        protected virtual TResult WithUnitOfWork<TResult>(Func<TResult> func)
        {
-            return WithUnitOfWork(new UnitOfWorkOptions(), func);
+            return WithUnitOfWork(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual TResult WithUnitOfWork<TResult>(UnitOfWorkOptions options, Func<TResult> func)
+        protected virtual TResult WithUnitOfWork<TResult>(AbpUnitOfWorkOptions options, Func<TResult> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -79,10 +79,10 @@ namespace Acme.BookStore

        protected virtual Task<TResult> WithUnitOfWorkAsync<TResult>(Func<Task<TResult>> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(UnitOfWorkOptions options, Func<Task<TResult>> func)
+        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(AbpUnitOfWorkOptions options, Func<Task<TResult>> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<DashboardDemoDomainSharedModule>("DashboardDemo");
            });
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiThemeSharedModule>(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<DashboardDemoDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}DashboardDemo.Domain.Shared", Path.DirectorySeparatorChar)));
--- 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<Task> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func<Task> action)
+        protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func<Task> action)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -59,10 +59,10 @@ namespace DashboardDemo

        protected virtual TResult WithUnitOfWork<TResult>(Func<TResult> func)
        {
-            return WithUnitOfWork(new UnitOfWorkOptions(), func);
+            return WithUnitOfWork(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual TResult WithUnitOfWork<TResult>(UnitOfWorkOptions options, Func<TResult> func)
+        protected virtual TResult WithUnitOfWork<TResult>(AbpUnitOfWorkOptions options, Func<TResult> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -79,10 +79,10 @@ namespace DashboardDemo

        protected virtual Task<TResult> WithUnitOfWorkAsync<TResult>(Func<Task<TResult>> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(UnitOfWorkOptions options, Func<Task<TResult>> func)
+        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(AbpUnitOfWorkOptions options, Func<Task<TResult>> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<ProductManagementApplicationContractsModule>();
            });
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<ProductManagementDomainModule>();
            });
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<ProductManagementWebModule>("ProductManagement");
            });
--- 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<Task> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func<Task> action)
+        protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func<Task> action)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -51,10 +51,10 @@ namespace ProductManagement

        protected virtual TResult WithUnitOfWork<TResult>(Func<TResult> func)
        {
-            return WithUnitOfWork(new UnitOfWorkOptions(), func);
+            return WithUnitOfWork(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual TResult WithUnitOfWork<TResult>(UnitOfWorkOptions options, Func<TResult> func)
+        protected virtual TResult WithUnitOfWork<TResult>(AbpUnitOfWorkOptions options, Func<TResult> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -71,10 +71,10 @@ namespace ProductManagement

        protected virtual Task<TResult> WithUnitOfWorkAsync<TResult>(Func<Task<TResult>> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(UnitOfWorkOptions options, Func<Task<TResult>> func)
+        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(AbpUnitOfWorkOptions options, Func<Task<TResult>> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<MyProjectNameDomainSharedModule>("MyCompanyName.MyProjectName");
            });
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain.Shared"));
                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain"));
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain.Shared"));
                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain"));
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain.Shared"));
                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain"));
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    //<TEMPLATE-REMOVE>
                    options.FileSets.ReplaceEmbeddedByPhysical<AbpUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar)));
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    //<TEMPLATE-REMOVE>
                    options.FileSets.ReplaceEmbeddedByPhysical<AbpUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar)));
--- 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<Task> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func<Task> action)
+        protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func<Task> action)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -59,10 +59,10 @@ namespace MyCompanyName.MyProjectName

        protected virtual TResult WithUnitOfWork<TResult>(Func<TResult> func)
        {
-            return WithUnitOfWork(new UnitOfWorkOptions(), func);
+            return WithUnitOfWork(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual TResult WithUnitOfWork<TResult>(UnitOfWorkOptions options, Func<TResult> func)
+        protected virtual TResult WithUnitOfWork<TResult>(AbpUnitOfWorkOptions options, Func<TResult> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -79,10 +79,10 @@ namespace MyCompanyName.MyProjectName

        protected virtual Task<TResult> WithUnitOfWorkAsync<TResult>(Func<Task<TResult>> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(UnitOfWorkOptions options, Func<Task<TResult>> func)
+        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(AbpUnitOfWorkOptions options, Func<Task<TResult>> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Domain.Shared", Path.DirectorySeparatorChar)));
                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Domain", Path.DirectorySeparatorChar)));
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    //<TEMPLATE-REMOVE>
                    options.FileSets.ReplaceEmbeddedByPhysical<AbpUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar)));
--- 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<VirtualFileSystemOptions>(options =>
+                Configure<AbpVirtualFileSystemOptions>(options =>
                {
                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Domain.Shared", Path.DirectorySeparatorChar)));
                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameDomainModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}src{0}MyCompanyName.MyProjectName.Domain", Path.DirectorySeparatorChar)));
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<MyProjectNameApplicationContractsModule>("MyCompanyName.MyProjectName");
            });
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<MyProjectNameDomainSharedModule>("MyCompanyName.MyProjectName");
            });
--- 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<VirtualFileSystemOptions>(options =>
+            Configure<AbpVirtualFileSystemOptions>(options =>
            {
                options.FileSets.AddEmbedded<MyProjectNameWebModule>("MyCompanyName.MyProjectName.Web");
            });
--- 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<Task> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task WithUnitOfWorkAsync(UnitOfWorkOptions options, Func<Task> action)
+        protected virtual async Task WithUnitOfWorkAsync(AbpUnitOfWorkOptions options, Func<Task> action)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -58,10 +58,10 @@ namespace MyCompanyName.MyProjectName

        protected virtual TResult WithUnitOfWork<TResult>(Func<TResult> func)
        {
-            return WithUnitOfWork(new UnitOfWorkOptions(), func);
+            return WithUnitOfWork(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual TResult WithUnitOfWork<TResult>(UnitOfWorkOptions options, Func<TResult> func)
+        protected virtual TResult WithUnitOfWork<TResult>(AbpUnitOfWorkOptions options, Func<TResult> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {
@ -78,10 +78,10 @@ namespace MyCompanyName.MyProjectName

        protected virtual Task<TResult> WithUnitOfWorkAsync<TResult>(Func<Task<TResult>> func)
        {
-            return WithUnitOfWorkAsync(new UnitOfWorkOptions(), func);
+            return WithUnitOfWorkAsync(new AbpUnitOfWorkOptions(), func);
        }

-        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(UnitOfWorkOptions options, Func<Task<TResult>> func)
+        protected virtual async Task<TResult> WithUnitOfWorkAsync<TResult>(AbpUnitOfWorkOptions options, Func<Task<TResult>> func)
        {
            using (var scope = ServiceProvider.CreateScope())
            {