From 71d796a30d78323e4855e35414184d0064c78280 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Sun, 20 Feb 2022 19:44:24 +0300
Subject: [PATCH] removed feature management from administration service

---
 .../AdministrationServiceApplicationContractsModule.cs      | 4 +---
 ...OnAbp.AdministrationService.Application.Contracts.csproj | 1 -
 .../AdministrationServiceApplicationModule.cs               | 2 --
 .../EShopOnAbp.AdministrationService.Application.csproj     | 1 -
 .../AdministrationServiceDomainSharedModule.cs              | 2 --
 .../EShopOnAbp.AdministrationService.Domain.Shared.csproj   | 1 -
 .../AdministrationServiceDomainModule.cs                    | 3 ---
 .../EShopOnAbp.AdministrationService.Domain.csproj          | 1 -
 ...opOnAbp.AdministrationService.EntityFrameworkCore.csproj | 1 -
 .../EntityFrameworkCore/AdministrationServiceDbContext.cs   | 6 ------
 .../AdministrationServiceEntityFrameworkCoreModule.cs       | 3 ---
 .../AdministrationServiceHttpApiClientModule.cs             | 2 --
 .../EShopOnAbp.AdministrationService.HttpApi.Client.csproj  | 1 -
 .../AdministrationServiceHttpApiModule.cs                   | 4 +---
 .../EShopOnAbp.AdministrationService.HttpApi.csproj         | 1 -
 15 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/AdministrationServiceApplicationContractsModule.cs b/services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/AdministrationServiceApplicationContractsModule.cs
index 7b2db5d6..51972266 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/AdministrationServiceApplicationContractsModule.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/AdministrationServiceApplicationContractsModule.cs
@@ -1,5 +1,4 @@
-using Volo.Abp.FeatureManagement;
-using Volo.Abp.Modularity;
+using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement;
 using Volo.Abp.SettingManagement;
 using EShopOnAbp.CatalogService;
@@ -10,7 +9,6 @@ namespace EShopOnAbp.AdministrationService
         typeof(CatalogServiceApplicationContractsModule),
         typeof(AdministrationServiceDomainSharedModule),
         typeof(AbpPermissionManagementApplicationContractsModule),
-        typeof(AbpFeatureManagementApplicationContractsModule),
         typeof(AbpSettingManagementApplicationContractsModule)
     )]
     public class AdministrationServiceApplicationContractsModule : AbpModule
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj b/services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj
index 8b38c44c..0c66122a 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.Application.Contracts/EShopOnAbp.AdministrationService.Application.Contracts.csproj
@@ -12,7 +12,6 @@
 
   <ItemGroup>
     <PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="5.1.2" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="5.1.2" />
     <PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="5.1.2" />
     
   </ItemGroup>
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Application/AdministrationServiceApplicationModule.cs b/services/administration/src/EShopOnAbp.AdministrationService.Application/AdministrationServiceApplicationModule.cs
index 64ed2788..ead8e7e2 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.Application/AdministrationServiceApplicationModule.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.Application/AdministrationServiceApplicationModule.cs
@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AutoMapper;
-using Volo.Abp.FeatureManagement;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement;
 using Volo.Abp.SettingManagement;
@@ -11,7 +10,6 @@ namespace EShopOnAbp.AdministrationService
         typeof(AdministrationServiceDomainModule),
         typeof(AdministrationServiceApplicationContractsModule),
         typeof(AbpPermissionManagementApplicationModule),
-        typeof(AbpFeatureManagementApplicationModule),
         typeof(AbpSettingManagementApplicationModule)
         )]
     public class AdministrationServiceApplicationModule : AbpModule
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj b/services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj
index eaad9d2f..05a23417 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.Application/EShopOnAbp.AdministrationService.Application.csproj
@@ -12,7 +12,6 @@
 
   <ItemGroup>
     <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="5.1.2" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="5.1.2" />
     <PackageReference Include="Volo.Abp.SettingManagement.Application" Version="5.1.2" />
   </ItemGroup>
 
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/AdministrationServiceDomainSharedModule.cs b/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/AdministrationServiceDomainSharedModule.cs
index 8faa0737..bf0aac75 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/AdministrationServiceDomainSharedModule.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/AdministrationServiceDomainSharedModule.cs
@@ -1,6 +1,5 @@
 using EShopOnAbp.AdministrationService.Localization;
 using Volo.Abp.AuditLogging;
-using Volo.Abp.FeatureManagement;
 using Volo.Abp.Localization;
 using Volo.Abp.Localization.ExceptionHandling;
 using Volo.Abp.Modularity;
