From 1cccbad0b7ac5ad6f3f3e6f8937dd7ca72c9e547 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 17 Mar 2020 14:45:46 +0300 Subject: [PATCH] Add module with source code: Delete "app" folder after download resolves https://github.com/abpframework/abp/issues/3159 --- .../ProjectModification/SolutionModuleAdder.cs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index dcb36d7bae..e369690785 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -107,14 +107,18 @@ namespace Volo.Abp.Cli.ProjectModification private async Task DownloadSourceCodesToSolutionFolder(ModuleWithMastersInfo module, string modulesFolderInSolution, string version = null) { + var targetModuleFolder = Path.Combine(modulesFolderInSolution, module.Name); + await SourceCodeDownloadService.DownloadAsync( module.Name, - Path.Combine(modulesFolderInSolution, module.Name), + targetModuleFolder, version, null, null ); + await DeleteAppFolderAsync(targetModuleFolder); + if (module.MasterModuleInfos == null) { return; @@ -126,6 +130,15 @@ namespace Volo.Abp.Cli.ProjectModification } } + private async Task DeleteAppFolderAsync(string targetModuleFolder) + { + var appFolder = Path.Combine(targetModuleFolder, "app"); + if (Directory.Exists(appFolder)) + { + Directory.Delete(appFolder, true); + } + } + private async Task AddNugetAndNpmReferences(ModuleWithMastersInfo module, string[] projectFiles) { foreach (var nugetPackage in module.NugetPackages)