Release/5.2.0

Directory.Build.props

@@ -1,16 +1,17 @@
 <Project>
 
   <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
     <Nullable>enable</Nullable>
     <AnalysisLevel>latest</AnalysisLevel>
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <PropertyGroup>
     <Company>Ignia</Company>
     <Product>OnTopic</Product>
-    <Copyright>©2021 Ignia, LLC</Copyright>
+    <Copyright>©2022 Ignia, LLC</Copyright>
     <Authors>Ignia</Authors>
     <PackageProjectUrl>https://github.com/Ignia/Topics-Library</PackageProjectUrl>
     <UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>

OnTopic.All/OnTopic.All.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.6.8">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.10.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

OnTopic.All/Properties/AssemblyInfo.cs

@@ -3,7 +3,6 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
-using System;
 using System.Runtime.InteropServices;
 
 /*==============================================================================================================================

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

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <UserSecretsId>62eb85bf-f802-4afd-8bec-3d344e1cfc79</UserSecretsId>
     <IsPackable>false</IsPackable>
   </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.Host/Program.cs

@@ -3,43 +3,91 @@
 | Client        Ignia, LLC
 | Project       Sample OnTopic Site
 \=============================================================================================================================*/
-using System;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
-
-namespace OnTopic.AspNetCore.Mvc.Host {
-
-  /*============================================================================================================================
-  | CLASS: PROGRAM
-  \---------------------------------------------------------------------------------------------------------------------------*/
-  /// <summary>
-  ///   The <see cref="Program"/> class—and it's <see cref="Program.Main(String[])"/> method—represent the entry point into the
-  ///   ASP.NET Core web application.
-  /// </summary>
-  [ExcludeFromCodeCoverage]
-  public static class Program {
-
-    /*==========================================================================================================================
-    | METHOD: MAIN
-    \-------------------------------------------------------------------------------------------------------------------------*/
-    /// <summary>
-    ///   Responsible for bootstrapping the web application.
-    /// </summary>
-    public static void Main(string[] args) => CreateHostBuilder(args).Build().Run();
-
-    /*==========================================================================================================================
-    | METHOD: CREATE WEB HOST BUILDER
-    \-------------------------------------------------------------------------------------------------------------------------*/
-    /// <summary>
-    ///   Configures a new <see cref="IWebHostBuilder"/> with the default options.
-    /// </summary>
-    public static IHostBuilder CreateHostBuilder(string[] args) =>
-      Microsoft.Extensions.Hosting.Host
-        .CreateDefaultBuilder(args)
-        .ConfigureWebHostDefaults(webBuilder => {
-          webBuilder.UseStartup<Startup>();
-        });
-
-  } //Class
-} //Namespace
+using Microsoft.AspNetCore.Mvc.Controllers;
+using Microsoft.AspNetCore.Mvc.ViewComponents;
+using OnTopic.AspNetCore.Mvc;
+using OnTopic.AspNetCore.Mvc.Host;
+
+#pragma warning disable CA1812 // Avoid uninstantiated internal classes
+
+/*==============================================================================================================================
+| CONFIGURE SERVICES
+\-----------------------------------------------------------------------------------------------------------------------------*/
+var builder = WebApplication.CreateBuilder(args);
+
+/*------------------------------------------------------------------------------------------------------------------------------
+| Configure: Cookie Policy
+\-----------------------------------------------------------------------------------------------------------------------------*/
+builder.Services.Configure<CookiePolicyOptions>(options => {
+  // This lambda determines whether user consent for non-essential cookies is needed for a given request.
+  options.CheckConsentNeeded = context => true;
+  options.MinimumSameSitePolicy = SameSiteMode.None;
+});
+
+/*------------------------------------------------------------------------------------------------------------------------------
+| Configure: Output Caching
+\-----------------------------------------------------------------------------------------------------------------------------*/
+builder.Services.AddResponseCaching();
+
+/*------------------------------------------------------------------------------------------------------------------------------
+| Configure: MVC
+\-----------------------------------------------------------------------------------------------------------------------------*/
+builder.Services.AddControllersWithViews()
+
+  //Add OnTopic support
+  .AddTopicSupport();
+
+/*------------------------------------------------------------------------------------------------------------------------------
+| Register: Activators
+\-----------------------------------------------------------------------------------------------------------------------------*/
+var activator = new SampleActivator(builder.Configuration.GetConnectionString("OnTopic"));
+
+builder.Services.AddSingleton<IControllerActivator>(activator);
+builder.Services.AddSingleton<IViewComponentActivator>(activator);
+
+/*==============================================================================================================================
+| CONFIGURE APPLICATION
+\-----------------------------------------------------------------------------------------------------------------------------*/
+var app = builder.Build();
+
+/*------------------------------------------------------------------------------------------------------------------------------
+| Configure: Error Pages
+\-----------------------------------------------------------------------------------------------------------------------------*/
+  app.UseStatusCodePagesWithReExecute("/Error/{0}/");
+if (!app.Environment.IsDevelopment()) {
+  app.UseExceptionHandler("/Error/500/");
+  // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+  app.UseHsts();
+}
+
+/*------------------------------------------------------------------------------------------------------------------------------
+| Configure: Server defaults
+\-----------------------------------------------------------------------------------------------------------------------------*/
+app.UseHttpsRedirection();
+app.UseStaticFiles();
+app.UseCookiePolicy();
+app.UseRouting();
+app.UseCors("default");
+app.UseResponseCaching();
+
+/*------------------------------------------------------------------------------------------------------------------------------
+| Configure: MVC
+\-----------------------------------------------------------------------------------------------------------------------------*/
+app.MapImplicitAreaControllerRoute();                           // {area:exists}/{action=Index}
+app.MapDefaultAreaControllerRoute();                            // {area:exists}/{controller}/{action=Index}/{id?}
+app.MapTopicAreaRoute();                                        // {area:exists}/{**path}
+
+app.MapTopicErrors(includeStaticFiles: false);                  // Error/{statusCode}
+app.MapDefaultControllerRoute();                                // {controller=Home}/{action=Index}/{id?}
+app.MapTopicRoute(rootTopic: "Web");                            // Web/{**path}
+app.MapTopicRoute(rootTopic: "Error");                          // Error/{**path}
+app.MapTopicSitemap();                                          // Sitemap
+app.MapTopicRedirect();                                         // Topic/{topicId}
+app.MapControllers();
+
+/*------------------------------------------------------------------------------------------------------------------------------
+| Run application
+\-----------------------------------------------------------------------------------------------------------------------------*/
+app.Run();
+
+#pragma warning restore CA1812 // Avoid uninstantiated internal classes

