Merge branch 'improvement/C#-10' into develop

Upgraded the project to use both C# 10 as well as the associated .NET 6 code analyzers.

Modified code to take advantage of natural types for generics; this was especially useful for XUNit's `Assert.Equal<>()` overloads, which no longer need the type parameter to be set in order to identify the correct overload.

Updated type checking statements to prefer `is` and `is not` where practice. This replaced a handful of cases where we were previously using `Equals(typeof())` or even `IsAssignableFrom()`.

Implemented new C# 10 constant string interpolation for `[Obsolete()]` attributes, which allows (most) class and member references to use `nameof()` instead of being hardcoded as strings.

Fixed a handful of new issues identified by the new code analyzers while I was at it.

This resolves Issue #96.

Author: JeremyCaney

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
     <AnalysisLevel>latest</AnalysisLevel>
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>

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

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

OnTopic.AspNetCore.Mvc.IntegrationTests/TopicViewResultExecutorTest.cs

@@ -163,7 +163,7 @@ public async Task MissingView_ReturnsInternalServerError() {
       var uri = new Uri("/Web/MissingView/", UriKind.Relative);
       var response = await client.GetAsync(uri).ConfigureAwait(false);
 
-      Assert.Equal<HttpStatusCode?>(HttpStatusCode.InternalServerError, response.StatusCode);
+      Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode);
 
     }
 

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

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

OnTopic.AspNetCore.Mvc.Tests/TopicRepositoryExtensionsTest.cs

@@ -62,7 +62,7 @@ public void Load_ByRoute_ReturnsTopic() {
       var currentTopic          = _topicRepository.Load(routes);
 
       Assert.NotNull(currentTopic);
-      Assert.Equal<Topic?>(topic, currentTopic);
+      Assert.Equal(topic, currentTopic);
       Assert.Equal("Web_0_1_1", currentTopic?.Key);
 
     }
@@ -84,7 +84,7 @@ public void Load_ByRoute_ReturnsRootTopic() {
       var currentTopic          = _topicRepository.Load(routes);
 
       Assert.NotNull(currentTopic);
-      Assert.Equal<Topic?>(topic, currentTopic);
+      Assert.Equal(topic, currentTopic);
       Assert.Equal("Root", currentTopic?.Key);
 
     }

OnTopic.AspNetCore.Mvc.Tests/TopicViewComponentTest.cs

@@ -131,7 +131,7 @@ public async Task Menu_Invoke_ReturnsNavigationViewModel() {
       Assert.NotNull(model);
       Assert.Equal(_topic.GetWebPath(), model?.CurrentWebPath);
       Assert.Equal("/Web/", model?.NavigationRoot?.WebPath);
-      Assert.Equal<int?>(3, model?.NavigationRoot?.Children.Count);
+      Assert.Equal(3, model?.NavigationRoot?.Children.Count);
 
     }
 
@@ -204,7 +204,7 @@ public async Task PageLevelNavigation_Invoke_ReturnsNavigationViewModel() {
       Assert.NotNull(model);
       Assert.Equal(_topic.GetWebPath(), model?.CurrentWebPath);
       Assert.Equal("/Web/Web_3/", model?.NavigationRoot?.WebPath);
-      Assert.Equal<int?>(2, model?.NavigationRoot?.Children.Count);
+      Assert.Equal(2, model?.NavigationRoot?.Children.Count);
       Assert.True(model?.NavigationRoot?.IsSelected(_topic.GetWebPath())?? false);
 
     }

OnTopic.AspNetCore.Mvc.Tests/ValidateTopicAttributeTest.cs

@@ -204,7 +204,7 @@ public void NestedTopic_List_Returns403() {
       var result                = context.Result as StatusCodeResult;
 
       Assert.NotNull(result);
-      Assert.Equal<int?>(403, result?.StatusCode);
+      Assert.Equal(403, result?.StatusCode);
 
     }
 
@@ -231,7 +231,7 @@ public void NestedTopic_Item_Returns403() {
       var result                = context.Result as StatusCodeResult;
 
       Assert.NotNull(result);
-      Assert.Equal<int?>(403, result?.StatusCode);
+      Assert.Equal(403, result?.StatusCode);
 
     }
 
@@ -257,7 +257,7 @@ public void Container_Returns403() {
       var result                = context.Result as StatusCodeResult;
 
       Assert.NotNull(result);
-      Assert.Equal<int?>(403, result?.StatusCode);
+      Assert.Equal(403, result?.StatusCode);
 
     }
 
@@ -309,7 +309,7 @@ public void PageGroupTopic_Empty_ReturnsRedirect() {
       var result = context.Result as StatusCodeResult;
 
       Assert.NotNull(result);
-      Assert.Equal<int?>(403, result?.StatusCode);
+      Assert.Equal(403, result?.StatusCode);
 
     }
 

OnTopic.AspNetCore.Mvc/Models/NavigationViewModel{T}.cs

@@ -77,7 +77,7 @@ public class NavigationViewModel<T> where T : class, IHierarchicalTopicViewModel
     /// </summary>
     /// <inheritdoc cref="CurrentWebPath"/>
     [ExcludeFromCodeCoverage]
-    [Obsolete("The CurrentKey property has been replaced in favor of CurrentWebPath.", true)]
+    [Obsolete($"The {nameof(CurrentKey)} property has been replaced in favor of {nameof(CurrentWebPath)}.", true)]
     public string CurrentKey { get; set; } = default!;
 
   } //Class