added .slnx support (#370)

close #365

Author: Aaronontheweb

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
-    "rollForward": "latestMajor"
+      "version": "9.0.200",
+      "rollForward": "major"
   }
 } 

src/Incrementalist.Tests/Commands/RunDotNetCommandTaskTests.cs

@@ -119,18 +119,20 @@ public async Task Should_Execute_Full_Solution_Build()
             var solutionPath = Path.Combine(_repository.BasePath, "test.sln");
 
             // Create a minimal valid solution file
-            var solutionContent = @"
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
-MinimumVisualStudioVersion = 10.0.40219.1
-Global
-    GlobalSection(SolutionConfigurationPlatforms) = preSolution
-        Debug|Any CPU = Debug|Any CPU
-        Release|Any CPU = Release|Any CPU
-    EndGlobalSection
-EndGlobal";
-            File.WriteAllText(solutionPath, solutionContent);
+            const string solutionContent = """
+
+                                           Microsoft Visual Studio Solution File, Format Version 12.00
+                                           # Visual Studio Version 17
+                                           VisualStudioVersion = 17.0.31903.59
+                                           MinimumVisualStudioVersion = 10.0.40219.1
+                                           Global
+                                               GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                                                   Debug|Any CPU = Debug|Any CPU
+                                                   Release|Any CPU = Release|Any CPU
+                                               EndGlobalSection
+                                           EndGlobal
+                                           """;
+            await File.WriteAllTextAsync(solutionPath, solutionContent);
 
             var task = new RunDotNetCommandTask(settings, _logger, new[] { "build", "-c", "Release", "--nologo" }, true, false);
 
@@ -140,5 +142,39 @@ public async Task Should_Execute_Full_Solution_Build()
             // Assert
             Assert.Equal(0, result);
         }
+
+        [Fact] public async Task Should_Execute_Full_Slnx_Build()
+        {
+            // Arrange
+            var settings = new BuildSettings("master", "test.slnx", _repository.BasePath);
+            var solutionPath = Path.Combine(_repository.BasePath, "test.slnx");
+            
+            // Create a minimal valid solution file
+            const string solutionContent = """
+                                            <Solution>
+                                             <Project Path="src/Akka.Console/Akka.Console.csproj" />
+                                           </Solution>
+                                           """;
+            await File.WriteAllTextAsync(solutionPath, solutionContent);
+            Directory.CreateDirectory(Path.Combine(_repository.BasePath, "src"));
+            Directory.CreateDirectory(Path.Combine(_repository.BasePath, "src", "Akka.Console"));
+            var projectPath = Path.Combine(_repository.BasePath, "src", "Akka.Console", "Akka.Console.csproj");
+            await File.WriteAllTextAsync(projectPath, """
+                                                      <Project Sdk="Microsoft.NET.Sdk">
+                                                        <PropertyGroup>
+                                                          <TargetFramework>net8.0</TargetFramework>
+                                                          <OutputType>Library</OutputType>
+                                                        </PropertyGroup>
+                                                      </Project>
+                                                      """);
+            
+            var task = new RunDotNetCommandTask(settings, _logger, ["build", "-c", "Release", "--nologo"], true, false);
+
+            // Act
+            var result = await task.Run(new FullSolutionBuildResult(solutionPath));
+
+            // Assert
+            Assert.Equal(0, result);
+        }
     }
 } 

src/Incrementalist.Tests/Incrementalist.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

src/Incrementalist.Tests/ProjectSystem/SolutionFinderSpecs.cs

@@ -44,6 +44,35 @@ public void Should_Find_Single_Solution()
             Assert.Single(solutions ?? []);
             Assert.EndsWith("MySolution.sln", solutions.First());
         }
