OnTopicCMS · JeremyCaney · Mar 3, 2021 · Feb 3, 2021 · Feb 3, 2021 · Feb 3, 2021
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,33 @@
+<Project>
+
+  <PropertyGroup>
+    <LangVersion>9.0</LangVersion>
+    <Nullable>enable</Nullable>
+    <AnalysisLevel>latest</AnalysisLevel>
+    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Company>Ignia</Company>
+    <Product>OnTopic</Product>
+    <Copyright>©2021 Ignia, LLC</Copyright>
+    <Authors>Ignia</Authors>
+    <PackageProjectUrl>https://github.com/Ignia/Topics-Library</PackageProjectUrl>
+    <UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
+    <NeutralLanguage>en</NeutralLanguage>
+    <IncludeSymbols>true</IncludeSymbols>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageIcon>Icon.png</PackageIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="../Icon.png" Pack="true" PackagePath=""/>
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
+</Project>
diff --git a/Icon.png b/Icon.png
diff --git a/OnTopic.All/OnTopic.All.csproj b/OnTopic.All/OnTopic.All.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <AssemblyTitle>OnTopic Library Metapackage</AssemblyTitle>
+    <Description>Includes all core packages associated with the OnTopic Library, excluding the OnTopic Editor. Reference this package as a shorthand for establishing a reference to each of the individual packages.</Description>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="GitVersion.MsBuild" Version="5.6.6">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\OnTopic.AspNetCore.Mvc\OnTopic.AspNetCore.Mvc.csproj" />
+    <ProjectReference Include="..\OnTopic.Data.Caching\OnTopic.Data.Caching.csproj" />
+    <ProjectReference Include="..\OnTopic.Data.Sql\OnTopic.Data.Sql.csproj" />
+    <ProjectReference Include="..\OnTopic.ViewModels\OnTopic.ViewModels.csproj" />
+    <ProjectReference Include="..\OnTopic\OnTopic.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/OnTopic.All/Properties/AssemblyInfo.cs b/OnTopic.All/Properties/AssemblyInfo.cs
@@ -0,0 +1,15 @@
+/*==============================================================================================================================
+| Author        Ignia, LLC
+| Client        Ignia, LLC
+| Project       Topics Library
+\=============================================================================================================================*/
+using System;
+using System.Runtime.InteropServices;
+
+/*==============================================================================================================================
+| DEFINE ASSEMBLY ATTRIBUTES
+>===============================================================================================================================
+| Declare and define attributes used in the compiling of the finished assembly.
+\-----------------------------------------------------------------------------------------------------------------------------*/
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant(false)]
diff --git a/OnTopic.All/README.md b/OnTopic.All/README.md
@@ -0,0 +1,31 @@
+# OnTopic Metapackage
+The `OnTopic.All` metapackage includes a reference to the core OnTopic libraries that most implementations will require. It is recommended that implementers reference this package instead of referencing each of the OnTopic packages individually, unless they have a specific need to customize which packages are referenced.
+
+[![OnTopic.Data.Caching package in Internal feed in Azure Artifacts](https://igniasoftware.feeds.visualstudio.com/_apis/public/Packaging/Feeds/46d5f49c-5e1e-47bb-8b14-43be6c719ba8/Packages/3dfb3a0a-c049-407d-959e-546f714dcd0f/Badge)](https://igniasoftware.visualstudio.com/OnTopic/_packaging?_a=package&feed=46d5f49c-5e1e-47bb-8b14-43be6c719ba8&package=3dfb3a0a-c049-407d-959e-546f714dcd0f&preferRelease=true)
+[![Build Status](https://igniasoftware.visualstudio.com/OnTopic/_apis/build/status/OnTopic-CI-V3?branchName=master)](https://igniasoftware.visualstudio.com/OnTopic/_build/latest?definitionId=7&branchName=master)
+![NuGet Deployment Status](https://rmsprodscussu1.vsrm.visualstudio.com/A09668467-721c-4517-8d2e-aedbe2a7d67f/_apis/public/Release/badge/bd7f03e0-6fcf-4ec6-939d-4e995668d40f/2/2)
+
+### Contents
+- [Scope](#scope)
+- [Installation](#installation)
+
+## Scope
+The `OnTopic.All` metapackage maintains a reference to the following packages:
+- [`OnTopic`](../OnTopic/README.md): The core OnTopic library.
+- [`OnTopic.AspNetCore.Mvc`](../OnTopic.AspNetCore.Mvc/README.md): The ASP.NET Core implementation, with support for both ASP.NET Core 3.x and ASP.NET Core 5.x.
+- [`OnTopic.Data.Caching`](../OnTopic.Data.Caching/README.md): An `ITopicRepository` decorator for caching the topic graph in memory.
+- [`OnTopic.Data.Sql`](../OnTopic.Data.Sql/README.md): An `ITopicRepository` implementation for persisting topic data in a SQL Server database.
+- [`OnTopic.ViewModels`](../OnTopic.ViewModels/README.md): A set of reference view models and binding models mapping to the out-of-the-box schema for the standard content types.
+
+## Installation
+Installation can be performed by providing a `<PackageReference /`> to the `OnTopic.All` **NuGet** package.
+```xml
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  …
+  <ItemGroup>
+    <PackageReference Include="OnTopic.All" Version="5.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+> *Note:* This package is currently only available on Ignia's private **NuGet** repository. For access, please contact [Ignia](http://www.ignia.com/).
diff --git a/OnTopic.AspNetCore.Mvc.Host/Components/MenuViewComponent.cs b/OnTopic.AspNetCore.Mvc.Host/Components/MenuViewComponent.cs
@@ -5,6 +5,7 @@
 \=============================================================================================================================*/
 using Microsoft.AspNetCore.Mvc;
 using OnTopic.AspNetCore.Mvc.Components;
+using OnTopic.AspNetCore.Mvc.Controllers;
 using OnTopic.AspNetCore.Mvc.Models;
 using OnTopic.Mapping.Hierarchical;
 using OnTopic.Repositories;
@@ -16,7 +17,7 @@ namespace OnTopic.AspNetCore.Mvc.Host.Components {
   | CLASS: MENU VIEW COMPONENT
   \---------------------------------------------------------------------------------------------------------------------------*/
   /// <summary>
-  ///   Defines a <see cref="ViewComponent"/> which provides access to a menu of <typeparamref name="NavigationTopicViewModel"/>
+  ///   Defines a <see cref="ViewComponent"/> which provides access to a menu of <see cref="NavigationTopicViewModel"/>
   ///   instances.
   /// </summary>
   /// <remarks>

diff --git a/OnTopic.AspNetCore.Mvc.Host/Components/PageLevelNavigationViewComponent.cs b/OnTopic.AspNetCore.Mvc.Host/Components/PageLevelNavigationViewComponent.cs
@@ -5,6 +5,7 @@
 \=============================================================================================================================*/
 using Microsoft.AspNetCore.Mvc;
 using OnTopic.AspNetCore.Mvc.Components;
+using OnTopic.AspNetCore.Mvc.Controllers;
 using OnTopic.AspNetCore.Mvc.Models;
 using OnTopic.Mapping.Hierarchical;
 using OnTopic.Repositories;
@@ -16,15 +17,14 @@ namespace OnTopic.AspNetCore.Mvc.Host.Components {
   | CLASS: PAGE-LEVEL NAVIGATION VIEW COMPONENT
   \---------------------------------------------------------------------------------------------------------------------------*/
   /// <summary>
-  ///   Defines a <see cref="ViewComponent"/> which provides access to a menu of <typeparamref name="NavigationTopicViewModel"/>
+  ///   Defines a <see cref="ViewComponent"/> which provides access to a menu of <see cref="NavigationTopicViewModel"/>
   ///   instances representing the nearest page-level navigation.
   /// </summary>
   /// <remarks>
   ///   <para>
   ///     As a best practice, global data required by the layout view are requested independent of the current page. This
-  ///     allows each layout element to be provided with its own layout data, in the form of <see
-  ///     cref="NavigationViewModel{T}"/>s, instead of needing to add this data to every view model returned by <see
-  ///     cref="TopicController"/>.
+  ///     allows each layout element to be provided with its own layout data, in the form of <see cref="NavigationViewModel{T}"
+  ///     />s, instead of needing to add this data to every view model returned by <see cref="TopicController"/>.
   ///   </para>
   /// </remarks>
   public class PageLevelNavigationViewComponent : PageLevelNavigationViewComponentBase<NavigationTopicViewModel> {

diff --git a/OnTopic.AspNetCore.Mvc.Host/OnTopic.AspNetCore.Mvc.Host.csproj b/OnTopic.AspNetCore.Mvc.Host/OnTopic.AspNetCore.Mvc.Host.csproj
@@ -1,17 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net5.0</TargetFrameworks>
     <UserSecretsId>62eb85bf-f802-4afd-8bec-3d344e1cfc79</UserSecretsId>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\OnTopic.AspNetCore.Mvc\OnTopic.AspNetCore.Mvc.csproj" />
-    <ProjectReference Include="..\OnTopic.Data.Caching\OnTopic.Data.Caching.csproj" />
-    <ProjectReference Include="..\OnTopic.Data.Sql\OnTopic.Data.Sql.csproj" />
-    <ProjectReference Include="..\OnTopic.ViewModels\OnTopic.ViewModels.csproj" />
-    <ProjectReference Include="..\OnTopic\OnTopic.csproj" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
-</Project>
+  <ItemGroup>
+    <ProjectReference Include="..\OnTopic.All\OnTopic.All.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/OnTopic.AspNetCore.Mvc.Host/Properties/AssemblyInfo.cs b/OnTopic.AspNetCore.Mvc.Host/Properties/AssemblyInfo.cs
@@ -0,0 +1,15 @@
+/*==============================================================================================================================
+| Author        Ignia, LLC
+| Client        Ignia, LLC
+| Project       Topics Library
+\=============================================================================================================================*/
+using System;
+using System.Runtime.InteropServices;
+
+/*==============================================================================================================================
+| DEFINE ASSEMBLY ATTRIBUTES
+>===============================================================================================================================
+| Declare and define attributes used in the compiling of the finished assembly.
+\-----------------------------------------------------------------------------------------------------------------------------*/
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant(false)]
diff --git a/OnTopic.AspNetCore.Mvc.Host/SampleActivator.cs b/OnTopic.AspNetCore.Mvc.Host/SampleActivator.cs
@@ -11,9 +11,10 @@
 using OnTopic.AspNetCore.Mvc.Host.Components;
 using OnTopic.Data.Caching;
 using OnTopic.Data.Sql;
+using OnTopic.Internal.Diagnostics;
+using OnTopic.Lookup;
 using OnTopic.Mapping;
 using OnTopic.Mapping.Hierarchical;
-using OnTopic.Reflection;
 using OnTopic.Repositories;
 using OnTopic.ViewModels;
 
@@ -31,21 +32,22 @@ public class SampleActivator : IControllerActivator, IViewComponentActivator {
     /*==========================================================================================================================
     | PRIVATE INSTANCES
     \-------------------------------------------------------------------------------------------------------------------------*/
-    private readonly            ITypeLookupService              _typeLookupService              = null;
-    private readonly            ITopicMappingService            _topicMappingService            = null;
-    private readonly            ITopicRepository                _topicRepository                = null;
+    private readonly            ITypeLookupService              _typeLookupService;
+    private readonly            ITopicMappingService            _topicMappingService;
+    private readonly            ITopicRepository                _topicRepository;
+    private                     DateTime                        _cacheLastUpdated               = DateTime.UtcNow;
 
     /*==========================================================================================================================
     | HIERARCHICAL TOPIC MAPPING SERVICE
     \-------------------------------------------------------------------------------------------------------------------------*/
-    private readonly IHierarchicalTopicMappingService<NavigationTopicViewModel> _hierarchicalMappingService = null;
+    private readonly IHierarchicalTopicMappingService<NavigationTopicViewModel> _hierarchicalMappingService;
 
     /*==========================================================================================================================
     | CONSTRUCTOR
     \-------------------------------------------------------------------------------------------------------------------------*/
     /// <summary>
-    ///   Establishes a new instance of the <see cref="SampleControllerFactory"/>, including any shared dependencies to be used
-    ///   across instances of controllers.
+    ///   Establishes a new instance of the <see cref="SampleActivator"/>, including any shared dependencies to be used across
+    ///   instances of controllers.
     /// </summary>
     /// <remarks>
     ///   The constructor is responsible for establishing dependencies with the singleton lifestyle so that they are available
@@ -86,14 +88,28 @@ public SampleActivator(string connectionString) {
     /// <summary>
     ///   Registers dependencies, and injects them into new instances of controllers in response to each request.
     /// </summary>
-    /// <returns>A concrete instance of an <see cref="IController"/>.</returns>
+    /// <returns>A concrete instance of an <see cref="Controller"/>.</returns>
     public object Create(ControllerContext context) {
 
+      /*------------------------------------------------------------------------------------------------------------------------
+      | Validate parameters
+      \-----------------------------------------------------------------------------------------------------------------------*/
+      Contract.Requires(context, nameof(context));
+
       /*------------------------------------------------------------------------------------------------------------------------
       | Determine controller type
       \-----------------------------------------------------------------------------------------------------------------------*/
       var type = context.ActionDescriptor.ControllerTypeInfo.AsType();
 
+      /*------------------------------------------------------------------------------------------------------------------------
+      | Periodically update cache
+      \-----------------------------------------------------------------------------------------------------------------------*/
+      if (DateTime.UtcNow > _cacheLastUpdated.AddMinutes(1)) {
+        var currentUpdate = DateTime.UtcNow;
+        _topicRepository.Refresh(_topicRepository.Load()!, _cacheLastUpdated);
+        _cacheLastUpdated = currentUpdate;
+      }
+
       /*------------------------------------------------------------------------------------------------------------------------
       | Configure and return appropriate controller
       \-----------------------------------------------------------------------------------------------------------------------*/
@@ -104,17 +120,22 @@ public object Create(ControllerContext context) {
           new SitemapController(_topicRepository),
         nameof(RedirectController) =>
           new RedirectController(_topicRepository),
-        _ => throw new Exception($"Unknown controller {type.Name}")
+        _ => throw new InvalidOperationException($"Unknown controller {type.Name}")
       };
 
     }
 
     /// <summary>
     ///   Registers dependencies, and injects them into new instances of view components in response to each request.
     /// </summary>
-    /// <returns>A concrete instance of an <see cref="IController"/>.</returns>
+    /// <returns>A concrete instance of an <see cref="ViewComponent"/>.</returns>
     public object Create(ViewComponentContext context) {
 
+      /*------------------------------------------------------------------------------------------------------------------------
+      | Validate parameters
+      \-----------------------------------------------------------------------------------------------------------------------*/
+      Contract.Requires(context, nameof(context));
+
       /*------------------------------------------------------------------------------------------------------------------------
       | Determine view component type
       \-----------------------------------------------------------------------------------------------------------------------*/
@@ -128,7 +149,7 @@ public object Create(ViewComponentContext context) {
           new MenuViewComponent(_topicRepository, _hierarchicalMappingService),
         nameof(PageLevelNavigationViewComponent) =>
           new PageLevelNavigationViewComponent(_topicRepository, _hierarchicalMappingService),
-        _ => throw new Exception($"Unknown view component {type.Name}")
+        _ => throw new InvalidOperationException($"Unknown view component {type.Name}")
       };
 
     }

diff --git a/OnTopic.AspNetCore.Mvc.Host/Views/ContentList/Accordion.cshtml b/OnTopic.AspNetCore.Mvc.Host/Views/ContentList/Accordion.cshtml
@@ -1,7 +1,7 @@
-@Html.PartialAsync("~/Views/ContentList/ContentList.cshtml")
+<partial name="~/Views/ContentList/ContentList.cshtml" />
 
 <!--
   Content Type: Content List
   View Type: Accordion
   View Location: ~/Views/ContentList/Accordion.cshtml
--->
+-->
diff --git a/OnTopic.AspNetCore.Mvc.Host/Views/ContentList/ContentList.cshtml b/OnTopic.AspNetCore.Mvc.Host/Views/ContentList/ContentList.cshtml
@@ -27,4 +27,4 @@
   Content Type: Content List
   View Type: Accordion
   View Location: ~/Views/ContentList/Accordion.cshtml
--->
+-->
diff --git a/OnTopic.AspNetCore.Mvc.Host/Views/ContentList/IndexedList.cshtml b/OnTopic.AspNetCore.Mvc.Host/Views/ContentList/IndexedList.cshtml
@@ -1,7 +1,7 @@
-@Html.PartialAsync("~/Views/ContentList/ContentList.cshtml")
+<partial name="~/Views/ContentList/ContentList.cshtml" />
 
 <!--
   Content Type: Content List
   View Type: Indexed List
   View Location: ~/Views/ContentList/IndexedList.cshtml
--->
+-->
diff --git a/OnTopic.AspNetCore.Mvc.Host/Views/ContentList/LinkedList.cshtml b/OnTopic.AspNetCore.Mvc.Host/Views/ContentList/LinkedList.cshtml
@@ -1,7 +1,7 @@
-@Html.PartialAsync("~/Views/ContentList/ContentList.cshtml")
+<partial name="~/Views/ContentList/ContentList.cshtml" />
 
 <!--
   Content Type: Content List
   View Type: Linked List
   View Location: ~/Views/ContentList/LinkedList.cshtml
--->
+-->
diff --git a/OnTopic.AspNetCore.Mvc.Host/Views/ContentTypes/Page.cshtml b/OnTopic.AspNetCore.Mvc.Host/Views/ContentTypes/Page.cshtml
@@ -5,4 +5,4 @@
 <!--
   Content Type: Page
   View Location: ~/ContentTypes/Page.cshtml
--->
+-->
diff --git a/OnTopic.AspNetCore.Mvc.Host/Views/ContentTypes/PageGroup.cshtml b/OnTopic.AspNetCore.Mvc.Host/Views/ContentTypes/PageGroup.cshtml
@@ -3,4 +3,4 @@
 <!--
   Content Type: PageGroup
   View Location: ~/ContentTypes/PageGroup.cshtml
--->
+-->
diff --git a/OnTopic.AspNetCore.Mvc.Host/Views/ContentTypes/Slideshow.cshtml b/OnTopic.AspNetCore.Mvc.Host/Views/ContentTypes/Slideshow.cshtml
@@ -0,0 +1,27 @@
+@model SlideshowTopicViewModel
+
+<partial name="_PageAttributes" />
+
+<h2>Attributes</h2>
+<ul>
+  <li>TransitionEffect: @Model.TransitionEffect</li>
+</ul>
+
+<h2>Collections</h2>
+
+<h3>Slides</h3>
+@foreach (var contentItem in Model.ContentItems) {
+  <h4>@contentItem.Key</h4>
+  <ul>
+    <li>Title: @contentItem.Title</li>
+    <li>Category: @contentItem.Category</li>
+    <li><a href="@contentItem.LearnMoreUrl">Learn More</a></li>
+    <li><img src="@contentItem.ThumbnailImage" /></li>
+    <li>Description: @contentItem.Description</li>
+  </ul>
+}
+
+<!--
+  Content Type: Slideshow
+  View Location: ~/Views/ContentTypes/Slideshow.cshtml
+-->
diff --git a/OnTopic.AspNetCore.Mvc.Host/Views/ContentTypes/Video.cshtml b/OnTopic.AspNetCore.Mvc.Host/Views/ContentTypes/Video.cshtml
@@ -11,4 +11,4 @@
 <!--
   Content Type: Video
   View Location: ~/Views/ContentTypes/Video.cshtml
--->
+-->
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,4 @@ @@
     <!--
       Content Type: Page
       View Location: ~/ContentTypes/Page.cshtml
-    -->
+    -->