Add .slnx support (#1662)

darthtrevino · timozn · josefpihrt · web-flow · commit 6c761a63e25c · 2025-08-24T10:43:25.000+02:00
* Add support for the slnx solution file type * Add support for the slnx solution file type * fix formatting * add slnx support * use net9.0 path in some tool scripts * add setup-dotnet step * Squashed commit of the following: commit 219124e Author: Chris Trevino <chtrevin@microsoft.com> Date: Tue Jul 1 22:02:34 2025 -0700 dotnet format commit f721781 Author: Chris Trevino <chtrevin@microsoft.com> Date: Tue Jul 1 21:57:24 2025 -0700 add pragma disable commit b645a59 Author: Chris Trevino <chtrevin@microsoft.com> Date: Tue Jul 1 21:47:40 2025 -0700 remove net7.0 targets (deprecated) commit 85b7920 Author: Chris Trevino <chtrevin@microsoft.com> Date: Tue Jul 1 21:42:00 2025 -0700 conditional Microsoft.Build import commit 7ce673f Author: Chris Trevino <chtrevin@microsoft.com> Date: Tue Jul 1 21:20:28 2025 -0700 drop net7.0 commit f26dd93 Author: Chris Trevino <chtrevin@microsoft.com> Date: Tue Jul 1 21:08:32 2025 -0700 update dotnet 9.0.x install commit c8f9262 Author: Chris Trevino <chtrevin@microsoft.com> Date: Tue Jul 1 21:02:57 2025 -0700 leave roslynator.sln commit 88581a4 Author: Chris Trevino <chtrevin@microsoft.com> Date: Tue Jul 1 20:55:47 2025 -0700 test fix commit 922110c Author: Chris Trevino <chtrevin@microsoft.com> Date: Tue Jul 1 20:44:34 2025 -0700 fix lint issue commit 4782f89 Author: Chris Trevino <chtrevin@microsoft.com> Date: Tue Jul 1 20:41:52 2025 -0700 fix lint violation commit cf5a4ed Merge: 27d7848 1384df8 Author: Chris Trevino <chtrevin@microsoft.com> Date: Tue Jul 1 20:36:51 2025 -0700 Merge branch 'dathtrevino/feat/slnx_support' into task/slnx_everything commit 27d7848 Author: Chris Trevino <chtrevin@microsoft.com> Date: Tue Jul 1 11:43:53 2025 -0700 slnx everything * revert slnx changes * revert a couple of changes * update pragma text * Update src/Tests/Analyzers.Tests/RCS1213RemoveUnusedMemberDeclarationTests.cs Co-authored-by: Josef Pihrt <josef@pihrt.net> * Update src/CommandLine.DocumentationGenerator/DocumentationWriter.cs Co-authored-by: Josef Pihrt <josef@pihrt.net> * fix tests * update changelog --------- Co-authored-by: timo <timo.nuernberg@online.de> Co-authored-by: Josef Pihrt <josef@pihrt.net>
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- [CLI] Add support for `slnx` files ([PR](https://github.com/dotnet/roslynator/pull/1662) by @darthtrevino)
+  - Bump Roslyn to 4.14.0
+  - Drop support for .NET 7 SDK
+
 ### Fixed
 
 - Fix analyzer [RCS1246](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1246) ([PR](https://github.com/dotnet/roslynator/pull/1676))
diff --git a/src/CommandLine.DocumentationGenerator/CommandLine.DocumentationGenerator.csproj b/src/CommandLine.DocumentationGenerator/CommandLine.DocumentationGenerator.csproj
@@ -1,11 +1,11 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Condition="'$(RoslynatorDotNetCli)' != true AND '$(RoslynatorCommandLine)' != true">
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RoslynatorDotNetCli)' == true">
-    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RoslynatorCommandLine)' == true">
diff --git a/src/CommandLine/CommandLine.csproj b/src/CommandLine/CommandLine.csproj
@@ -1,11 +1,11 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Condition="'$(RoslynatorDotNetCli)' != true AND '$(RoslynatorCommandLine)' != true">
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RoslynatorDotNetCli)' == true">
-    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RoslynatorCommandLine)' == true">
@@ -56,6 +56,7 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="Microsoft.Build" Version="17.14.8" ExcludeAssets="runtime" Condition="'$(TargetFramework)' == 'net9.0'" />
     <PackageReference Include="Microsoft.Build.Locator" Version="$(RoslynatorMicrosoftBuildLocatorVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynatorCliRoslynVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(RoslynatorCliRoslynVersion)" />
diff --git a/src/CommandLine/CommandLineHelpers.cs b/src/CommandLine/CommandLineHelpers.cs
@@ -21,7 +21,8 @@ public static bool IsGlobPatternForProject(string pattern)
     public static bool IsGlobPatternForSolution(string pattern)
     {
         return pattern.EndsWith(".sln", StringComparison.OrdinalIgnoreCase)
-            || pattern.EndsWith(".slnf", StringComparison.OrdinalIgnoreCase);
+            || pattern.EndsWith(".slnf", StringComparison.OrdinalIgnoreCase)
+            || pattern.EndsWith(".slnx", StringComparison.OrdinalIgnoreCase);
     }
 
     public static void WaitForKeyPress(string message = null)
diff --git a/src/CommandLine/Commands/MSBuildWorkspaceCommand.cs b/src/CommandLine/Commands/MSBuildWorkspaceCommand.cs
@@ -414,7 +414,8 @@ private static bool IsSolutionFile(string path)
         string extension = Path.GetExtension(path);
 
         return string.Equals(extension, ".sln", StringComparison.OrdinalIgnoreCase)
-            || string.Equals(extension, ".slnf", StringComparison.OrdinalIgnoreCase);
+            || string.Equals(extension, ".slnf", StringComparison.OrdinalIgnoreCase)
+            || string.Equals(extension, ".slnx", StringComparison.OrdinalIgnoreCase);
     }
 
     protected class ConsoleProgressReporter : IProgress<ProjectLoadProgress>
