Skip to content

Commit c92d8c3

Browse files
JimKerslakeJimKerslake
authored
Merge pull request #156 from cloudscribe/develop
master v10
2 parents 442c0ae + 40a14a2 commit c92d8c3

14 files changed

Lines changed: 33 additions & 49 deletions

‎src/NavigationDemo.Web/.npmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
registry=https://nexus2.esdm.co.uk/repository/ESDM-npm-proxy-cloudscribe/

‎src/NavigationDemo.Web/NavigationDemo.Web.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="cloudscribe.Web.Localization" Version="8.7.0" />
21+
<PackageReference Include="cloudscribe.Web.Localization" Version="10.0.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎src/NavigationDemo.Web/Startup.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ public void ConfigureServices(IServiceCollection services)
6060
services.AddMvc()
6161
.AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix)
6262
.AddDataAnnotationsLocalization()
63-
.AddRazorOptions(options =>
64-
{
65-
66-
})
67-
.SetCompatibilityVersion(CompatibilityVersion.Version_3_0)
63+
.AddRazorOptions(options => {})
6864
;
6965

7066
services.AddControllersWithViews();

‎src/RazorPages.WebApp/RazorPages.WebApp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<UserSecretsId>aspnet-RazorPages.WebApp-0BEB55BD-36A5-4CAC-A1C9-81104294AB20</UserSecretsId>
66
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
77
<IsPackable>false</IsPackable>

‎src/RazorPages.WebApp/Startup.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,7 @@ public void ConfigureServices(IServiceCollection services)
107107
services.AddMvc()
108108
.AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix)
109109
.AddDataAnnotationsLocalization()
110-
.AddRazorOptions(options =>
111-
{
112-
113-
})
114-
.SetCompatibilityVersion(CompatibilityVersion.Version_3_0)
115-
;
110+
.AddRazorOptions(options => {});
116111

117112

118113
}

