Merge pull request #1809 from abpframework/maliming/updateCommand

The CLI update command updates the test project.

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs

@@ -83,8 +83,11 @@ namespace Volo.Abp.Cli.ProjectModification
 
         public static string[] GetProjectFiles(string solutionFile)
         {
-            var baseProjectFolder = GetBaseProjectFolder(solutionFile);
-            return Directory.GetFiles(baseProjectFolder, "*.csproj", SearchOption.AllDirectories);
+            return GetBaseProjectFolders(solutionFile)
+                .Select(baseProjectFolder =>
+                    Directory.GetFiles(baseProjectFolder, "*.csproj", SearchOption.AllDirectories))
+                .SelectMany(files => files)
+                .ToArray();
         }
 
         public static string[] GetAssemblyNames(string[] projectFiles)
@@ -118,16 +121,33 @@ namespace Volo.Abp.Cli.ProjectModification
             return null;
         }
 
-        private static string GetBaseProjectFolder(string solutionFile)
+        private static string[] GetBaseProjectFolders(string solutionFile)
         {
+            var projectFolders = new List<string>();
             var baseFolder = Path.GetDirectoryName(solutionFile);
+            if (baseFolder == null)
+            {
+                return projectFolders.ToArray();
+            }
+
             var srcFolder = Path.Combine(baseFolder, "src");
             if (Directory.Exists(srcFolder))
             {
-                baseFolder = srcFolder;
+                projectFolders.Add(srcFolder);
+            }
+
+            var testFolder = Path.Combine(baseFolder, "test");
+            if (Directory.Exists(testFolder))
+            {
+                projectFolders.Add(testFolder);
+            }
+
+            if (!projectFolders.Any())
+            {
+                projectFolders.Add(baseFolder);
             }
 
-            return baseFolder;
+            return projectFolders.ToArray();
         }
     }
 }