Merge pull request #660 from cloudscribe/develop

JimKerslake · web-flow · commit dd79cb9bf05a · 2025-09-22T15:55:51.000+01:00
v8.5
diff --git a/src/cloudscribe.ContentUtils/cloudscribe.ContentUtils.csproj b/src/cloudscribe.ContentUtils/cloudscribe.ContentUtils.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Content utilities for html and markdown</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;blog,content</PackageTags>
diff --git a/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4.csproj b/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap4.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Bootstrap 4 pre-compiled views for cloudscribe Core and SimpleContent integration</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
diff --git a/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/VersionProvider.cs b/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/VersionProvider.cs
@@ -0,0 +1,31 @@
+﻿using System;
+using System.Reflection;
+using cloudscribe.Versioning;
+using cloudscribe.Web.Common;
+
+namespace cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5
+{
+    public class VersionProvider : IVersionProvider
+    {
+        public string Name { get { return "cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5"; } }
+
+        public Guid ApplicationId { get { return new Guid("f93067b4-919d-4910-acd1-4b3b1c210ecf"); } }
+
+        public Version CurrentVersion
+        {
+
+            get
+            {
+
+                var version = new Version(2, 0, 0, 0);
+                var versionString = typeof(CloudscribeCommonResources).Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
+                if (!string.IsNullOrWhiteSpace(versionString))
+                {
+                    Version.TryParse(versionString, out version);
+                }
+
+                return version;
+            }
+        }
+    }
+}
diff --git a/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5.csproj b/src/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.Core.SimpleContent.CompiledViews.Bootstrap5.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Bootstrap 5 pre-compiled views for cloudscribe Core and SimpleContent integration</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
diff --git a/src/cloudscribe.Core.SimpleContent/StartupExtenstions.cs b/src/cloudscribe.Core.SimpleContent/StartupExtenstions.cs
@@ -5,6 +5,7 @@
 using cloudscribe.SimpleContent.Models;
 using cloudscribe.SimpleContent.Web.Design;
 using cloudscribe.SimpleContent.Web.TagHelpers;
+using cloudscribe.Versioning;
 using cloudscribe.Web.Navigation.Caching;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Configuration;
