From bf06c3c29be99cfa95e94dfd0840d0b54598a638 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 1 Sep 2021 12:38:52 +0300 Subject: [PATCH] update SourceCodeDownloadStep --- .../Abp/Studio/ModuleInstalling/ModuleInstallingContext.cs | 6 ++++++ .../Studio/ModuleInstalling/Steps/SourceCodeDownloadStep.cs | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) 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 index 581b0c28cd..b1ace699dc 100644 --- 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 @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using JetBrains.Annotations; using Volo.Abp.Studio.Packages; @@ -60,5 +61,10 @@ namespace Volo.Abp.Studio.ModuleInstalling TargetModulePackages = targetModulePackages; } + + public string GetTargetSourceCodeFolder() + { + return Path.Combine(Path.GetDirectoryName(TargetModule), "modules", ModuleName); + } } } 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 index 5844e55272..b518c8bf7f 100644 --- 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 @@ -20,10 +20,9 @@ namespace Volo.Abp.Studio.ModuleInstalling.Steps SourceCodeTypes.Module, context.Version); - var targetFolder = - Path.Combine(Path.GetDirectoryName(context.TargetModule), "modules", context.ModuleName); + var targetFolder = context.GetTargetSourceCodeFolder(); - using (ZipArchive archive = ZipFile.OpenRead(zipFilePath)) + using (var archive = ZipFile.OpenRead(zipFilePath)) { foreach (var entry in archive.Entries) {