Merge pull request #53 from cloudscribe/develop

JimKerslake · web-flow · commit 520118656754 · 2025-05-01T17:43:52.000+01:00
v8.1 release
diff --git a/.github/workflows/cloudscribe-develop.yml b/.github/workflows/cloudscribe-develop.yml
@@ -6,6 +6,7 @@ name: cloudscribe-logging-develop-nuget-build
 on:
   push:
     branches: [ "develop" ]
+  workflow_dispatch:
 #   pull_request:
 #     branches: [ "develop" ]
 
@@ -30,3 +31,9 @@ jobs:
       run: dotnet pack -c Release
     - name: Publish NuGet package
       run: dotnet nuget push **/*.nupkg --source ${{ secrets.NUGET_SOURCE_URL }}
+    - name: Remote Repository Dispatch
+      uses: peter-evans/repository-dispatch@v3
+      with:
+        token: ${{ secrets.GHB_PAT }}
+        repository: GreatHouseBarn/cloudscribe-testing
+        event-type: cs.Logging
diff --git a/src/Demo.WebApp/Demo.WebApp.csproj b/src/Demo.WebApp/Demo.WebApp.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -24,16 +24,16 @@
   </ItemGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="cloudscribe.Core.Web" Version="8.0.0" />
-    <PackageReference Include="cloudscribe.Core.CompiledViews.Bootstrap3" Version="8.0.0" />
-    <PackageReference Include="cloudscribe.Core.Storage.EFCore.MSSQL" Version="8.0.0" />
-    <PackageReference Include="cloudscribe.Core.Storage.EFCore.MySql" Version="8.0.0" />
-    <PackageReference Include="cloudscribe.Core.Storage.EFCore.PostgreSql" Version="8.0.0" />
-    <PackageReference Include="cloudscribe.Core.Storage.EFCore.SQLite" Version="8.0.0" />
-    <PackageReference Include="cloudscribe.Core.Storage.NoDb" Version="8.0.0" />
-
-    <PackageReference Include="cloudscribe.Web.Localization" Version="8.0.0" />
-    <PackageReference Include="cloudscribe.Web.StaticFiles" Version="8.0.0" />
+    <PackageReference Include="cloudscribe.Core.Web" Version="8.1.*" />
+    <PackageReference Include="cloudscribe.Core.CompiledViews.Bootstrap3" Version="8.1.0" />
+    <PackageReference Include="cloudscribe.Core.Storage.EFCore.MSSQL" Version="8.1.0" />
+    <PackageReference Include="cloudscribe.Core.Storage.EFCore.MySql" Version="8.1.0" />
+    <PackageReference Include="cloudscribe.Core.Storage.EFCore.PostgreSql" Version="8.1.0" />
+    <PackageReference Include="cloudscribe.Core.Storage.EFCore.SQLite" Version="8.1.0" />
+    <PackageReference Include="cloudscribe.Core.Storage.NoDb" Version="8.1.0" />
+
+    <PackageReference Include="cloudscribe.Web.Localization" Version="8.1.0" />
+    <PackageReference Include="cloudscribe.Web.StaticFiles" Version="8.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/cloudscribe.Logging.EFCore.Common/cloudscribe.Logging.EFCore.Common.csproj b/src/cloudscribe.Logging.EFCore.Common/cloudscribe.Logging.EFCore.Common.csproj
@@ -1,8 +1,8 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Entity Framework Core implementation of cloudscribe ILogRepository</Description>
-    <Version>8.0.0</Version>
+    <Version>8.1.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;repositories;logging</PackageTags>
diff --git a/src/cloudscribe.Logging.EFCore.MSSQL/cloudscribe.Logging.EFCore.MSSQL.csproj b/src/cloudscribe.Logging.EFCore.MSSQL/cloudscribe.Logging.EFCore.MSSQL.csproj
@@ -1,8 +1,8 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>MSSQL Entity Framework Core implementation of cloudscribe ILogRepository</Description>
-    <Version>8.0.0</Version>
+    <Version>8.1.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;repositories;logging</PackageTags>
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="cloudscribe.Versioning" Version="8.0.0" /> 
+    <PackageReference Include="cloudscribe.Versioning" Version="8.1.0" /> 
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.0" />
diff --git a/src/cloudscribe.Logging.EFCore.MySql/cloudscribe.Logging.EFCore.MySql.csproj b/src/cloudscribe.Logging.EFCore.MySql/cloudscribe.Logging.EFCore.MySql.csproj
@@ -1,8 +1,8 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>MySQL Entity Framework Core implementation of cloudscribe ILogRepository</Description>
-    <Version>8.0.0</Version>
+    <Version>8.1.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;repositories;logging</PackageTags>
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="cloudscribe.Versioning" Version="8.0.0" />
+    <PackageReference Include="cloudscribe.Versioning" Version="8.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0" />
diff --git a/src/cloudscribe.Logging.EFCore.PostgreSql/cloudscribe.Logging.EFCore.PostgreSql.csproj b/src/cloudscribe.Logging.EFCore.PostgreSql/cloudscribe.Logging.EFCore.PostgreSql.csproj
@@ -1,8 +1,8 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>PostgreSql Entity Framework Core implementation of cloudscribe ILogRepository, using snake case tables and fields</Description>
-    <Version>8.0.0</Version>
+    <Version>8.1.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;repositories;logging</PackageTags>
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="cloudscribe.Versioning" Version="8.0.0" />
+    <PackageReference Include="cloudscribe.Versioning" Version="8.1.0" />
     <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" />
diff --git a/src/cloudscribe.Logging.EFCore.SQLite/cloudscribe.Logging.EFCore.SQLite.csproj b/src/cloudscribe.Logging.EFCore.SQLite/cloudscribe.Logging.EFCore.SQLite.csproj
@@ -1,8 +1,8 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>SQLite Entity Framework Core implementation of cloudscribe ILogRepository</Description>
-    <Version>8.0.0</Version>
+    <Version>8.1.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;repositories;logging</PackageTags>
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="cloudscribe.Versioning" Version="8.0.0" />
+    <PackageReference Include="cloudscribe.Versioning" Version="8.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
diff --git a/src/cloudscribe.Logging.EFCore.pgsql/cloudscribe.Logging.EFCore.pgsql.csproj b/src/cloudscribe.Logging.EFCore.pgsql/cloudscribe.Logging.EFCore.pgsql.csproj
@@ -1,8 +1,8 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>PostgreSql Entity Framework Core implementation of cloudscribe ILogRepository</Description>
-    <Version>8.0.0</Version>
+    <Version>8.1.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;repositories;logging</PackageTags>
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="cloudscribe.Versioning" Version="8.0.0" />
+    <PackageReference Include="cloudscribe.Versioning" Version="8.1.0" />
     <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" />
diff --git a/src/cloudscribe.Logging.NoDb/cloudscribe.Logging.NoDb.csproj b/src/cloudscribe.Logging.NoDb/cloudscribe.Logging.NoDb.csproj
@@ -1,8 +1,8 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>NoDb implementation of cloudscribe ILogRepository</Description>
-    <Version>8.0.0</Version>
+    <Version>8.1.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;repositories;logging</PackageTags>
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="cloudscribe.Versioning" Version="8.0.0" />
+    <PackageReference Include="cloudscribe.Versioning" Version="8.1.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
     
diff --git a/src/cloudscribe.Logging.Web/cloudscribe.Logging.Web.csproj b/src/cloudscribe.Logging.Web/cloudscribe.Logging.Web.csproj
@@ -1,8 +1,8 @@
-﻿<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
     <Description>An implementation of ILogger and ILoggerProvider that logs to the database using a pluggable model supporting multiple data platforms. Also proivides an MVC controller for viewing and managing the log data.</Description>
-    <Version>8.0.0</Version>
+    <Version>8.1.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
@@ -32,9 +32,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="cloudscribe.Versioning" Version="8.0.0" />
-    <PackageReference Include="cloudscribe.DateTimeUtils" Version="8.0.0" />
-    <PackageReference Include="cloudscribe.Web.Pagination" Version="8.0.0" />
+    <PackageReference Include="cloudscribe.Versioning" Version="8.1.0" />
+    <PackageReference Include="cloudscribe.DateTimeUtils" Version="8.1.0" />
+    <PackageReference Include="cloudscribe.Web.Pagination" Version="8.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.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.Logging/cloudscribe.Logging.csproj b/src/cloudscribe.Logging/cloudscribe.Logging.csproj
@@ -1,8 +1,8 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>An implementation of ILogger and ILoggerProvider that logs to the database using a pluggable model supporting multiple data platforms. Also proivides an MVC controller for viewing and managing the log data.</Description>
-    <Version>8.0.0</Version>
+    <Version>8.1.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>Joe Audette</Authors>
     <PackageTags>cloudscribe;logging;database</PackageTags>
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
     
-    <PackageReference Include="cloudscribe.Pagination.Models" Version="8.0.0" />
+    <PackageReference Include="cloudscribe.Pagination.Models" Version="8.1.0" />
     <PackageReference Include="NewtonSoft.Json" Version="13.0.3" />
   </ItemGroup>
 
diff --git a/update_version.ps1 b/update_version.ps1
@@ -0,0 +1,52 @@
+###################
+## PS script to implement a semantic versioning change from (say) 8.0.x to 8.1 
+## across all interdependent cs packages
+
+## Wherever we have <Version>8.0.n</Version> replace it to <Version>8.1.0</Version>     where n >= 0 
+
+## Wherever we have <PackageReference Include="cloudscribe.Anything" Version="8.0.*" /> replace it to  <PackageReference Include="cloudscribe.Anything" Version="8.1.*" />
+
+## Wherever we have <PackageReference Include="cloudscribe.Anything" Version="8.0.n" /> replace it to  <PackageReference Include="cloudscribe.Anything" Version="8.1.0" />  where n >= 0 
+
+## Exclude cloudscribe.HtmlAgilityPack and DbHelpers because those ones are ancient and frozen
+###################
+
+
+# Define the directory containing the .csproj files
+$directory = "src"
+
+# Define the old & new versions
+$oldVersion = '8\.1'   # slash needed !
+$newVersion = "8.2.0"
+$newWildcardVersion = "8.2.*"
+	
+
+# Get all .csproj files in the directory and subdirectories
+$csprojFiles = Get-ChildItem -Path $directory -Recurse -Filter *.csproj
+
+foreach ($file in $csprojFiles) {
+    # Read the content of the .csproj file
+    $content = Get-Content -Path $file.FullName
+
+    # Update the version of cloudscribe package references, except for cloudscribe.HtmlAgilityPack and cloudscribe.DbHelpers
+	
+	$wildCardPattern = '(?<=<PackageReference Include="cloudscribe\.(?!HtmlAgilityPack|DbHelpers)[^"]+" Version=")' + $oldVersion + '\.\*'
+	$updatedContent = $content -replace $wildCardPattern, $newWildcardVersion
+
+	$digitPattern = '(?<=<PackageReference Include="cloudscribe\.(?!HtmlAgilityPack|DbHelpers)[^"]+" Version=")' + $oldVersion + '\.\d+'
+	$updatedContent = $updatedContent -replace $digitPattern, $newVersion
+
+    # Update the <Version> element if it matches the pattern
+	$versionPattern = '<Version>' + $oldVersion + '\.\d+</Version>'
+	$replacement = "<Version>$newVersion</Version>"
+	$updatedContent = $updatedContent -replace $versionPattern, $replacement
+
+
+    # Write the updated content back to the .csproj file
+    Set-Content -Path $file.FullName -Value $updatedContent
+
+    Write-Host "Updated $file.FullName"
+}
+
+Write-Host "All cloudscribe package references (except cloudscribe.HtmlAgilityPack and cloudscribe.DbHelpers) and <Version> elements have been updated to version $newVersion or $newWildcardVersion as appropriate."
+