diff --git a/src/CommandLine/Json/DiagnosticGitLabJsonSerializer.cs b/src/CommandLine/Json/DiagnosticGitLabJsonSerializer.cs
@@ -64,9 +64,11 @@ public static void Serialize(
 #else
             hashBytes = SHA256.HashData(source);
 #endif
+#pragma warning disable CA1872 // Use Convert.ToHexString instead of BitConverter.ToString
             issueFingerPrint = BitConverter.ToString(hashBytes)
                 .Replace("-", "")
                 .ToLowerInvariant();
+#pragma warning restore CA1872
 
             reportItems.Add(new GitLabIssue()
             {
diff --git a/src/CommandLine/Program.cs b/src/CommandLine/Program.cs
@@ -871,7 +871,10 @@ private static bool TryParsePaths(IEnumerable<string> values, out ImmutableArray
 
         string directoryPath = Environment.CurrentDirectory;
 
-        if (!TryFindFile(Directory.EnumerateFiles(directoryPath, "*.sln", SearchOption.TopDirectoryOnly), out string solutionPath))
+        if (!TryFindFile(
+            Directory.EnumerateFiles(directoryPath, "*.sln", SearchOption.TopDirectoryOnly)
+                .Concat(Directory.EnumerateFiles(directoryPath, "*.slnx", SearchOption.TopDirectoryOnly)),
+            out string solutionPath))
         {
             WriteLine($"Multiple MSBuild solution files found in '{directoryPath}'", Verbosity.Quiet);
             return false;
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -31,8 +31,8 @@
   
   <PropertyGroup>
     <Version Condition="'$(Version)' == ''">1.0.0</Version>
-    <RoslynatorCliRoslynVersion>4.12.0</RoslynatorCliRoslynVersion>
-    <RoslynatorTestingRoslynVersion>4.12.0</RoslynatorTestingRoslynVersion>
+    <RoslynatorCliRoslynVersion>4.14.0</RoslynatorCliRoslynVersion>
+    <RoslynatorTestingRoslynVersion>4.14.0</RoslynatorTestingRoslynVersion>
     <RoslynatorAnalyzersPackageReferenceVersion>4.12.11</RoslynatorAnalyzersPackageReferenceVersion>
     <RoslynatorCliPackageVersion>$(RoslynatorCliVersion)</RoslynatorCliPackageVersion>
     <RoslynatorPackageVersion>$(Version)</RoslynatorPackageVersion>
diff --git a/src/Tests/Analyzers.Tests/RCS1213RemoveUnusedMemberDeclarationTests.cs b/src/Tests/Analyzers.Tests/RCS1213RemoveUnusedMemberDeclarationTests.cs
@@ -119,7 +119,7 @@ class C
 {
     #region R
     
-#endregion R
+    #endregion R
 }
 ");
     }
diff --git a/src/Tests/CSharp.Tests/SyntaxKindTests.cs b/src/Tests/CSharp.Tests/SyntaxKindTests.cs
@@ -595,6 +595,10 @@ public static void DetectNewSyntaxKinds()
                 case SyntaxKind.RefStructConstraint:
                 // new in 4.12.0
                 case SyntaxKind.FieldExpression:
+                // new in 4.14.0
+                case SyntaxKind.ExtensionKeyword:
+                case SyntaxKind.ExtensionDeclaration:
+                case SyntaxKind.IgnoredDirectiveTrivia:
                 {
                     break;
                 }
diff --git a/tools/generate_cli_docs.ps1 b/tools/generate_cli_docs.ps1
@@ -5,7 +5,7 @@ dotnet build "$PSScriptRoot/../src/CommandLine.DocumentationGenerator/CommandLin
 
  if(!$?) { Read-Host; Exit }
 
-& "$PSScriptRoot/../src/CommandLine.DocumentationGenerator/bin/Release/net8.0/Roslynator.CommandLine.DocumentationGenerator" `
+& "$PSScriptRoot/../src/CommandLine.DocumentationGenerator/bin/Release/net9.0/Roslynator.CommandLine.DocumentationGenerator" `
  build `
  "$PSScriptRoot/../src/CommandLine.DocumentationGenerator/data" `
  "help,migrate"
diff --git a/tools/generate_code.ps1 b/tools/generate_code.ps1
@@ -3,4 +3,4 @@ dotnet build "$PSScriptRoot/../src/Tools/Tools.sln" --no-restore /p:Configuratio
 
 if(!$?) { Read-Host; Exit }
 
-dotnet "$PSScriptRoot/../src/Tools/CodeGenerator/bin/Release/net8.0/Roslynator.CodeGenerator.dll" "../src"
+dotnet "$PSScriptRoot/../src/Tools/CodeGenerator/bin/Release/net9.0/Roslynator.CodeGenerator.dll" "../src"
diff --git a/tools/generate_configuration_file.ps1 b/tools/generate_configuration_file.ps1
@@ -3,7 +3,7 @@ dotnet build "$PSScriptRoot/../src/Tools/ConfigurationFileGenerator/Configuratio
 
 if(!$?) { Read-Host; Exit }
 
-dotnet "$PSScriptRoot/../src/Tools/ConfigurationFileGenerator/bin/Release/net8.0/Roslynator.ConfigurationFileGenerator.dll" `
+dotnet "$PSScriptRoot/../src/Tools/ConfigurationFileGenerator/bin/Release/net9.0/Roslynator.ConfigurationFileGenerator.dll" `
  "../src" `
  "$PSScriptRoot/../src/Tools/ConfigurationFileGenerator/configuration.md" `
  "build/configuration.md" 
diff --git a/tools/generate_metadata.ps1 b/tools/generate_metadata.ps1
@@ -3,4 +3,4 @@ dotnet build "$PSScriptRoot/../src/Tools/Tools.sln" --no-restore /p:"Configurati
 
 if(!$?) { Read-Host; Exit }
 
-& "$PSScriptRoot/../src/Tools/MetadataGenerator/bin/Release/net8.0/Roslynator.MetadataGenerator" "../src" "build"
+& "$PSScriptRoot/../src/Tools/MetadataGenerator/bin/Release/net9.0/Roslynator.MetadataGenerator" "../src" "build"
diff --git a/tools/generate_ref_docs.ps1 b/tools/generate_ref_docs.ps1
@@ -4,7 +4,7 @@ dotnet build generate_ref_docs.sln --no-restore -c Release -v minimal /m
 dotnet restore "$PSScriptRoot/../src/CommandLine.sln" -v minimal /m
 dotnet build "$PSScriptRoot/../src/CommandLine.sln" --no-restore -c Release -v minimal /m
 
-& "$PSScriptRoot/../src/CommandLine/bin/Release/net8.0/Roslynator" generate-doc generate_ref_docs.sln `
+& "$PSScriptRoot/../src/CommandLine/bin/Release/net9.0/Roslynator" generate-doc generate_ref_docs.sln `
  --properties Configuration=Release `
  -o "build/ref" `
  --host docusaurus `

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ public static bool IsGlobPatternForProject(string pattern)`
`21`	`21`	`public static bool IsGlobPatternForSolution(string pattern)`
`22`	`22`	`{`
`23`	`23`	`return pattern.EndsWith(".sln", StringComparison.OrdinalIgnoreCase)`
`24`		`- \|\| pattern.EndsWith(".slnf", StringComparison.OrdinalIgnoreCase);`
	`24`	`+ \|\| pattern.EndsWith(".slnf", StringComparison.OrdinalIgnoreCase)`
	`25`	`+ \|\| pattern.EndsWith(".slnx", StringComparison.OrdinalIgnoreCase);`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`public static void WaitForKeyPress(string message = null)`
Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,8 @@ private static bool IsSolutionFile(string path)`
`414`	`414`	`string extension = Path.GetExtension(path);`
`415`	`415`
`416`	`416`	`return string.Equals(extension, ".sln", StringComparison.OrdinalIgnoreCase)`
`417`		`- \|\| string.Equals(extension, ".slnf", StringComparison.OrdinalIgnoreCase);`
	`417`	`+ \|\| string.Equals(extension, ".slnf", StringComparison.OrdinalIgnoreCase)`
	`418`	`+ \|\| string.Equals(extension, ".slnx", StringComparison.OrdinalIgnoreCase);`
`418`	`419`	`}`
`419`	`420`
`420`	`421`	`protected class ConsoleProgressReporter : IProgress<ProjectLoadProgress>`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ class C`
`119`	`119`	`{`
`120`	`120`	`#region R`
`121`	`121`
`122`		`-#endregion R`
	`122`	`+ #endregion R`
`123`	`123`	`}`
`124`	`124`	`");`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -595,6 +595,10 @@ public static void DetectNewSyntaxKinds()`
`595`	`595`	`case SyntaxKind.RefStructConstraint:`
`596`	`596`	`// new in 4.12.0`
`597`	`597`	`case SyntaxKind.FieldExpression:`
	`598`	`+ // new in 4.14.0`
	`599`	`+ case SyntaxKind.ExtensionKeyword:`
	`600`	`+ case SyntaxKind.ExtensionDeclaration:`
	`601`	`+ case SyntaxKind.IgnoredDirectiveTrivia:`
`598`	`602`	`{`
`599`	`603`	`break;`
`600`	`604`	`}`