@@ -34,7 +35,7 @@ public static IServiceCollection AddCloudscribeCoreIntegrationForSimpleContent(
             services.AddScoped<ITreeCacheKeyResolver, SiteNavigationCacheKeyResolver>();
             services.AddScoped<IHandleRoleUpdated, HandleRoleUpdated>();
             services.AddScoped<IHandleRoleDeleted, HandleRoleDeleted>();
-            
+            services.AddScoped<IVersionProvider, VersionProvider>();
 
             if (configuration != null)
             {
diff --git a/src/cloudscribe.Core.SimpleContent/VersionProvider.cs b/src/cloudscribe.Core.SimpleContent/VersionProvider.cs
@@ -0,0 +1,38 @@
+﻿using cloudscribe.Core.SimpleContent.Integration;
+using cloudscribe.Versioning;
+using cloudscribe.Web.Common;
+using System;
+using System.Reflection;
+
+namespace cloudscribe.Core.SimpleContent
+{
+    public class VersionProvider : IVersionProvider
+    {
+        private Assembly assembly = typeof(AuthorNameResolver).Assembly;
+
+        public string Name
+        {
+            get { return assembly.GetName().Name; }
+
+        }
+
+        public Guid ApplicationId { get { return new Guid("f94177b4-919d-4910-acd1-4b3b1c210ecf"); } }
+
+        public Version CurrentVersion
+        {
+
+            get
+            {
+
+                var version = new Version(2, 0, 0, 0);
+                var versionString = typeof(CloudscribeCommonResources).Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
+                if (!string.IsNullOrWhiteSpace(versionString))
+                {
+                    Version.TryParse(versionString, out version);
+                }
+
+                return version;
+            }
+        }
+    }
+}
diff --git a/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj b/src/cloudscribe.Core.SimpleContent/cloudscribe.Core.SimpleContent.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>integration library for integrating cloudscribe SimpleContent with cloudscribe Core multi-tenant web app foundation</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;blog</PackageTags>
@@ -29,12 +29,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="cloudscribe.Core.Models" Version="8.4.0" />
-    <PackageReference Include="cloudscribe.Core.Identity" Version="8.4.0" />
-    <PackageReference Include="cloudscribe.Core.Web" Version="8.4.0" />
-    <PackageReference Include="cloudscribe.Web.Common" Version="8.4.0" />
-    <PackageReference Include="cloudscribe.FileManager.Web" Version="8.4.0" />
-    <PackageReference Include="cloudscribe.Syndication.Web" Version="8.4.0" />
+    <PackageReference Include="cloudscribe.Core.Models" Version="8.5.0" />
+    <PackageReference Include="cloudscribe.Core.Identity" Version="8.5.0" />
+    <PackageReference Include="cloudscribe.Core.Web" Version="8.5.0" />
+    <PackageReference Include="cloudscribe.Web.Common" Version="8.5.0" />
+    <PackageReference Include="cloudscribe.FileManager.Web" Version="8.5.0" />
+    <PackageReference Include="cloudscribe.Syndication.Web" Version="8.5.0" />
 
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />
diff --git a/src/cloudscribe.MetaWeblog/cloudscribe.MetaWeblog.csproj b/src/cloudscribe.MetaWeblog/cloudscribe.MetaWeblog.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>a re-useable implementation of the metaweblog api for asp.net core</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;metaweblog;api;asp.net core</PackageTags>
diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.SimpleContent.CompiledViews.Bootstrap4.csproj b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap4/cloudscribe.SimpleContent.CompiledViews.Bootstrap4.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Bootstrap 4 pre-compiled views for cloudscribe.SimpleContent.Web</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/VersionProvider.cs b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/VersionProvider.cs
@@ -0,0 +1,31 @@
+﻿using cloudscribe.Versioning;
+using cloudscribe.Web.Common;
+using System;
+using System.Reflection;
+
+namespace cloudscribe.SimpleContent.CompiledViews.Bootstrap5
+{
+    public class VersionProvider : IVersionProvider
+    {
+        public string Name { get { return "cloudscribe.SimpleContent.CompiledViews.Bootstrap5"; } }
+
+        public Guid ApplicationId { get { return new Guid("f94067b4-919d-4910-acd1-4b3b1c210ecf"); } }
+
+        public Version CurrentVersion
+        {
+
+            get
+            {
+
+                var version = new Version(2, 0, 0, 0);
+                var versionString = typeof(CloudscribeCommonResources).Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
+                if (!string.IsNullOrWhiteSpace(versionString))
+                {
+                    Version.TryParse(versionString, out version);
+                }
+
+                return version;
+            }
+        }
+    }
+}
diff --git a/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj b/src/cloudscribe.SimpleContent.CompiledViews.Bootstrap5/cloudscribe.SimpleContent.CompiledViews.Bootstrap5.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Bootstrap 5 pre-compiled views for cloudscribe.SimpleContent.Web</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
diff --git a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4.csproj b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4/cloudscribe.SimpleContent.ContentTemplates.Bootstrap4.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>A set of Content Templates for cloudscribe.SimpleContent using Bootstrap 4</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
diff --git a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/StartupExtensions.cs b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/StartupExtensions.cs
@@ -1,6 +1,8 @@
-﻿using cloudscribe.SimpleContent.ContentTemplates.Configuration;
+﻿using cloudscribe.SimpleContent.ContentTemplates.Bootstrap5;
+using cloudscribe.SimpleContent.ContentTemplates.Configuration;
 using cloudscribe.SimpleContent.ContentTemplates.Services;
 using cloudscribe.SimpleContent.Models;
+using cloudscribe.Versioning;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
@@ -26,7 +28,7 @@ IConfiguration configuration
 
             services.Configure<ImageWithContentOptions>(configuration.GetSection("ContentTemplateSettings:ImageWithContentOptions"));
             services.TryAddScoped<IImageWithContentOptionsProvider, ConfigImageWithContentOptionsProvider>();
-
+            services.AddScoped<IVersionProvider, VersionProvider>();
 
 
 
diff --git a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/VersionProvider.cs b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/VersionProvider.cs
@@ -0,0 +1,37 @@
+﻿using cloudscribe.Versioning;
+using cloudscribe.Web.Common;
+using System;
+using System.Reflection;
+
+namespace cloudscribe.SimpleContent.ContentTemplates.Bootstrap5
+{
+    public class VersionProvider : IVersionProvider
+    {
+        private Assembly assembly = typeof(ContentTemplateResources).Assembly;
+
+        public string Name
+        {
+            get { return assembly.GetName().Name; }
+
+        }
+
+        public Guid ApplicationId { get { return new Guid("f94167b4-919d-4910-acd1-4b3b1c210ecf"); } }
+
+        public Version CurrentVersion
+        {
+
+            get
+            {
+
+                var version = new Version(2, 0, 0, 0);
+                var versionString = typeof(CloudscribeCommonResources).Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
+                if (!string.IsNullOrWhiteSpace(versionString))
+                {
+                    Version.TryParse(versionString, out version);
+                }
+
+                return version;
+            }
+        }
+    }
+}
diff --git a/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5.csproj b/src/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5/cloudscribe.SimpleContent.ContentTemplates.Bootstrap5.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>A set of Content Templates for cloudscribe.SimpleContent using Bootstrap 5</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
diff --git a/src/cloudscribe.SimpleContent.MetaWeblog/cloudscribe.SimpleContent.MetaWeblog.csproj b/src/cloudscribe.SimpleContent.MetaWeblog/cloudscribe.SimpleContent.MetaWeblog.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>cloudscribe.SimpleContent.MetaWeblog Class Library</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;metaweblog;blog;cms</PackageTags>
@@ -26,9 +26,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
-    <PackageReference Include="cloudscribe.DateTimeUtils" Version="8.4.0" />
-    <PackageReference Include="cloudscribe.Web.Navigation" Version="8.4.0" />
-    <PackageReference Include="cloudscribe.Versioning" Version="8.4.0" />
+    <PackageReference Include="cloudscribe.DateTimeUtils" Version="8.5.0" />
+    <PackageReference Include="cloudscribe.Web.Navigation" Version="8.5.0" />
+    <PackageReference Include="cloudscribe.Versioning" Version="8.5.0" />
   </ItemGroup>
   <ItemGroup>
     <None Include="README.md" Pack="true" PackagePath="/" />
diff --git a/src/cloudscribe.SimpleContent.Models/cloudscribe.SimpleContent.Models.csproj b/src/cloudscribe.SimpleContent.Models/cloudscribe.SimpleContent.Models.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>cloudscribe.SimpleContent.Models Class Library</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;blog;cms</PackageTags>
@@ -25,7 +25,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="cloudscribe.Pagination.Models" Version="8.4.0" />
+    <PackageReference Include="cloudscribe.Pagination.Models" Version="8.5.0" />
 
     <PackageReference Include="System.Security.Claims" Version="4.3.0" />
   </ItemGroup>
diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.Common/cloudscribe.SimpleContent.Storage.EFCore.Common.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.Common/cloudscribe.SimpleContent.Storage.EFCore.Common.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>base package - Entity Framework Core implementation of cloudscribe SimpleContent commands and queries</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;commands;queries;ef</PackageTags>
diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.MSSQL/cloudscribe.SimpleContent.Storage.EFCore.MSSQL.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.MSSQL/cloudscribe.SimpleContent.Storage.EFCore.MSSQL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MSSQL Entity Framework Core implementation of cloudscribe SimpleContent commands and queries</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;commands;queries;ef</PackageTags>
diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.MySQL/cloudscribe.SimpleContent.Storage.EFCore.MySQL.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.MySQL/cloudscribe.SimpleContent.Storage.EFCore.MySQL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>MySQL Entity Framework Core implementation of cloudscribe SimpleContent commands and queries</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;commands;queries;ef</PackageTags>
diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql/cloudscribe.SimpleContent.Storage.EFCore.PostgreSql.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>PostgreSql Entity Framework Core implementation of cloudscribe SimpleContent commands and queries</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;commands;queries;ef</PackageTags>
@@ -28,7 +28,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
-    <PackageReference Include="cloudscribe.EFCore.PostgreSql.Conventions" Version="8.4.0" />
+    <PackageReference Include="cloudscribe.EFCore.PostgreSql.Conventions" Version="8.5.0" />
   </ItemGroup>
   <ItemGroup>
     <None Include="README.md" Pack="true" PackagePath="/" />
diff --git a/src/cloudscribe.SimpleContent.Storage.EFCore.SQLite/cloudscribe.SimpleContent.Storage.EFCore.SQLite.csproj b/src/cloudscribe.SimpleContent.Storage.EFCore.SQLite/cloudscribe.SimpleContent.Storage.EFCore.SQLite.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>SQLite Entity Framework Core implementation of cloudscribe SimpleContent commands and queries</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;commands;queries;ef</PackageTags>
diff --git a/src/cloudscribe.SimpleContent.Storage.NoDb/cloudscribe.SimpleContent.Storage.NoDb.csproj b/src/cloudscribe.SimpleContent.Storage.NoDb/cloudscribe.SimpleContent.Storage.NoDb.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>cloudscribe.SimpleContent.Storage implemented with NoDb file system storage</Description>
-    <Version>8.4.0</Version>
+    <Version>8.5.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;blog;json</PackageTags>
diff --git a/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj b/src/cloudscribe.SimpleContent.Syndication/cloudscribe.SimpleContent.Syndication.csproj
diff --git a/src/cloudscribe.SimpleContent.Web/VersionInfo.cs b/src/cloudscribe.SimpleContent.Web/VersionInfo.cs
diff --git a/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj b/src/cloudscribe.SimpleContent.Web/cloudscribe.SimpleContent.Web.csproj
diff --git a/src/sourceDev.WebApp/Config/CloudscribeFeatures.cs b/src/sourceDev.WebApp/Config/CloudscribeFeatures.cs
diff --git a/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json b/src/sourceDev.WebApp/nodb_storage/projects/f83067b4-919d-4910-acd1-4b3b1c210ecf/siteuser/17595de8-d27a-4304-bded-76b61a16ad19.json
diff --git a/src/sourceDev.WebApp/sourceDev.WebApp.csproj b/src/sourceDev.WebApp/sourceDev.WebApp.csproj
diff --git a/update_version.ps1 b/update_version.ps1
