diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cbf94bc..17a6cdd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,9 +9,15 @@ on: branches: - "renovate/**" +# Prevent duplicate runs if Renovate falls back to creating a PR +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }} + cancel-in-progress: true + jobs: main: - runs-on: ubuntu-latest + # We need windows to use nuget + runs-on: windows-latest steps: - uses: actions/checkout@v4 diff --git a/Build.ps1 b/Build.ps1 index 23b4020..27802f2 100644 --- a/Build.ps1 +++ b/Build.ps1 @@ -37,7 +37,7 @@ Process { Exec { & dotnet test --configuration Release --logger "console;verbosity=detailed" } # Push to a NuGet feed if the environment variables are set - if (($null -ne $env:NUGET_SOURCE ) -and ($null -ne $env:NUGET_API_KEY)) { + if (($null -ne $env:NUGET_SOURCE) -and ($null -ne $env:NUGET_API_KEY)) { Exec { & dotnet nuget push "$nupkgsPath" -s $env:NUGET_SOURCE -k $env:NUGET_API_KEY --skip-duplicate } } } diff --git a/src/files/analyzers/Analyzer.Microsoft.CodeAnalysis.CSharp.CodeStyle.editorconfig b/src/files/analyzers/Analyzer.Microsoft.CodeAnalysis.CSharp.CodeStyle.editorconfig index c4990ab..aa3c270 100644 --- a/src/files/analyzers/Analyzer.Microsoft.CodeAnalysis.CSharp.CodeStyle.editorconfig +++ b/src/files/analyzers/Analyzer.Microsoft.CodeAnalysis.CSharp.CodeStyle.editorconfig @@ -510,6 +510,11 @@ dotnet_diagnostic.IDE0305.severity = suggestion # Enabled: True, Severity: silent dotnet_diagnostic.IDE0320.severity = silent +# IDE0330: Use 'System.Threading.Lock' +# Help link: https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide0330 +# Enabled: True, Severity: silent +dotnet_diagnostic.IDE0330.severity = suggestion + # IDE1005: Delegate invocation can be simplified. # Help link: https://learn.microsoft.com/dotnet/fundamentals/code-analysis/style-rules/ide1005 # Enabled: True, Severity: silent @@ -555,7 +560,7 @@ dotnet_diagnostic.IDE2005.severity = warning # Enabled: True, Severity: silent dotnet_diagnostic.IDE2006.severity = warning -# RemoveUnnecessaryImportsFixable: +# RemoveUnnecessaryImportsFixable: # Enabled: True, Severity: silent dotnet_diagnostic.RemoveUnnecessaryImportsFixable.severity = silent diff --git a/tools/ConfigurationFilesGenerator/ConfigurationFilesGenerator.csproj b/tools/ConfigurationFilesGenerator/ConfigurationFilesGenerator.csproj index 177774c..21c0afe 100644 --- a/tools/ConfigurationFilesGenerator/ConfigurationFilesGenerator.csproj +++ b/tools/ConfigurationFilesGenerator/ConfigurationFilesGenerator.csproj @@ -2,17 +2,18 @@ Exe - net8.0 + net9.0 enable enable - - - - + + + + + diff --git a/tools/ConfigurationFilesGenerator/Program.cs b/tools/ConfigurationFilesGenerator/Program.cs index c922290..02d5174 100644 --- a/tools/ConfigurationFilesGenerator/Program.cs +++ b/tools/ConfigurationFilesGenerator/Program.cs @@ -73,7 +73,7 @@ await Parallel.ForEachAsync(packages, async (item, cancellationToken) => var currentRuleConfiguration = currentConfiguration.Rules.FirstOrDefault(r => r.Id == rule.Id); var severity = currentRuleConfiguration != null ? currentRuleConfiguration.Severity : rule.DefaultEffectiveSeverity; - sb.AppendLine($"# {rule.Id}: {rule.Title?.TrimEnd()}"); + sb.AppendLine($"# {rule.Id}: {rule.Title?.TrimEnd()}".TrimEnd()); if (!string.IsNullOrEmpty(rule.Url)) { sb.AppendLine($"# Help link: {rule.Url?.TrimEnd()}");