Merge branch 'release/4.6.0' into master

This update includes a few minor features, most notably improvements over routing and reporting for the ASP.NET Core `TopicController`. In addition, it upgrades the underlying code to C# 9.0 in order to take advantage of some new features such as improved pattern matching and implicitly typed initializers.

Features
- Updated `[ValidateTopic]` attribute to redirect to canonical URL to ensure consistency in analytics, indexes (0edab34)
- Updated `Topic.Load(RouteData)` extension to return null if an invalid `Key` is submitted (b303f13); this results in the `TopicController` treating incorrect topic paths (e.g., `/Web/!@~/`) as 404s instead of exceptions
- Added support for enabling (`IsIndexed`) and configuring (`IndexLabel`) an optional table of contents to the `ContentListTopicViewModel` (e9ccb06)

Bug Fixes
- Fixed issue with where the delegate is validated in the `HierarchicalTopicMappingService.GetViewModelAsnc()` method (69dff49)

Improvements
- Updated code to use C# 9.0 pattern matching and implicitly typed initializers (d63f2b5)
- Updated to latest versions of internal packages, and implemented  (4838da8)
- Updated to latest version of Code Analysis and fixed most issues introduced with C# 9.0 (089c96a)

Note: There are some Code Analysis false positives that remain with C# 9.0. Those are presumably fixed with the new `Microsoft.CodeAnalysis.NetAnalyzers` 5.0.0. There appears to be a bug in getting that to work with .NET 3.x projects, however, so it's not yet implemented.

Author: JeremyCaney

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

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<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.Host/Views/Layout/_Layout.cshtml

@@ -26,7 +26,7 @@
       <!-- /Page Header Area -->
 
       <article itemscope itemtype="http://schema.org/WebPageElement" itemprop="mainContentOfPage" class="grid-container">
-        <h1>@(Model.ContentType.Equals("PageGroup")? "Overview" : Model.Title)</h1>
+        <h1>@(Model.ContentType == "PageGroup"? "Overview" : Model.Title)</h1>
         <p class="subtitle">@Model.Subtitle</p>
         <section class="body">
           <partial name="_TopicAttributes" />

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

@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
+    <LangVersion>9.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
   </ItemGroup>

OnTopic.AspNetCore.Mvc.Tests/TopicControllerTest.cs

@@ -73,7 +73,7 @@ public TopicControllerTest() {
         RouteData               = routes,
         ActionDescriptor        = new ControllerActionDescriptor()
       };
-      _context                  = new ControllerContext(actionContext);
+      _context                  = new(actionContext);
 
     }
 
