diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index baa2369bb5..45f68d7b17 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -273,7 +273,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - run: dotnet restore - run: dotnet build --no-restore - run: dotnet pack --no-build diff --git a/ChangeLog.md b/ChangeLog.md index e46fb516ab..4e57e82bfa 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -20,6 +20,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Exclude ref-field backed properties from [RCS1085](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1085) ([PR](https://github.com/dotnet/roslynator/pull/1718) by @ovska) - [CLI] Fix `rename-symbol` support for top-level statement ([PR](https://github.com/dotnet/roslynator/pull/1721)) +### Changed + +- Migrate to .NET 10 (including command-line tool) ([PR](https://github.com/dotnet/roslynator/pull/1727)) + ## [4.14.1] - 2025-10-05 ### Added diff --git a/src/CommandLine.DocumentationGenerator/CommandLine.DocumentationGenerator.csproj b/src/CommandLine.DocumentationGenerator/CommandLine.DocumentationGenerator.csproj index a2c5d33083..b76cc01e3d 100644 --- a/src/CommandLine.DocumentationGenerator/CommandLine.DocumentationGenerator.csproj +++ b/src/CommandLine.DocumentationGenerator/CommandLine.DocumentationGenerator.csproj @@ -1,11 +1,11 @@  - net9.0 + net10.0 - net8.0;net9.0 + net8.0;net9.0;net10.0 diff --git a/src/CommandLine/CommandLine.csproj b/src/CommandLine/CommandLine.csproj index b5898c1a96..5149959b31 100644 --- a/src/CommandLine/CommandLine.csproj +++ b/src/CommandLine/CommandLine.csproj @@ -1,11 +1,11 @@  - net9.0 + net10.0 - net8.0;net9.0 + net8.0;net9.0;net10.0 @@ -52,11 +52,13 @@ + + - + diff --git a/src/Tests/Analyzers.Tests/Analyzers.Tests.csproj b/src/Tests/Analyzers.Tests/Analyzers.Tests.csproj index c0ba4bfee5..6ae4aef314 100644 --- a/src/Tests/Analyzers.Tests/Analyzers.Tests.csproj +++ b/src/Tests/Analyzers.Tests/Analyzers.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/src/Tests/CSharp.Tests/CSharp.Tests.csproj b/src/Tests/CSharp.Tests/CSharp.Tests.csproj index 28a39e2db3..78be2a5569 100644 --- a/src/Tests/CSharp.Tests/CSharp.Tests.csproj +++ b/src/Tests/CSharp.Tests/CSharp.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/src/Tests/CSharp.Workspaces.Tests/CSharp.Workspaces.Tests.csproj b/src/Tests/CSharp.Workspaces.Tests/CSharp.Workspaces.Tests.csproj index de4fa6f0ce..83b8fb0d30 100644 --- a/src/Tests/CSharp.Workspaces.Tests/CSharp.Workspaces.Tests.csproj +++ b/src/Tests/CSharp.Workspaces.Tests/CSharp.Workspaces.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/src/Tests/CodeAnalysis.Analyzers.Tests/CodeAnalysis.Analyzers.Tests.csproj b/src/Tests/CodeAnalysis.Analyzers.Tests/CodeAnalysis.Analyzers.Tests.csproj index 84a42488a3..d0684cfc21 100644 --- a/src/Tests/CodeAnalysis.Analyzers.Tests/CodeAnalysis.Analyzers.Tests.csproj +++ b/src/Tests/CodeAnalysis.Analyzers.Tests/CodeAnalysis.Analyzers.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/src/Tests/CodeFixes.Tests/CodeFixes.Tests.csproj b/src/Tests/CodeFixes.Tests/CodeFixes.Tests.csproj index 19b55a92b1..fc34145568 100644 --- a/src/Tests/CodeFixes.Tests/CodeFixes.Tests.csproj +++ b/src/Tests/CodeFixes.Tests/CodeFixes.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/src/Tests/Core.Tests/Core.Tests.csproj b/src/Tests/Core.Tests/Core.Tests.csproj index b0f5307113..3a92bdbc36 100644 --- a/src/Tests/Core.Tests/Core.Tests.csproj +++ b/src/Tests/Core.Tests/Core.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/src/Tests/Formatting.Analyzers.Tests/Formatting.Analyzers.Tests.csproj b/src/Tests/Formatting.Analyzers.Tests/Formatting.Analyzers.Tests.csproj index 24f9b6ccb9..83c0d2bb1f 100644 --- a/src/Tests/Formatting.Analyzers.Tests/Formatting.Analyzers.Tests.csproj +++ b/src/Tests/Formatting.Analyzers.Tests/Formatting.Analyzers.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/src/Tests/Refactorings.Tests/Refactorings.Tests.csproj b/src/Tests/Refactorings.Tests/Refactorings.Tests.csproj index 3fdf79c703..c3a735b097 100644 --- a/src/Tests/Refactorings.Tests/Refactorings.Tests.csproj +++ b/src/Tests/Refactorings.Tests/Refactorings.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/src/Tests/TestConsole/TestConsole.csproj b/src/Tests/TestConsole/TestConsole.csproj index 5840cd0bc5..247eb49195 100644 --- a/src/Tests/TestConsole/TestConsole.csproj +++ b/src/Tests/TestConsole/TestConsole.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/src/Tests/TestLibrary/TestLibrary.csproj b/src/Tests/TestLibrary/TestLibrary.csproj index 94a78ae762..4e5d3b1182 100644 --- a/src/Tests/TestLibrary/TestLibrary.csproj +++ b/src/Tests/TestLibrary/TestLibrary.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/src/Tools/CodeGeneration/CodeGeneration.csproj b/src/Tools/CodeGeneration/CodeGeneration.csproj index 1dac1d7358..fc05c1f0fe 100644 --- a/src/Tools/CodeGeneration/CodeGeneration.csproj +++ b/src/Tools/CodeGeneration/CodeGeneration.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/src/Tools/CodeGenerator/CodeGenerator.csproj b/src/Tools/CodeGenerator/CodeGenerator.csproj index e3496cd0a1..7afed13832 100644 --- a/src/Tools/CodeGenerator/CodeGenerator.csproj +++ b/src/Tools/CodeGenerator/CodeGenerator.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/src/Tools/ConfigurationFileGenerator/ConfigurationFileGenerator.csproj b/src/Tools/ConfigurationFileGenerator/ConfigurationFileGenerator.csproj index 3221b98d3d..e05c91ba50 100644 --- a/src/Tools/ConfigurationFileGenerator/ConfigurationFileGenerator.csproj +++ b/src/Tools/ConfigurationFileGenerator/ConfigurationFileGenerator.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 diff --git a/src/Tools/Metadata/Metadata.csproj b/src/Tools/Metadata/Metadata.csproj index 6617083b3e..567dd4e286 100644 --- a/src/Tools/Metadata/Metadata.csproj +++ b/src/Tools/Metadata/Metadata.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 diff --git a/src/Tools/MetadataGenerator/MetadataGenerator.csproj b/src/Tools/MetadataGenerator/MetadataGenerator.csproj index eb6bf87e75..213f1341c7 100644 --- a/src/Tools/MetadataGenerator/MetadataGenerator.csproj +++ b/src/Tools/MetadataGenerator/MetadataGenerator.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 @@ -10,6 +10,11 @@ Roslynator.CodeGeneration + + + + + diff --git a/tools/generate_cli_docs.ps1 b/tools/generate_cli_docs.ps1 index 5184abb048..d59040200a 100644 --- 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/net9.0/Roslynator.CommandLine.DocumentationGenerator" ` +& "$PSScriptRoot/../src/CommandLine.DocumentationGenerator/bin/Release/net10.0/Roslynator.CommandLine.DocumentationGenerator" ` build ` "$PSScriptRoot/../src/CommandLine.DocumentationGenerator/data" ` "help,migrate" diff --git a/tools/generate_code.ps1 b/tools/generate_code.ps1 index d354701862..4806f7a9da 100644 --- 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/net9.0/Roslynator.CodeGenerator.dll" "../src" +dotnet "$PSScriptRoot/../src/Tools/CodeGenerator/bin/Release/net10.0/Roslynator.CodeGenerator.dll" "../src" diff --git a/tools/generate_configuration_file.ps1 b/tools/generate_configuration_file.ps1 index ce2f4f71bf..fa73d6c066 100644 --- 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/net9.0/Roslynator.ConfigurationFileGenerator.dll" ` +dotnet "$PSScriptRoot/../src/Tools/ConfigurationFileGenerator/bin/Release/net10.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 index f1f727bbee..4a701023e3 100644 --- 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/net9.0/Roslynator.MetadataGenerator" "../src" "build" +& "$PSScriptRoot/../src/Tools/MetadataGenerator/bin/Release/net10.0/Roslynator.MetadataGenerator" "../src" "build" diff --git a/tools/generate_ref_docs.ps1 b/tools/generate_ref_docs.ps1 index 94a62d3946..63a0f2cbea 100644 --- 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/net9.0/Roslynator" generate-doc generate_ref_docs.sln ` +& "$PSScriptRoot/../src/CommandLine/bin/Release/net10.0/Roslynator" generate-doc generate_ref_docs.sln ` --properties Configuration=Release ` -o "build/ref" ` --host docusaurus ` diff --git a/tools/reinstall_cli.ps1 b/tools/reinstall_cli.ps1 index 18665c3aa6..daf1c544cb 100644 --- a/tools/reinstall_cli.ps1 +++ b/tools/reinstall_cli.ps1 @@ -1,4 +1,4 @@ -Remove-Item -Path "$PSScriptRoot/../src/CommandLine/bin/Release/net8.0" -Recurse +Remove-Item -Path "$PSScriptRoot/../src/CommandLine/bin/Release/net10.0" -Recurse Remove-Item -Path "$PSScriptRoot/../src/CommandLine/bin/Release/Roslynator.DotNet.Cli.*.nupkg" dotnet pack "$PSScriptRoot/../src/CommandLine/CommandLine.csproj" -c Release -v minimal /p:RoslynatorDotNetCli=true,Deterministic=true,TreatWarningsAsErrors=true,WarningsNotAsErrors="1573,1591" diff --git a/tools/reinstall_cli_debug.ps1 b/tools/reinstall_cli_debug.ps1 index 866d3bc91f..2e20289b99 100644 --- a/tools/reinstall_cli_debug.ps1 +++ b/tools/reinstall_cli_debug.ps1 @@ -1,4 +1,4 @@ -Remove-Item -Path "$PSScriptRoot/../src/CommandLine/bin/Debug/net8.0" -Recurse +Remove-Item -Path "$PSScriptRoot/../src/CommandLine/bin/Debug/net10.0" -Recurse Remove-Item -Path "$PSScriptRoot/../src/CommandLine/bin/Debug/Roslynator.DotNet.Cli.*.nupkg" dotnet pack "$PSScriptRoot/../src/CommandLine/CommandLine.csproj" -c Debug -v minimal /p:RoslynatorDotNetCli=true,Deterministic=true