Merge pull request #10999 from abpframework/Studio-Allow-null-analyzes

Studio module installing: Allow null analyzes

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;
     }
 }

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;
     }