Browse Source

Merge pull request #1809 from abpframework/maliming/updateCommand

The CLI update command updates the test project.
pull/1814/head
Yunus Emre Kalkan 7 years ago
committed by GitHub
parent
commit
a18a95e533
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 30
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs

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

Loading…
Cancel
Save