From a5897c03f866fa28c8ec87e2ea14542d2c3844a6 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 19 Apr 2021 16:53:53 +0300 Subject: [PATCH] Cli add-module: fix angular source code project finder --- .../Services/SourceCodeDownloadService.cs | 25 +------------------ .../AngularSourceCodeAdder.cs | 6 +++++ 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/SourceCodeDownloadService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/SourceCodeDownloadService.cs index 088cadb707..56e5c0a03b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/SourceCodeDownloadService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/Services/SourceCodeDownloadService.cs @@ -203,30 +203,7 @@ namespace Volo.Abp.Cli.Commands.Services return false; } - if (zipEntryName.Contains(Path.Combine("angular/e2e"))) - { - return true; - } - if (zipEntryName.Contains(Path.Combine("angular/src"))) - { - return true; - } - if (zipEntryName.Contains(Path.Combine("angular/node_modules"))) - { - return true; - } - if (zipEntryName.Contains(Path.Combine("angular/scripts"))) - { - return true; - } - if (zipEntryName.Contains(Path.Combine("angular/source-code-requirements"))) - { - return true; - } - - var fileName = Path.GetFileName(zipEntryName); - - if (!string.IsNullOrEmpty(fileName) && zipEntryName.Equals("angular/" + fileName)) + if (zipEntryName.StartsWith("angular/") && !zipEntryName.StartsWith("angular/projects")) { return true; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs index 9d95f818d1..93626d682d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/AngularSourceCodeAdder.cs @@ -246,6 +246,12 @@ namespace Volo.Abp.Cli.ProjectModification var foldersUnderProject = Directory.GetDirectories(Path.Combine(folder, "projects")); foreach (var folderUnderProject in foldersUnderProject) { + if (Path.GetFileName(folderUnderProject) == "dev-app") + { + Directory.Delete(folderUnderProject, true); + continue; + } + if (Directory.Exists(Path.Combine(folder, Path.GetFileName(folderUnderProject)))) { continue;