From 53f1a8d57b4fa7372a75b790dde1bb7526299b63 Mon Sep 17 00:00:00 2001 From: Theodore Tsirpanis Date: Thu, 23 Feb 2023 10:30:35 +0200 Subject: [PATCH] Support `Microsoft.Data.SqlClient` in S2857. (#6351) --- .../SonarAnalyzer.CSharp/Rules/SqlKeywordsDelimitedBySpace.cs | 1 + .../MetadataReferences/NuGetMetadataReference.cs | 1 + .../Rules/SqlKeywordsDelimitedBySpaceTest.cs | 2 ++ 3 files changed, 4 insertions(+) diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/SqlKeywordsDelimitedBySpace.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/SqlKeywordsDelimitedBySpace.cs index 813f75476dc..c61d2e96e85 100644 --- a/analyzers/src/SonarAnalyzer.CSharp/Rules/SqlKeywordsDelimitedBySpace.cs +++ b/analyzers/src/SonarAnalyzer.CSharp/Rules/SqlKeywordsDelimitedBySpace.cs @@ -41,6 +41,7 @@ public sealed class SqlKeywordsDelimitedBySpace : SonarDiagnosticAnalyzer CSharpSyntaxHelper.BuildQualifiedNameSyntax("System", "Data", "Entity"), CSharpSyntaxHelper.BuildQualifiedNameSyntax("System", "Data", "Odbc"), CSharpSyntaxHelper.BuildQualifiedNameSyntax("System", "Data", "OracleClient"), + CSharpSyntaxHelper.BuildQualifiedNameSyntax("Microsoft", "Data", "SqlClient"), CSharpSyntaxHelper.BuildQualifiedNameSyntax("Microsoft", "Data", "Sqlite"), SyntaxFactory.IdentifierName("Dapper"), SyntaxFactory.IdentifierName("NHibernate"), diff --git a/analyzers/tests/SonarAnalyzer.UnitTest/MetadataReferences/NuGetMetadataReference.cs b/analyzers/tests/SonarAnalyzer.UnitTest/MetadataReferences/NuGetMetadataReference.cs index 54cf0c66342..9fbfa4e7470 100644 --- a/analyzers/tests/SonarAnalyzer.UnitTest/MetadataReferences/NuGetMetadataReference.cs +++ b/analyzers/tests/SonarAnalyzer.UnitTest/MetadataReferences/NuGetMetadataReference.cs @@ -77,6 +77,7 @@ internal static class NuGetMetadataReference public static References MicrosoftAzureWebJobsExtensionsDurableTask(string packageVersion = Constants.NuGetLatestVersion) => Create("Microsoft.Azure.WebJobs.Extensions.DurableTask", packageVersion); public static References MicrosoftAzureWebJobsExtensionsHttp(string packageVersion = Constants.NuGetLatestVersion) => Create("Microsoft.Azure.WebJobs.Extensions.Http", packageVersion); public static References MicrosoftBuildNoTargets(string packageVersion = "3.1.0") => Create("Microsoft.Build.NoTargets", packageVersion); + public static References MicrosoftDataSqlClient(string packageVersion = "5.1.0") => Create("Microsoft.Data.SqlClient", packageVersion); public static References MicrosoftDataSqliteCore(string packageVersion = "2.0.0") => Create("Microsoft.Data.Sqlite.Core", packageVersion); public static References MicrosoftEntityFrameworkCore(string packageVersion) => Create("Microsoft.EntityFrameworkCore", packageVersion); public static References MicrosoftEntityFrameworkCoreSqliteCore(string packageVersion) => Create("Microsoft.EntityFrameworkCore.Sqlite.Core", packageVersion); diff --git a/analyzers/tests/SonarAnalyzer.UnitTest/Rules/SqlKeywordsDelimitedBySpaceTest.cs b/analyzers/tests/SonarAnalyzer.UnitTest/Rules/SqlKeywordsDelimitedBySpaceTest.cs index 254455d90e5..d0ddcaf077d 100644 --- a/analyzers/tests/SonarAnalyzer.UnitTest/Rules/SqlKeywordsDelimitedBySpaceTest.cs +++ b/analyzers/tests/SonarAnalyzer.UnitTest/Rules/SqlKeywordsDelimitedBySpaceTest.cs @@ -82,6 +82,7 @@ public class SqlKeywordsDelimitedBySpaceTest [DataRow("System.Data.Entity")] [DataRow("System.Data.Odbc")] [DataRow("Dapper")] + [DataRow("Microsoft.Data.SqlClient")] [DataRow("Microsoft.Data.Sqlite")] [DataRow("NHibernate")] [DataRow("PetaPoco")] @@ -91,6 +92,7 @@ public class SqlKeywordsDelimitedBySpaceTest .AddReferences(MetadataReferenceFacade.SystemData) .AddReferences(NuGetMetadataReference.Dapper()) .AddReferences(NuGetMetadataReference.EntityFramework()) + .AddReferences(NuGetMetadataReference.MicrosoftDataSqlClient()) .AddReferences(NuGetMetadataReference.MicrosoftDataSqliteCore()) .AddReferences(NuGetMetadataReference.MicrosoftSqlServerCompact()) .AddReferences(NuGetMetadataReference.NHibernate())