diff --git a/src/NavigationDemo.Web/.npmrc b/src/NavigationDemo.Web/.npmrc new file mode 100644 index 0000000..1cc0b3c --- /dev/null +++ b/src/NavigationDemo.Web/.npmrc @@ -0,0 +1 @@ +registry=https://nexus2.esdm.co.uk/repository/ESDM-npm-proxy-cloudscribe/ diff --git a/src/NavigationDemo.Web/NavigationDemo.Web.csproj b/src/NavigationDemo.Web/NavigationDemo.Web.csproj index 066503c..ee18498 100644 --- a/src/NavigationDemo.Web/NavigationDemo.Web.csproj +++ b/src/NavigationDemo.Web/NavigationDemo.Web.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 false @@ -18,7 +18,7 @@ - + diff --git a/src/NavigationDemo.Web/Startup.cs b/src/NavigationDemo.Web/Startup.cs index ce3b524..5e342c0 100644 --- a/src/NavigationDemo.Web/Startup.cs +++ b/src/NavigationDemo.Web/Startup.cs @@ -60,11 +60,7 @@ public void ConfigureServices(IServiceCollection services) services.AddMvc() .AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix) .AddDataAnnotationsLocalization() - .AddRazorOptions(options => - { - - }) - .SetCompatibilityVersion(CompatibilityVersion.Version_3_0) + .AddRazorOptions(options => {}) ; services.AddControllersWithViews(); diff --git a/src/RazorPages.WebApp/RazorPages.WebApp.csproj b/src/RazorPages.WebApp/RazorPages.WebApp.csproj index e52fc85..4d69646 100644 --- a/src/RazorPages.WebApp/RazorPages.WebApp.csproj +++ b/src/RazorPages.WebApp/RazorPages.WebApp.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 aspnet-RazorPages.WebApp-0BEB55BD-36A5-4CAC-A1C9-81104294AB20 InProcess false diff --git a/src/RazorPages.WebApp/Startup.cs b/src/RazorPages.WebApp/Startup.cs index fa1e2a7..6f3bdf6 100644 --- a/src/RazorPages.WebApp/Startup.cs +++ b/src/RazorPages.WebApp/Startup.cs @@ -107,12 +107,7 @@ public void ConfigureServices(IServiceCollection services) services.AddMvc() .AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix) .AddDataAnnotationsLocalization() - .AddRazorOptions(options => - { - - }) - .SetCompatibilityVersion(CompatibilityVersion.Version_3_0) - ; + .AddRazorOptions(options => {}); } diff --git a/src/cloudscribe.Web.Navigation/CachingNavigationViewComponent.cs b/src/cloudscribe.Web.Navigation/CachingNavigationViewComponent.cs index 82f2cd1..064b660 100644 --- a/src/cloudscribe.Web.Navigation/CachingNavigationViewComponent.cs +++ b/src/cloudscribe.Web.Navigation/CachingNavigationViewComponent.cs @@ -22,7 +22,6 @@ public CachingNavigationViewComponent( IEnumerable permissionResolvers, IEnumerable nodeFinders, IUrlHelperFactory urlHelperFactory, - IActionContextAccessor actionContextAccesor, INodeUrlPrefixProvider prefixProvider, ILogger logger, IDOMTreeCache DomCache, @@ -34,7 +33,6 @@ public CachingNavigationViewComponent( _permissionResolvers = permissionResolvers; _nodeFinders = nodeFinders; _urlHelperFactory = urlHelperFactory; - _actionContextAccesor = actionContextAccesor; _prefixProvider = prefixProvider; _log = logger; _domCache = DomCache; @@ -52,7 +50,6 @@ public CachingNavigationViewComponent( private IEnumerable _permissionResolvers; private IEnumerable _nodeFinders; private IUrlHelperFactory _urlHelperFactory; - private IActionContextAccessor _actionContextAccesor; private INodeUrlPrefixProvider _prefixProvider; @@ -101,7 +98,7 @@ public async Task InvokeAsync(string viewName, model = await CreateNavigationTree(filterName, startingNodeKey); ViewEngineResult viewResult = null; - var actionContext = _actionContextAccesor.ActionContext; + var actionContext = ViewContext; var tempData = new TempDataDictionary(actionContext.HttpContext, _tempDataProvider); string fullViewName = $"Components/CachingNavigation/{viewName}"; @@ -161,7 +158,7 @@ public async Task InvokeAsync(string viewName, private async Task CreateNavigationTree(string filterName, string startingNodeKey) { var rootNode = await _builder.GetTree(); - var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccesor.ActionContext); + var urlHelper = _urlHelperFactory.GetUrlHelper(ViewContext); NavigationViewModel model = new NavigationViewModel( startingNodeKey, filterName, diff --git a/src/cloudscribe.Web.Navigation/NavigationViewComponent.cs b/src/cloudscribe.Web.Navigation/NavigationViewComponent.cs index 5448ef2..42a7d05 100644 --- a/src/cloudscribe.Web.Navigation/NavigationViewComponent.cs +++ b/src/cloudscribe.Web.Navigation/NavigationViewComponent.cs @@ -21,7 +21,6 @@ public NavigationViewComponent( IEnumerable permissionResolvers, IEnumerable nodeFinders, IUrlHelperFactory urlHelperFactory, - IActionContextAccessor actionContextAccesor, INodeUrlPrefixProvider prefixProvider, ILogger logger) { @@ -29,7 +28,6 @@ public NavigationViewComponent( _permissionResolvers = permissionResolvers; _nodeFinders = nodeFinders; _urlHelperFactory = urlHelperFactory; - _actionContextAccesor = actionContextAccesor; _prefixProvider = prefixProvider; _log = logger; @@ -40,7 +38,6 @@ public NavigationViewComponent( private IEnumerable _permissionResolvers; private IEnumerable _nodeFinders; private IUrlHelperFactory _urlHelperFactory; - private IActionContextAccessor _actionContextAccesor; private INodeUrlPrefixProvider _prefixProvider; @@ -53,7 +50,7 @@ public async Task InvokeAsync(string viewName, string filt } var rootNode = await _builder.GetTree(); - var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccesor.ActionContext); + var urlHelper = _urlHelperFactory.GetUrlHelper(ViewContext); NavigationViewModel model = new NavigationViewModel( startingNodeKey, filterName, diff --git a/src/cloudscribe.Web.Navigation/ServiceCollectionExtensions.cs b/src/cloudscribe.Web.Navigation/ServiceCollectionExtensions.cs index ab34fc1..5238b5a 100644 --- a/src/cloudscribe.Web.Navigation/ServiceCollectionExtensions.cs +++ b/src/cloudscribe.Web.Navigation/ServiceCollectionExtensions.cs @@ -25,7 +25,6 @@ public static IServiceCollection AddCloudscribeNavigation( services.TryAddSingleton(); } - services.TryAddSingleton(); services.TryAddSingleton(); services.TryAddScoped(); diff --git a/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj b/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj index 4fa774d..a2c803b 100644 --- a/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj +++ b/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj @@ -2,8 +2,8 @@ an ASP.NET Core viewcomponent for menus and breadcrumbs - 8.7.0 - net8.0 + 10.0.0 + net10.0 Joe Audette true cloudscribe;asp.net core;mvcsitemapprovider;navigation;menus;breadcrumbs;bootstrap @@ -29,11 +29,11 @@ - - - - - + + + + + diff --git a/src/cloudscribe.Web.SiteMap.FromNavigation/NavigationTreeSiteMapNodeService.cs b/src/cloudscribe.Web.SiteMap.FromNavigation/NavigationTreeSiteMapNodeService.cs index aa73794..a806db8 100644 --- a/src/cloudscribe.Web.SiteMap.FromNavigation/NavigationTreeSiteMapNodeService.cs +++ b/src/cloudscribe.Web.SiteMap.FromNavigation/NavigationTreeSiteMapNodeService.cs @@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.Routing; +using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Logging; using System.Collections.Generic; using System.Threading; @@ -32,13 +33,11 @@ public NavigationTreeSiteMapNodeService( NavigationTreeBuilderService siteMapTreeBuilder, IEnumerable permissionResolvers, IUrlHelperFactory urlHelperFactory, - IActionContextAccessor actionContextAccesor, IHttpContextAccessor contextAccessor, ILogger logger) { this.siteMapTreeBuilder = siteMapTreeBuilder; this.urlHelperFactory = urlHelperFactory; - this.actionContextAccesor = actionContextAccesor; this.contextAccessor = contextAccessor; this.permissionResolvers = permissionResolvers; log = logger; @@ -46,7 +45,6 @@ public NavigationTreeSiteMapNodeService( private NavigationTreeBuilderService siteMapTreeBuilder; private IUrlHelperFactory urlHelperFactory; - private IActionContextAccessor actionContextAccesor; private ILogger log; private IHttpContextAccessor contextAccessor; private string baseUrl = string.Empty; @@ -86,7 +84,8 @@ public async Task> GetSiteMapNodes( { var rootNode = await siteMapTreeBuilder.GetTree(); var mapNodes = new List(); - var urlHelper = urlHelperFactory.GetUrlHelper(actionContextAccesor.ActionContext); + var actionContext = new ActionContext(contextAccessor.HttpContext, contextAccessor.HttpContext.GetRouteData(), new Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor()); + var urlHelper = urlHelperFactory.GetUrlHelper(actionContext); foreach (var navNode in rootNode.Flatten()) { if (navNode.ExcludeFromSearchSiteMap) continue; 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 61680ab..7c15475 100644 --- a/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj +++ b/src/cloudscribe.Web.SiteMap.FromNavigation/cloudscribe.Web.SiteMap.FromNavigation.csproj @@ -2,8 +2,8 @@ cloudscribe.Web.SiteMap.FromNavigation a library that implements ISiteMapNodeService using existing tree of nodes from cloudscribe.Web.Navigation.NavigationTreeBuilderService - 8.7.0 - net8.0 + 10.0.0 + net10.0 Joe Audette cloudscribe;mvc;sitemap icon.png diff --git a/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj b/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj index d03bda4..58313b9 100644 --- a/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj +++ b/src/cloudscribe.Web.SiteMap/cloudscribe.Web.SiteMap.csproj @@ -2,8 +2,8 @@ ASP.NET Core controller and models for generating an xml sitemap for search indexes http://www.sitemaps.org - 8.7.0 - net8.0 + 10.0.0 + net10.0 Joe Audette cloudscribe.Web.SiteMap @@ -31,8 +31,8 @@ - - + + diff --git a/test/cloudscribe.Web.Navigation.Test/cloudscribe.Web.Navigation.Test.csproj b/test/cloudscribe.Web.Navigation.Test/cloudscribe.Web.Navigation.Test.csproj index 5ba0d7a..f296dbf 100644 --- a/test/cloudscribe.Web.Navigation.Test/cloudscribe.Web.Navigation.Test.csproj +++ b/test/cloudscribe.Web.Navigation.Test/cloudscribe.Web.Navigation.Test.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 false @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/update_version.ps1 b/update_version.ps1 index f1488b0..d8f11bb 100644 --- a/update_version.ps1 +++ b/update_version.ps1 @@ -16,9 +16,9 @@ $directory = "src" # Define the old & new versions -$oldVersion = '8\.6' # slash needed ! -$newVersion = "8.7.0" -$newWildcardVersion = "8.7.*" +$oldVersion = '8\.7' # slash needed ! +$newVersion = "8.8.0" +$newWildcardVersion = "8.8.*" # Get all .csproj files in the directory and subdirectories