@@ -13,7 +12,6 @@ namespace EShopOnAbp.AdministrationService
 {
     [DependsOn(
         typeof(AbpPermissionManagementDomainSharedModule),
-        typeof(AbpFeatureManagementDomainSharedModule),
         typeof(AbpSettingManagementDomainSharedModule),
         typeof(AbpAuditLoggingDomainSharedModule)
         )]
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj b/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj
index b3ece5c4..905fc189 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.Domain.Shared/EShopOnAbp.AdministrationService.Domain.Shared.csproj
@@ -12,7 +12,6 @@
 
   <ItemGroup>
     <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="5.1.2" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="5.1.2" />
     <PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="5.1.2" />
     <PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="5.1.2" />
   </ItemGroup>
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Domain/AdministrationServiceDomainModule.cs b/services/administration/src/EShopOnAbp.AdministrationService.Domain/AdministrationServiceDomainModule.cs
index 5f6504f3..b71b1d25 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.Domain/AdministrationServiceDomainModule.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.Domain/AdministrationServiceDomainModule.cs
@@ -1,8 +1,6 @@
 using Volo.Abp.AuditLogging;
-using Volo.Abp.FeatureManagement;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
-using Volo.Abp.PermissionManagement;
 using Volo.Abp.PermissionManagement.Identity;
 using Volo.Abp.PermissionManagement.IdentityServer;
 using Volo.Abp.SettingManagement;
@@ -11,7 +9,6 @@ namespace EShopOnAbp.AdministrationService
 {
     [DependsOn(
         typeof(AdministrationServiceDomainSharedModule),
-        typeof(AbpFeatureManagementDomainModule),
         typeof(AbpSettingManagementDomainModule),
         typeof(AbpAuditLoggingDomainModule),
         typeof(AbpPermissionManagementDomainIdentityModule),
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj b/services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj
index 74f692c4..7ff0a6fc 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.Domain/EShopOnAbp.AdministrationService.Domain.csproj
@@ -13,7 +13,6 @@
     <PackageReference Include="Volo.Abp.PermissionManagement.Domain" Version="5.1.2" />
     <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="5.1.2" />
     <PackageReference Include="Volo.Abp.PermissionManagement.Domain.IdentityServer" Version="5.1.2" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="5.1.2" />
     <PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="5.1.2" />
     <PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="5.1.2" />
   </ItemGroup>
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj b/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj
index b75f6f30..edf92d25 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EShopOnAbp.AdministrationService.EntityFrameworkCore.csproj
@@ -17,7 +17,6 @@
     <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="5.1.2" />
     <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="5.1.2" />
     <PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="5.1.2" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="5.1.2" />
     <PackageReference Include="Volo.Abp.BlobStoring.Database.EntityFrameworkCore" Version="5.1.2" />
   </ItemGroup>
 
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EntityFrameworkCore/AdministrationServiceDbContext.cs b/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EntityFrameworkCore/AdministrationServiceDbContext.cs
index 5ace2645..c8834237 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EntityFrameworkCore/AdministrationServiceDbContext.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EntityFrameworkCore/AdministrationServiceDbContext.cs
@@ -5,9 +5,6 @@ using Volo.Abp.BlobStoring.Database;
 using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
 using Volo.Abp.Data;
 using Volo.Abp.EntityFrameworkCore;
-using Volo.Abp.EntityFrameworkCore.Modeling;
-using Volo.Abp.FeatureManagement;
-using Volo.Abp.FeatureManagement.EntityFrameworkCore;
 using Volo.Abp.PermissionManagement;
 using Volo.Abp.PermissionManagement.EntityFrameworkCore;
 using Volo.Abp.SettingManagement;
@@ -29,7 +26,6 @@ namespace EShopOnAbp.AdministrationService.EntityFrameworkCore
         : AbpDbContext<AdministrationServiceDbContext>,
         IPermissionManagementDbContext,
         ISettingManagementDbContext,
-        IFeatureManagementDbContext,
         IAuditLoggingDbContext,
         IBlobStoringDbContext
     {
@@ -41,7 +37,6 @@ namespace EShopOnAbp.AdministrationService.EntityFrameworkCore
 
         public DbSet<PermissionGrant> PermissionGrants { get; set; }
         public DbSet<Setting> Settings { get; set; }
-        public DbSet<FeatureValue> FeatureValues { get; set; }
         public DbSet<AuditLog> AuditLogs { get; set; }
         public DbSet<DatabaseBlobContainer> BlobContainers { get; set; }
         public DbSet<DatabaseBlob> Blobs { get; set; }
@@ -52,7 +47,6 @@ namespace EShopOnAbp.AdministrationService.EntityFrameworkCore
 
             builder.ConfigurePermissionManagement();
             builder.ConfigureSettingManagement();
-            builder.ConfigureFeatureManagement();
             builder.ConfigureAuditLogging();
             builder.ConfigureBlobStoring();
         }
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EntityFrameworkCore/AdministrationServiceEntityFrameworkCoreModule.cs b/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EntityFrameworkCore/AdministrationServiceEntityFrameworkCoreModule.cs
index 7e0cc460..3955ea29 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EntityFrameworkCore/AdministrationServiceEntityFrameworkCoreModule.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.EntityFrameworkCore/EntityFrameworkCore/AdministrationServiceEntityFrameworkCoreModule.cs
@@ -4,7 +4,6 @@ using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.BlobStoring.Database.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.PostgreSql;
-using Volo.Abp.FeatureManagement.EntityFrameworkCore;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement.EntityFrameworkCore;
 using Volo.Abp.SettingManagement.EntityFrameworkCore;
@@ -17,7 +16,6 @@ namespace EShopOnAbp.AdministrationService.EntityFrameworkCore
         typeof(AbpPermissionManagementEntityFrameworkCoreModule),
         typeof(AbpSettingManagementEntityFrameworkCoreModule),
         typeof(AbpAuditLoggingEntityFrameworkCoreModule),
-        typeof(AbpFeatureManagementEntityFrameworkCoreModule),
         typeof(BlobStoringDatabaseEntityFrameworkCoreModule)
         )]
     public class AdministrationServiceEntityFrameworkCoreModule : AbpModule
@@ -28,7 +26,6 @@ namespace EShopOnAbp.AdministrationService.EntityFrameworkCore
             {
                 options.ReplaceDbContext<IPermissionManagementDbContext>();
                 options.ReplaceDbContext<ISettingManagementDbContext>();
-                options.ReplaceDbContext<IFeatureManagementDbContext>();
                 options.ReplaceDbContext<IAuditLoggingDbContext>();
                 options.ReplaceDbContext<IBlobStoringDbContext>();
 
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/AdministrationServiceHttpApiClientModule.cs b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/AdministrationServiceHttpApiClientModule.cs
index 11ed358f..82f7f6d6 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/AdministrationServiceHttpApiClientModule.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/AdministrationServiceHttpApiClientModule.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.FeatureManagement;
 using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement;
 using Volo.Abp.SettingManagement;
@@ -9,7 +8,6 @@ namespace EShopOnAbp.AdministrationService
     [DependsOn(
         typeof(AdministrationServiceApplicationContractsModule),
         typeof(AbpPermissionManagementHttpApiClientModule),
-        typeof(AbpFeatureManagementHttpApiClientModule),
         typeof(AbpSettingManagementHttpApiClientModule)
     )]
     public class AdministrationServiceHttpApiClientModule : AbpModule
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj
index 2a1eda32..60d0d80b 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi.Client/EShopOnAbp.AdministrationService.HttpApi.Client.csproj
@@ -11,7 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="5.1.2" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi.Client" Version="5.1.2" />
     <PackageReference Include="Volo.Abp.SettingManagement.HttpApi.Client" Version="5.1.2" />
   </ItemGroup>
 
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/AdministrationServiceHttpApiModule.cs b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/AdministrationServiceHttpApiModule.cs
index f7d2c523..47549eca 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/AdministrationServiceHttpApiModule.cs
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/AdministrationServiceHttpApiModule.cs
@@ -1,5 +1,4 @@
-using Volo.Abp.FeatureManagement;
-using Volo.Abp.Modularity;
+using Volo.Abp.Modularity;
 using Volo.Abp.PermissionManagement.HttpApi;
 using Volo.Abp.SettingManagement;
 
@@ -8,7 +7,6 @@ namespace EShopOnAbp.AdministrationService
     [DependsOn(
         typeof(AdministrationServiceApplicationContractsModule),
         typeof(AbpPermissionManagementHttpApiModule),
-        typeof(AbpFeatureManagementHttpApiModule),
         typeof(AbpSettingManagementHttpApiModule)
         )]
     public class AdministrationServiceHttpApiModule : AbpModule
diff --git a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj
index 090dbb6f..fbc00ebb 100644
--- a/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj
+++ b/services/administration/src/EShopOnAbp.AdministrationService.HttpApi/EShopOnAbp.AdministrationService.HttpApi.csproj
@@ -11,7 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="5.1.2" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="5.1.2" />
     <PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="5.1.2" />
   </ItemGroup>