@@ -131,11 +131,11 @@ public void SitemapController_Index_ReturnsSitemapXml() {
 
       var actionContext         = new ActionContext {
         HttpContext             = new DefaultHttpContext(),
-        RouteData               = new RouteData(),
+        RouteData               = new(),
         ActionDescriptor        = new ControllerActionDescriptor()
       };
       var controller            = new SitemapController(_topicRepository) {
-        ControllerContext       = new ControllerContext(actionContext)
+        ControllerContext       = new(actionContext)
       };
       var result                = controller.Index() as ContentResult;
       var model                 = result.Content as string;

OnTopic.AspNetCore.Mvc.Tests/ValidateTopicAttributeTest.cs

@@ -40,7 +40,7 @@ public static ActionExecutingContext GetActionExecutingContext(Controller contro
 
       var actionContext = new ActionContext(
         new DefaultHttpContext(),
-        new RouteData(),
+        new(),
         new ControllerActionDescriptor(),
         modelState
       );
@@ -63,10 +63,10 @@ public static ActionExecutingContext GetActionExecutingContext(Controller contro
     ///   Generates a barebones <see cref="ControllerContext"/> for testing a controller.
     /// </summary>
     public static ControllerContext GetControllerContext() =>
-      new ControllerContext(
-        new ActionContext() {
+      new(
+        new() {
           HttpContext               = new DefaultHttpContext(),
-          RouteData                 = new RouteData(),
+          RouteData                 = new(),
           ActionDescriptor          = new ControllerActionDescriptor()
         }
       );
@@ -78,7 +78,7 @@ public static ControllerContext GetControllerContext() =>
     ///   Generates a barebones <see cref="ControllerContext"/> for testing a controller.
     /// </summary>
     public static TopicController GetTopicController(Topic topic) =>
-      new TopicController(
+      new(
           new DummyTopicRepository(),
           new DummyTopicMappingService()
       ) {

OnTopic.AspNetCore.Mvc/Components/MenuViewComponentBase{T}.cs

@@ -102,7 +102,7 @@ IHierarchicalTopicMappingService<T> hierarchicalTopicMappingService
       await HierarchicalTopicMappingService.GetRootViewModelAsync(
         navigationRootTopic!,
         3,
-        t => t.ContentType != "PageGroup"
+        t => t is not { ContentType: "List" } and not { Parent: { ContentType: "PageGroup" } }
       ).ConfigureAwait(false);
 
     /*==========================================================================================================================

OnTopic.AspNetCore.Mvc/Components/NavigationTopicViewComponentBase{T}.cs

@@ -77,7 +77,7 @@ IHierarchicalTopicMappingService<T> hierarchicalTopicMappingService
     /// <returns>The Topic associated with the current request.</returns>
     protected Topic? CurrentTopic {
       get {
-        if (_currentTopic == null) {
+        if (_currentTopic is null) {
           _currentTopic = TopicRepository.Load(RouteData);
         }
         return _currentTopic;

OnTopic.AspNetCore.Mvc/Components/PageLevelNavigationViewComponentBase{T}.cs

@@ -74,10 +74,9 @@ IHierarchicalTopicMappingService<T> hierarchicalTopicMappingService
       /*------------------------------------------------------------------------------------------------------------------------
       | Identify navigation root
       \-----------------------------------------------------------------------------------------------------------------------*/
-      if (navigationRootTopic != null) {
+      if (navigationRootTopic is not null) {
         while (
-          navigationRootTopic.Parent != null &&
-          !navigationRootTopic.ContentType.Equals("PageGroup", StringComparison.InvariantCulture)
+          navigationRootTopic is not null and not ({ Parent: null } or { ContentType: "PageGroup" })
         ) {
           navigationRootTopic = navigationRootTopic.Parent;
         }
@@ -86,7 +85,7 @@ IHierarchicalTopicMappingService<T> hierarchicalTopicMappingService
       /*------------------------------------------------------------------------------------------------------------------------
       | Return root
       \-----------------------------------------------------------------------------------------------------------------------*/
-      return navigationRootTopic?.Parent == null? null : navigationRootTopic;
+      return navigationRootTopic?.Parent is null? null : navigationRootTopic;
 
     }
 

OnTopic.AspNetCore.Mvc/Controllers/RedirectController.cs

@@ -59,7 +59,7 @@ public virtual ActionResult Redirect(int topicId) {
       /*------------------------------------------------------------------------------------------------------------------------
       | Provide error handling
       \-----------------------------------------------------------------------------------------------------------------------*/
-      if (topic == null) {
+      if (topic is null) {
         return NotFound("Invalid TopicID.");
       }
 

OnTopic.AspNetCore.Mvc/Controllers/SitemapController.cs

@@ -146,7 +146,7 @@ public virtual ActionResult Index(bool indent = false, bool includeMetadata = fa
     /// <returns>A Sitemap.org sitemap.</returns>
     [Obsolete("The GenerateSitemap() method should not be public. It will be marked private in OnTopic Library 5.0.")]
     public virtual XDocument GenerateSitemap(Topic rootTopic, bool includeMetadata = false) =>
-      new XDocument(
+      new(
         new XElement(_sitemapNamespace + "urlset",
           from topic in rootTopic?.Children
           select AddTopic(topic, includeMetadata)
@@ -172,9 +172,9 @@ public IEnumerable<XElement> AddTopic(Topic topic, bool includeMetadata = false)
       /*------------------------------------------------------------------------------------------------------------------------
       | Validate topic
       \-----------------------------------------------------------------------------------------------------------------------*/
-      if (topic == null) return topics;
-      if (topic.Attributes.GetValue("NoIndex") == "1") return topics;
-      if (topic.Attributes.GetValue("IsDisabled") == "1") return topics;
+      if (topic is null) return topics;
+      if (topic.Attributes.GetValue("NoIndex") is "1") return topics;
+      if (topic.Attributes.GetValue("IsDisabled") is "1") return topics;
       if (ExcludeContentTypes.Any(c => topic.ContentType.Equals(c, StringComparison.InvariantCultureIgnoreCase))) return topics;
 
       /*------------------------------------------------------------------------------------------------------------------------