Browse Source

Correctly ignore ignoredFolders

pull/6096/head
İsmail ÇAĞDAŞ 6 years ago
parent
commit
fea92c30cc
  1. 22
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultChangedProjectFinder.cs
  2. 3
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs

22
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultChangedProjectFinder.cs

@ -55,32 +55,38 @@ namespace Volo.Abp.Cli.Build
var projects = new List<DotNetProjectInfo>();
AddProjectsOfRepository(buildConfig.GitRepository, projects);
_dotNetProjectDependencyFiller.Fill(projects);
var allSortedProjectList = _buildProjectListSorter.SortByDependencies(
projects,
new DotNetProjectInfoEqualityComparer()
);
FilterIgnoredDirectories(allSortedProjectList, buildConfig.GitRepository);
return allSortedProjectList;
return FilterIgnoredDirectories(allSortedProjectList, buildConfig.GitRepository);
}
private void FilterIgnoredDirectories(List<DotNetProjectInfo> projects, GitRepository gitRepository)
private List<DotNetProjectInfo> FilterIgnoredDirectories(List<DotNetProjectInfo> projects,
GitRepository gitRepository)
{
foreach (var ignoredDirectory in gitRepository.IgnoredDirectories)
{
Console.WriteLine("projects count 1:" + projects.Count);
Console.WriteLine("Ignoring Directory...:" + Path.Combine(gitRepository.RootPath, ignoredDirectory));
projects = projects.Where(e =>
!e.CsProjPath.StartsWith(Path.Combine(gitRepository.RootPath, ignoredDirectory)))
.ToList();
Console.WriteLine("projects count 2:" + projects.Count);
}
foreach (var dependingRepository in gitRepository.DependingRepositories)
{
FilterIgnoredDirectories(projects, dependingRepository);
}
return projects;
}
private void AddProjectsOfRepository(GitRepository gitRepository, List<DotNetProjectInfo> projects)
@ -107,9 +113,9 @@ namespace Volo.Abp.Cli.Build
buildConfig.BuildName,
buildConfig.GitRepository
);
var allSortedProjectList = FindAllProjects(buildConfig);
MarkProjectsForBuild(
buildConfig.GitRepository,
gitRepositoryBuildStatus,

3
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs

@ -1,6 +1,7 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Cli.Args;
@ -51,7 +52,7 @@ namespace Volo.Abp.Cli.Commands
var buildConfig = DotNetProjectBuildConfigReader.Read(workingDirectory ?? Directory.GetCurrentDirectory());
buildConfig.BuildName = buildName;
buildConfig.ForceBuild = forceBuild;
Console.WriteLine("Finding changed projects...");
var changedProjectFiles = ChangedProjectFinder.Find(buildConfig);

Loading…
Cancel
Save