Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.7.2 #14530

Closed
wants to merge 118 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
0f413d3
Switch to 1.8.0-preview
sebastienros Sep 5, 2023
41f9fc8
Position the modal over the navbar (#14270)
MikeAlhayek Sep 5, 2023
0a07e04
Add 1.8 release notes file. (#14277)
MikeAlhayek Sep 5, 2023
13d7f71
jQuery 3.7.1 (#14231)
agriffard Sep 6, 2023
b953081
Add @brutoledo as a contributor
agriffard Sep 6, 2023
1fac3e7
Add @dannyd89 as a contributor
agriffard Sep 6, 2023
5862041
Typo SMS features
agriffard Sep 7, 2023
bda83b2
Update libphonenumber-csharp 8.13.20 (#14287)
hishamco Sep 7, 2023
e5c1d55
NLog.Web.AspNetCore 5.3.4 (#14283)
agriffard Sep 8, 2023
caeeb19
leaflet 1.9.4 (#14054)
agriffard Sep 8, 2023
007e30f
bootstrap-select 1.14.0-beta3 (#14282)
agriffard Sep 8, 2023
9cd2398
Fixes invalid cookie name (#14280)
ludovic-th Sep 8, 2023
450b613
Add @ludovic-th as a contributor
agriffard Sep 8, 2023
cffb706
Move Moq into tests libraries (#14260)
hishamco Sep 8, 2023
6f57c7e
Microsoft.Identity.Web 2.13.4 (#14292)
agriffard Sep 8, 2023
033e0ae
BenchmarkDotNet 0.13.8 (#14293)
agriffard Sep 8, 2023
141c947
mkdocs-material 9.3.0
agriffard Sep 11, 2023
2586eb3
mkdocs-material 9.3.1
agriffard Sep 11, 2023
808a1e6
Remove duplicate alert in settings (#14299)
hishamco Sep 12, 2023
adb1f21
Make WorkflowType extension able (#14275)
hyzx86 Sep 12, 2023
cd519f5
NET 6.0.22, 7.0.11 (#14320)
agriffard Sep 12, 2023
43301c4
Update OpenIddict 4.8.0 (#14321)
hishamco Sep 12, 2023
27930f7
Update Jint 3.0.0-beta-2051 (#14322)
hishamco Sep 12, 2023
08de169
Add IsViewOrPageResult() extension (#14228)
MikeAlhayek Sep 12, 2023
abd536b
Use language keywords instead of framework type names for type refere…
MikeAlhayek Sep 12, 2023
a2876bf
Few missing language types in .cs (#14323)
jtkech Sep 13, 2023
ccacef1
Language Types in Razor files (#14324)
jtkech Sep 13, 2023
398af98
Handle InvalidToken in UserService.ProcessValidationErrors() (#14331)
hishamco Sep 14, 2023
5c7854c
Make SRI hashes consistent (#13775)
hishamco Sep 14, 2023
df7a347
Update Form Migrations Create() (#14272)
jtkech Sep 14, 2023
45cbbae
Fix media item icon (#14342)
hishamco Sep 16, 2023
bbd6b6b
Update Azure.Storage.Blobs 12.18.0 (#14326)
hishamco Sep 16, 2023
e8d52fb
mkdocs 1.5.3
agriffard Sep 18, 2023
e9bdddd
mkdocs-material 9.3.2
agriffard Sep 19, 2023
81ca23b
Update Jint to 3.0.0-beta-2052 (#14369)
hyzx86 Sep 19, 2023
1d05d9c
Update libphonenumber-csharp 8.13.21 (#14376)
hishamco Sep 20, 2023
59cd31b
xunit 2.5.1, xunit.runner.visualstudio 2.5.1, xunit.runner.visualstud…
agriffard Sep 21, 2023
a2e1f35
Azure.Identity 1.10.1 (#14378)
agriffard Sep 21, 2023
f44c8e4
ZString 2.5.1 (#14377)
agriffard Sep 21, 2023
68dda26
mkdocs-material 9.4.0
agriffard Sep 21, 2023
63ac62c
mkdocs-material 9.4.1
agriffard Sep 22, 2023
2280fe4
mkdocs-material 9.4.2
agriffard Sep 25, 2023
2ed568f
Fix Monaco doc link (#14387)
agriffard Sep 25, 2023
76557b8
Upgrade to Bootstrap 5.3.2 (#14294)
agriffard Sep 26, 2023
74b3a96
Fixing Icon-Picker and cleanup sass (#14393)
MikeAlhayek Sep 26, 2023
eb5edff
Set html classes to make the scripts work again (removed in #9371) (#…
netwavebe Sep 26, 2023
6d996e1
Add a fallback function to crypto.randomUUID (#14371)
MikeAlhayek Sep 26, 2023
855eec9
Update HtmlSantizer 8.0.718 (#14395)
hishamco Sep 26, 2023
1885bcf
Update Microsoft.Identity.Web 2.14.0 (#14394)
hishamco Sep 26, 2023
f2c2d7b
SASS files cleanup in TheAdmin theme (#14399)
MikeAlhayek Sep 27, 2023
57f6644
Fix validation color in the login layout (#14400)
MikeAlhayek Sep 27, 2023
9a76299
Update Fluid 2.5.0 (#14402)
hishamco Sep 28, 2023
d743d5f
Trim Async suffix (#14407)
vjacquet Sep 29, 2023
2580252
Typos in OrchardCore.Notifications (#14409)
SzymonSel Sep 30, 2023
1111ee6
Update libphonenumber-csharp 8.13.22 (#14408)
hishamco Oct 1, 2023
1ad501d
Fix doc typo (#14411)
hishamco Oct 2, 2023
1de4d23
mkdocs-material 9.4.3
agriffard Oct 2, 2023
86bfaea
fix: workflow module page list issue when using PostgreSQL #14334 (#1…
emrahtokalak Oct 2, 2023
10498fe
Add @emrahtokalak as a contributor
agriffard Oct 2, 2023
e4e95dc
Add @vjacquet as a contributor
agriffard Oct 3, 2023
5ee50ef
Add OC.Notifications.Abstractions docs (#14427)
hishamco Oct 3, 2023
40fa134
Fix `Creating a modular ASP.NET Core application` tutorial (#14415)
xperiandri Oct 3, 2023
b4d8f75
mkdocs-material 9.4.4
agriffard Oct 5, 2023
7e1bd5c
Fix form validation and link decoration (BS 5.3) (#14432)
MikeAlhayek Oct 5, 2023
00573c0
Fix admin menu background color on small screen. (#14434)
MikeAlhayek Oct 5, 2023
17b3b55
Open the front page in the same browser instead of a blank tab. (#14435)
MikeAlhayek Oct 5, 2023
dc4a4d2
Fix Publish Later Buttons (#14438)
MikeAlhayek Oct 5, 2023
1d2fccc
Cleanup Archive/Publish Later and remove unnecessary assets and resou…
MikeAlhayek Oct 5, 2023
b5f63ea
BenchmarkDotNet 0.13.9 (#14436)
agriffard Oct 6, 2023
a82ff95
Update HtmlSantizer 8.0.723 (#14429)
hishamco Oct 6, 2023
d312e24
Microsoft.Identity.Web 2.15.1 (#14437)
agriffard Oct 6, 2023
29cba28
AdminBranding (#14453)
agriffard Oct 8, 2023
6bc8145
Admin Navbar link (#14454)
agriffard Oct 8, 2023
b03eef3
Upgrade TheTheme to use Bootstrap 5.3.2 (#14451)
MikeAlhayek Oct 9, 2023
24cc439
Fix sortable widgets (#14467)
MikeAlhayek Oct 9, 2023
8632c3b
Remove "Cannot update your own roles" warning (#14440)
MikeAlhayek Oct 9, 2023
eaa8bef
Fix null exception in EmailTask (#14471)
MikeAlhayek Oct 10, 2023
79f00db
mkdocs-material 9.4.5
agriffard Oct 10, 2023
919f378
Fix WidgetsListPart UI (#14461)
yaricrolletservico Oct 10, 2023
677e5b1
Memory Leaks (#14348)
jtkech Oct 11, 2023
f35cd8b
Update 7.0.12 & 6.0.23 (#14478)
hishamco Oct 11, 2023
cc8efea
OpenIddict 4.9.0 (#14463)
agriffard Oct 11, 2023
1c2712f
Fix an exception in ListPart with header (#14473)
MikeAlhayek Oct 11, 2023
234f476
Fix roles filter (#14468)
MikeAlhayek Oct 11, 2023
13a3a5f
Docs tabs
agriffard Oct 12, 2023
12029c5
Enable tabs
agriffard Oct 12, 2023
5e1b3c1
Docs missing links
agriffard Oct 12, 2023
fb30d28
Docs enable footer (Previous, Next link)
agriffard Oct 12, 2023
8647606
Typo Release 1.8
agriffard Oct 12, 2023
938daa5
Docs reference links
agriffard Oct 12, 2023
93d1993
Azure.Identity 1.10.2 (#14494)
agriffard Oct 12, 2023
f377a07
Update Taxomony field (#14477)
MikeAlhayek Oct 12, 2023
878b693
Introduce a new Narbar shape (#14488)
MikeAlhayek Oct 12, 2023
f988e38
Can't Reload Stream Config Provider (#14499)
jtkech Oct 12, 2023
600d214
Update YesSQL 3.4.0 (#14491)
hishamco Oct 12, 2023
4410094
NRE in query editor (#14501)
jtkech Oct 13, 2023
031db8f
Set index length limit for MySQL (#14500)
MikeAlhayek Oct 13, 2023
0f5d992
Fix a typo (#14503)
MikeAlhayek Oct 13, 2023
219096c
Fix TheBlogTheme shared views (#14493)
tbolon Oct 13, 2023
3351923
Merge branch 'release/1.7'
sebastienros Oct 13, 2023
0022499
Merge branch 'release/1.7'
sebastienros Oct 13, 2023
09d3636
Add @yaricrolletservico as a contributor
agriffard Oct 13, 2023
03e7b0a
mkdocs-material 9.4.6
agriffard Oct 14, 2023
48b350b
Docs GraphQL: Fix url api/graphql
agriffard Oct 14, 2023
fd156b9
Fix messages class names (#14508)
MikeAlhayek Oct 14, 2023
4dc8d06
Update 1.7.1 release notes (#14509)
MikeAlhayek Oct 14, 2023
52f1b08
js-cookie does not need to depend on jQuery (#14511)
MikeAlhayek Oct 15, 2023
03a3256
mkdocs-git-revision-date-localized-plugin 1.2.1
agriffard Oct 16, 2023
c79a9e5
NLog.Web.AspNetCore 5.3.5
agriffard Oct 16, 2023
d94059f
centrally define media resources (#14512)
giannik Oct 16, 2023
ef11011
Fix TheAdmin & TheTheme for RTL languages (#14486)
MikeAlhayek Oct 16, 2023
df1a4e7
Fixing TheTheme newly intruduced accessibility rules and HTML rules v…
wAsnk Oct 16, 2023
0f0c9f4
Update libphonenumber-csharp 8.13.23 (#14529)
hishamco Oct 17, 2023
c674cff
Release 1.7.2
MikeAlhayek Oct 17, 2023
2a25fa4
Update the release notes
MikeAlhayek Oct 17, 2023
81db8a9
Fix release notes
MikeAlhayek Oct 17, 2023
d0f297b
Merge branch 'main' into ma/release1.7.2
MikeAlhayek Oct 17, 2023
cdcbf79
Setting the 17th as the release date
MikeAlhayek Oct 17, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
54 changes: 54 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -2753,6 +2753,60 @@
"contributions": [
"code"
]
},
{
"login": "brutoledo",
"name": "Bruno Toledo",
"avatar_url": "https://avatars.githubusercontent.com/u/5890282?v=4",
"profile": "https://github.com/brutoledo",
"contributions": [
"doc"
]
},
{
"login": "dannyd89",
"name": "Daniel Draghici",
"avatar_url": "https://avatars.githubusercontent.com/u/15252548?v=4",
"profile": "https://github.com/dannyd89",
"contributions": [
"code"
]
},
{
"login": "ludovic-th",
"name": "ludovic-th",
"avatar_url": "https://avatars.githubusercontent.com/u/65158865?v=4",
"profile": "https://github.com/ludovic-th",
"contributions": [
"code"
]
},
{
"login": "emrahtokalak",
"name": "Emrah Tokalak",
"avatar_url": "https://avatars.githubusercontent.com/u/90242?v=4",
"profile": "http://emrahtokalak.com/",
"contributions": [
"code"
]
},
{
"login": "vjacquet",
"name": "vjacquet",
"avatar_url": "https://avatars.githubusercontent.com/u/6363920?v=4",
"profile": "https://github.com/vjacquet",
"contributions": [
"code"
]
},
{
"login": "yaricrolletservico",
"name": "yaricrolletservico",
"avatar_url": "https://avatars.githubusercontent.com/u/101557629?v=4",
"profile": "https://github.com/yaricrolletservico",
"contributions": [
"code"
]
}
],
"skipCi": true
Expand Down
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dotnet_style_qualification_for_event = false : suggestion

# Use language keywords instead of framework type names for type references
dotnet_style_predefined_type_for_locals_parameters_members = true : suggestion
dotnet_style_predefined_type_for_member_access = false : suggestion
dotnet_style_predefined_type_for_member_access = true : suggestion

# Suggest more modern language features when available
csharp_style_pattern_matching_over_is_with_cast_check = true : none
Expand Down
10 changes: 9 additions & 1 deletion Contributors.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Contributors ✨

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-296-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-302-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
Expand Down Expand Up @@ -406,6 +406,14 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<tr>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/BinderDyn"><img src="https://avatars.githubusercontent.com/u/43495737?v=4?s=100" width="100px;" alt="Marvin"/><br /><sub><b>Marvin</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=BinderDyn" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/dministro"><img src="https://avatars.githubusercontent.com/u/15349881?v=4?s=100" width="100px;" alt="József Horváth"/><br /><sub><b>József Horváth</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=dministro" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/brutoledo"><img src="https://avatars.githubusercontent.com/u/5890282?v=4?s=100" width="100px;" alt="Bruno Toledo"/><br /><sub><b>Bruno Toledo</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=brutoledo" title="Documentation">📖</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/dannyd89"><img src="https://avatars.githubusercontent.com/u/15252548?v=4?s=100" width="100px;" alt="Daniel Draghici"/><br /><sub><b>Daniel Draghici</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=dannyd89" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/ludovic-th"><img src="https://avatars.githubusercontent.com/u/65158865?v=4?s=100" width="100px;" alt="ludovic-th"/><br /><sub><b>ludovic-th</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=ludovic-th" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="http://emrahtokalak.com/"><img src="https://avatars.githubusercontent.com/u/90242?v=4?s=100" width="100px;" alt="Emrah Tokalak"/><br /><sub><b>Emrah Tokalak</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=emrahtokalak" title="Code">💻</a></td>
</tr>
<tr>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/vjacquet"><img src="https://avatars.githubusercontent.com/u/6363920?v=4?s=100" width="100px;" alt="vjacquet"/><br /><sub><b>vjacquet</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=vjacquet" title="Code">💻</a></td>
<td align="center" valign="top" width="16.66%"><a href="https://github.com/yaricrolletservico"><img src="https://avatars.githubusercontent.com/u/101557629?v=4?s=100" width="100px;" alt="yaricrolletservico"/><br /><sub><b>yaricrolletservico</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=yaricrolletservico" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Orchard Core consists of two distinct projects:

## Build Status

Stable (release/1.7.1):
Stable (release/1.7.2):

[![Build status](https://github.com/OrchardCMS/OrchardCore/actions/workflows/release_ci.yml/badge.svg)](https://github.com/OrchardCMS/OrchardCore/actions?query=workflow%3A%22Release+-+CI%22)
[![NuGet](https://img.shields.io/nuget/v/OrchardCore.Application.Cms.Targets.svg)](https://www.nuget.org/packages/OrchardCore.Application.Cms.Targets)
Expand All @@ -30,7 +30,7 @@ Nightly (main):

## Status

### 1.7.1
### 1.7.2

The software is finished -- and by finished, we mean there are no show-stopping, little-children-killing bugs in it. That we know of. There are probably numerous lower-priority bugs triaged into the next point release or service pack, as well.

Expand Down
7 changes: 6 additions & 1 deletion mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ theme:
logo: docs/assets/images/orchard-logo.png
favicon: docs/assets/images/favicon.png
features:
- navigation.footer
- header.autohide
- navigation.instant
- navigation.tabs
- content.tabs.link
palette:
- media: "(prefers-color-scheme: light)"
scheme: default
Expand Down Expand Up @@ -63,7 +65,7 @@ markdown_extensions:
check_paths: true
- pymdownx.superfences
- pymdownx.tabbed:
alternate_style: false
alternate_style: true
- pymdownx.tasklist
- pymdownx.tilde
- toc:
Expand Down Expand Up @@ -168,6 +170,7 @@ nav:
- Rules: docs/reference/modules/Rules/README.md
- Shortcodes: docs/reference/modules/Shortcodes/README.md
- Sitemaps: docs/reference/modules/Sitemaps/README.md
- SMS: docs/reference/modules/Sms/README.md
- Spatial: docs/reference/modules/Spatial/README.md
- XML-RPC: docs/reference/modules/XmlRpc/README.md
- Menu: docs/reference/modules/Menu/README.md
Expand All @@ -186,6 +189,7 @@ nav:
- Overview: docs/reference/modules/Users/README.md
- Custom User Settings: docs/reference/modules/Users/CustomUserSettings/README.md
- Notifications: docs/reference/modules/Notifications/README.md
- Ticket store: docs/reference/modules/Users/TicketStore.md
- Home Route: docs/reference/modules/HomeRoute/README.md
- Feeds: docs/reference/modules/Feeds/README.md
- Core Modules:
Expand Down Expand Up @@ -238,6 +242,7 @@ nav:
- Owners: docs/resources/owners/README.md
- Workshops: docs/resources/workshops/README.md
- Releases:
- 1.7.2: docs/releases/1.7.2.md
- 1.7.1: docs/releases/1.7.1.md
- 1.7.0: docs/releases/1.7.0.md
- 1.6.0: docs/releases/1.6.0.md
Expand Down
8 changes: 4 additions & 4 deletions src/OrchardCore.Build/Dependencies.AspNetCore.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
<!-- These versions are used for the NuGet packages that are dependent on the current TFM -->
<!-- Versions are preset for the default TFM (there may be no TFM in an evaluation phase) -->
<PropertyGroup>
<AspNetCorePackagesVersion>7.0.10</AspNetCorePackagesVersion>
<MicrosoftExtensionsPackagesVersion>7.0.10</MicrosoftExtensionsPackagesVersion>
<AspNetCorePackagesVersion>7.0.12</AspNetCorePackagesVersion>
<MicrosoftExtensionsPackagesVersion>7.0.12</MicrosoftExtensionsPackagesVersion>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework) == 'net6.0'">
<AspNetCorePackagesVersion>6.0.21</AspNetCorePackagesVersion>
<MicrosoftExtensionsPackagesVersion>6.0.21</MicrosoftExtensionsPackagesVersion>
<AspNetCorePackagesVersion>6.0.23</AspNetCorePackagesVersion>
<MicrosoftExtensionsPackagesVersion>6.0.23</MicrosoftExtensionsPackagesVersion>
</PropertyGroup>

<!-- 'Microsoft.AspNetCore' packages that are not included in the ASP.NET Core shared framework -->
Expand Down
31 changes: 15 additions & 16 deletions src/OrchardCore.Build/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,20 @@
<PackageManagement Include="AWSSDK.SecurityToken" Version="3.7.101.60" />
<PackageManagement Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.2.2" />
<PackageManagement Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.2" />
<PackageManagement Include="Azure.Identity" Version="1.10.0" />
<PackageManagement Include="Azure.Storage.Blobs" Version="12.17.0" />
<PackageManagement Include="BenchmarkDotNet" Version="0.13.7" />
<PackageManagement Include="Azure.Identity" Version="1.10.2" />
<PackageManagement Include="Azure.Storage.Blobs" Version="12.18.0" />
<PackageManagement Include="BenchmarkDotNet" Version="0.13.9" />
<PackageManagement Include="Castle.Core" Version="5.1.1" />
<PackageManagement Include="DocumentFormat.OpenXml" Version="2.20.0" />
<PackageManagement Include="Fluid.Core" Version="2.4.0" />
<PackageManagement Include="Fluid.Core" Version="2.5.0" />
<PackageManagement Include="GraphQL" Version="4.8.0" />
<PackageManagement Include="GraphQL.DataLoader" Version="4.8.0" />
<PackageManagement Include="GraphQL.MicrosoftDI" Version="4.8.0" />
<PackageManagement Include="GraphQL.SystemTextJson" Version="4.8.0" />
<PackageManagement Include="Jint" Version="3.0.0-beta-2051" />
<PackageManagement Include="HtmlSanitizer" Version="8.0.692" />
<PackageManagement Include="Jint" Version="3.0.0-beta-2052" />
<PackageManagement Include="HtmlSanitizer" Version="8.0.723" />
<PackageManagement Include="Irony.Core" Version="1.0.7" />
<PackageManagement Include="Jint" Version="3.0.0-beta-2049" />
<PackageManagement Include="libphonenumber-csharp" Version="8.13.19" />
<PackageManagement Include="libphonenumber-csharp" Version="8.13.23" />
<PackageManagement Include="Lorem.Universal.NET" Version="4.0.80" />
<PackageManagement Include="Lucene.Net" Version="4.8.0-beta00016" />
<PackageManagement Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
Expand All @@ -37,7 +36,7 @@
<PackageManagement Include="MailKit" Version="4.2.0" />
<PackageManagement Include="Markdig" Version="0.33.0" />
<PackageManagement Include="MessagePack" Version="2.2.60" />
<PackageManagement Include="Microsoft.Identity.Web" Version="2.13.3" />
<PackageManagement Include="Microsoft.Identity.Web" Version="2.15.1" />
<PackageManagement Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageManagement Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageManagement Include="MimeKit" Version="4.2.0" />
Expand All @@ -47,10 +46,10 @@
<PackageManagement Include="NEST" Version="7.17.5" />
<PackageManagement Include="Newtonsoft.Json" Version="13.0.3" />
<PackageManagement Include="NJsonSchema" Version="10.9.0" />
<PackageManagement Include="NLog.Web.AspNetCore" Version="5.3.3" />
<PackageManagement Include="NLog.Web.AspNetCore" Version="5.3.5" />
<PackageManagement Include="NodaTime" Version="3.1.9" />
<PackageManagement Include="OpenIddict.AspNetCore" Version="4.7.0" />
<PackageManagement Include="OpenIddict.Core" Version="4.7.0" />
<PackageManagement Include="OpenIddict.AspNetCore" Version="4.9.0" />
<PackageManagement Include="OpenIddict.Core" Version="4.9.0" />
<PackageManagement Include="OrchardCore.Translations.All" Version="1.7.1" />
<PackageManagement Include="PdfPig" Version="0.1.8" />
<PackageManagement Include="Serilog.AspNetCore" Version="7.0.0" />
Expand All @@ -59,14 +58,14 @@
<PackageManagement Include="StackExchange.Redis" Version="2.6.122" />
<PackageManagement Include="StyleCop.Analyzers" Version="1.1.118" />
<PackageManagement Include="System.Linq.Async" Version="6.0.1" />
<PackageManagement Include="xunit" Version="2.5.0" />
<PackageManagement Include="xunit.analyzers" Version="1.2.0" />
<PackageManagement Include="xunit.runner.visualstudio" Version="2.5.0" />
<PackageManagement Include="xunit" Version="2.5.1" />
<PackageManagement Include="xunit.analyzers" Version="1.3.0" />
<PackageManagement Include="xunit.runner.visualstudio" Version="2.5.1" />
<PackageManagement Include="YesSql" Version="3.4.0" />
<PackageManagement Include="YesSql.Abstractions" Version="3.4.0" />
<PackageManagement Include="YesSql.Core" Version="3.4.0" />
<PackageManagement Include="YesSql.Filters.Abstractions" Version="3.4.0" />
<PackageManagement Include="YesSql.Filters.Query" Version="3.4.0" />
<PackageManagement Include="ZString" Version="2.5.0" />
<PackageManagement Include="ZString" Version="2.5.1" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/OrchardCore.Build/OrchardCore.Commons.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

<PropertyGroup>
<LangVersion>10.0</LangVersion>
<VersionPrefix>1.7.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<VersionPrefix>1.8.0</VersionPrefix>
<VersionSuffix>preview</VersionSuffix>
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsNotAsErrors>612,618</WarningsNotAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public AdminMenu(IStringLocalizer<AdminMenu> localizer)

public Task BuildNavigationAsync(string name, NavigationBuilder builder)
{
if (!String.Equals(name, "admin", StringComparison.OrdinalIgnoreCase))
if (!string.Equals(name, "admin", StringComparison.OrdinalIgnoreCase))
{
return Task.CompletedTask;
}
Expand Down
4 changes: 1 addition & 3 deletions src/OrchardCore.Modules/OrchardCore.Admin/AdminMenuFilter.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.RazorPages;
using OrchardCore.DisplayManagement;
using OrchardCore.DisplayManagement.Layout;
using OrchardCore.DisplayManagement.Shapes;
Expand All @@ -27,7 +25,7 @@ public AdminMenuFilter(ILayoutAccessor layoutAccessor,
public async Task OnResultExecutionAsync(ResultExecutingContext filterContext, ResultExecutionDelegate next)
{
// Should only run on a full view rendering result
if (filterContext.Result is not ViewResult && filterContext.Result is not PageResult)
if (!filterContext.IsViewOrPageResult())
{
await next();
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
using Microsoft.AspNetCore.Mvc.ApplicationModels;
using Microsoft.AspNetCore.Mvc.ApplicationParts;
using Microsoft.AspNetCore.Mvc.Razor.Compilation;
using Microsoft.AspNetCore.Mvc.Razor.Extensions;
using Microsoft.Extensions.Hosting;
using OrchardCore.Mvc;

namespace OrchardCore.Admin
{
internal class AdminPageRouteModelProvider : IPageRouteModelProvider
{
private const string RazorPageDocumentKind = "mvc.1.0.razor-page";

private readonly IHostEnvironment _hostingEnvironment;
private readonly ApplicationPartManager _applicationManager;

Expand Down Expand Up @@ -75,7 +74,8 @@ public void OnProvidersExecuted(PageRouteModelProviderContext context)
{
}

private static IEnumerable<CompiledViewDescriptor> GetPageDescriptors<T>(ApplicationPartManager applicationManager) where T : ViewsFeature, new()
private static IEnumerable<CompiledViewDescriptor> GetPageDescriptors<T>(ApplicationPartManager applicationManager)
where T : ViewsFeature, new()
{
if (applicationManager == null)
{
Expand All @@ -100,7 +100,8 @@ public void OnProvidersExecuted(PageRouteModelProviderContext context)
}
}

private static bool IsRazorPage(CompiledViewDescriptor viewDescriptor) => viewDescriptor.Item?.Kind == RazorPageDocumentKind;
private static bool IsRazorPage(CompiledViewDescriptor viewDescriptor) =>
viewDescriptor.Item?.Kind == RazorPageDocumentClassifierPass.RazorPageDocumentKind;

private static T GetViewFeature<T>(ApplicationPartManager applicationManager) where T : ViewsFeature, new()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public async Task<ThemeSelectorResult> GetThemeAsync()
if (AdminAttribute.IsApplied(_httpContextAccessor.HttpContext))
{
string adminThemeName = await _adminThemeService.GetAdminThemeNameAsync();
if (String.IsNullOrEmpty(adminThemeName))
if (string.IsNullOrEmpty(adminThemeName))
{
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public AdminThemeService(
public async Task<IExtensionInfo> GetAdminThemeAsync()
{
string currentThemeName = await GetAdminThemeNameAsync();
if (String.IsNullOrEmpty(currentThemeName))
if (string.IsNullOrEmpty(currentThemeName))
{
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public override async Task<IDisplayResult> EditAsync(AdminSettings settings, Bui

return Initialize<AdminSettingsViewModel>("AdminSettings_Edit", model =>
{
model.DisplayDarkMode = settings.DisplayDarkMode;
model.DisplayThemeToggler = settings.DisplayThemeToggler;
model.DisplayMenuFilter = settings.DisplayMenuFilter;
model.DisplayNewMenu = settings.DisplayNewMenu;
model.DisplayTitlesInTopbar = settings.DisplayTitlesInTopbar;
Expand All @@ -58,7 +58,7 @@ public override async Task<IDisplayResult> UpdateAsync(AdminSettings settings, B

await context.Updater.TryUpdateModelAsync(model, Prefix);

settings.DisplayDarkMode = model.DisplayDarkMode;
settings.DisplayThemeToggler = model.DisplayThemeToggler;
settings.DisplayMenuFilter = model.DisplayMenuFilter;
settings.DisplayNewMenu = model.DisplayNewMenu;
settings.DisplayTitlesInTopbar = model.DisplayTitlesInTopbar;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using OrchardCore.Admin.Models;
using OrchardCore.DisplayManagement.Handlers;
using OrchardCore.DisplayManagement.Views;

namespace OrchardCore.Admin.Drivers;

public class VisitSiteNavbarDisplayDriver : DisplayDriver<Navbar>
{
public override IDisplayResult Display(Navbar model)
{
return View("VisitSiteNavbarItem", model)
.Location("DetailAdmin", "Content:20");
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
Expand Down
1 change: 1 addition & 0 deletions src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public override void ConfigureServices(IServiceCollection services)
services.AddScoped<IPermissionProvider, PermissionsAdminSettings>();
services.AddScoped<INavigationProvider, AdminMenu>();
services.AddSingleton<IPageRouteModelProvider, AdminPageRouteModelProvider>();
services.AddScoped<IDisplayDriver<Navbar>, VisitSiteNavbarDisplayDriver>();

services.Configure<AdminOptions>(_configuration.GetSection("OrchardCore_Admin"));
}
Expand Down
Loading