Merge pull request #127 from Lombiq/issue/OSOE-606

OSOE-606: Fixing new C# 11 analyzer violations
Lombiq · Jun 6, 2023 · 80f0387 · 80f0387
2 parents 548df55 + 59d5895
commit 80f0387
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Lombiq.HelpfulExtensions/Extensions/CodeGeneration/CodeGenerationDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/CodeGeneration/CodeGenerationDisplayDriver.cs
@@ -153,7 +153,7 @@ private string ConvertJArray(JArray jArray, int indentationDepth)
         var items = jArray.Select(item => ConvertJToken(item, indentationDepth + 8)).ToList();
 
         // If the items are formatted (for ListValueOption) then don't inject line-by-line formatting.
-        if (items.Any(item => item.ContainsOrdinalIgnoreCase(Environment.NewLine)))
+        if (items.Exists(item => item.ContainsOrdinalIgnoreCase(Environment.NewLine)))
         {
             var token = string.Join(string.Empty, items);
             return $"new[]\n{indentation}{{\n{token}{indentation}}}";

diff --git a/Lombiq.HelpfulExtensions/Extensions/Flows/FlowPartShapeTableProvider.cs b/Lombiq.HelpfulExtensions/Extensions/Flows/FlowPartShapeTableProvider.cs
@@ -2,7 +2,7 @@
 
 namespace Lombiq.HelpfulExtensions.Extensions.Flows;
 
-internal class FlowPartShapeTableProvider : IShapeTableProvider
+internal sealed class FlowPartShapeTableProvider : IShapeTableProvider
 {
     public void Discover(ShapeTableBuilder builder) => builder
         .Describe("FlowPart")

diff --git a/...fulExtensions/Extensions/OrchardRecipeMigration/Services/CommonOrchardContentConverter.cs b/...fulExtensions/Extensions/OrchardRecipeMigration/Services/CommonOrchardContentConverter.cs
@@ -1,11 +1,10 @@
-using Lombiq.HelpfulExtensions.Extensions.OrchardRecipeMigration.Models;
+using Lombiq.HelpfulExtensions.Extensions.OrchardRecipeMigration.Models;
 using OrchardCore.Alias.Models;
 using OrchardCore.Autoroute.Models;
 using OrchardCore.ContentManagement;
 using OrchardCore.Html.Models;
 using OrchardCore.Title.Models;
 using System;
-using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
@@ -71,7 +70,7 @@ bool HasElementAttribute(string elementName, string attributeName, out string va
         return Task.CompletedTask;
     }
 
-    private static string GetAlias(string value) => value.Split("/alias=").Last().Trim().Replace("\\/", "/");
+    private static string GetAlias(string value) => value.Split("/alias=")[^1].Trim().Replace("\\/", "/");
 
     private static void AlterIfPartExists<TPart>(ContentItem contentItem, Action<TPart> action)
         where TPart : ContentPart, new()

diff --git a/Lombiq.HelpfulExtensions/Extensions/ShapeTracing/ShapeTracingShapeEvents.cs b/Lombiq.HelpfulExtensions/Extensions/ShapeTracing/ShapeTracingShapeEvents.cs
@@ -7,7 +7,7 @@
 
 namespace Lombiq.HelpfulExtensions.Extensions.ShapeTracing;
 
-internal class ShapeTracingShapeEvents : IShapeDisplayEvents
+internal sealed class ShapeTracingShapeEvents : IShapeDisplayEvents
 {
     private readonly IHttpContextAccessor _hca;
 

diff --git a/Lombiq.HelpfulExtensions/Views/MenuWidget.cshtml b/Lombiq.HelpfulExtensions/Views/MenuWidget.cshtml
@@ -1,4 +1,5 @@
 @using Lombiq.HelpfulExtensions.Extensions.Widgets.ViewModels
+@using Lombiq.HelpfulLibraries.Common.Utilities;
 @using Microsoft.AspNetCore.Http.Extensions
 @using OrchardCore.Navigation
 <style asp-name="font-awesome"></style>
@@ -12,7 +13,7 @@
     const string dropdownElementName = blockName + "__dropdown";
     const string dropdownItemElementName = blockName + "__dropdownItem";
 
-    var contentIdName = FormattableString.Invariant($"{contentElementName}_{Guid.NewGuid()}");
+    var contentIdName = StringHelper.CreateInvariant($"{contentElementName}_{Guid.NewGuid()}");
 
     var baseUri = new Uri(Context.Request.GetDisplayUrl());
 
@@ -50,7 +51,7 @@
             <ul class="navbar-nav me-auto mb-lg-0">
                 @foreach (var menuItem in menuItems)
                 {
-                    var dropdownIdName = FormattableString.Invariant($"{dropdownElementName}_{Guid.NewGuid()}");
+                    var dropdownIdName = StringHelper.CreateInvariant($"{dropdownElementName}_{Guid.NewGuid()}");
                     @if (menuItem.Items.Any())
                     {
                         var submenuItems = menuItem