Use SonarAnalyzer.CSharp.Styling (#9207)

SonarSource · Apr 29, 2024 · a998f32 · a998f32
1 parent 0b809e4
commit a998f32
Show file tree

Hide file tree

Showing 18 changed files with 104 additions and 3 deletions.
diff --git a/analyzers/Analyzers.targets b/analyzers/Analyzers.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <!-- This file is included in all projects inside src and tests directories. -->
-  <Import Project="$(MSBuildThisFileDirectory)\StyleCopAnalyzers.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\StylingAnalyzers.targets" />
   <Import Project="$(MSBuildThisFileDirectory)\Directory.Build.targets" />
 
   <PropertyGroup>

diff --git a/analyzers/NuGet.Config b/analyzers/NuGet.Config
@@ -36,7 +36,8 @@
       <owners>protobuf-packages;Microsoft;sharwell;meirb;kzu;dotnetfoundation;castleproject;jonorossi;onovotny;fluentassertions;SteveGilham;jamesnk;commandlineparser;grpc-packages;Fody;</owners>
     </repository>
     <author name="SonarSource">
-      <certificate fingerprint="FC4D3F3F815C1B56A656F1A5D9456AF04B469267D945786057175049B15A62A0" hashAlgorithm="SHA256" allowUntrustedRoot="false" />
+      <!-- Subject Name: CN=SonarSource SA, valid from 2023-10-17 -->
+      <certificate fingerprint="A943C46DBA193D99C1135FFE33D3337524E9B3F05B416B9314E168CD206EF427" hashAlgorithm="SHA256" allowUntrustedRoot="false" />
     </author>
   </trustedSigners>
 </configuration>
diff --git a/analyzers/SonarAnalyzer.sln b/analyzers/SonarAnalyzer.sln
@@ -51,7 +51,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AnalysisConfig", "AnalysisConfig", "{E044950A-098B-4090-B4FB-8D6BD086828B}"
 	ProjectSection(SolutionItems) = preProject
 		stylecop.json = stylecop.json
-		StyleCopAnalyzers.targets = StyleCopAnalyzers.targets
+		StylingAnalyzers.targets = StylingAnalyzers.targets
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SonarAnalyzer.SourceGenerators", "src\SonarAnalyzer.SourceGenerators\SonarAnalyzer.SourceGenerators.csproj", "{76D6EBB8-D2B0-41C1-8880-027EC78CB7FF}"

diff --git a/analyzers/StyleCopAnalyzers.targets → analyzers/StylingAnalyzers.targets b/analyzers/StyleCopAnalyzers.targets → analyzers/StylingAnalyzers.targets
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <ItemGroup>
+    <PackageReference Include="SonarAnalyzer.CSharp.Styling" Version="9.24.0.89429">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/analyzers/src/ITs.JsonParser/packages.lock.json b/analyzers/src/ITs.JsonParser/packages.lock.json
@@ -8,6 +8,12 @@
         "resolved": "2.9.1",
         "contentHash": "OE0sl1/sQ37bjVsPKKtwQlWDgqaxWgtme3xZz7JssWUzg5JpMIyHgCTY9MVMxOg48fJ1AgGT3tgdH5m/kQ5xhA=="
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",

diff --git a/analyzers/src/RuleDescriptorGenerator/packages.lock.json b/analyzers/src/RuleDescriptorGenerator/packages.lock.json
@@ -22,6 +22,12 @@
           "Microsoft.CodeAnalysis.Workspaces.Common": "[1.3.2]"
         }
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",

diff --git a/analyzers/src/SonarAnalyzer.CFG/packages.lock.json b/analyzers/src/SonarAnalyzer.CFG/packages.lock.json
@@ -33,6 +33,12 @@
           "Microsoft.NETCore.Platforms": "1.1.0"
         }
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",

diff --git a/analyzers/src/SonarAnalyzer.CSharp.Styling/packages.lock.json b/analyzers/src/SonarAnalyzer.CSharp.Styling/packages.lock.json
@@ -38,6 +38,12 @@
           "Microsoft.NETCore.Platforms": "1.1.0"
         }
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",

diff --git a/analyzers/src/SonarAnalyzer.CSharp/packages.lock.json b/analyzers/src/SonarAnalyzer.CSharp/packages.lock.json
@@ -27,6 +27,12 @@
           "Microsoft.NETCore.Platforms": "1.1.0"
         }
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",

