From 687789fdeed4db483624dd898ce8d232a762fad1 Mon Sep 17 00:00:00 2001 From: Jim Kerslake <39943820+JimKerslake@users.noreply.github.com> Date: Mon, 3 Mar 2025 11:54:45 +0000 Subject: [PATCH 1/5] CI test commit --- src/NavigationDemo.Web/NavigationDemo.Web.csproj | 2 +- src/RazorPages.WebApp/RazorPages.WebApp.csproj | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/NavigationDemo.Web/NavigationDemo.Web.csproj b/src/NavigationDemo.Web/NavigationDemo.Web.csproj index 1a3352d..4532a01 100644 --- a/src/NavigationDemo.Web/NavigationDemo.Web.csproj +++ b/src/NavigationDemo.Web/NavigationDemo.Web.csproj @@ -2,7 +2,7 @@ net8.0 - + false diff --git a/src/RazorPages.WebApp/RazorPages.WebApp.csproj b/src/RazorPages.WebApp/RazorPages.WebApp.csproj index 8dc9d48..fa7e685 100644 --- a/src/RazorPages.WebApp/RazorPages.WebApp.csproj +++ b/src/RazorPages.WebApp/RazorPages.WebApp.csproj @@ -4,6 +4,7 @@ net8.0 aspnet-RazorPages.WebApp-0BEB55BD-36A5-4CAC-A1C9-81104294AB20 InProcess + false From 9546e82dbc19db15efaf12c568f04274082e149a Mon Sep 17 00:00:00 2001 From: Simon Annetts Date: Thu, 6 Mar 2025 16:14:38 +0000 Subject: [PATCH 2/5] Update cloudscribe-develop.yml --- .github/workflows/cloudscribe-develop.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/cloudscribe-develop.yml b/.github/workflows/cloudscribe-develop.yml index c308427..1e8e52b 100644 --- a/.github/workflows/cloudscribe-develop.yml +++ b/.github/workflows/cloudscribe-develop.yml @@ -6,6 +6,7 @@ name: cloudscribe-navigation-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.Web.Navigation From 984398dd12a5c3a3a76f3a14f29c59dd9f67a1a8 Mon Sep 17 00:00:00 2001 From: Jim Kerslake <39943820+JimKerslake@users.noreply.github.com> Date: Fri, 28 Mar 2025 14:14:58 +0000 Subject: [PATCH 3/5] v8.1 increments --- src/NavigationDemo.Web/NavigationDemo.Web.csproj | 4 ++-- .../cloudscribe.Web.Navigation.csproj | 4 ++-- .../cloudscribe.Web.SiteMap.FromNavigation.csproj | 4 ++-- src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/NavigationDemo.Web/NavigationDemo.Web.csproj b/src/NavigationDemo.Web/NavigationDemo.Web.csproj index 4532a01..9a64dc6 100644 --- a/src/NavigationDemo.Web/NavigationDemo.Web.csproj +++ b/src/NavigationDemo.Web/NavigationDemo.Web.csproj @@ -1,4 +1,4 @@ - + net8.0 @@ -18,7 +18,7 @@ - + diff --git a/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj b/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj index cfd3ca2..b1d069d 100644 --- a/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj +++ b/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj @@ -1,8 +1,8 @@ - + an ASP.NET Core viewcomponent for menus and breadcrumbs - 8.0.0 + 8.1.0 net8.0 Joe Audette true diff --git a/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj b/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj index ee70a81..9eb4d7b 100644 --- a/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj +++ b/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj @@ -1,8 +1,8 @@ - + cloudscribe.Web.SiteMap.FromNavigation a library that implements ISiteMapNodeService using existing tree of nodes from cloudscribe.Web.Navigation.NavigationTreeBuilderService - 8.0.0 + 8.1.0 net8.0 Joe Audette cloudscribe;mvc;sitemap diff --git a/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj b/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj index 035efc3..a3c6b3d 100644 --- a/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj +++ b/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj @@ -1,8 +1,8 @@ - + ASP.NET Core controller and models for generating an xml sitemap for search indexes http://www.sitemaps.org - 8.0.0 + 8.1.0 net8.0 Joe Audette From 8901d3a979b67b5d8e1510558582b8dc912c0f42 Mon Sep 17 00:00:00 2001 From: Jim Kerslake <39943820+JimKerslake@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:04:50 +0100 Subject: [PATCH 4/5] #135 trailing slash bug --- .../TreeNodeExtensions.cs | 2 +- update_version.ps1 | 43 +++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 update_version.ps1 diff --git a/src/cloudscribe.Web.Navigation/TreeNodeExtensions.cs b/src/cloudscribe.Web.Navigation/TreeNodeExtensions.cs index 98fb44a..ff67e52 100644 --- a/src/cloudscribe.Web.Navigation/TreeNodeExtensions.cs +++ b/src/cloudscribe.Web.Navigation/TreeNodeExtensions.cs @@ -32,7 +32,7 @@ public static TreeNode FindByUrlExact( if (!string.IsNullOrEmpty(n.Value.Url)) { - if (n.Value.Url.Equals(urlToMatch, StringComparison.OrdinalIgnoreCase)) + if (n.Value.Url.Equals(urlToMatch.TrimEnd('/'), StringComparison.OrdinalIgnoreCase)) { return true; } } diff --git a/update_version.ps1 b/update_version.ps1 new file mode 100644 index 0000000..644cf46 --- /dev/null +++ b/update_version.ps1 @@ -0,0 +1,43 @@ +################### +## PS script to implement a semantic versioning change from (say) 8.0.x to 8.1 +## across all interdependent cs packages + +## Wherever we have 8.0.n replace it to 8.1.0 where n >= 0 + +## Wherever we have replace it to + +## Wherever we have replace it to 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 new version +$newVersion = "8.1.0" +$newWildcardVersion = "8.1.*" + +# 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 + $updatedContent = $content -replace '(?<=$newVersion" + + # 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 elements have been updated to version $newVersion or $newWildcardVersion as appropriate." + From 866f388059223c345a2d1afab43087b598c2d3db Mon Sep 17 00:00:00 2001 From: Jim Kerslake <39943820+JimKerslake@users.noreply.github.com> Date: Thu, 1 May 2025 15:25:13 +0100 Subject: [PATCH 5/5] Update update_version.ps1 --- update_version.ps1 | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/update_version.ps1 b/update_version.ps1 index 644cf46..1e4919a 100644 --- a/update_version.ps1 +++ b/update_version.ps1 @@ -15,9 +15,11 @@ # Define the directory containing the .csproj files $directory = "src" -# Define the new version -$newVersion = "8.1.0" -$newWildcardVersion = "8.1.*" +# 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 @@ -27,11 +29,18 @@ foreach ($file in $csprojFiles) { $content = Get-Content -Path $file.FullName # Update the version of cloudscribe package references, except for cloudscribe.HtmlAgilityPack and cloudscribe.DbHelpers - $updatedContent = $content -replace '(?<=$newVersion" + $updatedContent = $updatedContent -replace $versionPattern, $replacement - # Update the element if it matches the 8.0.* pattern - $updatedContent = $updatedContent -replace '8\.0\.\d+', "$newVersion" # Write the updated content back to the .csproj file Set-Content -Path $file.FullName -Value $updatedContent