diff --git a/build/common.ps1 b/build/common.ps1 index 01a7565fba..61d9cf03d2 100644 --- a/build/common.ps1 +++ b/build/common.ps1 @@ -20,8 +20,7 @@ $solutionPaths = @( "../modules/background-jobs", "../modules/account", "../modules/cms-kit", - "../modules/blob-storing-database", - "../studio" + "../modules/blob-storing-database" ) if ($full -eq "-f") diff --git a/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj b/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj index 7e53ddc078..8ad72ac461 100644 --- a/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj +++ b/modules/account/src/Volo.Abp.Account.Installer/Volo.Abp.Account.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AbpAccountInstallerModule.cs b/modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AbpAccountInstallerModule.cs index 060b47ef68..01d2fa0e3f 100644 --- a/modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AbpAccountInstallerModule.cs +++ b/modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AbpAccountInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.Account; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpAccountInstallerModule : AbpModule diff --git a/modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AccountInstallerPipelineBuilder.cs b/modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AccountInstallerPipelineBuilder.cs deleted file mode 100644 index 9fb955c9a8..0000000000 --- a/modules/account/src/Volo.Abp.Account.Installer/Volo/Abp/Account/AccountInstallerPipelineBuilder.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.Account; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class AccountInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - return GetBasePipeline(context); - } -} diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj index b76f01e430..5a04e797a5 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo.Abp.AuditLogging.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AbpAuditLoggingInstallerModule.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AbpAuditLoggingInstallerModule.cs index 52ed214a90..33601e6c40 100644 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AbpAuditLoggingInstallerModule.cs +++ b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AbpAuditLoggingInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.AuditLogging; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpAuditLoggingInstallerModule : AbpModule diff --git a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AuditLoggingInstallerPipelineBuilder.cs b/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AuditLoggingInstallerPipelineBuilder.cs deleted file mode 100644 index 94ae5d81fc..0000000000 --- a/modules/audit-logging/src/Volo.Abp.AuditLogging.Installer/Volo/Abp/AuditLogging/AuditLoggingInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.AuditLogging; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class AuditLoggingInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.AuditLogging.EntityFrameworkCore", - "ConfigureAuditLogging" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj index 0aba8c2405..05bd0b8f6b 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo.Abp.BackgroundJobs.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/AbpBackgroundJobsInstallerModule.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/AbpBackgroundJobsInstallerModule.cs index 1e17c8cfd9..299565ea62 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/AbpBackgroundJobsInstallerModule.cs +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/AbpBackgroundJobsInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.BackgroundJobs; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpBackgroundJobsInstallerModule : AbpModule diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/BackgroundJobsInstallerPipelineBuilder.cs b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/BackgroundJobsInstallerPipelineBuilder.cs deleted file mode 100644 index ebe2feac61..0000000000 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Installer/Volo/Abp/BackgroundJobs/BackgroundJobsInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.BackgroundJobs; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class BackgroundJobsInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.BackgroundJobs.EntityFrameworkCore", - "ConfigureBackgroundJobs" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj index 342b9f7c64..5c9e9c6305 100644 --- a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj +++ b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo.Abp.BasicTheme.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/AbpBasicThemeInstallerModule.cs b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/AbpBasicThemeInstallerModule.cs index 1832de02bd..39b212b00a 100644 --- a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/AbpBasicThemeInstallerModule.cs +++ b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/AbpBasicThemeInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.BasicTheme; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpBasicThemeInstallerModule : AbpModule diff --git a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/BasicThemeInstallerPipelineBuilder.cs b/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/BasicThemeInstallerPipelineBuilder.cs deleted file mode 100644 index 4b80e9d364..0000000000 --- a/modules/basic-theme/src/Volo.Abp.BasicTheme.Installer/Volo/Abp/BasicTheme/BasicThemeInstallerPipelineBuilder.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.BasicTheme; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class BasicThemeInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - return GetBasePipeline(context); - } -} diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj index 84be724466..cb351f8da9 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo.Abp.BlobStoring.Database.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/AbpBlobStoringDatabaseInstallerModule.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/AbpBlobStoringDatabaseInstallerModule.cs index abd8b35732..96ea2ea912 100644 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/AbpBlobStoringDatabaseInstallerModule.cs +++ b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/AbpBlobStoringDatabaseInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.BlobStoring.Database; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpBlobStoringDatabaseInstallerModule : AbpModule diff --git a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseInstallerPipelineBuilder.cs b/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseInstallerPipelineBuilder.cs deleted file mode 100644 index 945d229dc2..0000000000 --- a/modules/blob-storing-database/src/Volo.Abp.BlobStoring.Database.Installer/Volo/Abp/BlobStoring/Database/BlobStoringDatabaseInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.BlobStoring.Database; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class BlobStoringDatabaseInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.BlobStoring.Database.EntityFrameworkCore", - "ConfigureBlobStoring" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj b/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj index 7a465c40e7..643522f32b 100644 --- a/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj +++ b/modules/blogging/src/Volo.Blogging.Installer/Volo.Blogging.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerModule.cs b/modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerModule.cs index 1820fba2b8..d75137b8a2 100644 --- a/modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerModule.cs +++ b/modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Blogging; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class BloggingInstallerModule : AbpModule diff --git a/modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerPipelineBuilder.cs b/modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerPipelineBuilder.cs deleted file mode 100644 index 638bd4a5e3..0000000000 --- a/modules/blogging/src/Volo.Blogging.Installer/Volo/Blogging/BloggingInstallerPipelineBuilder.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Blogging; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class BloggingInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - - return GetBasePipeline(context); - } -} diff --git a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj index 3dbb813339..75cf15ad04 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo.CmsKit.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/AbpCmsKitInstallerModule.cs b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/AbpCmsKitInstallerModule.cs index f7724fb7b5..546a9c3f1e 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/AbpCmsKitInstallerModule.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/AbpCmsKitInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.CmsKit; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class VoloCmsKitInstallerModule : AbpModule diff --git a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/CmsKitInstallerPipelineBuilder.cs b/modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/CmsKitInstallerPipelineBuilder.cs deleted file mode 100644 index 951ea57362..0000000000 --- a/modules/cms-kit/src/Volo.CmsKit.Installer/Volo/Abp/CmsKit/CmsKitInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.CmsKit; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class BlobStoringDatabaseInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.CmsKit.EntityFrameworkCore", - "ConfigureCmsKit" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj b/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj index 9720456e6c..322d689782 100644 --- a/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj +++ b/modules/docs/src/Volo.Docs.Installer/Volo.Docs.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerModule.cs b/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerModule.cs index ea8276f5d0..f041885cc3 100644 --- a/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerModule.cs +++ b/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Docs; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class DocsInstallerModule : AbpModule diff --git a/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerPipelineBuilder.cs b/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerPipelineBuilder.cs deleted file mode 100644 index eed3cb2490..0000000000 --- a/modules/docs/src/Volo.Docs.Installer/Volo/Docs/DocsInstallerPipelineBuilder.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Docs; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class DocsInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - - return GetBasePipeline(context); - } -} diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj index 6f3b4f9be4..892777d2ab 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo.Abp.FeatureManagement.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo/Abp/FeatureManagement/AbpFeatureManagementInstallerModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo/Abp/FeatureManagement/AbpFeatureManagementInstallerModule.cs index 596831e338..1c888dd77c 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo/Abp/FeatureManagement/AbpFeatureManagementInstallerModule.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo/Abp/FeatureManagement/AbpFeatureManagementInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.FeatureManagement; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpFeatureManagementInstallerModule : AbpModule diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo/Abp/FeatureManagement/FeatureManagementInstallerPipelineBuilder.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo/Abp/FeatureManagement/FeatureManagementInstallerPipelineBuilder.cs deleted file mode 100644 index 5e06086e9c..0000000000 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Installer/Volo/Abp/FeatureManagement/FeatureManagementInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.FeatureManagement; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class FeatureManagementInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.FeatureManagement.EntityFrameworkCore", - "ConfigureFeatureManagement" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj b/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj index 0c0fd81d2e..71cdf1eff3 100644 --- a/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj +++ b/modules/identity/src/Volo.Abp.Identity.Installer/Volo.Abp.Identity.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/identity/src/Volo.Abp.Identity.Installer/Volo/Abp/Identity/AbpIdentityInstallerModule.cs b/modules/identity/src/Volo.Abp.Identity.Installer/Volo/Abp/Identity/AbpIdentityInstallerModule.cs index 23a1de23a2..cab6b3cc2f 100644 --- a/modules/identity/src/Volo.Abp.Identity.Installer/Volo/Abp/Identity/AbpIdentityInstallerModule.cs +++ b/modules/identity/src/Volo.Abp.Identity.Installer/Volo/Abp/Identity/AbpIdentityInstallerModule.cs @@ -1,11 +1,9 @@ -using Volo.Abp.Studio; -using Volo.Abp.Modularity; +using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.Identity { [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpIdentityInstallerModule : AbpModule diff --git a/modules/identity/src/Volo.Abp.Identity.Installer/Volo/Abp/Identity/IdentityInstallerPipelineBuilder.cs b/modules/identity/src/Volo.Abp.Identity.Installer/Volo/Abp/Identity/IdentityInstallerPipelineBuilder.cs deleted file mode 100644 index 8f2f75c30c..0000000000 --- a/modules/identity/src/Volo.Abp.Identity.Installer/Volo/Abp/Identity/IdentityInstallerPipelineBuilder.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.Identity -{ - [Dependency(ServiceLifetime.Transient, ReplaceServices = true)] - [ExposeServices(typeof(IModuleInstallingPipelineBuilder))] - public class IdentityInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency - { - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.Identity.EntityFrameworkCore", - "ConfigureIdentity" - ) - ); - - return GetBasePipeline(context); - } - } -} diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj index 372b51398b..6b99c2fd47 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo.Abp.IdentityServer.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo/Abp/IdentityServer/AbpIdentityServerInstallerModule.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo/Abp/IdentityServer/AbpIdentityServerInstallerModule.cs index cbb7f66c1b..80b73a8979 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo/Abp/IdentityServer/AbpIdentityServerInstallerModule.cs +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo/Abp/IdentityServer/AbpIdentityServerInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.IdentityServer; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpIdentityServerInstallerModule : AbpModule diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo/Abp/IdentityServer/IdentityServerInstallerPipelineBuilder.cs b/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo/Abp/IdentityServer/IdentityServerInstallerPipelineBuilder.cs deleted file mode 100644 index 76e1692193..0000000000 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Installer/Volo/Abp/IdentityServer/IdentityServerInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.IdentityServer; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class IdentityServerInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.IdentityServer.EntityFrameworkCore", - "ConfigureIdentityServer" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj index 07c8c2ed10..d2cdd84b53 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo.Abp.OpenIddict.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/AbpOpenIddictInstallerModule.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/AbpOpenIddictInstallerModule.cs index fd24b25610..13a8a4c702 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/AbpOpenIddictInstallerModule.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/AbpOpenIddictInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.OpenIddict; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpOpenIddictInstallerModule : AbpModule diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/OpenIddictInstallerPipelineBuilder.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/OpenIddictInstallerPipelineBuilder.cs deleted file mode 100644 index 67668bbae1..0000000000 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Installer/Volo/Abp/OpenIddict/OpenIddictInstallerPipelineBuilder.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.OpenIddict; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class OpenIddictInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - return GetBasePipeline(context); - } -} diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj index 7667987ab3..c98cf37a80 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo.Abp.PermissionManagement.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo/Abp/PermissionManagement/AbpPermissionManagementInstallerModule.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo/Abp/PermissionManagement/AbpPermissionManagementInstallerModule.cs index e9ac5c3ada..fee5e242ba 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo/Abp/PermissionManagement/AbpPermissionManagementInstallerModule.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo/Abp/PermissionManagement/AbpPermissionManagementInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.PermissionManagement; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpPermissionManagementInstallerModule : AbpModule diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo/Abp/PermissionManagement/PermissionManagementInstallerPipelineBuilder.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo/Abp/PermissionManagement/PermissionManagementInstallerPipelineBuilder.cs deleted file mode 100644 index 97bd5706a0..0000000000 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Installer/Volo/Abp/PermissionManagement/PermissionManagementInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.PermissionManagement; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class PermissionManagementInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.PermissionManagement.EntityFrameworkCore", - "ConfigurePermissionManagement" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj index 025fb08a62..80d67a675e 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo.Abp.SettingManagement.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo/Abp/SettingManagement/AbpSettingManagementInstallerModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo/Abp/SettingManagement/AbpSettingManagementInstallerModule.cs index 70ac2de81f..0b96079e3d 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo/Abp/SettingManagement/AbpSettingManagementInstallerModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo/Abp/SettingManagement/AbpSettingManagementInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.SettingManagement; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpSettingManagementInstallerModule : AbpModule diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo/Abp/SettingManagement/SettingManagementInstallerPipelineBuilder.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo/Abp/SettingManagement/SettingManagementInstallerPipelineBuilder.cs deleted file mode 100644 index d4b68fc61f..0000000000 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Installer/Volo/Abp/SettingManagement/SettingManagementInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.SettingManagement; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class SettingManagementInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.SettingManagement.EntityFrameworkCore", - "ConfigureSettingManagement" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj index 5c6b70856d..639761f65b 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo.Abp.TenantManagement.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo/Abp/TenantManagement/AbpTenantManagementInstallerModule.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo/Abp/TenantManagement/AbpTenantManagementInstallerModule.cs index 9da8db98a5..2ac855ddc3 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo/Abp/TenantManagement/AbpTenantManagementInstallerModule.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo/Abp/TenantManagement/AbpTenantManagementInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.TenantManagement; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpTenantManagementInstallerModule : AbpModule diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo/Abp/TenantManagement/TenantManagementInstallerPipelineBuilder.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo/Abp/TenantManagement/TenantManagementInstallerPipelineBuilder.cs deleted file mode 100644 index f5ce7d6a91..0000000000 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Installer/Volo/Abp/TenantManagement/TenantManagementInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.TenantManagement; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class AuditLoggingInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.TenantManagement.EntityFrameworkCore", - "ConfigureTenantManagement" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj b/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj index 3e18ed33b5..fbce82ad48 100644 --- a/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj +++ b/modules/users/src/Volo.Abp.Users.Installer/Volo.Abp.Users.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/users/src/Volo.Abp.Users.Installer/Volo/Abp/Users/AbpUsersInstallerModule.cs b/modules/users/src/Volo.Abp.Users.Installer/Volo/Abp/Users/AbpUsersInstallerModule.cs index 28e3a70bf2..6715e7a930 100644 --- a/modules/users/src/Volo.Abp.Users.Installer/Volo/Abp/Users/AbpUsersInstallerModule.cs +++ b/modules/users/src/Volo.Abp.Users.Installer/Volo/Abp/Users/AbpUsersInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.Users; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpUsersInstallerModule : AbpModule diff --git a/modules/users/src/Volo.Abp.Users.Installer/Volo/Abp/Users/UsersInstallerPipelineBuilder.cs b/modules/users/src/Volo.Abp.Users.Installer/Volo/Abp/Users/UsersInstallerPipelineBuilder.cs deleted file mode 100644 index 27ea46c7bc..0000000000 --- a/modules/users/src/Volo.Abp.Users.Installer/Volo/Abp/Users/UsersInstallerPipelineBuilder.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.Users; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class UsersInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - context.AddEfCoreConfigurationMethodDeclaration( - new EfCoreConfigurationMethodDeclaration( - "Volo.Abp.Users.EntityFrameworkCore", - "ConfigureAbpUser" - ) - ); - - return GetBasePipeline(context); - } -} diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj index eb9383d4d9..330816a049 100644 --- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj +++ b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo.Abp.VirtualFileExplorer.Installer.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo/Abp/VirtualFileExplorer/AbpVirtualFileExplorerInstallerModule.cs b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo/Abp/VirtualFileExplorer/AbpVirtualFileExplorerInstallerModule.cs index 74ffdeb7f4..e8de080477 100644 --- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo/Abp/VirtualFileExplorer/AbpVirtualFileExplorerInstallerModule.cs +++ b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo/Abp/VirtualFileExplorer/AbpVirtualFileExplorerInstallerModule.cs @@ -1,11 +1,9 @@ using Volo.Abp.Modularity; -using Volo.Abp.Studio; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.VirtualFileExplorer; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class AbpVirtualFileExplorerInstallerModule : AbpModule diff --git a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo/Abp/VirtualFileExplorer/VirtualFileExplorerInstallerPipelineBuilder.cs b/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo/Abp/VirtualFileExplorer/VirtualFileExplorerInstallerPipelineBuilder.cs deleted file mode 100644 index 6d403dd6ab..0000000000 --- a/modules/virtual-file-explorer/src/Volo.Abp.VirtualFileExplorer.Installer/Volo/Abp/VirtualFileExplorer/VirtualFileExplorerInstallerPipelineBuilder.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace Volo.Abp.VirtualFileExplorer; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class VirtualFileExplorerInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - return GetBasePipeline(context); - } -} diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index bb434880de..2050ef35c5 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -69,7 +69,6 @@ function Read-File { # List of solutions $solutions = ( "framework", - "../abp-studio", "modules/account", "modules/audit-logging", "modules/background-jobs", @@ -226,13 +225,6 @@ $projects = ( "framework/src/Volo.Abp.Kafka", "framework/src/Volo.Abp.Swashbuckle", - # studio - "../abp-studio/src/Volo.Abp.Studio.Domain.Shared", - "../abp-studio/src/Volo.Abp.Studio.Domain.CommonServices", - "../abp-studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions", - "../abp-studio/src/Volo.Abp.Studio.ModuleInstaller", - "../abp-studio/src/Volo.Abp.Studio.Analyzing.Abstractions", - # modules/account "modules/account/src/Volo.Abp.Account.Application.Contracts", "modules/account/src/Volo.Abp.Account.Application", diff --git a/studio/Volo.Abp.Studio.Open.abpmdl.json b/studio/Volo.Abp.Studio.Open.abpmdl.json deleted file mode 100644 index f48973d3e9..0000000000 --- a/studio/Volo.Abp.Studio.Open.abpmdl.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "folders": { - "items": { - "src": {} - } - }, - "packages": { - "Volo.Abp.Studio.Analyzing.Abstractions": { - "path": "src/Volo.Abp.Studio.Analyzing.Abstractions/Volo.Abp.Studio.Analyzing.Abstractions.abppkg.json", - "folder": "src" - }, - "Volo.Abp.Studio.Domain.CommonServices": { - "path": "src/Volo.Abp.Studio.Domain.CommonServices/Volo.Abp.Studio.Domain.CommonServices.abppkg.json", - "folder": "src" - }, - "Volo.Abp.Studio.Domain.Shared": { - "path": "src/Volo.Abp.Studio.Domain.Shared/Volo.Abp.Studio.Domain.Shared.abppkg.json", - "folder": "src" - }, - "Volo.Abp.Studio.ModuleInstaller": { - "path": "src/Volo.Abp.Studio.ModuleInstaller/Volo.Abp.Studio.ModuleInstaller.abppkg.json", - "folder": "src" - }, - "Volo.Abp.Studio.ModuleInstaller.Abstractions": { - "path": "src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo.Abp.Studio.ModuleInstaller.Abstractions.abppkg.json", - "folder": "src" - } - } -} \ No newline at end of file diff --git a/studio/Volo.Abp.Studio.Open.abpsln.json b/studio/Volo.Abp.Studio.Open.abpsln.json deleted file mode 100644 index 768927dd78..0000000000 --- a/studio/Volo.Abp.Studio.Open.abpsln.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "modules": { - "Volo.Abp.Studio.Open": { - "path": "Volo.Abp.Studio.Open.abpmdl.json" - } - } -} \ No newline at end of file diff --git a/studio/Volo.Abp.Studio.Open.sln b/studio/Volo.Abp.Studio.Open.sln deleted file mode 100644 index 563e1d4602..0000000000 --- a/studio/Volo.Abp.Studio.Open.sln +++ /dev/null @@ -1,49 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{344A1096-CC05-42D1-BDDB-E254C27508A9}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Studio.Analyzing.Abstractions", "src\Volo.Abp.Studio.Analyzing.Abstractions\Volo.Abp.Studio.Analyzing.Abstractions.csproj", "{2271296E-33FD-46BE-97FD-9938193CB7D1}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Studio.Domain.CommonServices", "src\Volo.Abp.Studio.Domain.CommonServices\Volo.Abp.Studio.Domain.CommonServices.csproj", "{1C86021F-E522-41A1-AC3F-01B0E474D75E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Studio.Domain.Shared", "src\Volo.Abp.Studio.Domain.Shared\Volo.Abp.Studio.Domain.Shared.csproj", "{28132E4E-FFB9-45C4-99AD-1BCA04B3E597}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Studio.ModuleInstaller", "src\Volo.Abp.Studio.ModuleInstaller\Volo.Abp.Studio.ModuleInstaller.csproj", "{4FA11334-D727-4C14-9D71-1DB46AC3BE9C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Studio.ModuleInstaller.Abstractions", "src\Volo.Abp.Studio.ModuleInstaller.Abstractions\Volo.Abp.Studio.ModuleInstaller.Abstractions.csproj", "{99679BF9-B888-4814-8E85-F751984CAFF8}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2271296E-33FD-46BE-97FD-9938193CB7D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2271296E-33FD-46BE-97FD-9938193CB7D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2271296E-33FD-46BE-97FD-9938193CB7D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2271296E-33FD-46BE-97FD-9938193CB7D1}.Release|Any CPU.Build.0 = Release|Any CPU - {1C86021F-E522-41A1-AC3F-01B0E474D75E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C86021F-E522-41A1-AC3F-01B0E474D75E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C86021F-E522-41A1-AC3F-01B0E474D75E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C86021F-E522-41A1-AC3F-01B0E474D75E}.Release|Any CPU.Build.0 = Release|Any CPU - {28132E4E-FFB9-45C4-99AD-1BCA04B3E597}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28132E4E-FFB9-45C4-99AD-1BCA04B3E597}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28132E4E-FFB9-45C4-99AD-1BCA04B3E597}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28132E4E-FFB9-45C4-99AD-1BCA04B3E597}.Release|Any CPU.Build.0 = Release|Any CPU - {4FA11334-D727-4C14-9D71-1DB46AC3BE9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4FA11334-D727-4C14-9D71-1DB46AC3BE9C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4FA11334-D727-4C14-9D71-1DB46AC3BE9C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4FA11334-D727-4C14-9D71-1DB46AC3BE9C}.Release|Any CPU.Build.0 = Release|Any CPU - {99679BF9-B888-4814-8E85-F751984CAFF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99679BF9-B888-4814-8E85-F751984CAFF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99679BF9-B888-4814-8E85-F751984CAFF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99679BF9-B888-4814-8E85-F751984CAFF8}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {2271296E-33FD-46BE-97FD-9938193CB7D1} = {344A1096-CC05-42D1-BDDB-E254C27508A9} - {1C86021F-E522-41A1-AC3F-01B0E474D75E} = {344A1096-CC05-42D1-BDDB-E254C27508A9} - {28132E4E-FFB9-45C4-99AD-1BCA04B3E597} = {344A1096-CC05-42D1-BDDB-E254C27508A9} - {4FA11334-D727-4C14-9D71-1DB46AC3BE9C} = {344A1096-CC05-42D1-BDDB-E254C27508A9} - {99679BF9-B888-4814-8E85-F751984CAFF8} = {344A1096-CC05-42D1-BDDB-E254C27508A9} - EndGlobalSection -EndGlobal diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo.Abp.Studio.Analyzing.Abstractions.abppkg.json b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo.Abp.Studio.Analyzing.Abstractions.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo.Abp.Studio.Analyzing.Abstractions.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo.Abp.Studio.Analyzing.Abstractions.csproj b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo.Abp.Studio.Analyzing.Abstractions.csproj deleted file mode 100644 index 3998636495..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo.Abp.Studio.Analyzing.Abstractions.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - netstandard2.0 - - - - - - - - diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/AbpStudioAnalyzingAbstractionsModule.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/AbpStudioAnalyzingAbstractionsModule.cs deleted file mode 100644 index a8d5ea5918..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/AbpStudioAnalyzingAbstractionsModule.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Volo.Abp.Modularity; - -namespace Volo.Abp.Studio.Analyzing; - -public class AbpStudioAnalyzingAbstractionsModule : AbpModule -{ - -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Application/ApplicationServiceModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Application/ApplicationServiceModel.cs deleted file mode 100644 index 469f6d4e89..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Application/ApplicationServiceModel.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections.Generic; -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Analyzing.Models.Application; - -[PackageContentItemName(ContentTypeName)] -public class ApplicationServiceModel : PackageContentItemModel -{ - public const string ContentTypeName = "applicationService"; - - public string Namespace { get; set; } - - public string Summary { get; set; } - - public List ImplementingInterfaces { get; set; } - - public ApplicationServiceModel([NotNull] string name) : base(name) - { - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Authorization/PermissionModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Authorization/PermissionModel.cs deleted file mode 100644 index c711879e48..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Authorization/PermissionModel.cs +++ /dev/null @@ -1,23 +0,0 @@ -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Analyzing.Models.Authorization; - -[PackageContentItemName(ContentTypeName)] -public class PermissionModel : PackageContentItemModel -{ - public const string ContentTypeName = "permission"; - - public string DisplayName { get; } - - public bool IsEnabled { get; } - - public PermissionModel( - [NotNull] string name, - string displayName, - bool isEnabled) - : base(name) - { - DisplayName = displayName; - IsEnabled = isEnabled; - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/DatabaseCollectionModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/DatabaseCollectionModel.cs deleted file mode 100644 index b089f8c2c7..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/DatabaseCollectionModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Analyzing.Models.Database; - -[PackageContentItemName(ContentTypeName)] -public class DatabaseCollectionModel : PackageContentItemModel -{ - public const string ContentTypeName = "databaseCollection"; - - public string EntityFullName { get; private set; } - - public DatabaseCollectionModel([NotNull] string name, string entityFullName) : base(name) - { - EntityFullName = Check.NotNullOrWhiteSpace(entityFullName, nameof(entityFullName)); - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/DatabaseTableModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/DatabaseTableModel.cs deleted file mode 100644 index b210fefa78..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/DatabaseTableModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Analyzing.Models.Database; - -[PackageContentItemName(ContentTypeName)] -public class DatabaseTableModel : PackageContentItemModel -{ - public const string ContentTypeName = "databaseTable"; - - public string EntityFullName { get; private set; } - - public DatabaseTableModel([NotNull] string name, string entityFullName) : base(name) - { - EntityFullName = Check.NotNullOrWhiteSpace(entityFullName, nameof(entityFullName)); - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/EfCoreDbContextModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/EfCoreDbContextModel.cs deleted file mode 100644 index d780e8363b..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/EfCoreDbContextModel.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Analyzing.Models.Database; - -[PackageContentItemName(ContentTypeName)] -public class EfCoreDbContextModel : PackageContentItemModel, IDbContextModel -{ - public const string ContentTypeName = "efCoreDbContext"; - - public string Namespace { get; private set; } - - public string ConnectionStringName { get; set; } - - public List DatabaseTables { get; set; } - - public EfCoreDbContextModel( - [NotNull] string name, - [NotNull] string @namespace - ) : base(name) - { - Namespace = Check.NotNullOrWhiteSpace(@namespace, nameof(@namespace)); - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/IDbContextModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/IDbContextModel.cs deleted file mode 100644 index e2daad00aa..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/IDbContextModel.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Volo.Abp.Studio.Analyzing.Models.Database; - -public interface IDbContextModel -{ - string ConnectionStringName { get; set; } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/MongoDbContextModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/MongoDbContextModel.cs deleted file mode 100644 index 66af6ce1ab..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Database/MongoDbContextModel.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Analyzing.Models.Database; - -[PackageContentItemName(ContentTypeName)] -public class MongoDbContextModel : PackageContentItemModel, IDbContextModel -{ - public const string ContentTypeName = "mongoDbContext"; - - public string Namespace { get; private set; } - - public string ConnectionStringName { get; set; } - - public List DatabaseCollections { get; set; } - - public MongoDbContextModel( - [NotNull] string name, - [NotNull] string @namespace - ) : base(name) - { - Namespace = Check.NotNullOrWhiteSpace(@namespace, nameof(@namespace)); - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Domain/AggregateRootModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Domain/AggregateRootModel.cs deleted file mode 100644 index 2778d9f6b0..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Domain/AggregateRootModel.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Volo.Abp.Studio.Analyzing.Models.Domain; - -[PackageContentItemName(ContentTypeName)] -public class AggregateRootModel : EntityModel -{ - public new const string ContentTypeName = "aggregateRoot"; - - public AggregateRootModel(string name) : base(name) - { - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Domain/DomainServiceModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Domain/DomainServiceModel.cs deleted file mode 100644 index a06935c145..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Domain/DomainServiceModel.cs +++ /dev/null @@ -1,17 +0,0 @@ -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Analyzing.Models.Domain; - -[PackageContentItemName(ContentTypeName)] -public class DomainServiceModel : PackageContentItemModel -{ - public const string ContentTypeName = "domainService"; - - public string Namespace { get; set; } - - public string Summary { get; set; } - - public DomainServiceModel([NotNull] string name) : base(name) - { - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Domain/EntityModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Domain/EntityModel.cs deleted file mode 100644 index 4df5392d61..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Domain/EntityModel.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; - -namespace Volo.Abp.Studio.Analyzing.Models.Domain; - -[PackageContentItemName(ContentTypeName)] -public class EntityModel : PackageContentItemModel -{ - public const string ContentTypeName = "entity"; - - public string Namespace { get; set; } - - public string PrimaryKeyType { get; set; } - - public string Summary { get; set; } - - public List CollectionProperties { get; set; } - public List NavigationProperties { get; set; } - - public EntityModel(string name) : base(name) - { - CollectionProperties = new List(); - NavigationProperties = new List(); - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Domain/RepositoryInterfaceModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Domain/RepositoryInterfaceModel.cs deleted file mode 100644 index 8eac804536..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Domain/RepositoryInterfaceModel.cs +++ /dev/null @@ -1,19 +0,0 @@ -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Analyzing.Models.Domain; - -[PackageContentItemName(ContentTypeName)] -public class RepositoryInterfaceModel : PackageContentItemModel -{ - public const string ContentTypeName = "repositoryInterface"; - - public string Namespace { get; set; } - - public string Summary { get; set; } - - public EntityModel EntityModel { get; set; } - - public RepositoryInterfaceModel([NotNull] string name) : base(name) - { - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Feature/FeatureModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Feature/FeatureModel.cs deleted file mode 100644 index 70e42d4d58..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Feature/FeatureModel.cs +++ /dev/null @@ -1,39 +0,0 @@ -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Analyzing.Models.Feature; - -[PackageContentItemName(ContentTypeName)] -public class FeatureModel : PackageContentItemModel -{ - public const string ContentTypeName = "feature"; - - public string ValueType { get; } - - public string DefaultValue { get; } - - public string DisplayName { get; } - - public string Description { get; } - - public bool IsAvailableToHost { get; } - - public bool IsVisibleToClients { get; } - - public FeatureModel( - [NotNull] string name, - [NotNull] string valueType, - string defaultValue, - string displayName, - string description, - bool isAvailableToHost, - bool isVisibleToClients - ) : base(name) - { - ValueType = valueType; - DefaultValue = defaultValue; - DisplayName = displayName; - Description = description; - IsAvailableToHost = isAvailableToHost; - IsVisibleToClients = isVisibleToClients; - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Module/AbpModuleModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Module/AbpModuleModel.cs deleted file mode 100644 index 4bdfffb5d4..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Module/AbpModuleModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Analyzing.Models.Module; - -[PackageContentItemName(ContentTypeName)] -public class AbpModuleModel : PackageContentItemModel -{ - public const string ContentTypeName = "abpModule"; - - public string Namespace { get; set; } - - public AbpModuleModel([NotNull] string name) : base(name) - { - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/PackageContentItemModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/PackageContentItemModel.cs deleted file mode 100644 index 5c57e7bf6f..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/PackageContentItemModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Analyzing.Models; - -public abstract class PackageContentItemModel -{ - public string ContentType { get; } - public string Name { get; } - - public PackageContentItemModel([NotNull] string name) - { - Name = Check.NotNullOrWhiteSpace(name, nameof(name)); - ContentType = PackageContentItemNameAttribute.GetName(GetType()); - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/PackageContentItemNameAttribute.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/PackageContentItemNameAttribute.cs deleted file mode 100644 index 9427c813ae..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/PackageContentItemNameAttribute.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using Volo.Abp.Reflection; - -namespace Volo.Abp.Studio.Analyzing.Models; - -public class PackageContentItemNameAttribute : Attribute -{ - public string Name { get; } - - public PackageContentItemNameAttribute(string name) - { - Name = name; - } - - public static string GetName(Type type) - { - var attribute = ReflectionHelper.GetSingleAttributeOrDefault(type); - if (attribute == null) - { - throw new ApplicationException($"Given type {type.FullName} must have an {nameof(PackageContentItemNameAttribute)}, but not defined!"); - } - - return attribute.Name; - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/PackageContentList.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/PackageContentList.cs deleted file mode 100644 index c1805e4112..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/PackageContentList.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Collections.Generic; - -namespace Volo.Abp.Studio.Analyzing.Models; - -public class PackageContentList : List -{ - -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/PackageModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/PackageModel.cs deleted file mode 100644 index d5a991c76d..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/PackageModel.cs +++ /dev/null @@ -1,19 +0,0 @@ -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Analyzing.Models; - -public class PackageModel -{ - public string Name { get; } - - public string Hash { get; } - - public PackageContentList Contents { get; } - - public PackageModel([NotNull] string name, [NotNull] string hash) - { - Name = Check.NotNullOrWhiteSpace(name, nameof(name)); - Contents = new PackageContentList(); - Hash = hash; - } -} diff --git a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Setting/SettingModel.cs b/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Setting/SettingModel.cs deleted file mode 100644 index 06c9548bbb..0000000000 --- a/studio/src/Volo.Abp.Studio.Analyzing.Abstractions/Volo/Abp/Studio/Analyzing/Models/Setting/SettingModel.cs +++ /dev/null @@ -1,25 +0,0 @@ -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Analyzing.Models.Setting; - -[PackageContentItemName(ContentTypeName)] -public class SettingModel : PackageContentItemModel -{ - public const string ContentTypeName = "setting"; - - public string DefaultValue { get; set; } - - public string DisplayName { get; set; } - - public string Description { get; set; } - - public bool IsVisibleToClient { get; set; } - - public bool IsInherited { get; set; } - - public bool IsEncrypted { get; set; } - - public SettingModel([NotNull] string name) : base(name) - { - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo.Abp.Studio.Domain.CommonServices.abppkg.json b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo.Abp.Studio.Domain.CommonServices.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo.Abp.Studio.Domain.CommonServices.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo.Abp.Studio.Domain.CommonServices.csproj b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo.Abp.Studio.Domain.CommonServices.csproj deleted file mode 100644 index 0f266a153e..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo.Abp.Studio.Domain.CommonServices.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - net5.0 - true - - - - - - - - - - - - - - diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/AbpStudioDomainCommonServicesModule.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/AbpStudioDomainCommonServicesModule.cs deleted file mode 100644 index 54d2ea09f2..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/AbpStudioDomainCommonServicesModule.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.IO.Abstractions; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Modularity; - -namespace Volo.Abp.Studio; - -[DependsOn( - typeof(AbpStudioDomainSharedModule) - )] -public class AbpStudioDomainCommonServicesModule : AbpModule -{ - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddSingleton(new FileSystem()); - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/AbpStudioException.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/AbpStudioException.cs deleted file mode 100644 index 7e851f38cf..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/AbpStudioException.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Runtime.Serialization; -using Microsoft.Extensions.Logging; - -namespace Volo.Abp.Studio; - -public class AbpStudioException : BusinessException -{ - public AbpStudioException( - string code = null, - string message = null, - string details = null, - Exception innerException = null, - LogLevel logLevel = LogLevel.Warning) - : base(code, message, details, innerException, logLevel) - { - Code = code; - Details = details; - LogLevel = logLevel; - } - - public AbpStudioException(SerializationInfo serializationInfo, StreamingContext context) - : base(serializationInfo, context) - { - - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Helpers/PathHelper.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Helpers/PathHelper.cs deleted file mode 100644 index 2fd608c0b1..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Helpers/PathHelper.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Helpers; - -public static class PathHelper -{ - public static string GetRelativePath([NotNull] string basePath, [NotNull] string targetPath) - { - Check.NotNull(basePath, nameof(basePath)); - Check.NotNull(targetPath, nameof(targetPath)); - - return new Uri(basePath).MakeRelativeUri(new Uri(targetPath)).ToString(); - } - - public static string EnsureForwardSlash(string path) - { - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - return path.Replace("\\", "/"); - } - - return path; - } - - public static string Normalize(string path) - { - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - { - return path.Replace("/", "\\"); - } - - return path; - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/AbpModuleFileManager.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/AbpModuleFileManager.cs deleted file mode 100644 index 84b3d944cb..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/AbpModuleFileManager.cs +++ /dev/null @@ -1,76 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO.Abstractions; -using System.Linq; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; - -namespace Volo.Abp.Studio.Packages.Modifying; - -public class AbpModuleFileManager : IAbpModuleFileManager, ITransientDependency -{ - public IFileSystem FileSystem { get; } - - public AbpModuleFileManager(IFileSystem fileSystem) - { - FileSystem = fileSystem; - } - - public async Task AddDependency(string filePath, string moduleToAdd) - { - var fileContent = await FileSystem.File.ReadAllTextAsync(filePath); - var moduleName = moduleToAdd.Split(".").Last(); - var moduleNamespace = moduleToAdd.RemovePostFix("." + moduleName); - var usingStatement = $"using {moduleNamespace};"; - var dependsOnStart = $"DependsOn("; - - if (fileContent.Contains($"typeof({moduleName})")) - { - // module already added - return; - } - - if (!fileContent.NormalizeLineEndings().SplitToLines().Any(l => l.Trim().StartsWith("namespace ") && l.Contains(moduleNamespace)) && - !fileContent.Contains(usingStatement) - ) - { - fileContent = usingStatement + Environment.NewLine + fileContent; - } - - if (!fileContent.Contains(dependsOnStart)) - { - var fileLines = fileContent.NormalizeLineEndings().SplitToLines().ToList(); - fileLines.InsertBefore(l => l.Contains("public") && l.Contains("class"), $" [DependsOn(typeof({moduleName}))]"); - fileContent = fileLines.JoinAsString(Environment.NewLine); - } - else - { - var fileLines = fileContent.NormalizeLineEndings().SplitToLines().ToList(); - var dependsOnStartLine = fileLines.First(l => l.Contains(dependsOnStart)); - var dependsOnStartLineModified = dependsOnStartLine.Replace(dependsOnStart, - dependsOnStart + Environment.NewLine + - $" typeof({moduleName})," - ); - fileContent = fileContent.Replace(dependsOnStartLine, dependsOnStartLineModified); - } - - FileSystem.File.WriteAllTextAsync(filePath, fileContent); - } - - public async Task ExtractModuleNameWithNamespace(string filePath) - { - var fileContent = await FileSystem.File.ReadAllTextAsync(filePath); - - var fileLines = fileContent.NormalizeLineEndings().SplitToLines(); - - var lineOfClassName = fileLines.First(l => l.Contains("public") && l.Contains("class")); - - var moduleName = lineOfClassName.Split(":")[0].Trim().Split(" ").Last(); - - var lineOfNamespace = fileLines.First(l => l.Trim().StartsWith("namespace")); - - var moduleNamespace = lineOfNamespace.Split(" ").Skip(1).First(); - - return moduleNamespace + "." + moduleName; - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/CsprojFileManager.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/CsprojFileManager.cs deleted file mode 100644 index a9f4227c34..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/CsprojFileManager.cs +++ /dev/null @@ -1,261 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Threading.Tasks; -using System.Xml; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.Helpers; -using Volo.Abp.Studio.Package; -using Volo.Abp.Studio.Xml; - -namespace Volo.Abp.Studio.Packages.Modifying; - -public class CsprojFileManager : XmlFileManagerBase, ICsprojFileManager, ITransientDependency -{ - public async Task AddProjectReferenceAsync(string filePath, string projectToReference) - { - var document = await GetXmlDocumentAsync(filePath); - - /*if (document.SelectNodes($"/Project/ItemGroup/ProjectReference[ends-with(@Include, '{Path.GetFileName(projectToReference)}')]").Count > 0) - { - return; - }*/ - - var packageReferenceToSameProject = - document.SelectNodes( - $"/Project/ItemGroup/PackageReference[starts-with(@Include, '{Path.GetFileName(projectToReference).RemovePostFix(".csproj")}')]" - ); - - if (packageReferenceToSameProject.Count > 0) - { - packageReferenceToSameProject[0].ParentNode.RemoveChild(packageReferenceToSameProject[0]); - } - - var relativePath = PathHelper.GetRelativePath(filePath, projectToReference); - - var itemGroupNode = GetOrCreateItemGroupNode(document); - - var newNode = document.CreateElement("ProjectReference"); - - var includeAttr = document.CreateAttribute("Include"); - includeAttr.Value = relativePath; - newNode.Attributes.Append(includeAttr); - - itemGroupNode.AppendChild(newNode); - - await SaveXmlDocumentAsync(filePath, document); - } - - public async Task AddPackageReferenceAsync(string filePath, string packageName, string version) - { - var document = await GetXmlDocumentAsync(filePath); - - if (document.SelectNodes($"/Project/ItemGroup/PackageReference[starts-with(@Include, '{packageName}')]").Count > 0) - { - // Package reference is already added. - return; - } - - var itemGroupNode = GetOrCreateItemGroupNode(document); - - var newNode = document.CreateElement("PackageReference"); - - var includeAttr = document.CreateAttribute("Include"); - includeAttr.Value = packageName; - newNode.Attributes.Append(includeAttr); - - var versionAttr = document.CreateAttribute("Version"); - versionAttr.Value = version; - newNode.Attributes.Append(versionAttr); - - itemGroupNode.AppendChild(newNode); - itemGroupNode.AppendChild(document.CreateWhitespace(Environment.NewLine + " ")); - - await SaveXmlDocumentAsync(filePath, document); - } - - public async Task AddImportAsync(string filePath, string importFilePath) - { - var document = await GetXmlDocumentAsync(filePath); - - var relativeImportFilePath = PathHelper.GetRelativePath(filePath, importFilePath); - - var importNode = document.CreateElement("Import"); - - var projectAttr = document.CreateAttribute("Project"); - projectAttr.Value = relativeImportFilePath; - importNode.Attributes.Append(projectAttr); - - document["Project"].AppendChild(importNode); - document["Project"].AppendChild(document.CreateWhitespace(Environment.NewLine + " ")); - - await SaveXmlDocumentAsync(filePath, document); - } - - public async Task AddAssemblyVersionAsync(string filePath, string version) - { - var document = await GetXmlDocumentAsync(filePath); - - var matchedNodes = document.SelectNodes($"/Project/PropertyGroup"); - - if (matchedNodes.Count == 0) - { - return; - } - - var versionNode = document.CreateElement("Version"); - - versionNode.InnerText = version; - - matchedNodes[0].AppendChild(versionNode); - - await SaveXmlDocumentAsync(filePath, document); - } - - public async Task AddCopyLocalLockFileAssembliesAsync(string filePath) - { - var document = await GetXmlDocumentAsync(filePath); - - var matchedNodes = document.SelectNodes($"/Project/PropertyGroup"); - - if (matchedNodes.Count == 0) - { - return; - } - - var versionNode = document.CreateElement("CopyLocalLockFileAssemblies"); - - versionNode.InnerText = "True"; - - matchedNodes[0].AppendChild(versionNode); - - await SaveXmlDocumentAsync(filePath, document); - } - - public async Task ConvertPackageReferenceToProjectReferenceAsync(string filePath, string projectToReference) - { - var document = await GetXmlDocumentAsync(filePath); - - var packageName = Path.GetFileName(projectToReference).RemovePostFix(".csproj"); - - var matchedNodes = document.SelectNodes($"/Project/ItemGroup/PackageReference[starts-with(@Include, '{packageName}')]"); - - if (matchedNodes.Count == 0) - { - return; - } - - XmlNode targetNode = null; - - foreach (XmlNode matchedNode in matchedNodes) - { - if (matchedNode.Attributes["Include"].Value == packageName) - { - targetNode = matchedNode; - break; - } - } - - if (targetNode == null) - { - return; - } - - var targetNodeParent = targetNode.ParentNode; - - targetNodeParent.RemoveChild(targetNode); - - var relativePath = PathHelper.GetRelativePath(filePath, projectToReference); - - var newNode = document.CreateElement("ProjectReference"); - - var includeAttr = document.CreateAttribute("Include"); - includeAttr.Value = relativePath; - newNode.Attributes.Append(includeAttr); - - targetNodeParent.AppendChild(newNode); - - await SaveXmlDocumentAsync(filePath, document); - } - - public async Task GetTargetFrameworkAsync(string filePath) - { - var document = await GetXmlDocumentAsync(filePath); - - var nodes = document["Project"]?["PropertyGroup"]?.SelectNodes("TargetFramework"); - - if (nodes == null || nodes.Count == 0) - { - return null; - } - - return nodes[0].InnerText.Trim(); - } - - public async Task> GetDependencyListAsync(string filePath) - { - var result = new List(); - - var document = await GetXmlDocumentAsync(filePath); - - var packageReferenceNodes = document.SelectNodes($"/Project/ItemGroup/PackageReference"); - var projectReferenceNodes = document.SelectNodes($"/Project/ItemGroup/ProjectReference"); - - if (packageReferenceNodes != null && packageReferenceNodes.Count > 0) - { - foreach (XmlNode packageReferenceNode in packageReferenceNodes) - { - result.Add( - new PackageDependency( - packageReferenceNode.Attributes["Include"].Value, - packageReferenceNode.Attributes["Version"].Value - ) - ); - } - } - - if (projectReferenceNodes != null && projectReferenceNodes.Count > 0) - { - foreach (XmlNode projectReferenceNode in projectReferenceNodes) - { - result.Add( - new PackageDependency( - Path.GetFullPath(Path.Combine(Path.GetDirectoryName(filePath), projectReferenceNode.Attributes["Include"].Value)) - ) - ); - } - } - - return result; - } - - private XmlNode GetOrCreateItemGroupNode(XmlDocument document) - { - var nodes = document["Project"].SelectNodes("ItemGroup"); - - if (nodes == null || nodes.Count < 1) - { - var newNode = document.CreateElement("ItemGroup"); - document["Project"].AppendChild(newNode); - return newNode; - } - - foreach (XmlNode node in nodes) - { - if (node.SelectNodes("ProjectReference").Count > 0) - { - return node; - } - } - - foreach (XmlNode node in nodes) - { - if (node.SelectNodes("PackageReference").Count > 0) - { - return node; - } - } - - return nodes[0]; - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/IAbpModuleFileManager.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/IAbpModuleFileManager.cs deleted file mode 100644 index 99aeef2697..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/IAbpModuleFileManager.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Threading.Tasks; - -namespace Volo.Abp.Studio.Packages.Modifying; - -public interface IAbpModuleFileManager -{ - Task AddDependency(string filePath, string moduleToAdd); - - Task ExtractModuleNameWithNamespace(string filePath); -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/ICsprojFileManager.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/ICsprojFileManager.cs deleted file mode 100644 index b0617f10f7..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Modifying/ICsprojFileManager.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; -using Volo.Abp.Studio.Package; - -namespace Volo.Abp.Studio.Packages.Modifying; - -public interface ICsprojFileManager -{ - Task AddProjectReferenceAsync(string filePath, string projectToReference); - - Task AddPackageReferenceAsync(string filePath, string packageName, string version); - - Task AddImportAsync(string filePath, string importFilePath); - - Task AddAssemblyVersionAsync(string filePath, string version); - - Task AddCopyLocalLockFileAssembliesAsync(string filePath); - - Task ConvertPackageReferenceToProjectReferenceAsync(string filePath, string projectToReference); - - - Task GetTargetFrameworkAsync(string filePath); - - Task> GetDependencyListAsync(string filePath); -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Nuget/INugetSourceCodeStore.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Nuget/INugetSourceCodeStore.cs deleted file mode 100644 index 36aeeb53e4..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Nuget/INugetSourceCodeStore.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Threading.Tasks; - -namespace Volo.Abp.Studio.Nuget; - -public interface INugetSourceCodeStore -{ - Task GetCachedSourceCodeFilePathAsync(string name, - string type, - string version = null, - bool includePreReleases = false); - - Task GetCachedDllFilePathAsync(string name, - string type, - string version = null, - bool includePreReleases = false, - bool includeDependencies = false); -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Nuget/NugetPackageCacheManager.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Nuget/NugetPackageCacheManager.cs deleted file mode 100644 index 053a9afaf0..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Nuget/NugetPackageCacheManager.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.IO; -using System.Threading.Tasks; -using Volo.Abp.Cli.Utils; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.Helpers; - -namespace Volo.Abp.Studio.Nuget; - -public class NugetPackageCacheManager : ITransientDependency -{ - private readonly ICmdHelper _cmdHelper; - - public NugetPackageCacheManager(ICmdHelper cmdHelper) - { - _cmdHelper = cmdHelper; - } - - public async Task CachePackageAsync(string packageName, string version, bool deleteAfter = true) - { - var temporaryFolder = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); - - Directory.CreateDirectory(temporaryFolder); - - _cmdHelper.RunCmdAndGetOutput("dotnet new console -lang c#", temporaryFolder); - _cmdHelper.RunCmdAndGetOutput($"dotnet add package {packageName} --version {version}", temporaryFolder); - - if (deleteAfter) - { - Directory.Delete(temporaryFolder, true); - } - - return temporaryFolder; - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Nuget/NugetSourceCodeStore.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Nuget/NugetSourceCodeStore.cs deleted file mode 100644 index c518a966e3..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Nuget/NugetSourceCodeStore.cs +++ /dev/null @@ -1,162 +0,0 @@ -using System; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Volo.Abp.Cli.NuGet; -using Volo.Abp.Cli.ProjectBuilding; -using Volo.Abp.Cli.Utils; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.Helpers; -using Volo.Abp.Studio.Modules; - -namespace Volo.Abp.Studio.Nuget; - -[Dependency(ReplaceServices = true)] -public class NugetSourceCodeStore : ISourceCodeStore, INugetSourceCodeStore, ITransientDependency -{ - private readonly NuGetService _nuGetService; - private readonly NugetPackageCacheManager _nugetPackageCacheManager; - private readonly ICmdHelper _cmdHelper; - - public NugetSourceCodeStore( - NuGetService nuGetService, - NugetPackageCacheManager nugetPackageCacheManager, - ICmdHelper cmdHelper) - { - _nuGetService = nuGetService; - _nugetPackageCacheManager = nugetPackageCacheManager; - _cmdHelper = cmdHelper; - } - - public async Task GetAsync( - string name, - string type, - string version = null, - string templateSource = null, - bool includePreReleases = false) - { - name = GetNugetPackageName(name, type); - - var latestVersion = await GetLatestVersionAsync(name, includePreReleases); - - version ??= latestVersion; - - var localCachedFilePath = await GetLocalCacheSourceCodeFilePathInternal(name, version); - - if (localCachedFilePath == null) - { - return null; - } - - return new TemplateFile(await File.ReadAllBytesAsync(localCachedFilePath), version, latestVersion, version); - } - - public async Task GetCachedSourceCodeFilePathAsync(string name, string type, string version = null, - bool includePreReleases = false) - { - name = GetNugetPackageName(name, type); - - version ??= await GetLatestVersionAsync(name, includePreReleases); - - return await GetLocalCacheSourceCodeFilePathInternal(name, version); - } - - public async Task GetCachedDllFilePathAsync(string name, string type, string version = null, bool includePreReleases = false, bool includeDependencies = false) - { - if (type == SourceCodeTypes.Template) - { - name = TemplateNugetPackageInfoProvider.GetNugetPackageName(name); - } - - version ??= await GetLatestVersionAsync(name, includePreReleases); - - var localDllFolder = Path.Combine( - GetLocalNugetCachePath(), - name, - version, - "lib"); - - if (!Directory.Exists(localDllFolder) || - (includeDependencies && !Directory.GetFiles(localDllFolder, $"*Volo.Abp.Studio.ModuleInstaller.dll", SearchOption.AllDirectories).Any())) - { - if (includeDependencies) - { - var temporaryFolder = await _nugetPackageCacheManager.CachePackageAsync(name, version, false); - - var outputFolder = Path.GetDirectoryName( - Directory - .GetFiles(localDllFolder, $"*{name}.dll", SearchOption.AllDirectories) - .First() - ); - - _cmdHelper.RunCmdAndGetOutput($"dotnet build -o {outputFolder}", temporaryFolder); - - Directory.Delete(temporaryFolder, true); - } - else - { - await _nugetPackageCacheManager.CachePackageAsync(name, version); - } - } - - if (!Directory.Exists(localDllFolder)) - { - return null; - } - - return Directory.GetFiles(localDllFolder, $"{name}.dll", SearchOption.AllDirectories).FirstOrDefault(); - } - - private async Task GetLatestVersionAsync(string nugetPackage, bool includePreReleases) - { - var v = await _nuGetService.GetLatestVersionOrNullAsync(nugetPackage, includePreReleases); - - return v.ToString(); - } - - private async Task GetLocalCacheSourceCodeFilePathInternal(string name, string version) - { - var localCacheFile = Path.Combine( - GetLocalNugetCachePath(), - name, - version, - "content", - $"{name}.zip"); - - - if (!File.Exists(localCacheFile)) - { - await _nugetPackageCacheManager.CachePackageAsync(name, version); - - if (!File.Exists(localCacheFile)) - { - return null; - } - } - - return localCacheFile; - } - - private string GetLocalNugetCachePath() - { - return Path.Combine( - Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), - ".nuget", - "packages"); - } - - private string GetNugetPackageName(string name, string type) - { - if (type == SourceCodeTypes.Template) - { - return TemplateNugetPackageInfoProvider.GetNugetPackageName(name); - } - - if (type == SourceCodeTypes.Module) - { - return name + ModuleConsts.SourceCorePackagePostfix; - } - - return name; - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Nuget/TemplateNugetPackageInfoProvider.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Nuget/TemplateNugetPackageInfoProvider.cs deleted file mode 100644 index 00a22e55e2..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Nuget/TemplateNugetPackageInfoProvider.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Threading.Tasks; - -namespace Volo.Abp.Studio.Nuget; - -public static class TemplateNugetPackageInfoProvider -{ - public static string GetNugetPackageName(string template) - { - switch (template) - { - case "app": - return "Cotur.Abp.Basic.Template"; // todo: replace with real template! - default: - return null; - } - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Package/PackageDependency.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Package/PackageDependency.cs deleted file mode 100644 index f43c65e383..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Package/PackageDependency.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.IO; - -namespace Volo.Abp.Studio.Package; - -public class PackageDependency -{ - public ReferenceType Type { get; } - - public string Name { get; } - - public string Version { get; } - - public string Path { get; } - - public PackageDependency(string name, string version) - { - Type = ReferenceType.Package; - Name = name; - Version = version; - } - - public PackageDependency(string path) - { - Type = ReferenceType.Project; - Path = path; - Name = System.IO.Path.GetFileName(path).RemovePostFix(".csproj"); - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Package/PackageTypes.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Package/PackageTypes.cs deleted file mode 100644 index faa4405849..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Package/PackageTypes.cs +++ /dev/null @@ -1,243 +0,0 @@ -using System.Collections.Generic; - -namespace Volo.Abp.Studio.Packages; - -public static class PackageTypes -{ - public const string Domain = "lib.domain"; - public const string DomainShared = "lib.domain-shared"; - public const string Application = "lib.application"; - public const string ApplicationContracts = "lib.application-contracts"; - public const string EntityFrameworkCore = "lib.ef"; - public const string MongoDB = "lib.mongodb"; - public const string HttpApi = "lib.http-api"; - public const string HttpApiClient = "lib.http-api-client"; - public const string Mvc = "lib.mvc"; - public const string Blazor = "lib.blazor"; - public const string BlazorWebAssembly = "lib.blazor-wasm"; - public const string BlazorServer = "lib.blazor-server"; - public const string Test = "lib.test"; - - public const string HostHttpApi = "host.http-api"; - public const string HostMvc = "host.mvc"; - public const string HostBlazorWebAssembly = "host.blazor-wasm"; - public const string HostBlazorServer = "host.blazor-server"; - public const string HostApiGatewayOcelot = "host.api-gateway-ocelot"; - - public static string CalculateDefaultPackageNameForModule( - string moduleName, - string packageType) - { - switch (packageType) - { - case Domain: - return moduleName + ".Domain"; - case DomainShared: - return moduleName + ".Domain.Shared"; - case Application: - return moduleName + ".Application"; - case ApplicationContracts: - return moduleName + ".Application.Contracts"; - case EntityFrameworkCore: - return moduleName + ".EntityFrameworkCore"; - case HttpApi: - return moduleName + ".HttpApi"; - case HttpApiClient: - return moduleName + ".HttpApi.Client"; - case MongoDB: - return moduleName + ".MongoDB"; - case Mvc: - return moduleName + ".Web"; - case Blazor: - return moduleName + ".Blazor"; - case BlazorWebAssembly: - return moduleName + ".Blazor.WebAssembly"; - case BlazorServer: - return moduleName + ".Blazor.Server"; - case HostHttpApi: - return moduleName + ".HttpApi.Host"; - case HostMvc: - return moduleName + ".Web.Host"; - case HostBlazorWebAssembly: - return moduleName + ".Blazor.Client"; - case HostBlazorServer: - return moduleName + ".Blazor.Host"; - case HostApiGatewayOcelot: - return moduleName + ".Gateway"; - default: - throw new AbpStudioException(AbpStudioErrorCodes.PackageNameMustBeSpecified); - } - } - - public static bool IsHostProject(string packageType) - { - return - packageType == HostMvc || - packageType == HostHttpApi || - packageType == HostBlazorWebAssembly || - packageType == HostBlazorServer || - packageType == HostApiGatewayOcelot; - } - - public static bool IsUiProject(string packageType) - { - return - packageType == Mvc || - packageType == BlazorWebAssembly || - packageType == BlazorServer; - } - - public static string GetHostTypeOfUi(string packageType, bool useHostBlazorServerForMvcPackages = false) - { - return packageType switch - { - Mvc => !useHostBlazorServerForMvcPackages ? HostMvc : HostBlazorServer, - BlazorWebAssembly => HostBlazorWebAssembly, - BlazorServer => HostBlazorServer, - _ => null - }; - } - - public static List GetSuggestedInstallationType(string packageType) - { - if (packageType == DomainShared) - { - return new List() - { - Domain, - DomainShared, - ApplicationContracts - }; - } - - if (packageType == Domain) - { - return new List() - { - Domain, - Application - }; - } - - if (packageType == ApplicationContracts) - { - return new List() - { - Application, - ApplicationContracts, - Mvc, - Blazor, - BlazorServer, - BlazorWebAssembly, - HttpApi - }; - } - - if (packageType == Application) - { - return new List() - { - Application, - HostMvc, - HostBlazorServer, - HostBlazorWebAssembly, - HostHttpApi - }; - } - - if (packageType == EntityFrameworkCore) - { - return new List() - { - EntityFrameworkCore, - HostMvc, - HostBlazorServer, - HostBlazorWebAssembly, - HostHttpApi - }; - } - - if (packageType == MongoDB) - { - return new List() - { - MongoDB, - HostMvc, - HostBlazorServer, - HostBlazorWebAssembly, - HostHttpApi - }; - } - - if (packageType == HttpApi) - { - return new List() - { - HttpApi, - HostMvc, - HostBlazorServer, - HostBlazorWebAssembly, - HostHttpApi - }; - } - - if (packageType == HttpApiClient) - { - return new List() - { - HttpApiClient, - HostMvc, - HostBlazorServer, - HostBlazorWebAssembly, - HostHttpApi - }; - } - - if (packageType == Mvc) - { - return new List() - { - Mvc, - HostMvc - }; - } - - if (packageType == Blazor) - { - return new List() - { - Blazor, - BlazorServer, - BlazorWebAssembly - }; - } - - if (packageType == BlazorServer) - { - return new List() - { - BlazorServer, - HostBlazorServer - }; - } - - if (packageType == BlazorWebAssembly) - { - return new List() - { - BlazorWebAssembly, - HostBlazorWebAssembly - }; - } - - if (packageType == Test) - { - return new List() - { - Test - }; - } - - return new List(); - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Package/ReferenceType.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Package/ReferenceType.cs deleted file mode 100644 index 81916c320b..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Package/ReferenceType.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Volo.Abp.Studio.Package; - -public enum ReferenceType -{ - Project = 1, - Package = 2 -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/DotnetSlnFileModifierService.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/DotnetSlnFileModifierService.cs deleted file mode 100644 index 9b77e644a0..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/DotnetSlnFileModifierService.cs +++ /dev/null @@ -1,125 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.IO.Abstractions; -using System.Linq; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.Helpers; - -namespace Volo.Abp.Studio.Solution; - -public class DotnetSlnFileModifierService : IDotnetSlnFileModifierService, ITransientDependency -{ - public IFileSystem FileSystem { get; } - - public DotnetSlnFileModifierService(IFileSystem fileSystem) - { - FileSystem = fileSystem; - } - - public async Task AddProjectAsync(string slnFilePath, string projectPath, string slnTargetFolder = "src") - { - var projectName = FileSystem.Path.GetFileName(projectPath).RemovePostFix(".csproj"); - var folderId = await GetOrAddFolderIdAsync(slnFilePath, slnTargetFolder); - var slnFileLines = (await FileSystem.File.ReadAllTextAsync(slnFilePath)) - .Split(Environment.NewLine).ToList(); - - if (slnFileLines.Any(l => l.Contains($"\"{projectName}\"") && l.Contains("9A19103F-16F7-4668-BE54-9A1E7A4F7556"))) - { - throw new AbpStudioException(AbpStudioErrorCodes.ProjectWithSameNameAlreadyExistInTheSolutionFile) - .WithData("Solution Path", slnFilePath) - .WithData("Project Name", projectName); - } - - var projectId = Guid.NewGuid().ToString(); - var relativeProjectPath = PathHelper.GetRelativePath(slnFilePath, projectPath).Replace("/", "\\"); - var newProjectLine = "Project(\"{9A19103F-16F7-4668-BE54-9A1E7A4F7556}\") = \"" + projectName + "\"," + - " \"" + relativeProjectPath + "\", \"{" + projectId + "}\"" - + Environment.NewLine + "EndProject"; - - slnFileLines.InsertAfter(l => l.Trim().Equals("EndProject"), newProjectLine); - - var newPostSolutionLine = - " {" + projectId + "}.Debug|Any CPU.ActiveCfg = Debug|Any CPU" + Environment.NewLine + - " {" + projectId + "}.Debug|Any CPU.Build.0 = Debug|Any CPU" + Environment.NewLine + - " {" + projectId + "}.Release|Any CPU.ActiveCfg = Release|Any CPU" + Environment.NewLine + - " {" + projectId + "}.Release|Any CPU.Build.0 = Release|Any CPU"; - - if (!slnFileLines.Any(l => l.Contains("GlobalSection") && l.Contains("ProjectConfigurationPlatforms"))) - { - slnFileLines.InsertBefore(l => l.Trim().Equals("EndGlobal"), " GlobalSection(ProjectConfigurationPlatforms) = postSolution"); - slnFileLines.InsertBefore(l => l.Trim().Equals("EndGlobal"), " EndGlobalSection"); - } - - slnFileLines.InsertAfter(l => l.Contains("GlobalSection") && l.Contains("ProjectConfigurationPlatforms"), - newPostSolutionLine); - - var newPreSolutionLine = - " {" + projectId + "} = {" + folderId + "}"; - - - if (!slnFileLines.Any(l => l.Contains("GlobalSection") && l.Contains("NestedProjects"))) - { - slnFileLines.InsertBefore(l => l.Trim().Equals("EndGlobal"), " GlobalSection(NestedProjects) = preSolution"); - slnFileLines.InsertBefore(l => l.Trim().Equals("EndGlobal"), " EndGlobalSection"); - } - - slnFileLines.InsertAfter(l => l.Contains("GlobalSection") && l.Contains("NestedProjects"), newPreSolutionLine); - - await FileSystem.File.WriteAllTextAsync(slnFilePath, string.Join(Environment.NewLine, slnFileLines)); - } - - private async Task GetOrAddFolderIdAsync(string solutionFile, string folderName, string parentFolderId = null) - { - if (folderName.Contains("/") && parentFolderId == null) - { - var parents = folderName.Split("/").SkipLast(1).JoinAsString("/"); - folderName = folderName.Split("/").Last(); - - parentFolderId = await GetOrAddFolderIdAsync(solutionFile, parents); - } - - var file = await FileSystem.File.ReadAllTextAsync(solutionFile); - var lines = file.Split(Environment.NewLine).ToList(); - string folderId; - - var folderLineIndex = lines.FindIndex(l => - l.Contains("2150E333-8FDC-42A3-9474-1A3956D46DE8") && l.Contains("\"" + folderName + "\"")); - - if (folderLineIndex < 0) - { - folderId = Guid.NewGuid().ToString(); - var newFolderLine = "Project(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\") = \"" + folderName + "\", \"" + - folderName + "\", \"{" + folderId + "}\"" - + Environment.NewLine + "EndProject"; - - if (lines.Any(l => l.Trim().Equals("EndProject"))) - { - lines.InsertAfter(l => l.Trim().Equals("EndProject"), newFolderLine); - } - else - { - lines.InsertAfter(l => l.StartsWith("Microsoft Visual Studio Solution File"), newFolderLine); - } - - if (parentFolderId != null && lines.Any(l => l.Contains("GlobalSection") && l.Contains("NestedProjects"))) - { - var newPreSolutionLine = - " {" + folderId + "} = {" + parentFolderId + "}"; - - lines.InsertAfter(l => l.Contains("GlobalSection") && l.Contains("NestedProjects"), - newPreSolutionLine); - } - - await FileSystem.File.WriteAllTextAsync(solutionFile, string.Join(Environment.NewLine, lines)); - } - else - { - folderId = lines[folderLineIndex].Replace("\"", " ").Replace("{", " ").Replace("}", " ").TrimEnd() - .Split(" ").Last(); - } - - return folderId; - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/IDotnetSlnFileModifierService.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/IDotnetSlnFileModifierService.cs deleted file mode 100644 index 8fe371c373..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/IDotnetSlnFileModifierService.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Threading.Tasks; - -namespace Volo.Abp.Studio.Solution; - -public interface IDotnetSlnFileModifierService -{ - Task AddProjectAsync(string slnFile, string projectPath, string slnTargetFolder = "src"); -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/ISolutionFileModuleAdder.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/ISolutionFileModuleAdder.cs deleted file mode 100644 index 16105c4698..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/ISolutionFileModuleAdder.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Threading.Tasks; - -namespace Volo.Abp.Studio.Solution; - -public interface ISolutionFileModuleAdder -{ - Task AddAsync(string TargetModule, string ModuleName); -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/SolutionFileModuleAdder.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/SolutionFileModuleAdder.cs deleted file mode 100644 index df7dceec3e..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Solution/SolutionFileModuleAdder.cs +++ /dev/null @@ -1,46 +0,0 @@ -using System; -using System.IO; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.Modules; - -namespace Volo.Abp.Studio.Solution; - -public class SolutionFileModuleAdder : ISolutionFileModuleAdder, ITransientDependency -{ - private readonly IDotnetSlnFileModifierService _dotnetSlnFileModifierService; - - public SolutionFileModuleAdder(IDotnetSlnFileModifierService dotnetSlnFileModifierService) - { - _dotnetSlnFileModifierService = dotnetSlnFileModifierService; - } - - public async Task AddAsync(string TargetModule, string ModuleName) - { - var targetFolder = Path.Combine(Path.GetDirectoryName(TargetModule), "modules", ModuleName); ; - var slnFile = TargetModule.RemovePostFix(ModuleConsts.FileExtension) + ".sln"; - var moduleSrcFolder = Path.Combine(targetFolder, "src"); - var moduleTestFolder = Path.Combine(targetFolder, "test"); - - await AddProjectsUnderDirectoryToSolutionFile(slnFile, moduleSrcFolder, $"modules/{ModuleName}"); - await AddProjectsUnderDirectoryToSolutionFile(slnFile, moduleTestFolder, $"test/{ModuleName}.Tests"); - } - - private async Task AddProjectsUnderDirectoryToSolutionFile( - string slnFile, - string directory, - string slnTargetFolder) - { - if (!Directory.Exists(directory)) - { - return; - } - - var projects = Directory.GetFiles(directory, "*.csproj", SearchOption.AllDirectories); - - foreach (var project in projects) - { - await _dotnetSlnFileModifierService.AddProjectAsync(slnFile, project, slnTargetFolder); - } - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Xml/XmlFileManagerBase.cs b/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Xml/XmlFileManagerBase.cs deleted file mode 100644 index e9066743c1..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Xml/XmlFileManagerBase.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.IO; -using System.IO.Abstractions; -using System.Threading.Tasks; -using System.Xml; -using System.Xml.Linq; -using Volo.Abp.Threading; - -namespace Volo.Abp.Studio.Xml; - -public abstract class XmlFileManagerBase -{ - public IFileSystem FileSystem { get; set; } - - public ICancellationTokenProvider CancellationTokenProvider { get; set; } - - protected async Task GetXmlDocumentAsync(string filePath) - { - try - { - var doc = new XmlDocument() { PreserveWhitespace = true }; - doc.Load(GenerateStreamFromString(await FileSystem.File.ReadAllTextAsync(filePath))); - return doc; - } - catch (Exception ex) - { - throw new AbpException($"Error while reading {filePath} as XML document.", innerException: ex); - } - } - - protected async Task SaveXmlDocumentAsync(string filePath, XmlDocument rootNode) - { - await SaveFileContentAsync(filePath, XDocument.Parse(rootNode.OuterXml).ToString()); - } - - protected async Task SaveFileContentAsync(string filePath, string content) - { - await FileSystem.File.WriteAllTextAsync(filePath, content, CancellationTokenProvider.Token); - } - - private MemoryStream GenerateStreamFromString(string s) - { - var stream = new MemoryStream(); - var writer = new StreamWriter(stream); - writer.Write(s); - writer.Flush(); - stream.Position = 0; - return stream; - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo.Abp.Studio.Domain.Shared.abppkg.analyze.json b/studio/src/Volo.Abp.Studio.Domain.Shared/Volo.Abp.Studio.Domain.Shared.abppkg.analyze.json deleted file mode 100644 index 843fa12242..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo.Abp.Studio.Domain.Shared.abppkg.analyze.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Volo.Abp.Studio.Domain.Shared", - "hash": "64d3a6a5ecb4776705864ea8cc2b56b5", - "contents": [ - { - "namespace": "Volo.Abp.Studio", - "contentType": "abpModule", - "name": "AbpStudioDomainSharedModule" - } - ] -} \ No newline at end of file diff --git a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo.Abp.Studio.Domain.Shared.abppkg.json b/studio/src/Volo.Abp.Studio.Domain.Shared/Volo.Abp.Studio.Domain.Shared.abppkg.json deleted file mode 100644 index 8b3de05f76..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo.Abp.Studio.Domain.Shared.abppkg.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "role": "lib.domain-shared" -} \ No newline at end of file diff --git a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo.Abp.Studio.Domain.Shared.csproj b/studio/src/Volo.Abp.Studio.Domain.Shared/Volo.Abp.Studio.Domain.Shared.csproj deleted file mode 100644 index 62daa81f1a..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo.Abp.Studio.Domain.Shared.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - netstandard2.0 - - - - - - - - - diff --git a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo/Abp/Studio/AbpStudioDomainSharedModule.cs b/studio/src/Volo.Abp.Studio.Domain.Shared/Volo/Abp/Studio/AbpStudioDomainSharedModule.cs deleted file mode 100644 index 7a66f31fff..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo/Abp/Studio/AbpStudioDomainSharedModule.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp.Cli; -using Volo.Abp.Modularity; - -namespace Volo.Abp.Studio; - -[DependsOn( - typeof(AbpCliCoreModule) -)] -public class AbpStudioDomainSharedModule : AbpModule -{ - -} diff --git a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo/Abp/Studio/AbpStudioErrorCodes.cs b/studio/src/Volo.Abp.Studio.Domain.Shared/Volo/Abp/Studio/AbpStudioErrorCodes.cs deleted file mode 100644 index 5c8118accc..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo/Abp/Studio/AbpStudioErrorCodes.cs +++ /dev/null @@ -1,32 +0,0 @@ -namespace Volo.Abp.Studio; - -public static class AbpStudioErrorCodes -{ - public const string SolutionAlreadyExists = "AbpStudio:SolutionAlreadyExists"; - public const string ModuleAlreadyExistsInTheSolution = "AbpStudio:ModuleAlreadyExistsInTheSolution"; - public const string ModuleFileAlreadyExists = "AbpStudio:ModuleFileAlreadyExists"; - public const string IncorrectFileFormat = "AbpStudio:IncorrectFileFormat"; - public const string ModuleNotFound = "AbpStudio:ModuleNotFound"; - public const string SolutionNotFound = "AbpStudio:SolutionNotFound"; - public const string ModuleNotSpecified = "AbpStudio:ModuleNotSpecified"; - public const string SolutionNotSpecified = "AbpStudio:SolutionNotSpecified"; - public const string ProjectAlreadyExistInTheModule = "AbpStudio:ProjectAlreadyExistInTheModule"; - public const string IncorrectSolutionFileFormat = "AbpStudio:IncorrectSolutionFileFormat"; - public const string FolderNotFound = "AbpStudio:FolderNotFound"; - public const string ProjectWithSameNameAlreadyExistInTheSolutionFile = "AbpStudio:ProjectWithSameNameAlreadyExistInTheSolutionFile"; - public const string UndefinedPackageTemplate = "AbpStudio:UndefinedPackageTemplate"; - public const string PackageTemplateNotSpecified = "AbpStudio:PackageTemplateNotSpecified"; - public const string PackageNameMustBeSpecified = "AbpStudio:PackageNameMustBeSpecified"; - public const string FileAlreadyExists = "AbpStudio:FileAlreadyExists"; - public const string PackageNotSpecified = "AbpStudio:PackageNotSpecified"; - public const string DbmsMustBeSpecified = "AbpStudio:DbmsMustBeSpecified"; - public const string UserNotLoggedIn = "AbpStudio:UserNotLoggedIn"; - public const string LoginFailed = "AbpStudio:LoginFailed"; - public const string PackageAlreadyExist = "AbpStudio:PackageAlreadyExist"; - public const string AbpModuleFileNotFound = "AbpStudio:AbpModuleFileNotFound"; - public const string DllNotFound = "AbpStudio:DllNotFound"; - public const string PackageNotFound = "AbpStudio:PackageNotFound"; - public const string FileNotFound = "AbpStudio:FileNotFound"; - public const string IncorrectFolderName = "AbpStudio:IncorrectFolderName"; - public const string ModuleAlreadyInstalled = "AbpStudio:ModuleAlreadyInstalled"; -} diff --git a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo/Abp/Studio/Modules/ModuleConsts.cs b/studio/src/Volo.Abp.Studio.Domain.Shared/Volo/Abp/Studio/Modules/ModuleConsts.cs deleted file mode 100644 index f2e17d63bd..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo/Abp/Studio/Modules/ModuleConsts.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace Volo.Abp.Studio.Modules; - -public static class ModuleConsts -{ - public const string FileExtension = ".abpmdl.json"; - public const string InstallerPackagePostfix = ".Installer"; - public const string SourceCorePackagePostfix = ".SourceCode"; - public const string Packages = "packages"; - - public static class Layers //TODO: Moving to PackageTypes - { - public const string Domain = "lib.domain"; - public const string DomainShared = "lib.domain.shared"; - public const string Application = "lib.application"; - public const string ApplicationContracts = "lib.application.contracts"; - } -} diff --git a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo/Abp/Studio/Package/PackageReferenceCompatibility.cs b/studio/src/Volo.Abp.Studio.Domain.Shared/Volo/Abp/Studio/Package/PackageReferenceCompatibility.cs deleted file mode 100644 index cfb9c9da69..0000000000 --- a/studio/src/Volo.Abp.Studio.Domain.Shared/Volo/Abp/Studio/Package/PackageReferenceCompatibility.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Volo.Abp.Studio.Packages.Referencing; - -public enum PackageReferenceCompatibility -{ - Unknown, - DDD_Compatible, - Compatible, - TestProject, - IndirectlyReferenced, - DirectlyReferenced, - CircularReference -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo.Abp.Studio.ModuleInstaller.Abstractions.abppkg.json b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo.Abp.Studio.ModuleInstaller.Abstractions.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo.Abp.Studio.ModuleInstaller.Abstractions.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo.Abp.Studio.ModuleInstaller.Abstractions.csproj b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo.Abp.Studio.ModuleInstaller.Abstractions.csproj deleted file mode 100644 index 8076b60746..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo.Abp.Studio.ModuleInstaller.Abstractions.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - netstandard2.0 - - - - - - - - - diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/AbpStudioModuleInstallerAbstractionsModule.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/AbpStudioModuleInstallerAbstractionsModule.cs deleted file mode 100644 index dc634383ee..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/AbpStudioModuleInstallerAbstractionsModule.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp.Modularity; -using Volo.Abp.Studio.Analyzing; - -namespace Volo.Abp.Studio; - -[DependsOn( - typeof(AbpStudioAnalyzingAbstractionsModule) -)] -public class AbpStudioModuleInstallerAbstractionsModule : AbpModule -{ - -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Analyzing/AnalyzingOptions.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Analyzing/AnalyzingOptions.cs deleted file mode 100644 index 82f4268e64..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Analyzing/AnalyzingOptions.cs +++ /dev/null @@ -1,36 +0,0 @@ -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Analyzing; - -public class AnalyzingOptions -{ - public bool Force { get; set; } = false; - - [CanBeNull] - public string AnalyzeConfigurationFile { get; set; } - - // Combines two options - // The second option has more priority - public static AnalyzingOptions Combine([CanBeNull] AnalyzingOptions first, [CanBeNull] AnalyzingOptions second) - { - if (second == null && first == null) - { - return new AnalyzingOptions(); - } - - if (second == null) - { - return first; - } - - if (first == null) - { - return second; - } - - return new AnalyzingOptions - { - AnalyzeConfigurationFile = second.AnalyzeConfigurationFile ?? first.AnalyzeConfigurationFile - }; - } -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/EfCoreConfigurationMethodDeclaration.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/EfCoreConfigurationMethodDeclaration.cs deleted file mode 100644 index ac8dac7c79..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/EfCoreConfigurationMethodDeclaration.cs +++ /dev/null @@ -1,17 +0,0 @@ -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.ModuleInstalling; - -public class EfCoreConfigurationMethodDeclaration -{ - public string Namespace { get; } - - public string MethodName { get; } - - public EfCoreConfigurationMethodDeclaration([NotNull] string nameSpace, [NotNull] string methodName) - { - Namespace = Check.NotNullOrEmpty(nameSpace, nameof(nameSpace)); - MethodName = Check.NotNullOrEmpty(methodName, nameof(methodName)); - } - -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/IModuleInstallingPipelineBuilder.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/IModuleInstallingPipelineBuilder.cs deleted file mode 100644 index 1ec35b5300..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/IModuleInstallingPipelineBuilder.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Threading.Tasks; - -namespace Volo.Abp.Studio.ModuleInstalling; - -public interface IModuleInstallingPipelineBuilder -{ - Task BuildAsync(ModuleInstallingContext context); -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingContext.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingContext.cs deleted file mode 100644 index 83df73196a..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingContext.cs +++ /dev/null @@ -1,88 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using JetBrains.Annotations; -using Volo.Abp.Studio.Packages; - -namespace Volo.Abp.Studio.ModuleInstalling; - -public class ModuleInstallingContext -{ - public string ModuleName { get; set; } - - public string TargetModule { get; set; } - - public bool WithSourceCode { get; set; } - - public bool AddToSolutionFile { get; set; } - - public string Version { get; set; } - - public List EfCoreConfigurationMethodDeclarations { get; } - - public List TargetModulePackages { get; protected set; } - - public List ReferenceModulePackages { get; protected set; } - - public Dictionary Options { get; } - - public IServiceProvider ServiceProvider { get; } - - public ModuleInstallingContext( - string moduleName, - string targetModule, - bool withSourceCode, - bool addToSolutionFile, - string version, - Dictionary options, - IServiceProvider serviceProvider) - { - ModuleName = moduleName; - TargetModule = targetModule; - WithSourceCode = withSourceCode; - AddToSolutionFile = addToSolutionFile; - Version = version; - Options = options; - - TargetModulePackages = new List(); - ReferenceModulePackages = new List(); - - EfCoreConfigurationMethodDeclarations = new List(); - - ServiceProvider = Check.NotNull(serviceProvider, nameof(serviceProvider)); - } - - public void AddEfCoreConfigurationMethodDeclaration(params EfCoreConfigurationMethodDeclaration[] methodNames) - { - foreach (var methodName in methodNames) - { - Check.NotNull(methodName, nameof(methodName)); - - EfCoreConfigurationMethodDeclarations.Add(methodName); - } - } - - public void SetReferenceModulePackages([NotNull] List referenceModulePackages) - { - Check.NotNull(referenceModulePackages, nameof(referenceModulePackages)); - - ReferenceModulePackages = referenceModulePackages; - } - - public void SetTargetModulePackages([NotNull] List targetModulePackages) - { - Check.NotNull(targetModulePackages, nameof(targetModulePackages)); - - TargetModulePackages = targetModulePackages; - } - - public string GetTargetSourceCodeFolder() - { - return CalculateTargetSourceCodeFolder(TargetModule, ModuleName); - } - - public static string CalculateTargetSourceCodeFolder(string targetModule, string moduleName) - { - return Path.Combine(Path.GetDirectoryName(targetModule), "modules", moduleName); - } -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingPipeline.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingPipeline.cs deleted file mode 100644 index 3d678a11b4..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingPipeline.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Volo.Abp.Studio.ModuleInstalling; - -public class ModuleInstallingPipeline -{ - public ModuleInstallingContext Context { get; } - - public List Steps { get; } - - public ModuleInstallingPipeline(ModuleInstallingContext context) - { - Context = context; - Steps = new List(); - } - - public async Task ExecuteAsync() - { - foreach (var step in Steps) - { - await step.ExecuteAsync(Context); - } - } - - public void Add(ModuleInstallingPipelineStep step) - { - Steps.Add(step); - } - - public void Remove(Type stepType) - { - Steps.RemoveAll(step => step.GetType() == stepType); - } - - public void Replace(Type stepType, ModuleInstallingPipelineStep step) - { - Steps.ReplaceOne(step => step.GetType() == stepType, step); - } - - public void InsertAfter(Type stepType, ModuleInstallingPipelineStep step) - { - Steps.InsertAfter(step => step.GetType() == stepType, step); - } - - public void InsertBefore(Type stepType, ModuleInstallingPipelineStep step) - { - Steps.InsertBefore(step => step.GetType() == stepType, step); - } -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingPipelineStep.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingPipelineStep.cs deleted file mode 100644 index 40b31c725c..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingPipelineStep.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Threading.Tasks; - -namespace Volo.Abp.Studio.ModuleInstalling; - -public abstract class ModuleInstallingPipelineStep -{ - public abstract Task ExecuteAsync(ModuleInstallingContext context); -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/Options/IModuleInstallingOptionProvider.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/Options/IModuleInstallingOptionProvider.cs deleted file mode 100644 index 8c15f8a037..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/Options/IModuleInstallingOptionProvider.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Collections.Generic; -using System.Threading.Tasks; - -namespace Volo.Abp.Studio.ModuleInstalling.Options; - -public interface IModuleInstallingOptionProvider -{ - Task> GetAsync(); -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/Options/ModuleInstallingOption.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/Options/ModuleInstallingOption.cs deleted file mode 100644 index d16af1b882..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/Options/ModuleInstallingOption.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Collections.Generic; -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.ModuleInstalling.Options; - -public class ModuleInstallingOption -{ - public string Name { get; set; } - - public string Description { get; set; } - - public ModuleInstallingOptionType Type { get; set; } - - public Dictionary Values { get; set; } - - public ModuleInstallingOption( - [NotNull] string name, - [NotNull] string description, - [NotNull] ModuleInstallingOptionType type, - [CanBeNull] Dictionary values = null) - { - Name = Check.NotNullOrWhiteSpace(name, nameof(name)); - Description = Check.NotNullOrWhiteSpace(description, nameof(description)); - Type = type; - Values = values ?? new Dictionary(); - } -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/Options/ModuleInstallingOptionType.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/Options/ModuleInstallingOptionType.cs deleted file mode 100644 index e0305fc872..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/Options/ModuleInstallingOptionType.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Volo.Abp.Studio.ModuleInstalling.Options; - -public enum ModuleInstallingOptionType -{ - NotSpecified, - Checkbox, - FreeText, - ComboBox -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Package/PackageConsts.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Package/PackageConsts.cs deleted file mode 100644 index dff57b316b..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Package/PackageConsts.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Volo.Abp.Studio.Packages; - -public static class PackageConsts -{ - public const string FileExtension = ".abppkg.json"; - - public const string RoleProperty = "role"; -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Package/PackageHelper.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Package/PackageHelper.cs deleted file mode 100644 index a4fb995c0b..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Package/PackageHelper.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.IO; -using JetBrains.Annotations; - -namespace Volo.Abp.Studio.Packages; - -public static class PackageHelper -{ - public static string GetNameFromPath([NotNull] string path) - { - Check.NotNullOrWhiteSpace(path, nameof(path)); - - return Path - .GetFileName(path) - .RemovePostFix(StringComparison.OrdinalIgnoreCase, PackageConsts.FileExtension); - } -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Package/PackageInfo.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Package/PackageInfo.cs deleted file mode 100644 index 9bcb4e3d0a..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Package/PackageInfo.cs +++ /dev/null @@ -1,26 +0,0 @@ -using JetBrains.Annotations; -using Volo.Abp.Studio.Analyzing; - -namespace Volo.Abp.Studio.Packages; - -public class PackageInfo -{ - [NotNull] - public string Path { get; } - - [NotNull] - public string Name { get; } - - [CanBeNull] - public string Role { get; } - - [CanBeNull] - public AnalyzingOptions AnalyzingOptions { get; set; } - - public PackageInfo([NotNull] string path, [CanBeNull] string role) - { - Path = Check.NotNullOrWhiteSpace(path, nameof(path)); - Name = PackageHelper.GetNameFromPath(path); - Role = role; - } -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Package/PackageInfoWithAnalyze.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Package/PackageInfoWithAnalyze.cs deleted file mode 100644 index bdb1cd3178..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Package/PackageInfoWithAnalyze.cs +++ /dev/null @@ -1,27 +0,0 @@ -using JetBrains.Annotations; -using Volo.Abp.Studio.Analyzing.Models; - -namespace Volo.Abp.Studio.Packages; - -public class PackageInfoWithAnalyze -{ - [NotNull] - public string Path { get; } - - [NotNull] - public string Name { get; } - - [CanBeNull] - public string Role { get; } - - [CanBeNull] - public PackageModel Analyze { get; } - - public PackageInfoWithAnalyze([NotNull] string path, [CanBeNull] string role, [CanBeNull] PackageModel analyze) - { - Path = Check.NotNullOrWhiteSpace(path, nameof(path)); - Name = PackageHelper.GetNameFromPath(path); - Role = role; - Analyze = analyze; - } -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo.Abp.Studio.ModuleInstaller.abppkg.json b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo.Abp.Studio.ModuleInstaller.abppkg.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo.Abp.Studio.ModuleInstaller.abppkg.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo.Abp.Studio.ModuleInstaller.csproj b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo.Abp.Studio.ModuleInstaller.csproj deleted file mode 100644 index e0ef26d462..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo.Abp.Studio.ModuleInstaller.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - net6.0 - true - - - - - - - - - diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/AbpStudioModuleInstallerModule.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/AbpStudioModuleInstallerModule.cs deleted file mode 100644 index 627736a06d..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/AbpStudioModuleInstallerModule.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Volo.Abp.Modularity; - -namespace Volo.Abp.Studio; - -[DependsOn( - typeof(AbpStudioDomainCommonServicesModule), - typeof(AbpStudioModuleInstallerAbstractionsModule) - )] -public class AbpStudioModuleInstallerModule : AbpModule -{ - public override void ConfigureServices(ServiceConfigurationContext context) - { - - } -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingPipelineBuilderBase.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingPipelineBuilderBase.cs deleted file mode 100644 index 4c061ae87d..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingPipelineBuilderBase.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System.Linq; -using Volo.Abp.Studio.ModuleInstalling.Steps; - -namespace Volo.Abp.Studio.ModuleInstalling; - -public abstract class ModuleInstallingPipelineBuilderBase -{ - protected ModuleInstallingPipeline GetBasePipeline(ModuleInstallingContext context) - { - var pipeline = new ModuleInstallingPipeline(context); - - if (context.WithSourceCode) - { - pipeline.Add(new SourceCodeDownloadStep()); - pipeline.Add(new AssemblyVersionStep()); - - if (context.AddToSolutionFile) - { - pipeline.Add(new AddToSolutionFileStep()); - } - } - - pipeline.Add(new PackageReferencingStep()); - - if (context.EfCoreConfigurationMethodDeclarations.Any()) - { - pipeline.Add(new AddEfCoreConfigurationMethodStep()); - } - - return pipeline; - } -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/AddEfCoreConfigurationMethodStep.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/AddEfCoreConfigurationMethodStep.cs deleted file mode 100644 index 20caa109ba..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/AddEfCoreConfigurationMethodStep.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Cli.ProjectModification; -using Volo.Abp.Studio.Packages; -using Volo.Abp.Studio.Packages.Modifying; -using Volo.Abp.Studio.Analyzing.Models.Module; - -namespace Volo.Abp.Studio.ModuleInstalling.Steps; - -public class AddEfCoreConfigurationMethodStep : ModuleInstallingPipelineStep -{ - public override async Task ExecuteAsync(ModuleInstallingContext context) - { - var efCoreProject = context.TargetModulePackages.FirstOrDefault(p => p.Role == PackageTypes.EntityFrameworkCore); - - if (efCoreProject == null) - { - return; - } - - var efCoreProjectCsprojPath = efCoreProject.Path.RemovePostFix(PackageConsts.FileExtension) + ".csproj"; - - var _derivedClassFinder = context.ServiceProvider.GetRequiredService(); - var _dbContextFileBuilderConfigureAdder = context.ServiceProvider.GetRequiredService(); - - var dbContextFile = _derivedClassFinder.Find(efCoreProjectCsprojPath, "AbpDbContext").FirstOrDefault(); - - if (dbContextFile == null) - { - return; - } - - foreach (var declaration in context.EfCoreConfigurationMethodDeclarations) - { - try - { - _dbContextFileBuilderConfigureAdder.Add(dbContextFile, declaration.Namespace + ":" + declaration.MethodName); - } - catch (Exception e) - { - continue; - } - } - } -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/AddToSolutionFileStep.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/AddToSolutionFileStep.cs deleted file mode 100644 index 4d28f99089..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/AddToSolutionFileStep.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Studio.Solution; - -namespace Volo.Abp.Studio.ModuleInstalling.Steps; - -public class AddToSolutionFileStep : ModuleInstallingPipelineStep -{ - public override async Task ExecuteAsync(ModuleInstallingContext context) - { - var _solutionFileModuleAdder = context.ServiceProvider.GetRequiredService(); - - await _solutionFileModuleAdder.AddAsync(context.TargetModule, context.ModuleName); - } -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/AssemblyVersionStep.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/AssemblyVersionStep.cs deleted file mode 100644 index ecd83db1b1..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/AssemblyVersionStep.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.IO; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Studio.Packages.Modifying; - -namespace Volo.Abp.Studio.ModuleInstalling.Steps; - -public class AssemblyVersionStep : ModuleInstallingPipelineStep -{ - public async override Task ExecuteAsync(ModuleInstallingContext context) - { - var moduleFolder = Path.GetDirectoryName(context.TargetModule); - var commonPropsFilePath = Path.Combine(moduleFolder, "common.props"); - - if (!File.Exists(commonPropsFilePath)) - { - return; - } - - var _csprojFileManager = context.ServiceProvider.GetRequiredService(); - - var csProjFiles = Directory.GetFiles(context.GetTargetSourceCodeFolder(), "*.csproj", SearchOption.AllDirectories); - - foreach (var csProjFile in csProjFiles) - { - await _csprojFileManager.AddAssemblyVersionAsync(csProjFile, context.Version); - await _csprojFileManager.AddCopyLocalLockFileAssembliesAsync(csProjFile); - } - } -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/PackageReferencingStep.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/PackageReferencingStep.cs deleted file mode 100644 index 3d68a1177d..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/PackageReferencingStep.cs +++ /dev/null @@ -1,110 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Studio.Packages; -using Volo.Abp.Studio.Packages.Modifying; -using Volo.Abp.Studio.Analyzing.Models.Module; - -namespace Volo.Abp.Studio.ModuleInstalling.Steps; - -public class PackageReferencingStep : ModuleInstallingPipelineStep -{ - public override async Task ExecuteAsync(ModuleInstallingContext context) - { - var _abpModuleFileManager = context.ServiceProvider.GetRequiredService(); - - foreach (var referencePackage in context.ReferenceModulePackages) - { - var targetPackages = GetTargetPackages(context.TargetModulePackages, referencePackage); - - foreach (var targetPackage in targetPackages) - { - await AddReferenceAsync(context, targetPackage, referencePackage); - - var targetAbpModulePath = FindAbpModuleFile(targetPackage.Path); - var referencePackageAbpModuleName = FindAbpModuleName(referencePackage); - - if (targetAbpModulePath != null && referencePackageAbpModuleName != null) - { - await _abpModuleFileManager.AddDependency(targetAbpModulePath, referencePackageAbpModuleName); - } - } - } - } - - private async Task AddReferenceAsync( - ModuleInstallingContext context, - PackageInfo targetPackage, - PackageInfoWithAnalyze referencePackage) - { - var _csprojFileManager = context.ServiceProvider.GetRequiredService(); - var csprojFilePath = targetPackage.Path.RemovePostFix(PackageConsts.FileExtension) + ".csproj"; - - if (context.WithSourceCode) - { - var referenceProjectPath = Directory.GetFiles(context.GetTargetSourceCodeFolder(), - $"*{referencePackage.Name}.csproj", - SearchOption.AllDirectories).FirstOrDefault(); - - if (referenceProjectPath == null) - { - return; - } - - await _csprojFileManager.AddProjectReferenceAsync( - csprojFilePath, - referenceProjectPath); - } - else - { - await _csprojFileManager.AddPackageReferenceAsync( - csprojFilePath, - referencePackage.Name, - context.Version); - } - } - - private string FindAbpModuleFile(string targetPackagePath) - { - return Directory.GetFiles(Path.GetDirectoryName(targetPackagePath), "*Module.cs", - SearchOption.AllDirectories) - .FirstOrDefault(); - } - - private string FindAbpModuleName(PackageInfoWithAnalyze package) - { - var abpModuleModel = package.Analyze?.Contents.Where(y => - y.ContentType == AbpModuleModel.ContentTypeName - ).Cast().FirstOrDefault(); - - if (abpModuleModel == null) - { - return null; - } - - return abpModuleModel.Namespace + "." + abpModuleModel.Name; - } - - private List GetTargetPackages(List targetModulePackages, - PackageInfoWithAnalyze referencePackage) - { - if (PackageTypes.IsHostProject(referencePackage.Role)) - { - return new List(); - } - - if (PackageTypes.IsUiProject(referencePackage.Role)) - { - var useHostBlazorServerForMvcPackages = targetModulePackages.All(p => p.Role != PackageTypes.HostMvc); - var targetHostType = - PackageTypes.GetHostTypeOfUi(referencePackage.Role, useHostBlazorServerForMvcPackages); - - return targetModulePackages.Where(p => p.Role == targetHostType).ToList(); - } - - return targetModulePackages.Where(p => p.Role == referencePackage.Role).ToList(); - } -} diff --git a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/SourceCodeDownloadStep.cs b/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/SourceCodeDownloadStep.cs deleted file mode 100644 index 2d0448e54e..0000000000 --- a/studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/SourceCodeDownloadStep.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.IO; -using System.IO.Compression; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Cli.ProjectBuilding; -using Volo.Abp.Studio.Nuget; - -namespace Volo.Abp.Studio.ModuleInstalling.Steps; - -public class SourceCodeDownloadStep : ModuleInstallingPipelineStep -{ - public override async Task ExecuteAsync(ModuleInstallingContext context) - { - var _nugetSourceCodeStoreManager = context.ServiceProvider.GetRequiredService(); - - var zipFilePath = await _nugetSourceCodeStoreManager.GetCachedSourceCodeFilePathAsync( - context.ModuleName, - SourceCodeTypes.Module, - context.Version); - - if (zipFilePath == null) - { - throw new AbpStudioException(message: $"Source code not found for {context.ModuleName} (v{context.Version})"); - } - - var targetFolder = context.GetTargetSourceCodeFolder(); - - if (Directory.Exists(targetFolder)) - { - return; - } - - Directory.CreateDirectory(targetFolder); - - ZipFile.ExtractToDirectory(zipFilePath, targetFolder); - } -} diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj index 7d648864c2..a78ab4542f 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyCompanyName.MyProjectName.Installer.csproj @@ -9,7 +9,6 @@ - diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyProjectNameInstallerModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyProjectNameInstallerModule.cs index 7b530fd9d3..b887cf1372 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyProjectNameInstallerModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyProjectNameInstallerModule.cs @@ -1,11 +1,9 @@ -using Volo.Abp.Studio; -using Volo.Abp.Modularity; +using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; namespace MyCompanyName.MyProjectName; [DependsOn( - typeof(AbpStudioModuleInstallerModule), typeof(AbpVirtualFileSystemModule) )] public class MyProjectNameInstallerModule : AbpModule diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyProjectNameInstallerPipelineBuilder.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyProjectNameInstallerPipelineBuilder.cs deleted file mode 100644 index 1a0eae46a5..0000000000 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Installer/MyProjectNameInstallerPipelineBuilder.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Studio.ModuleInstalling; - -namespace MyCompanyName.MyProjectName; - -[Dependency(ServiceLifetime.Transient, ReplaceServices = true)] -[ExposeServices(typeof(IModuleInstallingPipelineBuilder))] -public class MyProjectNameInstallerPipelineBuilder : ModuleInstallingPipelineBuilderBase, IModuleInstallingPipelineBuilder, ITransientDependency -{ - public async Task BuildAsync(ModuleInstallingContext context) - { - return GetBasePipeline(context); - } -}