moved globbing into the internals of the EmitDependencyGraphTask (#397)

close #395

Author: Aaronontheweb

src/Incrementalist.Cmd/Commands/EmitDependencyGraphTask.cs

@@ -38,8 +38,47 @@ public EmitDependencyGraphTask(BuildSettings settings, MSBuildWorkspace workspac
         public MSBuildWorkspace Workspace { get; }
 
         public ILogger Logger { get; }
+        
+        // Post-process the build result
+        BuildAnalysisResult FilterBuildResult(BuildAnalysisResult original, IReadOnlyList<SlnFileWithPath> allProjects)
+        {
+            var skipGlobs = Settings.SkipGlobs;
+            var targetGlobs = Settings.TargetGlobs;
 
-        public async Task<BuildAnalysisResult> Run()
+            if (targetGlobs.Count == 0 && skipGlobs.Count == 0)
+                return original;
+
+            var projectsToRebuild = original switch
+            {
+                FullSolutionBuildResult full => allProjects.Select(c => c.Path).ToList(),
+                IncrementalBuildResult incremental => incremental.AffectedProjects,
+                _ => []
+            };
+
+            // Need to process our globs
+
+            // globbing is designed to work with relative paths
+            var relativePaths = projectsToRebuild.Select(c =>
+                Settings.WorkingDirectory.ComputeRelativePathToMe(c)).ToList();
+
+            // we glob and then convert back into absolute paths
+            var filteredProjects = GlobFilter.FilterProjects(relativePaths, skipGlobs, targetGlobs)
+                .Select(c => c.ComputeAbsolutePath(Settings.WorkingDirectory)).ToList();
+
+            if (filteredProjects.Count != projectsToRebuild.Count)
+            {
+                // had at least 1 hit on a filter
+                Logger.LogInformation(
+                    "Incrementalist selected {OriginalAffectedProjects} projects for rebuild, after filtering with globs: {FilteredAffectedProjects}",
+                    projectsToRebuild.Count, filteredProjects.Count);
+
+                return new IncrementalBuildResult(filteredProjects);
+            }
+
+            return original;
+        }
+
+        private async Task<(BuildAnalysisResult result, IReadOnlyList<SlnFileWithPath> allProjects)> RunInternal()
         {
             // start the cancellation timer.
             _cts.CancelAfter(Settings.TimeoutDuration);
@@ -71,7 +110,7 @@ public async Task<BuildAnalysisResult> Run()
             if (affectedFiles.Count == 0)
             {
                 Logger.LogInformation("No files were affected by the changes");
-                return new IncrementalBuildResult(Array.Empty<AbsolutePath>());
+                return (new IncrementalBuildResult(Array.Empty<AbsolutePath>()), []);
             }
 
             // Log the breakdown of modified files by type
@@ -96,7 +135,7 @@ public async Task<BuildAnalysisResult> Run()
             if (importDetector.RequiresFullSolutionBuild(affectedFiles.Keys))
             {
                 Logger.LogInformation("Solution-wide changes detected. Full solution build required");
-                return new FullSolutionBuildResult(new AbsolutePath(solution.FilePath!));
+                return (new FullSolutionBuildResult(new AbsolutePath(solution.FilePath!)), projectFiles);
             }
 
             // Get the list of affected project files directly
@@ -108,7 +147,7 @@ public async Task<BuildAnalysisResult> Run()
             if (directlyAffectedProjects.Count == solution.Projects.Count())
             {
                 Logger.LogInformation("All projects are affected. Full solution build required");
-                return new FullSolutionBuildResult(new AbsolutePath(solution.FilePath!));
+                return (new FullSolutionBuildResult(new AbsolutePath(solution.FilePath!)), projectFiles);
             }
 
             /* INCREMENTAL BUILDS */
@@ -121,7 +160,7 @@ public async Task<BuildAnalysisResult> Run()
             var projectsToRebuild = dependencyGraph.SelectMany(x => x.Value).Distinct().ToList();
 
             // need to write a new cache
-            return ComputeResult(projectsToRebuild);
+            return (ComputeResult(projectsToRebuild), projectFiles);
 
             BuildAnalysisResult ComputeResult(IReadOnlyList<AbsolutePath> projectFilePaths)
             {
@@ -143,5 +182,14 @@ BuildAnalysisResult ComputeResult(IReadOnlyList<AbsolutePath> projectFilePaths)
                 return new IncrementalBuildResult(projectFilePaths);
             }
         }
+
+        public async Task<BuildAnalysisResult> Run()
+        {
+            var (buildResult, allProjects) = await RunInternal();
+            
+            // Post-process the build result
+            var filteredResult = FilterBuildResult(buildResult, allProjects);
+            return filteredResult;
+        }
     }
 }

src/Incrementalist.Cmd/GlobFilter.cs

