3.8.1 (Patch): Return 301 for Nested Topics

Ignia.Topics.Data.Caching/Ignia.Topics.Data.Caching.csproj

@@ -48,14 +48,6 @@
     <TargetFrameworkProfile />
     <ShouldCreateLogs>True</ShouldCreateLogs>
     <AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
-    <UpdateAssemblyVersion>True</UpdateAssemblyVersion>
-    <UpdateAssemblyFileVersion>True</UpdateAssemblyFileVersion>
-    <UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
-    <AssemblyVersionSettings>None.None.Increment.None</AssemblyVersionSettings>
-    <UpdatePackageVersion>False</UpdatePackageVersion>
-    <AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
-    <InheritWinAppVersionFrom>None</InheritWinAppVersionFrom>
-    <AssemblyFileVersionSettings>None.None.Increment.None</AssemblyFileVersionSettings>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -158,8 +150,10 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.props'))" />
     <Error Condition="!Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets'))" />
+    <Error Condition="!Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets'))" />
   </Target>
   <Import Project="..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets" Condition="Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets')" />
+  <Import Project="..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Ignia.Topics.Data.Caching/Ignia.Topics.Data.Caching.nuspec

@@ -2,9 +2,9 @@
 <package >
   <metadata>
     <id>$id$</id>
-    <version>$version$</version>
+    <version>$SemVer$</version>
     <title>$title$</title>
-    <authors>Ignia</authors>
+    <authors>$author$</authors>
     <owners>JeremyCaney</owners>
     <projectUrl>https://github.com/Ignia/Topics-Library</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

Ignia.Topics.Data.Caching/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@
 >===============================================================================================================================
 | Declare and define attributes used in the compiling of the finished assembly.
 \-----------------------------------------------------------------------------------------------------------------------------*/
-[assembly: AssemblyCompany("Ignia, LLC")]
+[assembly: AssemblyCompany("Ignia")]
 [assembly: AssemblyCopyright("Copyright © 2018 Ignia, LLC")]
 [assembly: AssemblyProduct("Ignia OnTopic Library")]
 [assembly: AssemblyTitle("OnTopic Cached Repository")]
@@ -21,8 +21,6 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("3.6.1762.0")]
-[assembly: AssemblyFileVersion("3.5.1794.0")]
 [assembly: CLSCompliant(true)]
 [assembly: Guid("206b7f91-ca25-4e9d-9576-60d2e54a2c0a")]
 

Ignia.Topics.Data.Caching/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CodeContracts.MSBuild" version="1.12.0" targetFramework="net45" developmentDependency="true" />
+  <package id="GitVersionTask" version="3.6.5" targetFramework="net47" developmentDependency="true" />
 </packages>

Ignia.Topics.Data.Sql/Ignia.Topics.Data.Sql.csproj

@@ -208,8 +208,10 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.props'))" />
     <Error Condition="!Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets'))" />
+    <Error Condition="!Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets'))" />
   </Target>
   <Import Project="..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets" Condition="Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets')" />
+  <Import Project="..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Ignia.Topics.Data.Sql/Ignia.Topics.Data.Sql.nuspec

@@ -2,9 +2,9 @@
 <package >
   <metadata>
     <id>$id$</id>
-    <version>$version$</version>
+    <version>$SemVer$</version>
     <title>$title$</title>
-    <authors>Ignia</authors>
+    <authors>$author$</authors>
     <owners>JeremyCaney</owners>
     <projectUrl>https://github.com/Ignia/Topics-Library</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

Ignia.Topics.Data.Sql/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@
 >===============================================================================================================================
 | Declare and define attributes used in the compiling of the finished assembly.
 \-----------------------------------------------------------------------------------------------------------------------------*/
-[assembly: AssemblyCompany("Ignia, LLC")]
+[assembly: AssemblyCompany("Ignia")]
 [assembly: AssemblyCopyright("Copyright © 2018 Ignia, LLC")]
 [assembly: AssemblyProduct("Ignia OnTopic Library")]
 [assembly: AssemblyTitle("Ignia SQL Server Repository")]
@@ -21,7 +21,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("3.6.1739.0")]
-[assembly: AssemblyFileVersion("3.5.1763.0")]
 [assembly: CLSCompliant(true)]
 [assembly: Guid("1de1f923-c7c2-435b-b49a-975acbcb5ff0")]

Ignia.Topics.Data.Sql/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CodeContracts.MSBuild" version="1.12.0" targetFramework="net45" developmentDependency="true" />
+  <package id="GitVersionTask" version="3.6.5" targetFramework="net47" developmentDependency="true" />
 </packages>

Ignia.Topics.Tests/Ignia.Topics.Tests.csproj

@@ -22,14 +22,6 @@
     <TargetFrameworkProfile />
     <ShouldCreateLogs>True</ShouldCreateLogs>
     <AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
