Merge branch 'maintenance/code-analysis' into develop

The latest version of Code Analysis and Visual Studio's Validation library exposed some new issues. These are fixed as part of this update. These include e.g. removing unnecessary suppressions, updating to the LTR release of .NET 3.1, and preferring the new range operators over `Substring()` where possible.

Author: JeremyCaney

OnTopic.AspNetCore.Mvc.Host/OnTopic.AspNetCore.Mvc.Host.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>62eb85bf-f802-4afd-8bec-3d344e1cfc79</UserSecretsId>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

OnTopic.AspNetCore.Mvc.Tests/OnTopic.AspNetCore.Mvc.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>9.0</LangVersion>
   </PropertyGroup>

OnTopic.AspNetCore.Mvc/OnTopic.AspNetCore.Mvc.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <ProjectGuid>{B7F136A1-C86D-4A74-AC4F-3693CD1358A4}</ProjectGuid>
     <RootNamespace>OnTopic.AspNetCore.Mvc</RootNamespace>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ShouldCreateLogs>True</ShouldCreateLogs>
     <AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
     <LangVersion>9.0</LangVersion>

OnTopic.AspNetCore.Mvc/TopicViewResultExecutor.cs

@@ -122,7 +122,7 @@ public ViewEngineResult FindView(ActionContext actionContext, TopicViewResult vi
             // Get content-type after the slash and replace '+' characters in the content-type to '-' for view file encoding
             // purposes
             var acceptHeader = splitHeaders[i]
-              .Substring(splitHeaders[i].IndexOf("/", StringComparison.InvariantCulture) + 1)
+              [(splitHeaders[i].IndexOf("/", StringComparison.InvariantCulture) + 1)..]
               .Replace("+", "-", StringComparison.InvariantCulture);
             // Validate against available views; if content-type represents a valid view, stop validation
             if (acceptHeader is not null) {

OnTopic.TestDoubles/DummyTopicMappingService.cs

@@ -10,7 +10,6 @@
 using OnTopic.Mapping.Annotations;
 
 #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
-#pragma warning disable IDE0060 // Remove unused parameter
 
 namespace OnTopic.TestDoubles {
 
@@ -57,5 +56,4 @@ public DummyTopicMappingService() {
   } //Class
 } //Namespace
 
-#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously
-#pragma warning restore IDE0060 // Remove unused parameter
+#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously

OnTopic.Tests/OnTopic.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <NoWarn>CS1591,1701,1702,CA1707,CA1062,CS8602,CS8604;CA1303;IDE0059</NoWarn>
     <LangVersion>9.0</LangVersion>

OnTopic/Mapping/TopicMappingService.cs

@@ -665,12 +665,10 @@ void AddToList(object dto) {
           try {
             targetList.Add(dto);
           }
-          #pragma warning disable CA1031 // Do not catch general exception types
           catch (ArgumentException) {
             //Ignore exceptions caused by duplicate keys, in case the IList represents a keyed collection
             //We would defensively check for this, except IList doesn't provide a suitable method to do so
           }
-          #pragma warning restore CA1031 // Do not catch general exception types
         }
       }
 
@@ -710,11 +708,9 @@ ConcurrentDictionary<int, object> cache
       try {
         topicDto = await MapAsync(source, configuration.CrawlRelationships, cache).ConfigureAwait(false);
       }
-      #pragma warning disable CA1031 // Do not catch general exception types
       catch (InvalidOperationException) {
         //Disregard errors caused by unmapped view models; those are functionally equivalent to IsAssignableFrom() mismatches
       }
-      #pragma warning restore CA1031 // Do not catch general exception types
       if (topicDto is not null && configuration.Property.PropertyType.IsAssignableFrom(topicDto.GetType())) {
         configuration.Property.SetValue(target, topicDto);
       }