Feature/idp 2744 fix auto merge and nuget conflict

.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

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 }
     }
   }

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
 

tools/ConfigurationFilesGenerator/ConfigurationFilesGenerator.csproj

@@ -2,17 +2,18 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Meziantou.Framework.FullPath" Version="1.0.14" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.11.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.11.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.12.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.12.0" />
     <PackageReference Include="NuGet.Protocol" Version="6.12.1" />
   </ItemGroup>
 

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()}");