@@ -15,15 +15,15 @@ public static class GlobFilter
     /// <param name="skipGlobs">Filter out any projects that match these glob patterns.</param>
     /// <param name="targetGlobs">Only include projects that match these glob patterns.</param>
     /// <returns>The final set of filtered project paths.</returns>
-    public static IReadOnlyList<RelativePath> FilterProjects(IReadOnlyList<RelativePath> originalProjects, string[] skipGlobs, string[] targetGlobs)
+    public static IReadOnlyList<RelativePath> FilterProjects(IReadOnlyList<RelativePath> originalProjects, IReadOnlyList<string> skipGlobs, IReadOnlyList<string> targetGlobs)
     {
-        if (skipGlobs.Length == 0 && targetGlobs.Length == 0)
+        if (skipGlobs.Count == 0 && targetGlobs.Count == 0)
             return originalProjects;
 
         IEnumerable<RelativePath> currentProjects = originalProjects;
 
         // 1. Apply targetGlobs (inclusion filter)
-        if (targetGlobs.Length > 0)
+        if (targetGlobs.Count > 0)
         {
             var targetMatcher = new Matcher(StringComparison.OrdinalIgnoreCase); // Use case-insensitive matching for file paths
             targetMatcher.AddIncludePatterns(targetGlobs);
@@ -32,7 +32,7 @@ public static IReadOnlyList<RelativePath> FilterProjects(IReadOnlyList<RelativeP
         }
 
         // 2. Apply skipGlobs (exclusion filter)
-        if (skipGlobs.Length > 0)
+        if (skipGlobs.Count > 0)
         {
             var skipMatcher = new Matcher(StringComparison.OrdinalIgnoreCase);
             skipMatcher.AddIncludePatterns(skipGlobs); // Add skip patterns to identify matches for exclusion

src/Incrementalist.Cmd/Program.cs

@@ -189,6 +189,8 @@ private static async Task AnalyzeFolderDiff(ListFoldersOptions options, Absolute
 
             var settings = new BuildSettings(options.GitBranch!, normalized,
                 workingFolder,
+                options.SkipGlobs?.ToArray() ?? [],
+                options.TargetGlobs?.ToArray() ?? [],
                 TimeSpan.FromMinutes(options.TimeoutMinutes));
             var emitTask = new EmitAffectedFoldersTask(settings, logger);
             var affectedFiles = (await emitTask.Run());
@@ -226,11 +228,13 @@ private static async Task ProcessSln(RunOptions options, RelativePath sln, Absol
             logger.LogInformation("Starting analysis of solution: {Solution}", sln);
 
             var settings = new BuildSettings(options.GitBranch!, sln, workingFolder,
+                options.SkipGlobs?.ToArray() ?? [],
+                options.TargetGlobs?.ToArray() ?? [],
                 TimeSpan.FromMinutes(options.TimeoutMinutes));
 
             logger.LogInformation("Beginning dependency analysis...");
             var emitTask = new EmitDependencyGraphTask(settings, msBuild, logger);
-            var buildResult = FilterBuildResult(await emitTask.Run());
+            var buildResult = await emitTask.Run();
 
             var analysisTime = stopwatch.Elapsed;
             logger.LogInformation("Solution analysis completed in {Duration:g}", analysisTime);
@@ -251,7 +255,7 @@ private static async Task ProcessSln(RunOptions options, RelativePath sln, Absol
 
                 switch (buildResult)
                 {
-                    case FullSolutionBuildResult _:
+                    case FullSolutionBuildResult:
                         buildType = "Full solution build";
                         projectsToRebuild = msBuild.CurrentSolution.Projects.Where(p => p.FilePath is not null)
                             .Select(p => new AbsolutePath(p.FilePath!)).ToList();
@@ -290,48 +294,6 @@ private static async Task ProcessSln(RunOptions options, RelativePath sln, Absol
                     logger.LogInformation("{AffectedProjects} affected projects: {AllProjectList}", projectsToRebuild.Count, affectedFilesStr);
                 }
             }
-
-            return;
-
-            // Post-process the build result
-            BuildAnalysisResult FilterBuildResult(BuildAnalysisResult original)
-            {
-                var skipGlobs = options.SkipGlobs?.ToArray() ?? [];
-                var targetGlobs = options.TargetGlobs?.ToArray() ?? [];
-
-                if (targetGlobs.Length == 0 && skipGlobs.Length == 0)
-                    return original;
-
-                var projectsToRebuild = original switch
-                {
-                    FullSolutionBuildResult full => msBuild.CurrentSolution.Projects.Where(p => p.FilePath is not null)
-                        .Select(p => new AbsolutePath(p.FilePath!)).ToList(),
-                    IncrementalBuildResult incremental => incremental.AffectedProjects,
-                    _ => []
-                };
-
-                // Need to process our globs
-
-                // globbing is designed to work with relative paths
-                var relativePaths = projectsToRebuild.Select(c =>
-                    settings.WorkingDirectory.ComputeRelativePathToMe(c)).ToList();
-
-                // we glob and then convert back into absolute paths
-                var filteredProjects = GlobFilter.FilterProjects(relativePaths, skipGlobs, targetGlobs)
-                    .Select(c => c.ComputeAbsolutePath(settings.WorkingDirectory)).ToList();
-
-                if (filteredProjects.Count != projectsToRebuild.Count)
-                {
-                    // had at least 1 hit on a filter
-                    logger.LogInformation(
-                        "Incrementalist selected {OriginalAffectedProjects} projects for rebuild, after filtering with globs: {FilteredAffectedProjects}",
-                        projectsToRebuild.Count, filteredProjects.Count);
-
-                    return new IncrementalBuildResult(filteredProjects);
-                }
-
-                return original;
-            }
         }
 
         private static void HandleAffectedFiles(SlnOptions options, string affectedFilesStr, int affectedFilesCount,

src/Incrementalist.Tests/Commands/RunDotNetCommandTaskTests.cs

@@ -32,14 +32,14 @@ public RunDotNetCommandTaskTests(ITestOutputHelper outputHelper)
 
         public void Dispose()
         {
-            _repository?.Dispose();
+            _repository.Dispose();
         }
 
         [Fact]
         public async Task Should_Execute_Command_Successfully()
         {
             // Arrange
-            var settings = new BuildSettings("master", new RelativePath("test.sln"), _repository.BasePath);
+            var settings = new BuildSettings("master", new RelativePath("test.sln"), _repository.BasePath,[], []);
             var projectPath = new AbsolutePath(Path.Combine(_repository.BasePath.Path, "test.csproj"));
             await File.WriteAllTextAsync(projectPath.Path, @"<Project Sdk=""Microsoft.NET.Sdk"">
   <PropertyGroup>
@@ -60,7 +60,7 @@ await File.WriteAllTextAsync(projectPath.Path, @"<Project Sdk=""Microsoft.NET.Sd
         public async Task Should_Handle_Failed_Command()
         {
             // Arrange
-            var settings = new BuildSettings("master", new RelativePath("test.sln"), _repository.BasePath);
+            var settings = new BuildSettings("master", new RelativePath("test.sln"), _repository.BasePath, [], []);
             var task = new RunDotNetCommandTask(settings, _logger, ["build", "--invalid-option"], true, false);
 
             // Act
@@ -76,7 +76,7 @@ public async Task Should_Handle_Failed_Command()
         public async Task Should_Run_Commands_In_Parallel()
         {
             // Arrange
-            var settings = new BuildSettings("master", new RelativePath("test.sln"), _repository.BasePath);
+            var settings = new BuildSettings("master", new RelativePath("test.sln"), _repository.BasePath, [], []);
             var projects = new List<AbsolutePath>();
             for (int i = 1; i <= 3; i++)
             {
@@ -104,7 +104,7 @@ await File.WriteAllTextAsync(projectPath.Path, @"<Project Sdk=""Microsoft.NET.Sd
         public async Task Should_Stop_On_First_Failure_When_ContinueOnError_False()
         {
             // Arrange
-            var settings = new BuildSettings("master", new RelativePath("test.sln"), _repository.BasePath);
+            var settings = new BuildSettings("master", new RelativePath("test.sln"), _repository.BasePath, [], []);
             var task = new RunDotNetCommandTask(settings, _logger, ["invalid-command"], false, false);
             var projects = new[] { "project1.csproj", "project2.csproj" }.Select(c =>
                 new AbsolutePath(Path.Combine(_repository.BasePath.Path, c))).ToList();
@@ -120,7 +120,7 @@ public async Task Should_Stop_On_First_Failure_When_ContinueOnError_False()
         public async Task Should_Execute_Full_Solution_Build()
         {
             // Arrange
-            var settings = new BuildSettings("master", new RelativePath("test.sln"), _repository.BasePath);
+            var settings = new BuildSettings("master", new RelativePath("test.sln"), _repository.BasePath, [], []);
             var solutionPath = new AbsolutePath(Path.Combine(_repository.BasePath.Path, "test.sln"));
 
             // Create a minimal valid solution file
@@ -153,7 +153,7 @@ public async Task Should_Execute_Full_Solution_Build()
         public async Task Should_Execute_Full_Slnx_Build()
         {
             // Arrange
-            var settings = new BuildSettings("master", new RelativePath("test.slnx"), _repository.BasePath);
+            var settings = new BuildSettings("master", new RelativePath("test.slnx"), _repository.BasePath, [], []);
             var solutionPath = new AbsolutePath(Path.Combine(_repository.BasePath.Path, "test.slnx"));
 
             // Create a minimal valid solution file

src/Incrementalist.Tests/Dependencies/EmitDependencyGraphSpecs.cs

@@ -35,8 +35,8 @@ public EmitDependencyGraphSpecs(ITestOutputHelper outputHelper, MSBuildFixture f
         _logger = new TestOutputLogger(outputHelper);
     }
 
-    private BuildSettings GetBuildSettings() =>
-        new BuildSettings(PrimaryBranch, _generatedTestSolution.FilePath, Repository.BasePath);
+    private BuildSettings GetBuildSettings(string[]? skipGlobs = null, string[]? targetGlobs = null) =>
+        new BuildSettings(PrimaryBranch, _generatedTestSolution.FilePath, Repository.BasePath, skipGlobs ?? [], targetGlobs ?? []);
 
     public const string ProjectBTests = "ProjectB.Tests";
     public const string ProjectB = "ProjectB";
@@ -132,6 +132,36 @@ public async Task ShouldDetectSolutionWideChanges(string fileName, string fileCo
         Assert.IsType<FullSolutionBuildResult>(result);
     }
 
+    /// <summary>
+    /// Reproduction for https://github.com/petabridge/Incrementalist/issues/395
+    /// </summary>
+    [Fact]
+    public async Task ShouldPerformGlobbingOnSolutionWideChanges()
+    {
+        // arrange
+        // will trigger a full rebuild
+        var newFile = new SampleFile("Directory.Build.props", SolutionFileSamples.DirectoryBuildProps);
+        Repository
+            .WriteFile(newFile)
+            .Commit("Added new file"); // should create the diffs
+        
+        // should only target the tests project
+        var buildSettings = GetBuildSettings(["src/**/*.csproj"]);
+        
+        var cmd = new EmitDependencyGraphTask(buildSettings, _workspace, _logger);
+
+        // act
+        var result = await cmd.Run();
+
+        // assert
+        Assert.NotNull(result);
+        Assert.IsType<IncrementalBuildResult>(result);
+        var actualAffectedProjects = ((IncrementalBuildResult)result).AffectedProjects
+            .Select(c => Path.GetFileNameWithoutExtension(c.Path)).ToList();
+        var expectedAffectedProjects = new[] { ProjectBTests };
+        Assert.Equivalent(expectedAffectedProjects, actualAffectedProjects);
+    }
+
     public Task InitializeAsync()
     {
         Repository

src/Incrementalist.Tests/Dependencies/FSharpProjectsTrackingSpecs.cs

@@ -48,7 +48,7 @@ public async Task FSharpProjectDiff_should_be_tracked()
                 .Commit("Updated both project files");
 
             var logger = new TestOutputLogger(_outputHelper);
-            var settings = new BuildSettings("master", new RelativePath("FSharpSolution.sln"), Repository.BasePath);
+            var settings = new BuildSettings("master", new RelativePath("FSharpSolution.sln"), Repository.BasePath, [], []);
             var emitTask = new EmitDependencyGraphTask(settings, _workspace, logger);
             var buildResult = await emitTask.Run();
 

src/Incrementalist/BuildSettings.cs

@@ -5,6 +5,7 @@
 // -----------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using Microsoft.Extensions.Logging;
 
@@ -13,16 +14,17 @@ namespace Incrementalist
     /// <summary>
     ///     The settings used for this execution of incremental build analysis.
     /// </summary>
-    public class BuildSettings
+    public sealed class BuildSettings
     {
         public static readonly TimeSpan DefaultTimeout = TimeSpan.FromMinutes(1);
 
-        public BuildSettings(string targetBranch, RelativePath solutionFile, AbsolutePath workingDirectory,
-            TimeSpan? timeoutDuration = null)
+        public BuildSettings(string targetBranch, RelativePath solutionFile, AbsolutePath workingDirectory, IReadOnlyList<string> skipGlobs, IReadOnlyList<string> targetGlobs, TimeSpan? timeoutDuration = null)
         {
             TargetBranch = targetBranch;
             SolutionFile = solutionFile;
             WorkingDirectory = workingDirectory;
+            SkipGlobs = skipGlobs;
+            TargetGlobs = targetGlobs;
             TimeoutDuration = timeoutDuration ?? DefaultTimeout;
         }
 
@@ -50,5 +52,15 @@ public BuildSettings(string targetBranch, RelativePath solutionFile, AbsolutePat
         ///     prior to cancelling it.
         /// </summary>
         public TimeSpan TimeoutDuration { get; }
+        
+        /// <summary>
+        /// Globs to skip when searching for project files.
+        /// </summary>
+        public IReadOnlyList<string> SkipGlobs { get; }
+        
+        /// <summary>
+        /// Exclude all projects that don't match the given globs.
+        /// </summary>
+        public IReadOnlyList<string> TargetGlobs { get; }
     }
 }