Resolved #858

abpframework · Mar 4, 2019 · 58b803e · 58b803e
1 parent c649993
commit 58b803e
Show file tree

Hide file tree

Showing 22 changed files with 0 additions and 120 deletions.
diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/AbpEmailingModule.cs
@@ -18,11 +18,6 @@ public class AbpEmailingModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<SettingOptions>(options =>
-            {
-                options.DefinitionProviders.Add<EmailSettingProvider>();
-            });
-
             Configure<VirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<AbpEmailingModule>();

diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpLocalizationModule.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpLocalizationModule.cs
@@ -27,11 +27,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
                 .Add<AbpValidationResource>("en")
                 .AddVirtualJson("/Localization/Resources/AbpValidation");
             });
-
-            Configure<SettingOptions>(options =>
-            {
-                options.DefinitionProviders.Add<LocalizationSettingProvider>();
-            });
         }
     }
 }
diff --git a/.../test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcTestModule.cs b/.../test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcTestModule.cs
@@ -57,11 +57,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
                 });
             });
 
-            Configure<PermissionOptions>(options =>
-            {
-                options.DefinitionProviders.Add<TestPermissionDefinitionProvider>();
-            });
-
             Configure<VirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<AbpAspNetCoreMvcTestModule>();

diff --git a/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/AbpSettingsTestModule.cs b/framework/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/AbpSettingsTestModule.cs
@@ -13,7 +13,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             Configure<SettingOptions>(options =>
             {
                 options.ValueProviders.Add<TestSettingValueProvider>();
-                options.DefinitionProviders.Add<TestSettingDefinitionProvider>();
             });
         }
     }

diff --git a/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs b/modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs
@@ -31,11 +31,6 @@ public override void PreConfigureServices(ServiceConfigurationContext context)
 
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<SettingOptions>(options =>
-            {
-                options.DefinitionProviders.Add<AccountSettingDefinitionProvider>();
-            });
-
             Configure<VirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<AbpAccountWebModule>("Volo.Abp.Account.Web");

diff --git a/...c/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingApplicationContractsModule.cs b/...c/Volo.Blogging.Application.Contracts/Volo/Blogging/BloggingApplicationContractsModule.cs
@@ -12,11 +12,6 @@ public class BloggingApplicationContractsModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<PermissionOptions>(options =>
-            {
-                options.DefinitionProviders.Add<BloggingPermissionDefinitionProvider>();
-            });
-
             Configure<VirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<BloggingApplicationContractsModule>();

diff --git a/...o.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminApplicationContractsModule.cs b/...o.Docs.Admin.Application.Contracts/Volo/Docs/Admin/DocsAdminApplicationContractsModule.cs
@@ -15,11 +15,6 @@ public class DocsAdminApplicationContractsModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<PermissionOptions>(options =>
-            {
-                options.DefinitionProviders.Add<DocsAdminPermissionDefinitionProvider>();
-            });
-
             Configure<VirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<DocsAdminApplicationContractsModule>();

diff --git a/...Identity.Application.Contracts/Volo/Abp/Identity/AbpIdentityApplicationContractsModule.cs b/...Identity.Application.Contracts/Volo/Abp/Identity/AbpIdentityApplicationContractsModule.cs
@@ -21,11 +21,6 @@ public class AbpIdentityApplicationContractsModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<PermissionOptions>(options =>
-            {
-                options.DefinitionProviders.Add<IdentityPermissionDefinitionProvider>();
-            });
-
             Configure<VirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<AbpIdentityApplicationContractsModule>();

diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentityDomainModule.cs
@@ -24,11 +24,6 @@ public class AbpIdentityDomainModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<SettingOptions>(options =>
-            {
-                options.DefinitionProviders.Add<AbpIdentitySettingDefinitionProvider>();
-            });
-
             Configure<VirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<AbpIdentityDomainModule>();

diff --git a/...tity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/AbpIdentityDomainTestModule.cs b/...tity/test/Volo.Abp.Identity.Domain.Tests/Volo/Abp/Identity/AbpIdentityDomainTestModule.cs
@@ -13,14 +13,6 @@ namespace Volo.Abp.Identity
         )]
     public class AbpIdentityDomainTestModule : AbpModule
     {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            Configure<PermissionOptions>(options =>
-            {
-                options.DefinitionProviders.Add<IdentityTestPermissionDefinitionProvider>();
-            });
-        }
-
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
             SeedTestData(context);

diff --git a/...anagement.TestBase/Volo/Abp/PermissionManagement/AbpPermissionManagementTestBaseModule.cs b/...anagement.TestBase/Volo/Abp/PermissionManagement/AbpPermissionManagementTestBaseModule.cs
@@ -12,14 +12,6 @@ namespace Volo.Abp.PermissionManagement
         )]
     public class AbpPermissionManagementTestBaseModule : AbpModule
     {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            Configure<PermissionOptions>(options =>
-            {
-                options.DefinitionProviders.Add<TestPermissionDefinitionProvider>();
-            });
-        }
-
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
             SeedTestData(context);

diff --git a/...ttingManagement.TestBase/Volo/Abp/SettingManagement/AbpSettingManagementTestBaseModule.cs b/...ttingManagement.TestBase/Volo/Abp/SettingManagement/AbpSettingManagementTestBaseModule.cs
@@ -11,14 +11,6 @@ namespace Volo.Abp.SettingManagement
         typeof(AbpSettingManagementDomainModule))]
     public class AbpSettingManagementTestBaseModule : AbpModule
     {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            Configure<SettingOptions>(options =>
-            {
-                options.DefinitionProviders.Add<TestSettingDefinitionProvider>();
-            });
-        }
-
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
             SeedTestData(context);

