Skip to content

Commit 6a0946c

Browse files
gvkriesgvkries
authored
Merge branch 'main' into gvkries/gql-14182
2 parents a3ec084 + 049d775 commit 6a0946c

File tree

335 files changed

+3227
-1270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

335 files changed

+3227
-1270
lines changed

‎.all-contributorsrc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3295,6 +3295,15 @@
32953295
"contributions": [
32963296
"code"
32973297
]
3298+
},
3299+
{
3300+
"login": "davidlfox",
3301+
"name": "David L. Fox",
3302+
"avatar_url": "https://avatars.githubusercontent.com/u/5315855?v=4",
3303+
"profile": "https://www.iamdavidfox.com",
3304+
"contributions": [
3305+
"code"
3306+
]
32983307
}
32993308
],
33003309
"skipCi": true,

‎Directory.Packages.props‎

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,9 @@
55
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
66
</PropertyGroup>
77

8-
<PropertyGroup>
9-
<!-- Special case - this property is used by a DotNetCliToolReference -->
10-
<DotNetXunitVersion>2.3.0</DotNetXunitVersion>
11-
</PropertyGroup>
12-
138
<ItemGroup>
149
<PackageVersion Include="AngleSharp" Version="1.2.0" />
15-
<PackageVersion Include="AWSSDK.S3" Version="3.7.411.5" />
10+
<PackageVersion Include="AWSSDK.S3" Version="3.7.412.4" />
1611
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
1712
<PackageVersion Include="Azure.Communication.Email" Version="1.0.1" />
1813
<PackageVersion Include="Azure.Communication.Sms" Version="1.0.1" />
@@ -70,9 +65,9 @@
7065
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
7166
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
7267
<PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
73-
<PackageVersion Include="xunit" Version="2.9.2" />
74-
<PackageVersion Include="xunit.analyzers" Version="1.17.0" />
75-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
68+
<PackageVersion Include="xunit.v3" Version="1.0.0" />
69+
<PackageVersion Include="xunit.analyzers" Version="1.18.0" />
70+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
7671
<PackageVersion Include="YesSql" Version="5.2.0" />
7772
<PackageVersion Include="YesSql.Abstractions" Version="5.2.0" />
7873
<PackageVersion Include="YesSql.Core" Version="5.2.0" />
@@ -128,44 +123,44 @@
128123
</ItemGroup>
129124

130125
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'" >
131-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
126+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.1" />
132127
</ItemGroup>
133128

134129
<!-- These versions are used for the NuGet packages that are dependent on the current TFM -->
135130
<!-- There may be no TFM in an evaluation phase so we can't use a conditional 'Property' -->
136131

137132
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
138-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.0" />
139-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.0" />
140-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.0" />
141-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.0" />
142-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="9.0.0" />
143-
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />
144-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.0" />
145-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
146-
<PackageVersion Include="Microsoft.AspNetCore.Owin" Version="9.0.0" />
147-
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.0" />
148-
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="9.0.0" />
133+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Facebook" Version="9.0.1" />
134+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="9.0.1" />
135+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="9.0.1" />
136+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.1" />
137+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="9.0.1" />
138+
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.1" />
139+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="9.0.1" />
140+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.1" />
141+
<PackageVersion Include="Microsoft.AspNetCore.Owin" Version="9.0.1" />
142+
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.1" />
143+
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="9.0.1" />
149144

150145
<!-- dotnet/extensions repository -->
151-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
146+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.1.0" />
152147

153148
<!-- Serilog.AspNetCore -->
154149
<PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
155150
</ItemGroup>
156151

157152
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
158-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Facebook" Version="8.0.11" />
159-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.11" />
160-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="8.0.11" />
161-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.11" />
162-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="8.0.11" />
163-
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.11" />
164-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.11" />
165-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.11" />
166-
<PackageVersion Include="Microsoft.AspNetCore.Owin" Version="8.0.11" />
167-
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.11" />
168-
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="8.0.11" />
153+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Facebook" Version="8.0.12" />
154+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.12" />
155+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="8.0.12" />
156+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.12" />
157+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.Twitter" Version="8.0.12" />
158+
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.12" />
159+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.12" />
160+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.12" />
161+
<PackageVersion Include="Microsoft.AspNetCore.Owin" Version="8.0.12" />
162+
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.12" />
163+
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="8.0.12" />
169164