OnTopic.AspNetCore.Mvc.Host/Properties/AssemblyInfo.cs

@@ -3,7 +3,6 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
-using System;
 using System.Runtime.InteropServices;
 
 /*==============================================================================================================================

OnTopic.AspNetCore.Mvc.Host/SampleActivator.cs

@@ -3,7 +3,6 @@
 | Client        Ignia, LLC
 | Project       Sample OnTopic Site
 \=============================================================================================================================*/
-using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Controllers;
@@ -118,6 +117,8 @@ public object Create(ControllerContext context) {
       return type.Name switch {
         nameof(TopicController) =>
           new TopicController(_topicRepository, _topicMappingService),
+        nameof(ErrorController) =>
+          new ErrorController(_topicRepository, _topicMappingService),
         nameof(SitemapController) =>
           new SitemapController(_topicRepository),
         nameof(RedirectController) =>

OnTopic.AspNetCore.Mvc.IntegrationTests.Host/Areas/Area/Controllers/AreaController.cs

@@ -3,12 +3,9 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
-using System.Diagnostics.CodeAnalysis;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Routing;
 using OnTopic.AspNetCore.Mvc.Controllers;
 using OnTopic.Mapping;
-using OnTopic.Repositories;
 
 namespace OnTopic.AspNetCore.Mvc.IntegrationTests.Areas.Area.Controllers {
 

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

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </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/Program.cs

@@ -3,10 +3,6 @@
 | Client        Ignia, LLC
 | Project       Integration Tests Host
 \=============================================================================================================================*/
-using System;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
 
 namespace OnTopic.AspNetCore.Mvc.IntegrationTests.Host {
 

OnTopic.AspNetCore.Mvc.IntegrationTests.Host/Properties/AssemblyInfo.cs

@@ -3,8 +3,17 @@
 | Client        Ignia, LLC
 | Project       Topics Library
 \=============================================================================================================================*/
-using System;
-using System.Diagnostics.CodeAnalysis;
+
+/*==============================================================================================================================
+| USING DIRECTIVES (GLOBAL)
+\-----------------------------------------------------------------------------------------------------------------------------*/
+global using System.Diagnostics.CodeAnalysis;
+global using OnTopic.Internal.Diagnostics;
+global using OnTopic.Repositories;
+
+/*==============================================================================================================================
+| USING DIRECTIVES (LOCAL)
+\-----------------------------------------------------------------------------------------------------------------------------*/
 using System.Runtime.InteropServices;
 
 /*==============================================================================================================================