diff --git a/...tion.Contracts/Volo/Abp/TenantManagement/AbpTenantManagementApplicationContractsModule.cs b/...tion.Contracts/Volo/Abp/TenantManagement/AbpTenantManagementApplicationContractsModule.cs
@@ -14,11 +14,6 @@ public class AbpTenantManagementApplicationContractsModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<PermissionOptions>(options =>
-            {
-                options.DefinitionProviders.Add<AbpTenantManagementPermissionDefinitionProvider>();
-            });
-
             Configure<VirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<AbpTenantManagementApplicationContractsModule>();

diff --git a/samples/BookStore/src/Acme.BookStore.Application/BookStoreApplicationModule.cs b/samples/BookStore/src/Acme.BookStore.Application/BookStoreApplicationModule.cs
@@ -15,11 +15,6 @@ public class BookStoreApplicationModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<PermissionOptions>(options =>
-            {
-                options.DefinitionProviders.Add<BookStorePermissionDefinitionProvider>();
-            });
-
             Configure<AbpAutoMapperOptions>(options =>
             {
                 options.AddProfile<BookStoreApplicationAutoMapperProfile>();

diff --git a/samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs b/samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs
@@ -30,11 +30,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
                     .AddBaseTypes(typeof(AbpValidationResource))
                     .AddVirtualJson("/Localization/BookStore");
             });
-
-            Configure<SettingOptions>(options =>
-            {
-                options.DefinitionProviders.Add<BookStoreSettingDefinitionProvider>();
-            });
         }
     }
 }
diff --git a/...nt.Application.Contracts/ProductManagement/ProductManagementApplicationContractsModule.cs b/...nt.Application.Contracts/ProductManagement/ProductManagementApplicationContractsModule.cs
@@ -16,11 +16,6 @@ public class ProductManagementApplicationContractsModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<PermissionOptions>(options =>
-            {
-                options.DefinitionProviders.Add<ProductManagementPermissionDefinitionProvider>();
-            });
-
             Configure<VirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<ProductManagementApplicationContractsModule>();
@@ -32,11 +27,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
                     .Get<ProductManagementResource>()
                     .AddVirtualJson("/ProductManagement/Localization/ApplicationContracts");
             });
-
-            Configure<SettingOptions>(options =>
-            {
-                options.DefinitionProviders.Add<ProductManagementSettingDefinitionProvider>();
-            });
         }
     }
 }
diff --git a/...lication.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs b/...lication.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs
@@ -16,11 +16,6 @@ public class MyProjectNameApplicationContractsModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<PermissionOptions>(options =>
-            {
-                options.DefinitionProviders.Add<MyProjectNamePermissionDefinitionProvider>();
-            });
-
             Configure<VirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<MyProjectNameApplicationContractsModule>();

diff --git a/...e.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs b/...e.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs
@@ -18,11 +18,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             {
                 options.AddProfile<MyProjectNameApplicationAutoMapperProfile>(validate: true);
             });
-
-            Configure<SettingOptions>(options =>
-            {
-                options.DefinitionProviders.Add<MyProjectNameSettingDefinitionProvider>();
-            });
         }
     }
 }
diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Application/MyProjectNameApplicationModule.cs
@@ -16,11 +16,6 @@ public class MyProjectNameApplicationModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<PermissionOptions>(options =>
-            {
-                options.DefinitionProviders.Add<MyProjectNamePermissionDefinitionProvider>();
-            });
-
             Configure<AbpAutoMapperOptions>(options =>
             {
                 options.AddProfile<MyProjectNameApplicationAutoMapperProfile>();

diff --git a/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs b/templates/mvc/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDomainModule.cs
@@ -36,11 +36,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
                     .AddBaseTypes(typeof(AbpValidationResource))
                     .AddVirtualJson("/Localization/MyProjectName");
             });
-
-            Configure<SettingOptions>(options =>
-            {
-                options.DefinitionProviders.Add<MyProjectNameSettingDefinitionProvider>();
-            });
         }
     }
 }
diff --git a/...lication.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs b/...lication.Contracts/MyCompanyName/MyProjectName/MyProjectNameApplicationContractsModule.cs
@@ -16,11 +16,6 @@ public class MyProjectNameApplicationContractsModule : AbpModule
     {
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
-            Configure<PermissionOptions>(options =>
-            {
-                options.DefinitionProviders.Add<MyProjectNamePermissionDefinitionProvider>();
-            });
-
             Configure<VirtualFileSystemOptions>(options =>
             {
                 options.FileSets.AddEmbedded<MyProjectNameApplicationContractsModule>();

diff --git a/...e.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs b/...e.MyProjectName.Application/MyCompanyName/MyProjectName/MyProjectNameApplicationModule.cs
@@ -18,11 +18,6 @@ public override void ConfigureServices(ServiceConfigurationContext context)
             {
                 options.AddProfile<MyProjectNameApplicationAutoMapperProfile>(validate: true);
             });
-
-            Configure<SettingOptions>(options =>
-            {
-                options.DefinitionProviders.Add<MyProjectNameSettingDefinitionProvider>();
-            });
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 Configure<SettingOptions>(options =>
                 {
                     options.ValueProviders.Add<TestSettingValueProvider>();
-                    options.DefinitionProviders.Add<TestSettingDefinitionProvider>();
                 });
             }
         }
@@ Expand Down @@