From 15d51fee2298996627e4ee614b317f593a45ab78 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Mon, 18 Oct 2021 13:54:08 +0300 Subject: [PATCH] Created ModuleConsts.InstallerPackagePostfix & SourceCorePackagePostfix --- .../Volo/Abp/Studio/Nuget/NugetSourceCodeStore.cs | 3 ++- .../Volo/Abp/Studio/Modules/ModuleConsts.cs | 4 +++- .../Volo/Abp/Studio/Package/PackageConsts.cs | 3 --- 3 files changed, 5 insertions(+), 5 deletions(-) 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 index 54e6aa8cb6..c81d95b2dc 100644 --- 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 @@ -7,6 +7,7 @@ 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 { @@ -153,7 +154,7 @@ namespace Volo.Abp.Studio.Nuget if (type == SourceCodeTypes.Module) { - return $"{name}.SourceCode"; + return name + ModuleConsts.SourceCorePackagePostfix; } return name; 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 index 378d66ab65..b2c9733720 100644 --- 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 @@ -3,8 +3,10 @@ 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"; 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 index e9ec9285e2..05a7abb16e 100644 --- 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 @@ -4,9 +4,6 @@ { public const string FileExtension = ".abppkg.json"; - //todo: use this everywhere! - public const string InstallerExtension = ".Installer"; - public const string RoleProperty = "role"; } }