-    <UpdateAssemblyVersion>True</UpdateAssemblyVersion>
-    <UpdateAssemblyFileVersion>True</UpdateAssemblyFileVersion>
-    <UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
-    <AssemblyVersionSettings>None.None.Increment.None</AssemblyVersionSettings>
-    <UpdatePackageVersion>False</UpdatePackageVersion>
-    <AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
-    <InheritWinAppVersionFrom>None</InheritWinAppVersionFrom>
-    <AssemblyFileVersionSettings>None.None.Increment.None</AssemblyFileVersionSettings>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Ignia.Topics.Tests/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@
 >===============================================================================================================================
 | Declare and define attributes used in the compiling of the finished assembly.
 \-----------------------------------------------------------------------------------------------------------------------------*/
-[assembly: AssemblyCompany("Ignia, LLC")]
+[assembly: AssemblyCompany("Ignia")]
 [assembly: AssemblyCopyright("Copyright © 2018 Ignia, LLC")]
 [assembly: AssemblyProduct("Ignia OnTopic Library")]
 [assembly: AssemblyTitle("Ignia OnTopic Unit Tests")]
@@ -21,7 +21,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("3.6.1791.0")]
-[assembly: AssemblyFileVersion("3.5.1839.0")]
 [assembly: CLSCompliant(true)]
 [assembly: Guid("27632801-bfe3-41d9-8678-3c4bbe45e6c9")]

Ignia.Topics.ViewModels/Ignia.Topics.ViewModels.csproj

@@ -14,14 +14,8 @@
     <TargetFrameworkProfile />
     <ShouldCreateLogs>True</ShouldCreateLogs>
     <AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
-    <UpdateAssemblyVersion>True</UpdateAssemblyVersion>
-    <UpdateAssemblyFileVersion>True</UpdateAssemblyFileVersion>
-    <UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
-    <AssemblyVersionSettings>None.None.Increment.None</AssemblyVersionSettings>
-    <UpdatePackageVersion>False</UpdatePackageVersion>
-    <AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
-    <InheritWinAppVersionFrom>None</InheritWinAppVersionFrom>
-    <AssemblyFileVersionSettings>None.None.Increment.None</AssemblyFileVersionSettings>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -79,7 +73,15 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Ignia.Topics.ViewModels.nuspec" />
+    <None Include="packages.config" />
     <None Include="README.md" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets'))" />
+  </Target>
 </Project>

Ignia.Topics.ViewModels/Ignia.Topics.ViewModels.nuspec

@@ -2,9 +2,9 @@
 <package >
   <metadata>
     <id>$id$</id>
-    <version>$version$</version>
+    <version>$SemVer$</version>
     <title>$title$</title>
-    <authors>Ignia</authors>
+    <authors>$author$</authors>
     <owners>JeremyCaney</owners>
     <projectUrl>https://github.com/Ignia/Topics-Library</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

Ignia.Topics.ViewModels/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@
 >===============================================================================================================================
 | Declare and define attributes used in the compiling of the finished assembly.
 \-----------------------------------------------------------------------------------------------------------------------------*/
-[assembly: AssemblyCompany("Ignia, LLC")]
+[assembly: AssemblyCompany("Ignia")]
 [assembly: AssemblyCopyright("Copyright © 2018 Ignia, LLC")]
 [assembly: AssemblyProduct("Ignia OnTopic Library")]
 [assembly: AssemblyTitle("Ignia OnTopic View Models")]
@@ -21,8 +21,6 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("3.6.1762.0")]
-[assembly: AssemblyFileVersion("3.5.1793.0")]
 [assembly: CLSCompliant(true)]
 [assembly: Guid("e52fc633-b4c5-4a2b-8caf-30e756d7a6a7")]
 

Ignia.Topics.ViewModels/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="GitVersionTask" version="3.6.5" targetFramework="net47" developmentDependency="true" />
+</packages>

Ignia.Topics.Web.Mvc/Controllers/TopicController.cs

@@ -6,6 +6,7 @@
 using System;
 using System.Diagnostics.Contracts;
 using System.Linq;
+using System.Net;
 using System.Threading.Tasks;
 using System.Web.Mvc;
 using Ignia.Topics.Mapping;
