Browse Source

Studio module installing: Allow null analyzes

pull/10999/head
Yunus Emre Kalkan 5 years ago
parent
commit
9117046933
  1. 6
      studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Package/PackageInfoWithAnalyze.cs
  2. 15
      studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/PackageReferencingStep.cs

6
studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/Package/PackageInfoWithAnalyze.cs

@ -14,14 +14,14 @@ public class PackageInfoWithAnalyze
[CanBeNull]
public string Role { get; }
[NotNull]
[CanBeNull]
public PackageModel Analyze { get; }
public PackageInfoWithAnalyze([NotNull] string path, [CanBeNull] string role, [NotNull] PackageModel analyze)
public PackageInfoWithAnalyze([NotNull] string path, [CanBeNull] string role, [CanBeNull] PackageModel analyze)
{
Path = Check.NotNullOrWhiteSpace(path, nameof(path));
Name = PackageHelper.GetNameFromPath(path);
Role = role;
Analyze = Check.NotNull(analyze, nameof(analyze));
Analyze = analyze;
}
}

15
studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/PackageReferencingStep.cs

@ -25,8 +25,12 @@ public class PackageReferencingStep : ModuleInstallingPipelineStep
await AddReferenceAsync(context, targetPackage, referencePackage);
var targetAbpModulePath = FindAbpModuleFile(targetPackage.Path);
var referencePackageAbpModuleName = FindAbpModuleName(referencePackage);
await _abpModuleFileManager.AddDependency(targetAbpModulePath, FindAbpModuleName(referencePackage));
if (targetAbpModulePath != null && referencePackageAbpModuleName != null)
{
await _abpModuleFileManager.AddDependency(targetAbpModulePath, referencePackageAbpModuleName);
}
}
}
}
@ -72,9 +76,14 @@ public class PackageReferencingStep : ModuleInstallingPipelineStep
private string FindAbpModuleName(PackageInfoWithAnalyze package)
{
var abpModuleModel = package.Analyze.Contents.Where(y =>
var abpModuleModel = package.Analyze?.Contents.Where(y =>
y.ContentType == AbpModuleModel.ContentTypeName
).Cast<AbpModuleModel>().First();
).Cast<AbpModuleModel>().FirstOrDefault();
if (abpModuleModel == null)
{
return null;
}
return abpModuleModel.Namespace + "." + abpModuleModel.Name;
}

Loading…
Cancel
Save