‎src/cloudscribe.Web.Navigation/CachingNavigationViewComponent.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public CachingNavigationViewComponent(
2222
IEnumerable<INavigationNodePermissionResolver> permissionResolvers,
2323
IEnumerable<IFindCurrentNode> nodeFinders,
2424
IUrlHelperFactory urlHelperFactory,
25-
IActionContextAccessor actionContextAccesor,
2625
INodeUrlPrefixProvider prefixProvider,
2726
ILogger<NavigationViewComponent> logger,
2827
IDOMTreeCache DomCache,
@@ -34,7 +33,6 @@ public CachingNavigationViewComponent(
3433
_permissionResolvers = permissionResolvers;
3534
_nodeFinders = nodeFinders;
3635
_urlHelperFactory = urlHelperFactory;
37-
_actionContextAccesor = actionContextAccesor;
3836
_prefixProvider = prefixProvider;
3937
_log = logger;
4038
_domCache = DomCache;
@@ -52,7 +50,6 @@ public CachingNavigationViewComponent(
5250
private IEnumerable<INavigationNodePermissionResolver> _permissionResolvers;
5351
private IEnumerable<IFindCurrentNode> _nodeFinders;
5452
private IUrlHelperFactory _urlHelperFactory;
55-
private IActionContextAccessor _actionContextAccesor;
5653
private INodeUrlPrefixProvider _prefixProvider;
5754

5855

@@ -101,7 +98,7 @@ public async Task<IViewComponentResult> InvokeAsync(string viewName,
10198
model = await CreateNavigationTree(filterName, startingNodeKey);
10299

103100
ViewEngineResult viewResult = null;
104-
var actionContext = _actionContextAccesor.ActionContext;
101+
var actionContext = ViewContext;
105102
var tempData = new TempDataDictionary(actionContext.HttpContext, _tempDataProvider);
106103

107104
string fullViewName = $"Components/CachingNavigation/{viewName}";
@@ -161,7 +158,7 @@ public async Task<IViewComponentResult> InvokeAsync(string viewName,
161158
private async Task<NavigationViewModel> CreateNavigationTree(string filterName, string startingNodeKey)
162159
{
163160
var rootNode = await _builder.GetTree();
164-
var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccesor.ActionContext);
161+
var urlHelper = _urlHelperFactory.GetUrlHelper(ViewContext);
165162
NavigationViewModel model = new NavigationViewModel(
166163
startingNodeKey,
167164
filterName,

‎src/cloudscribe.Web.Navigation/NavigationViewComponent.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@ public NavigationViewComponent(
2121
IEnumerable<INavigationNodePermissionResolver> permissionResolvers,
2222
IEnumerable<IFindCurrentNode> nodeFinders,
2323
IUrlHelperFactory urlHelperFactory,
24-
IActionContextAccessor actionContextAccesor,
2524
INodeUrlPrefixProvider prefixProvider,
2625
ILogger<NavigationViewComponent> logger)
2726
{
2827
_builder = siteMapTreeBuilder;
2928
_permissionResolvers = permissionResolvers;
3029
_nodeFinders = nodeFinders;
3130
_urlHelperFactory = urlHelperFactory;
32-
_actionContextAccesor = actionContextAccesor;
3331
_prefixProvider = prefixProvider;
3432

3533
_log = logger;
@@ -40,7 +38,6 @@ public NavigationViewComponent(
4038
private IEnumerable<INavigationNodePermissionResolver> _permissionResolvers;
4139
private IEnumerable<IFindCurrentNode> _nodeFinders;
4240
private IUrlHelperFactory _urlHelperFactory;
43-
private IActionContextAccessor _actionContextAccesor;
4441
private INodeUrlPrefixProvider _prefixProvider;
4542

4643

@@ -53,7 +50,7 @@ public async Task<IViewComponentResult> InvokeAsync(string viewName, string filt
5350
}
5451

5552
var rootNode = await _builder.GetTree();
56-
var urlHelper = _urlHelperFactory.GetUrlHelper(_actionContextAccesor.ActionContext);
53+
var urlHelper = _urlHelperFactory.GetUrlHelper(ViewContext);
5754
NavigationViewModel model = new NavigationViewModel(
5855
startingNodeKey,
5956
filterName,

‎src/cloudscribe.Web.Navigation/ServiceCollectionExtensions.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public static IServiceCollection AddCloudscribeNavigation(
2525
services.TryAddSingleton<NavigationOptions, NavigationOptions>();
2626
}
2727

28-
services.TryAddSingleton<IActionContextAccessor, ActionContextAccessor>();
2928
services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
3029
services.TryAddScoped<ITreeCacheKeyResolver, DefaultCacheKeyResolver>();
3130

‎src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<Description>an ASP.NET Core viewcomponent for menus and breadcrumbs</Description>
5-
<Version>8.7.0</Version>
6-
<TargetFramework>net8.0</TargetFramework>
5+
<Version>10.0.0</Version>
6+
<TargetFramework>net10.0</TargetFramework>
77
<Authors>Joe Audette</Authors>
88
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
99
<PackageTags>cloudscribe;asp.net core;mvcsitemapprovider;navigation;menus;breadcrumbs;bootstrap</PackageTags>
@@ -29,11 +29,11 @@
2929
</ItemGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
33-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
34-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
35-
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
36-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.0" />
33+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
34+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
35+
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0" />
36+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
3737

3838
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3939
</ItemGroup>

‎src/cloudscribe.Web.SiteMap.FromNavigation/NavigationTreeSiteMapNodeService.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Microsoft.AspNetCore.Mvc;
1111
using Microsoft.AspNetCore.Mvc.Infrastructure;
1212
using Microsoft.AspNetCore.Mvc.Routing;
13+
using Microsoft.AspNetCore.Routing;
1314
using Microsoft.Extensions.Logging;
1415
using System.Collections.Generic;
1516
using System.Threading;
@@ -32,21 +33,18 @@ public NavigationTreeSiteMapNodeService(
3233
NavigationTreeBuilderService siteMapTreeBuilder,
3334
IEnumerable<INavigationNodePermissionResolver> permissionResolvers,
3435
IUrlHelperFactory urlHelperFactory,
35-
IActionContextAccessor actionContextAccesor,
3636
IHttpContextAccessor contextAccessor,
3737
ILogger<NavigationTreeSiteMapNodeService> logger)
3838
{
3939
this.siteMapTreeBuilder = siteMapTreeBuilder;
4040
this.urlHelperFactory = urlHelperFactory;
41-
this.actionContextAccesor = actionContextAccesor;
4241
this.contextAccessor = contextAccessor;
4342
this.permissionResolvers = permissionResolvers;
4443
log = logger;
4544
}
4645

4746
private NavigationTreeBuilderService siteMapTreeBuilder;
4847
private IUrlHelperFactory urlHelperFactory;
49-
private IActionContextAccessor actionContextAccesor;
5048
private ILogger log;
5149
private IHttpContextAccessor contextAccessor;
5250
private string baseUrl = string.Empty;
@@ -86,7 +84,8 @@ public async Task<IEnumerable<ISiteMapNode>> GetSiteMapNodes(
8684
{
8785
var rootNode = await siteMapTreeBuilder.GetTree();
8886
var mapNodes = new List<SiteMapNode>();
89-
var urlHelper = urlHelperFactory.GetUrlHelper(actionContextAccesor.ActionContext);
87+
var actionContext = new ActionContext(contextAccessor.HttpContext, contextAccessor.HttpContext.GetRouteData(), new Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor());
88+
var urlHelper = urlHelperFactory.GetUrlHelper(actionContext);
9089
foreach (var navNode in rootNode.Flatten())
9190
{
9291
if (navNode.ExcludeFromSearchSiteMap) continue;

0 commit comments

Comments
 (0)