+        
+        /// <summary>
+        /// https://github.com/petabridge/Incrementalist/issues/365
+        /// </summary>
+        [Fact(DisplayName = "Should .slnx solution in root directory")]
+        public void Should_Find_Slnx_Solution()
+        {
+            // Arrange
+            const string solutionContent = """
+                                             <Solution>
+                                             <Folder Name="/build/">
+                                               <File Path="Directory.Build.props" />
+                                               <File Path="Directory.Packages.props" />
+                                               <File Path="global.json" />
+                                               <File Path="NuGet.Config" />
+                                               <File Path="README.md" />
+                                             </Folder>
+                                             <Project Path="src/Akka.Console/Akka.Console.csproj" />
+                                           </Solution>
+                                           """;
+            _repository.WriteFile("MySolution.slnx", solutionContent);
+
+            // Act
+            var solutions = SolutionFinder.GetSolutions(_repository.BasePath).ToList();
+
+            // Assert
+            Assert.Single(solutions ?? []);
+            Assert.EndsWith("MySolution.slnx", solutions.First());
+        }
 
         [Fact(DisplayName = "Should find multiple solutions in root directory")]
         public void Should_Find_Multiple_Solutions()

src/Incrementalist/ProjectSystem/SolutionFinder.cs

@@ -11,31 +11,33 @@
 namespace Incrementalist.ProjectSystem
 {
     /// <summary>
-    ///     Used to look for .sln files in a given directory.
+    ///     Used to look for .sln and .slnx files in a given directory.
     /// </summary>
     public static class SolutionFinder
     {
         /// <summary>
-        ///     The default filter used to look for solutions in a given folder.
-        /// </summary>
-        public const string DefaultSolutionFilter = "*.sln";
-
-        /// <summary>
-        ///     Enumerate all of the MSBuild solution files in a given folder.
+        ///     Enumerate all of the MSBuild solution files (.sln and .slnx) in a given folder.
         /// </summary>
         /// <param name="folderPath">The top level path to search.</param>
-        /// <param name="searchFilter">Optional. A wildcard filter in the form of "*.sln".</param>
-        /// <param name="searchOption">Optional. Specifies whether to recurse sub-directories or not.</param>
-        /// <returns>If any solutions are found, will return an enumerable list of them in order in which they are discovered.</returns>
+        /// <param name="searchFilter">Optional. A wildcard filter, e.g., "*.sln". If null or empty, defaults to searching for both "*.sln" and "*.slnx".</param>
+        /// <param name="searchOption">Optional. Specifies whether to recurse sub-directories or not. Defaults to <see cref="SearchOption.AllDirectories"/>.</param>
+        /// <returns>If any solutions are found, will return an enumerable list of their paths, ordered by filename.</returns>
         public static IEnumerable<string> GetSolutions(string folderPath, string searchFilter = null,
             SearchOption? searchOption = null)
         {
-            if (string.IsNullOrEmpty(searchFilter))
-                return Directory.EnumerateFileSystemEntries(folderPath, DefaultSolutionFilter,
-                    searchOption ?? SearchOption.AllDirectories).OrderBy(Path.GetFileName);
+            var finalSearchOption = searchOption ?? SearchOption.AllDirectories;
 
-            return Directory.EnumerateFileSystemEntries(folderPath, searchFilter,
-                searchOption ?? SearchOption.AllDirectories).OrderBy(Path.GetFileName);
+            if (string.IsNullOrEmpty(searchFilter))
+            {
+                // Search for both .sln and .slnx if no specific filter is provided
+                var slnFiles = Directory.EnumerateFileSystemEntries(folderPath, "*.sln", finalSearchOption);
+                var slnxFiles = Directory.EnumerateFileSystemEntries(folderPath, "*.slnx", finalSearchOption);
+                return slnFiles.Concat(slnxFiles).OrderBy(Path.GetFileName);
+            }
+            
+            // Use the provided search filter
+            return Directory.EnumerateFileSystemEntries(folderPath, searchFilter, finalSearchOption)
+                .OrderBy(Path.GetFileName);
         }
     }
 }