diff --git a/analyzers/src/SonarAnalyzer.Common/packages.lock.json b/analyzers/src/SonarAnalyzer.Common/packages.lock.json
@@ -54,6 +54,12 @@
           "Microsoft.NETCore.Platforms": "1.1.0"
         }
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",

diff --git a/analyzers/src/SonarAnalyzer.ShimLayer.CodeGeneration/packages.lock.json b/analyzers/src/SonarAnalyzer.ShimLayer.CodeGeneration/packages.lock.json
@@ -20,6 +20,12 @@
           "Microsoft.NETCore.Platforms": "1.1.0"
         }
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",

diff --git a/analyzers/src/SonarAnalyzer.SourceGenerators/packages.lock.json b/analyzers/src/SonarAnalyzer.SourceGenerators/packages.lock.json
@@ -32,6 +32,12 @@
         "resolved": "13.0.3",
         "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ=="
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",

diff --git a/analyzers/src/SonarAnalyzer.VisualBasic/packages.lock.json b/analyzers/src/SonarAnalyzer.VisualBasic/packages.lock.json
@@ -27,6 +27,12 @@
           "Microsoft.NETCore.Platforms": "1.1.0"
         }
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",

diff --git a/analyzers/tests/ITs.JsonParser.Test/packages.lock.json b/analyzers/tests/ITs.JsonParser.Test/packages.lock.json
@@ -45,6 +45,12 @@
         "resolved": "3.1.1",
         "contentHash": "3rjkGxciNHHmPW8cl1/QVIYjOpfptjmAH5JrLBw+dnMTYDoweg3I579N7OIbar3Zd3q9dfWFrCy2LEV/AmPn3A=="
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",

diff --git a/analyzers/tests/SonarAnalyzer.CSharp.Styling.Test/packages.lock.json b/analyzers/tests/SonarAnalyzer.CSharp.Styling.Test/packages.lock.json
@@ -30,6 +30,12 @@
         "resolved": "3.1.1",
         "contentHash": "3rjkGxciNHHmPW8cl1/QVIYjOpfptjmAH5JrLBw+dnMTYDoweg3I579N7OIbar3Zd3q9dfWFrCy2LEV/AmPn3A=="
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",

diff --git a/analyzers/tests/SonarAnalyzer.Test/packages.lock.json b/analyzers/tests/SonarAnalyzer.Test/packages.lock.json
@@ -39,6 +39,12 @@
         "resolved": "3.1.1",
         "contentHash": "3rjkGxciNHHmPW8cl1/QVIYjOpfptjmAH5JrLBw+dnMTYDoweg3I579N7OIbar3Zd3q9dfWFrCy2LEV/AmPn3A=="
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",
@@ -621,6 +627,12 @@
         "resolved": "3.1.1",
         "contentHash": "3rjkGxciNHHmPW8cl1/QVIYjOpfptjmAH5JrLBw+dnMTYDoweg3I579N7OIbar3Zd3q9dfWFrCy2LEV/AmPn3A=="
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",

diff --git a/analyzers/tests/SonarAnalyzer.TestFramework.Test/packages.lock.json b/analyzers/tests/SonarAnalyzer.TestFramework.Test/packages.lock.json
@@ -30,6 +30,12 @@
         "resolved": "3.1.1",
         "contentHash": "3rjkGxciNHHmPW8cl1/QVIYjOpfptjmAH5JrLBw+dnMTYDoweg3I579N7OIbar3Zd3q9dfWFrCy2LEV/AmPn3A=="
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",

diff --git a/analyzers/tests/SonarAnalyzer.TestFramework/packages.lock.json b/analyzers/tests/SonarAnalyzer.TestFramework/packages.lock.json
@@ -102,6 +102,12 @@
           "System.Text.Json": "7.0.3"
         }
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",
@@ -637,6 +643,12 @@
           "NuGet.Packaging": "6.9.1"
         }
       },
+      "SonarAnalyzer.CSharp.Styling": {
+        "type": "Direct",
+        "requested": "[9.24.0.89429, )",
+        "resolved": "9.24.0.89429",
+        "contentHash": "B4PG7b9UNPYYjHp/L3pOTW+8jLDEf+KSv5OD2BUY37PL7PKnfiM32oHNgjMrBcPCtQJxK5CsAxmP239id/66VQ=="
+      },
       "StyleCop.Analyzers": {
         "type": "Direct",
         "requested": "[1.2.0-beta.556, )",