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.

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 class TopicViewResultExecutorTest: IClassFixture<WebApplicationFactory<St
       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 class TopicRepositoryExtensionsTest: IClassFixture<StubTopicRepository> {
       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 class TopicRepositoryExtensionsTest: IClassFixture<StubTopicRepository> {
       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 class TopicViewComponentTest: IClassFixture<StubTopicRepository> {
       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 class TopicViewComponentTest: IClassFixture<StubTopicRepository> {
       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 class ValidateTopicAttributeTest {
       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 class ValidateTopicAttributeTest {
       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 class ValidateTopicAttributeTest {
       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 class ValidateTopicAttributeTest {
       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

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

@@ -19,7 +19,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <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/TopicViewResultExecutor.cs

@@ -114,10 +114,10 @@ IModelMetadataProvider modelMetadataProvider
       if (!(view?.Success ?? false) && requestContext.Headers.ContainsKey("Accept")) {
         foreach (var header in requestContext.Headers["Accept"]) {
           var value = header.Replace("+", "-", StringComparison.Ordinal);
-          if (value.Contains("/", StringComparison.Ordinal)) {
+          if (value.Contains('/', StringComparison.Ordinal)) {
             value = value[(value.IndexOf("/", StringComparison.Ordinal)+1)..];
           }
-          if (value.Contains(";", StringComparison.Ordinal)) {
+          if (value.Contains(';', StringComparison.Ordinal)) {
             value = value[..(value.IndexOf(";", StringComparison.Ordinal))];
           }
           if (value is not null) {

OnTopic.Data.Caching/OnTopic.Data.Caching.csproj

@@ -18,7 +18,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <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.Data.Sql/OnTopic.Data.Sql.csproj

@@ -18,7 +18,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <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.Data.Sql/SqlDataReaderExtensions.cs

@@ -201,7 +201,7 @@ internal static class SqlDataReaderExtensions {
       /*------------------------------------------------------------------------------------------------------------------------
       | Assign parent
       \-----------------------------------------------------------------------------------------------------------------------*/
-      if (parentId >= 0 && current.Parent?.Id != parentId && topics.Keys.Contains(parentId)) {
+      if (parentId >= 0 && current.Parent?.Id != parentId && topics.ContainsKey(parentId)) {
         current.Parent = topics[parentId];
       }
 
@@ -359,7 +359,7 @@ internal static class SqlDataReaderExtensions {
       var related               = (Topic?)null;
 
       // Fetch the related topic
-      if (topics.Keys.Contains(targetTopicId)) {
+      if (topics.ContainsKey(targetTopicId)) {
         related                 = topics[targetTopicId];
       }
 
@@ -417,7 +417,7 @@ internal static class SqlDataReaderExtensions {
       // Fetch the related topic
       if (targetTopicId is null) {
       }
-      else if (topics.Keys.Contains(targetTopicId.Value)) {
+      else if (topics.ContainsKey(targetTopicId.Value)) {
         referenced              = topics[targetTopicId.Value];
       }
       else {

OnTopic.TestDoubles/OnTopic.TestDoubles.csproj

@@ -12,7 +12,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.TestDoubles/StubTopicRepository.cs

@@ -205,7 +205,10 @@ public class StubTopicRepository : TopicRepository, ITopicRepository {
     \-------------------------------------------------------------------------------------------------------------------------*/
     /// <inheritdoc cref="TopicRepository.GetContentTypeDescriptors(ContentTypeDescriptor)" />
     [ExcludeFromCodeCoverage]
-    [Obsolete("Deprecated. Instead, use the new SetContentTypeDescriptorsProxy(), which provides the same function.", true)]
+    [Obsolete(
+      $"Deprecated. Instead, use the new {nameof(SetContentTypeDescriptorsProxy)}, which provides the same function.",
+      true
+    )]
     public ContentTypeDescriptorCollection GetContentTypeDescriptorsProxy(ContentTypeDescriptor topicGraph) =>
       base.SetContentTypeDescriptors(topicGraph);
 

OnTopic.Tests/AttributeCollectionTest.cs

@@ -109,7 +109,7 @@ public class AttributeCollectionTest {
 
       topic.Attributes.SetInteger("Number1", 1);
 
-      Assert.Equal<int>(1, topic.Attributes.GetInteger("Number1", 5));
+      Assert.Equal(1, topic.Attributes.GetInteger("Number1", 5));
 
     }
 
@@ -131,9 +131,9 @@ public class AttributeCollectionTest {
 
       baseTopic.Attributes.SetInteger("Number1", 1);
 
-      Assert.Equal<int>(1, topic.Attributes.GetInteger("Number1", 5));
-      Assert.Equal<int>(1, childTopic.Attributes.GetInteger("Number1", 5, true));
-      Assert.Equal<int>(0, topic.Attributes.GetInteger("Number1", inheritFromBase: false));
+      Assert.Equal(1, topic.Attributes.GetInteger("Number1", 5));
+      Assert.Equal(1, childTopic.Attributes.GetInteger("Number1", 5, true));
+      Assert.Equal(0, topic.Attributes.GetInteger("Number1", inheritFromBase: false));
 
     }
 
@@ -150,8 +150,8 @@ public class AttributeCollectionTest {
 
       topic.Attributes.SetValue("Number3", "Invalid");
 
-      Assert.Equal<int>(0, topic.Attributes.GetInteger("Number3"));
-      Assert.Equal<int>(5, topic.Attributes.GetInteger("Number3", 5));
+      Assert.Equal(0, topic.Attributes.GetInteger("Number3"));
+      Assert.Equal(5, topic.Attributes.GetInteger("Number3", 5));
 
     }
 
@@ -166,8 +166,8 @@ public class AttributeCollectionTest {
 
       var topic = new Topic("Test", "Container");
 
-      Assert.Equal<int>(0, topic.Attributes.GetInteger("InvalidKey"));
-      Assert.Equal<int>(5, topic.Attributes.GetInteger("InvalidKey", 5));
+      Assert.Equal(0, topic.Attributes.GetInteger("InvalidKey"));
+      Assert.Equal(5, topic.Attributes.GetInteger("InvalidKey", 5));
 
     }
 
@@ -184,7 +184,7 @@ public class AttributeCollectionTest {
 
       topic.Attributes.SetDouble("Number1", 1);
 
-      Assert.Equal<double>(1.0, topic.Attributes.GetDouble("Number1", 5.0));
+      Assert.Equal(1.0, topic.Attributes.GetDouble("Number1", 5.0));
 
     }
 
@@ -206,9 +206,9 @@ public class AttributeCollectionTest {
 
       baseTopic.Attributes.SetDouble("Number1", 1);
 
-      Assert.Equal<double>(1.0, topic.Attributes.GetDouble("Number1", 5.0));
-      Assert.Equal<double>(1.0, childTopic.Attributes.GetDouble("Number1", 5.0, true));
-      Assert.Equal<double>(0.0, topic.Attributes.GetInteger("Number1", inheritFromBase: false));
+      Assert.Equal(1.0, topic.Attributes.GetDouble("Number1", 5.0));
+      Assert.Equal(1.0, childTopic.Attributes.GetDouble("Number1", 5.0, true));
+      Assert.Equal(0.0, topic.Attributes.GetInteger("Number1", inheritFromBase: false));
 
     }
 
@@ -225,8 +225,8 @@ public class AttributeCollectionTest {
 
       topic.Attributes.SetValue("Number3", "Invalid");
 
-      Assert.Equal<double>(0, topic.Attributes.GetDouble("Number3"));
-      Assert.Equal<double>(5.0, topic.Attributes.GetDouble("Number3", 5.0));
+      Assert.Equal(0.0, topic.Attributes.GetDouble("Number3"));
+      Assert.Equal(5.0, topic.Attributes.GetDouble("Number3", 5.0));
 
     }
 
@@ -241,8 +241,8 @@ public class AttributeCollectionTest {
 
       var topic = new Topic("Test", "Container");
 
-      Assert.Equal<double>(0, topic.Attributes.GetDouble("InvalidKey"));
-      Assert.Equal<double>(5.0, topic.Attributes.GetDouble("InvalidKey", 5.0));
+      Assert.Equal(0.0, topic.Attributes.GetDouble("InvalidKey"));
+      Assert.Equal(5.0, topic.Attributes.GetDouble("InvalidKey", 5.0));
 
     }
 
@@ -260,7 +260,7 @@ public class AttributeCollectionTest {
 
       topic.Attributes.SetDateTime("DateTime1", dateTime1);
 
-      Assert.Equal<DateTime>(dateTime1, topic.Attributes.GetDateTime("DateTime1", DateTime.MinValue));
+      Assert.Equal(dateTime1, topic.Attributes.GetDateTime("DateTime1", DateTime.MinValue));
 
     }
 
@@ -283,9 +283,9 @@ public class AttributeCollectionTest {
 
       baseTopic.Attributes.SetDateTime("DateTime1", dateTime1);
 
-      Assert.Equal<DateTime>(dateTime1, topic.Attributes.GetDateTime("DateTime1", DateTime.Now));
-      Assert.Equal<DateTime>(dateTime1, childTopic.Attributes.GetDateTime("DateTime1", DateTime.Now, true));
-      Assert.Equal<DateTime>(new DateTime(), topic.Attributes.GetDateTime("DateTime1", inheritFromBase: false));
+      Assert.Equal(dateTime1, topic.Attributes.GetDateTime("DateTime1", DateTime.Now));
+      Assert.Equal(dateTime1, childTopic.Attributes.GetDateTime("DateTime1", DateTime.Now, true));
+      Assert.Equal(new DateTime(), topic.Attributes.GetDateTime("DateTime1", inheritFromBase: false));
 
     }
 
@@ -303,8 +303,8 @@ public class AttributeCollectionTest {
 
       topic.Attributes.SetValue("DateTime2", "IncorrectValue");
 
-      Assert.Equal<DateTime>(new DateTime(), topic.Attributes.GetDateTime("DateTime2"));
-      Assert.Equal<DateTime>(dateTime1, topic.Attributes.GetDateTime("DateTime2", dateTime1));
+      Assert.Equal(new DateTime(), topic.Attributes.GetDateTime("DateTime2"));
+      Assert.Equal(dateTime1, topic.Attributes.GetDateTime("DateTime2", dateTime1));
 
     }
 
@@ -323,8 +323,8 @@ public class AttributeCollectionTest {
 
       topic.Attributes.SetDateTime("DateTime2", dateTime2);
 
-      Assert.Equal<DateTime>(new DateTime(), topic.Attributes.GetDateTime("DateTime3"));
-      Assert.Equal<DateTime>(dateTime1, topic.Attributes.GetDateTime("DateTime3", dateTime1));
+      Assert.Equal(new DateTime(), topic.Attributes.GetDateTime("DateTime3"));
+      Assert.Equal(dateTime1, topic.Attributes.GetDateTime("DateTime3", dateTime1));
 
     }
 
@@ -686,9 +686,9 @@ public class AttributeCollectionTest {
       topic.Attributes.TryGetValue("Bar", out var cleanedAttribute2);
       topic.Attributes.TryGetValue("Baz", out var cleanedAttribute3);
 
-      Assert.Equal<DateTime?>(firstVersion, cleanedAttribute1?.LastModified);
-      Assert.Equal<DateTime?>(secondVersion, cleanedAttribute2?.LastModified);
-      Assert.Equal<DateTime?>(thirdVersion, cleanedAttribute3?.LastModified);
+      Assert.Equal(firstVersion, cleanedAttribute1?.LastModified);
+      Assert.Equal(secondVersion, cleanedAttribute2?.LastModified);
+      Assert.Equal(thirdVersion, cleanedAttribute3?.LastModified);
 
     }
 
@@ -874,7 +874,7 @@ public class AttributeCollectionTest {
 
       topic.Attributes.SetInteger("NumericAttribute", 1);
 
-      Assert.Equal<int>(1, topic.NumericAttribute);
+      Assert.Equal(1, topic.NumericAttribute);
 
     }
 
@@ -928,7 +928,7 @@ public class AttributeCollectionTest {
 
       topic.Attributes.SetDateTime("DateTimeAttribute", dateTime);
 
-      Assert.Equal<DateTime>(dateTime, topic.DateTimeAttribute);
+      Assert.Equal(dateTime, topic.DateTimeAttribute);
 
     }