Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
5 changes: 3 additions & 2 deletions src/CommandLine/CommandLine.csproj
Original file line number Diff line number Diff line change
@@ -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">
Expand Down Expand Up @@ -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)" />
Expand Down
3 changes: 2 additions & 1 deletion src/CommandLine/CommandLineHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion src/CommandLine/Commands/MSBuildWorkspaceCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/CommandLine/Json/DiagnosticGitLabJsonSerializer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
5 changes: 4 additions & 1 deletion src/CommandLine/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class C
{
#region R

#endregion R
#endregion R
}
");
}
Expand Down
4 changes: 4 additions & 0 deletions src/Tests/CSharp.Tests/SyntaxKindTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion tools/generate_cli_docs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion tools/generate_code.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion tools/generate_configuration_file.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion tools/generate_metadata.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion tools/generate_ref_docs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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 `
Expand Down
Loading