170165
<!-- dotnet/extensions repository -->
171166
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.10.0" />

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Nightly (`main`):
2525
[![Build status](https://github.com/OrchardCMS/OrchardCore/actions/workflows/preview_ci.yml/badge.svg)](https://github.com/OrchardCMS/OrchardCore/actions?query=workflow%3A%22Preview+-+CI%22)
2626
[![Cloudsmith](https://api-prd.cloudsmith.io/badges/version/orchardcore/preview/nuget/OrchardCore.Application.Cms.Targets/latest/x/?render=true&badge_token=gAAAAABey9hKFD_C-ZIpLvayS3HDsIjIorQluDs53KjIdlxoDz6Ntt1TzvMNJp7a_UWvQbsfN5nS7_0IbxCyqHZsjhmZP6cBkKforo-NqwrH5-E6QCrJ3D8%3D)](https://cloudsmith.io/~orchardcore/repos/preview/packages/detail/nuget/OrchardCore.Application.Cms.Targets/latest/)
2727

28-
## Project Status: v2.1.3
28+
## Project Status: v2.1.4
2929

3030
The software is production-ready, and capable of serving large mission-critical applications as well, and we're not aware of any fundamental bugs or missing features we deem crucial. Orchard Core continues to evolve, with each version bringing new improvements, and keeping up with the cutting-edge of .NET.
3131

‎mkdocs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ nav:
265265
- Mini Profiler: reference/modules/MiniProfiler/README.md
266266
- Modules: reference/modules/Modules/README.md
267267
- OpenId: reference/modules/OpenId/README.md
268+
- Permissions: reference/modules/Security/Permissions.md
268269
- Razor Helpers: reference/modules/Razor/README.md
269270
- Recipes: reference/modules/Recipes/README.md
270271
- Redis: reference/modules/Redis/README.md
@@ -286,6 +287,7 @@ nav:
286287
- Libraries: reference/libraries/README.md
287288
- Glossary: reference/glossary/README.md
288289
- Releases Notes:
290+
- 2.1.4: releases/2.1.4.md
289291
- 2.1.3: releases/2.1.3.md
290292
- 2.1.2: releases/2.1.2.md
291293
- 2.1.1: releases/2.1.1.md

‎src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,34 @@ public AdminMenu(IStringLocalizer<AdminMenu> stringLocalizer)
2222

2323
protected override ValueTask BuildAsync(NavigationBuilder builder)
2424
{
25-
builder
25+
if (NavigationHelper.UseLegacyFormat())
26+
{
27+
builder
2628
.Add(S["Configuration"], configuration => configuration
2729
.Add(S["Settings"], settings => settings
2830
.Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin
29-
.AddClass("admin").Id("admin")
31+
.AddClass("admin")
32+
.Id("admin")
3033
.Action("Index", "Admin", _routeValues)
3134
.Permission(PermissionsAdminSettings.ManageAdminSettings)
3235
.LocalNav()
3336
)
3437
)
3538
);
3639

40+
return ValueTask.CompletedTask;
41+
}
42+
43+
builder
44+
.Add(S["Settings"], settings => settings
45+
.Add(S["Admin"], S["Admin"].PrefixPosition(), admin => admin
46+
.AddClass("admin").Id("admin")
47+
.Action("Index", "Admin", _routeValues)
48+
.Permission(PermissionsAdminSettings.ManageAdminSettings)
49+
.LocalNav()
50+
)
51+
);
52+
3753
return ValueTask.CompletedTask;
3854
}
3955
}

‎src/OrchardCore.Modules/OrchardCore.Admin/Drivers/VisitSiteNavbarDisplayDriver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ public sealed class VisitSiteNavbarDisplayDriver : DisplayDriver<Navbar>
99
public override IDisplayResult Display(Navbar model, BuildDisplayContext context)
1010
{
1111
return View("VisitSiteNavbarItem", model)
12-
.Location("DetailAdmin", "Content:20");
12+
.Location(OrchardCoreConstants.DisplayType.DetailAdmin, "Content:20");
1313
}
1414
}

‎src/OrchardCore.Modules/OrchardCore.Admin/Views/NavigationItemText-admin.Id.cshtml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
<span class="icon">
2-
<i class="fa-solid fa-tachometer" aria-hidden="true"></i>
1+
@using OrchardCore.Navigation
2+
3+
@if (NavigationHelper.UseLegacyFormat())
4+
{
5+
<span class="icon">
6+
<i class="fa-solid fa-tachometer" aria-hidden="true"></i>
7+
</span>
8+
<span class="title">@Model.Text</span>
9+
10+
return;
11+
}
12+
13+
<span class="icon icon-none">
314
</span>
4-
<span class="title">@T["Admin"]</span>
15+
<span class="title">@Model.Text</span>

‎src/OrchardCore.Modules/OrchardCore.AdminDashboard/Controllers/DashboardController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public async Task<IActionResult> Index()
7272
wrappers.Add(new DashboardWrapper
7373
{
7474
Dashboard = widget,
75-
Content = await _contentItemDisplayManager.BuildDisplayAsync(widget, _updateModelAccessor.ModelUpdater, "DetailAdmin")
75+
Content = await _contentItemDisplayManager.BuildDisplayAsync(widget, _updateModelAccessor.ModelUpdater, OrchardCoreConstants.DisplayType.DetailAdmin)
7676
});
7777
}
7878

@@ -124,7 +124,7 @@ public async Task<IActionResult> Manage()
124124
var wrapper = new DashboardWrapper
125125
{
126126
Dashboard = widget,
127-
Content = await _contentItemDisplayManager.BuildDisplayAsync(widget, _updateModelAccessor.ModelUpdater, "DetailAdmin")
127+
Content = await _contentItemDisplayManager.BuildDisplayAsync(widget, _updateModelAccessor.ModelUpdater, OrchardCoreConstants.DisplayType.DetailAdmin)
128128
};
129129

130130
wrappers.Add(wrapper);

‎src/OrchardCore.Modules/OrchardCore.AdminDashboard/Drivers/DashboardContentDisplayDriver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public override async Task<IDisplayResult> DisplayAsync(ContentItem model, Build
9797
var shapeTag = Initialize<ContentItemViewModel>("DashboardWidget_DetailAdmin__ContentsTags", m =>
9898
{
9999
m.ContentItem = model;
100-
}).Location("DetailAdmin", "Tags:10");
100+
}).Location(OrchardCoreConstants.DisplayType.DetailAdmin, "Tags:10");
101101
results.Add(shapeTag);
102102

103103
return Combine(results.ToArray());

‎src/OrchardCore.Modules/OrchardCore.AdminDashboard/Views/NavigationItemText-dashboard.Id.cshtml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
<span class="icon"><i class="fa-solid fa-tachometer-alt" aria-hidden="true"></i></span><span class="title">@T["Dashboard"]</span>
1+
<span class="icon">
2+
<i class="fa-solid fa-tachometer-alt" aria-hidden="true"></i>
3+
</span>
4+
<span class="title">@Model.Text</span>

0 commit comments

Comments
 (0)