From 125fd39f0b11b7fe4d1392a37664085b3bc2dc55 Mon Sep 17 00:00:00 2001
From: Marko Lahma <marko.lahma@gmail.com>
Date: Sun, 19 May 2024 22:02:59 +0300
Subject: [PATCH] Remove warnings related to CA1707 (#16101)

Co-authored-by: Hisham Bin Ateya <hishamco_2007@yahoo.com>
---
 Directory.Build.props                         |  3 ---
 .../Services/AzureEmailProviderBase.cs        |  4 ++--
 .../PagerShapesTableProvider.cs               |  2 ++
 .../LuceneContentPickerShapeProvider.cs       |  2 ++
 .../ShapeFactoryExtensions.cs                 | 20 +++++++++----------
 .../ElasticContentPickerShapeProvider.cs      |  2 ++
 .../OrchardCore.Abstractions.Tests.csproj     |  6 ++----
 .../OrchardCore.Benchmarks.csproj             |  2 ++
 .../OrchardCore.Tests.csproj                  |  2 ++
 9 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index e297bd9081f..f518024cb29 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -45,9 +45,6 @@
     <!-- Exception type is not sufficiently specific -->
     <NoWarn>$(NoWarn);CA2201</NoWarn>
 
-    <!-- Remove the underscores from member name -->
-    <NoWarn>$(NoWarn);CA1707</NoWarn>
-
     <!-- Use PascalCase for named placeholders in the logging message template -->
     <NoWarn>$(NoWarn);CA1727</NoWarn>
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Email.Azure/Services/AzureEmailProviderBase.cs b/src/OrchardCore.Modules/OrchardCore.Email.Azure/Services/AzureEmailProviderBase.cs
index 39e4329eb99..7e56dde13b4 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email.Azure/Services/AzureEmailProviderBase.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Email.Azure/Services/AzureEmailProviderBase.cs
@@ -16,7 +16,7 @@ public abstract class AzureEmailProviderBase : IEmailProvider
     // Common supported file extensions and their corresponding MIME types for email attachments
     // using Azure Communication Services Email.
     // For more info <see href="https://learn.microsoft.com/en-us/azure/communication-services/concepts/email/email-attachment-allowed-mime-types" />
-    protected static readonly Dictionary<string, string> _allowedMimeTypes = new()
+    protected static readonly Dictionary<string, string> AllowedMimeTypes = new()
     {
         { ".3gp", "video/3gpp" },
         { ".3g2", "video/3gpp2" },
@@ -206,7 +206,7 @@ private EmailMessage FromMailMessage(MailMessage message, Dictionary<string, ILi
             }
             var extension = Path.GetExtension(attachment.Filename);
 
-            if (_allowedMimeTypes.TryGetValue(extension, out var contentType))
+            if (AllowedMimeTypes.TryGetValue(extension, out var contentType))
             {
                 var data = new byte[attachment.Stream.Length];
 
diff --git a/src/OrchardCore.Modules/OrchardCore.Navigation/PagerShapesTableProvider.cs b/src/OrchardCore.Modules/OrchardCore.Navigation/PagerShapesTableProvider.cs
index 53506f88f5b..b31b4841a54 100644
--- a/src/OrchardCore.Modules/OrchardCore.Navigation/PagerShapesTableProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Navigation/PagerShapesTableProvider.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CA1707 // Remove the underscores from member name
+
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Shapes/LuceneContentPickerShapeProvider.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Shapes/LuceneContentPickerShapeProvider.cs
index 733824360cc..ebc8472f4bf 100644
--- a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Shapes/LuceneContentPickerShapeProvider.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Shapes/LuceneContentPickerShapeProvider.cs
@@ -18,7 +18,9 @@ public LuceneContentPickerShapeProvider(IStringLocalizer<LuceneContentPickerShap
         }
 
         [Shape]
+#pragma warning disable CA1707 // Remove the underscores from member name
         public IHtmlContent ContentPickerField_Option__Lucene(dynamic shape)
+#pragma warning restore CA1707
         {
             var selected = shape.Editor == "Lucene";
             if (selected)
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/ShapeFactoryExtensions.cs b/src/OrchardCore/OrchardCore.Navigation.Core/ShapeFactoryExtensions.cs
index 03d64bc33e9..efa3c76b016 100644
--- a/src/OrchardCore/OrchardCore.Navigation.Core/ShapeFactoryExtensions.cs
+++ b/src/OrchardCore/OrchardCore.Navigation.Core/ShapeFactoryExtensions.cs
@@ -7,17 +7,17 @@ namespace OrchardCore.DisplayManagement;
 
 public static class ShapeFactoryExtensions
 {
-    public static ValueTask<IShape> PagerAsync(this IShapeFactory _shapeFactory, Pager pager, int totalItemCount)
-        => _shapeFactory.CreateAsync(nameof(Pager), Arguments.From(new
+    public static ValueTask<IShape> PagerAsync(this IShapeFactory shapeFactory, Pager pager, int totalItemCount)
+        => shapeFactory.CreateAsync(nameof(Pager), Arguments.From(new
         {
             pager.Page,
             pager.PageSize,
             TotalItemCount = totalItemCount,
         }));
 
-    public static async ValueTask<IShape> PagerAsync(this IShapeFactory _shapeFactory, Pager pager, int totalItemCount, RouteData routeData)
+    public static async ValueTask<IShape> PagerAsync(this IShapeFactory shapeFactory, Pager pager, int totalItemCount, RouteData routeData)
     {
-        var pagerShape = await _shapeFactory.PagerAsync(pager, totalItemCount);
+        var pagerShape = await shapeFactory.PagerAsync(pager, totalItemCount);
 
         if (routeData != null)
         {
@@ -27,20 +27,20 @@ public static async ValueTask<IShape> PagerAsync(this IShapeFactory _shapeFactor
         return pagerShape;
     }
 
-    public static ValueTask<IShape> PagerAsync(this IShapeFactory _shapeFactory, Pager pager, int totalItemCount, RouteValueDictionary routeValues)
-        => _shapeFactory.PagerAsync(pager, totalItemCount, routeValues == null ? null : new RouteData(routeValues));
+    public static ValueTask<IShape> PagerAsync(this IShapeFactory shapeFactory, Pager pager, int totalItemCount, RouteValueDictionary routeValues)
+        => shapeFactory.PagerAsync(pager, totalItemCount, routeValues == null ? null : new RouteData(routeValues));
 
-    public static ValueTask<IShape> PagerSlimAsync(this IShapeFactory _shapeFactory, PagerSlim pager)
-        => _shapeFactory.CreateAsync(nameof(PagerSlim), Arguments.From(new
+    public static ValueTask<IShape> PagerSlimAsync(this IShapeFactory shapeFactory, PagerSlim pager)
+        => shapeFactory.CreateAsync(nameof(PagerSlim), Arguments.From(new
         {
             pager.Before,
             pager.After,
             pager.PageSize,
         }));
 
-    public static async ValueTask<IShape> PagerSlimAsync(this IShapeFactory _shapeFactory, PagerSlim pager, IDictionary<string, string> values)
+    public static async ValueTask<IShape> PagerSlimAsync(this IShapeFactory shapeFactory, PagerSlim pager, IDictionary<string, string> values)
     {
-        var shape = await _shapeFactory.CreateAsync(nameof(PagerSlim), Arguments.From(new
+        var shape = await shapeFactory.CreateAsync(nameof(PagerSlim), Arguments.From(new
         {
             pager.Before,
             pager.After,
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Shapes/ElasticContentPickerShapeProvider.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Shapes/ElasticContentPickerShapeProvider.cs
index ef58bcf9be6..4f3f229fcb3 100644
--- a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Shapes/ElasticContentPickerShapeProvider.cs
+++ b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Shapes/ElasticContentPickerShapeProvider.cs
@@ -18,7 +18,9 @@ public ElasticContentPickerShapeProvider(IStringLocalizer<ElasticContentPickerSh
         }
 
         [Shape]
+#pragma warning disable CA1707 // Remove the underscores from member name
         public IHtmlContent ContentPickerField_Option__Elasticsearch(dynamic shape)
+#pragma warning restore CA1707
         {
             var selected = shape.Editor == "Elasticsearch";
             if (selected)
diff --git a/test/OrchardCore.Abstractions.Tests/OrchardCore.Abstractions.Tests.csproj b/test/OrchardCore.Abstractions.Tests/OrchardCore.Abstractions.Tests.csproj
index 603e87fdff1..05753ee0665 100644
--- a/test/OrchardCore.Abstractions.Tests/OrchardCore.Abstractions.Tests.csproj
+++ b/test/OrchardCore.Abstractions.Tests/OrchardCore.Abstractions.Tests.csproj
@@ -5,12 +5,10 @@
   <PropertyGroup>
     <TargetFrameworks>$(CommonTargetFrameworks)</TargetFrameworks>
     <RootNamespace>OrchardCore</RootNamespace>
+    <!-- Remove the underscores from member name -->
+    <NoWarn>$(NoWarn);CA1707</NoWarn>
   </PropertyGroup>
 
-  <!--<ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-  </ItemGroup>-->
-
   <ItemGroup>
     <None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
diff --git a/test/OrchardCore.Benchmarks/OrchardCore.Benchmarks.csproj b/test/OrchardCore.Benchmarks/OrchardCore.Benchmarks.csproj
index 04cbbed1a4c..22ce21b4340 100644
--- a/test/OrchardCore.Benchmarks/OrchardCore.Benchmarks.csproj
+++ b/test/OrchardCore.Benchmarks/OrchardCore.Benchmarks.csproj
@@ -7,6 +7,8 @@
     <RootNamespace>OrchardCore.Benchmark</RootNamespace>
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
+    <!-- Remove the underscores from member name -->
+    <NoWarn>$(NoWarn);CA1707</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/OrchardCore.Tests/OrchardCore.Tests.csproj b/test/OrchardCore.Tests/OrchardCore.Tests.csproj
index 28995c4eb9f..a11ad9ecb36 100644
--- a/test/OrchardCore.Tests/OrchardCore.Tests.csproj
+++ b/test/OrchardCore.Tests/OrchardCore.Tests.csproj
@@ -4,6 +4,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(CommonTargetFrameworks)</TargetFrameworks>
+    <!-- Remove the underscores from member name -->
+    <NoWarn>$(NoWarn);CA1707</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>