@@ -151,7 +152,18 @@ protected override void OnActionExecuting(ActionExecutingContext filterContext)
       }
 
       /*------------------------------------------------------------------------------------------------------------------------
-      | Handle page group
+      | Handle nested topics
+      >-----------------------------------------------------------------------------------------------------------------------—-
+      | Nested topics are not expected to be viewed directly; if a user requests a nested topic, return a 403 to indicate that
+      | the request is valid, but forbidden.
+      \-----------------------------------------------------------------------------------------------------------------------*/
+      if (CurrentTopic.ContentType.Equals("List") || CurrentTopic.Parent.ContentType.Equals("List")) {
+        filterContext.Result = new HttpStatusCodeResult(HttpStatusCode.Forbidden);
+        return;
+      }
+
+      /*------------------------------------------------------------------------------------------------------------------------
+      | Handle page groups
       >-----------------------------------------------------------------------------------------------------------------------—-
       | PageGroups are a special content type for packaging multiple pages together. When a PageGroup is identified, the user is
       | redirected to the first (non-hidden, non-disabled) page in the page group.

Ignia.Topics.Web.Mvc/Ignia.Topics.Web.Mvc.csproj

@@ -17,14 +17,6 @@
     </NuGetPackageImportStamp>
     <ShouldCreateLogs>True</ShouldCreateLogs>
     <AdvancedSettingsExpanded>False</AdvancedSettingsExpanded>
-    <UpdateAssemblyVersion>True</UpdateAssemblyVersion>
-    <UpdateAssemblyFileVersion>True</UpdateAssemblyFileVersion>
-    <UpdateAssemblyInfoVersion>False</UpdateAssemblyInfoVersion>
-    <AssemblyVersionSettings>None.None.Increment.None</AssemblyVersionSettings>
-    <UpdatePackageVersion>False</UpdatePackageVersion>
-    <AssemblyInfoVersionType>SettingsVersion</AssemblyInfoVersionType>
-    <InheritWinAppVersionFrom>None</InheritWinAppVersionFrom>
-    <AssemblyFileVersionSettings>None.None.Increment.None</AssemblyFileVersionSettings>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -107,8 +99,10 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.props'))" />
     <Error Condition="!Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets'))" />
+    <Error Condition="!Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets'))" />
   </Target>
   <Import Project="..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets" Condition="Exists('..\packages\CodeContracts.MSBuild.1.12.0\build\CodeContracts.MSBuild.targets')" />
+  <Import Project="..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.6.5\build\dotnet\GitVersionTask.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Ignia.Topics.Web.Mvc/Ignia.Topics.Web.Mvc.nuspec

@@ -2,9 +2,9 @@
 <package >
   <metadata>
     <id>$id$</id>
-    <version>$version$</version>
+    <version>$SemVer$</version>
     <title>$title$</title>
-    <authors>Ignia</authors>
+    <authors>$author$</authors>
     <owners>JeremyCaney</owners>
     <projectUrl>https://github.com/Ignia/Topics-Library</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

Ignia.Topics.Web.Mvc/Properties/AssemblyInfo.cs

@@ -12,7 +12,7 @@
 >===============================================================================================================================
 | Declare and define attributes used in the compiling of the finished assembly.
 \-----------------------------------------------------------------------------------------------------------------------------*/
-[assembly: AssemblyCompany("Ignia, LLC")]
+[assembly: AssemblyCompany("Ignia")]
 [assembly: AssemblyCopyright("Copyright © 2015 Ignia, LLC")]
 [assembly: AssemblyProduct("Ignia OnTopic Library")]
 [assembly: AssemblyTitle("Ignia OnTopic MVC Library")]
@@ -21,7 +21,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("3.6.1767.0")]
-[assembly: AssemblyFileVersion("3.5.1799.0")]
 [assembly: CLSCompliant(true)]
 [assembly: Guid("3b3ce34d-b5e5-47ca-bfef-e6740650f378")]

Ignia.Topics.Web.Mvc/TopicViewEngine.cs

@@ -33,6 +33,8 @@ public TopicViewEngine(IViewPageActivator viewPageActivator = null) : base(viewP
 
       /*------------------------------------------------------------------------------------------------------------------------
       | Define view location
+      >-------------------------------------------------------------------------------------------------------------------------
+      | Supports the following replacement tokens: {0} Controller, {1} View, {2} Area, and {3} Content Type.
       \-----------------------------------------------------------------------------------------------------------------------*/
       var viewLocations = new[] {
         "~/Views/{3}/{1}.cshtml",
@@ -174,7 +176,7 @@ private static List<string> GetSearchPaths(ControllerContext controllerContext,
         area = routeData.GetRequiredString("area");
       }
       if (routeData.Values.ContainsKey("controller")) {
-        area = routeData.GetRequiredString("controller");
+        controller = routeData.GetRequiredString("controller");
       }
       if (routeData.Values.ContainsKey("contenttype")) {
         routeData.Values.TryGetValue("contenttype", out contentType);

Ignia.Topics.Web.Mvc/packages.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CodeContracts.MSBuild" version="1.12.0" targetFramework="net45" developmentDependency="true" />
+  <package id="GitVersionTask" version="3.6.5" targetFramework="net47" developmentDependency="true" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.4" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="3.2.4" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.4" targetFramework="net45" />