[CLI] Support .NET 9 (#1605)

josefpihrt · web-flow · commit 8c591b34a5a7 · 2025-01-01T11:27:18.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -261,6 +261,9 @@ jobs:
         working-directory: src/CommandLine
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.101
       - run: dotnet restore
       - run: dotnet build --no-restore
       - run: dotnet pack --no-build
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- [CLI] Add support for .NET 9 ([PR](https://github.com/dotnet/roslynator/pull/1605))
+
 ### Fixed
 
 - Fix refactoring 'Change accessibility' ([RR0186](https://josefpihrt.github.io/docs/roslynator/refactorings/RR0186)) ([PR](https://github.com/dotnet/roslynator/pull/1599))
diff --git a/src/CommandLine.DocumentationGenerator/CommandLine.DocumentationGenerator.csproj b/src/CommandLine.DocumentationGenerator/CommandLine.DocumentationGenerator.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RoslynatorDotNetCli)' == true">
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RoslynatorCommandLine)' == true">
diff --git a/src/CommandLine/CommandLine.csproj b/src/CommandLine/CommandLine.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RoslynatorDotNetCli)' == true">
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(RoslynatorCommandLine)' == true">
diff --git a/src/CommandLine/DelegateFactory.cs b/src/CommandLine/DelegateFactory.cs
@@ -150,7 +150,11 @@ private static TDelegate CreateDelegate<TDelegate>(
 
         if (method.IsStatic)
         {
+#if NETFRAMEWORK
             return (TDelegate)method.CreateDelegate(typeof(TDelegate));
+#else
+            return method.CreateDelegate<TDelegate>();
+#endif
         }
         else
         {
diff --git a/src/CommandLine/docs/NetCore/NuGetReadme.md b/src/CommandLine/docs/NetCore/NuGetReadme.md
@@ -4,7 +4,7 @@
 
 ## Requirements
 
-.NET Core SDK 6.0, 7.0 or 8.0.
+.NET Core SDK 7, 8 or 9.
 
 ## Installation
 
diff --git a/src/Documentation/SymbolDefinitionDisplay.cs b/src/Documentation/SymbolDefinitionDisplay.cs
@@ -955,7 +955,7 @@ private static void FormatParameters(
 
     private static int FindParameterListStart(
         ISymbol symbol,
-        IList<SymbolDisplayPart> parts)
+        ImmutableArray<SymbolDisplayPart>.Builder parts)
     {
         int parenthesesDepth = 0;
         int bracesDepth = 0;
diff --git a/src/Refactorings/CSharp/Refactorings/SortMemberDeclarations/SortMemberDeclarationsRefactoring.cs b/src/Refactorings/CSharp/Refactorings/SortMemberDeclarations/SortMemberDeclarationsRefactoring.cs
@@ -109,7 +109,7 @@ private static Task<Document> RefactorAsync(
         return document.ReplaceMembersAsync(info, newMembers, cancellationToken);
     }
 
-    private static SyntaxKind GetSingleKindOrDefault(IReadOnlyList<MemberDeclarationSyntax> members)
+    private static SyntaxKind GetSingleKindOrDefault(MemberDeclarationListSelection members)
     {
         SyntaxKind kind = members[0].Kind();
 
diff --git a/src/Tools/CodeGeneration/Markdown/MarkdownGenerator.cs b/src/Tools/CodeGeneration/Markdown/MarkdownGenerator.cs
@@ -158,7 +158,7 @@ public static string CreateAnalyzerMarkdown(AnalyzerMetadata analyzer, Immutable
 
         static IEnumerable<MElement> CreateSamples(AnalyzerMetadata analyzer)
         {
-            IReadOnlyList<SampleMetadata> samples = analyzer.Samples;
+            List<SampleMetadata> samples = analyzer.Samples;
             LegacyAnalyzerOptionKind kind = analyzer.Kind;
 
             if (samples.Count > 0)

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,11 @@ private static TDelegate CreateDelegate<TDelegate>(`
`150`	`150`
`151`	`151`	`if (method.IsStatic)`
`152`	`152`	`{`
	`153`	`+#if NETFRAMEWORK`
`153`	`154`	`return (TDelegate)method.CreateDelegate(typeof(TDelegate));`
	`155`	`+#else`
	`156`	`+ return method.CreateDelegate<TDelegate>();`
	`157`	`+#endif`
`154`	`158`	`}`
`155`	`159`	`else`
`156`	`160`	`{`
Original file line number	Diff line number	Diff line change
`@@ -955,7 +955,7 @@ private static void FormatParameters(`
`955`	`955`
`956`	`956`	`private static int FindParameterListStart(`
`957`	`957`	`ISymbol symbol,`
`958`		`- IList<SymbolDisplayPart> parts)`
	`958`	`+ ImmutableArray<SymbolDisplayPart>.Builder parts)`
`959`	`959`	`{`
`960`	`960`	`int parenthesesDepth = 0;`
`961`	`961`	`int bracesDepth = 0;`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ private static Task<Document> RefactorAsync(`
`109`	`109`	`return document.ReplaceMembersAsync(info, newMembers, cancellationToken);`
`110`	`110`	`}`
`111`	`111`
`112`		`- private static SyntaxKind GetSingleKindOrDefault(IReadOnlyList<MemberDeclarationSyntax> members)`
	`112`	`+ private static SyntaxKind GetSingleKindOrDefault(MemberDeclarationListSelection members)`
`113`	`113`	`{`
`114`	`114`	`SyntaxKind kind = members[0].Kind();`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public static string CreateAnalyzerMarkdown(AnalyzerMetadata analyzer, Immutable`
`158`	`158`
`159`	`159`	`static IEnumerable<MElement> CreateSamples(AnalyzerMetadata analyzer)`
`160`	`160`	`{`
`161`		`- IReadOnlyList<SampleMetadata> samples = analyzer.Samples;`
	`161`	`+ List<SampleMetadata> samples = analyzer.Samples;`
`162`	`162`	`LegacyAnalyzerOptionKind kind = analyzer.Kind;`
`163`	`163`
`164`	`164`	`if (samples.Count > 0)`