From fea92c30ccd8ce0dcd4715964748cec380c302b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0smail=20=C3=87A=C4=9EDA=C5=9E?=
 <ismailcagdas@gmail.com>
Date: Thu, 5 Nov 2020 15:25:36 +0300
Subject: [PATCH] Correctly ignore ignoredFolders

---
 .../Cli/Build/DefaultChangedProjectFinder.cs  | 22 ++++++++++++-------
 .../Volo/Abp/Cli/Commands/BuildCommand.cs     |  3 ++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultChangedProjectFinder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultChangedProjectFinder.cs
index e866c425b5..e9e8106cf9 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Build/DefaultChangedProjectFinder.cs
+++ b/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,
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs
index 6d28b39fad..253977c70b 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs
+++ b/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);