Merge branch 'main' into ma/admin-menu-permission

.all-contributorsrc

@@ -3277,6 +3277,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "cbadger-montecitobank",
+      "name": "cbadger",
+      "avatar_url": "https://avatars.githubusercontent.com/u/123421218?v=4",
+      "profile": "https://github.com/cbadger-montecitobank",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "skipCi": true,

.github/workflows/assets_validation.yml

@@ -19,7 +19,7 @@ concurrency:
 jobs:
   test-npm-build:
     name: Test building assets
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - name: Rebuild packages

.github/workflows/close_stale_prs_issues.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   close-stale-prs-issues:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/stale@v9
         with:

.github/workflows/comment_issue_on_triage.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   comment-issue-on-triage:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       issues: write
     # Despite the trigger being called "issues", this would still run for setting the milestone of PRs too.

.github/workflows/community_metrics.yml

@@ -12,7 +12,7 @@ permissions:
 jobs:
   generate-community-metrics:
     name: Generate Community Metrics
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - name: Get Dates For Last Month
       shell: pwsh

.github/workflows/contributor_map.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   update-contributor-map:
     name: Update Contributor Map
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Update Contributor Map

.github/workflows/docs_validation.yml

@@ -20,7 +20,7 @@ concurrency:
 jobs:
   validate-building-documentation:
     name: Validating Building the Documentation
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
       with:

.github/workflows/first_time_contributor.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   first-time-contributor-welcome:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     # We don't use the actions/first-interaction action because it can't reference the author, nor can it comment after
     # PR merge.

.github/workflows/functional_all_db.yml

@@ -29,7 +29,7 @@ jobs:
         github.event_name == 'push' ||
         github.event.review.state == 'APPROVED' ||
         github.event.review.state == 'CHANGES_REQUESTED'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container:
       image: cypress/included:13.17.0
     steps:
@@ -59,7 +59,7 @@ jobs:
         github.event_name == 'push' ||
         github.event.review.state == 'APPROVED' ||
         github.event.review.state == 'CHANGES_REQUESTED'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container:
       image: cypress/included:13.17.0
     env:
@@ -90,7 +90,7 @@ jobs:
         github.event_name == 'push' ||
         github.event.review.state == 'APPROVED' ||
         github.event.review.state == 'CHANGES_REQUESTED'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container:
       image: cypress/included:13.17.0
     services:
@@ -136,7 +136,7 @@ jobs:
         github.event_name == 'push' ||
         github.event.review.state == 'APPROVED' ||
         github.event.review.state == 'CHANGES_REQUESTED'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container:
       image: cypress/included:13.17.0
     services:
@@ -178,7 +178,7 @@ jobs:
         github.event_name == 'push' ||
         github.event.review.state == 'APPROVED' ||
         github.event.review.state == 'CHANGES_REQUESTED'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container:
       image: cypress/included:13.17.0
     services:

.github/workflows/main_ci.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-22.04, windows-latest]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
@@ -38,14 +38,14 @@ jobs:
       run: |
         dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj 
     - name: Functional Tests
-      if: matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-22.04'
       run: |
         cd test/OrchardCore.Tests.Functional
         npm install
         npm run cms:test
         npm run mvc:test
     - uses: actions/upload-artifact@v4
-      if: matrix.os == 'ubuntu-latest' && failure()
+      if: matrix.os == 'ubuntu-22.04' && failure()
       with:
         name: Functional Test failure
         path: |

.github/workflows/pr_ci.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-22.04, windows-latest]
     name: Build & Test
     steps:
     - uses: actions/checkout@v4
@@ -35,14 +35,14 @@ jobs:
       run: |
         dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
     - name: Functional Tests
-      if: matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-22.04'
       run: |
         cd test/OrchardCore.Tests.Functional
         npm install
         npm run cms:test
         npm run mvc:test
     - uses: actions/upload-artifact@v4
-      if: matrix.os == 'ubuntu-latest' && failure()
+      if: matrix.os == 'ubuntu-22.04' && failure()
       with:
         name: functional-test-failure
         path: |

.github/workflows/preview_ci.yml

@@ -9,7 +9,7 @@ env:
   DOTNET_CLI_TELEMETRY_OPTOUT: true
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Build, Test, Deploy
     steps:
     - uses: actions/checkout@v4

.github/workflows/release_ci.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-22.04, windows-latest]
     steps:
     - name: Get the version
       id: get_version
@@ -37,7 +37,7 @@ jobs:
       with:
         dotnet-version: '9.0.x'
     - name: Set build number 
-      if: matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-22.04'
       run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 15471 ))" >> $GITHUB_ENV
     - name: Build
       # NuGetAudit is intentionally not disabled here like it is for other CI builds, because we need to address any
@@ -48,35 +48,35 @@ jobs:
       run: |
         dotnet test -c Release --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj 
     - name: Functional Tests
-      if: matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-22.04'
       run: |
         cd test/OrchardCore.Tests.Functional
         npm install
         npm run cms:test
         npm run mvc:test
     - uses: actions/upload-artifact@v4
-      if: matrix.os == 'ubuntu-latest' && failure()
+      if: matrix.os == 'ubuntu-22.04' && failure()
       with:
         name: Functional Test failure
         path: |
           test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots
           src/OrchardCore.Cms.Web/App_Data_Tests/logs
     - name: Deploy release NuGet packages
-      if: matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-22.04'
       run: |
         dotnet pack -c Release --no-build -p:Version=${{ steps.get_version.outputs.VERSION }} -p:TreatWarningsAsErrors=false
         dotnet nuget push './src/**/*.nupkg' -t 600 -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
     - name: Set up Docker Buildx
-      if: matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-22.04'
       uses: docker/setup-buildx-action@v3
     - name: Login to DockerHub
-      if: matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-22.04'
       uses: docker/login-action@v3
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_PASSWORD }}
     - name: Deploy release docker images
-      if: matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-22.04'
       shell: pwsh
       run: |
         Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data -Recurse | Remove-Item -Recurse -Confirm:$false

.github/workflows/validate_pr.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   validate-pull-request:
     name: Validate Pull Request
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 3
     steps:
       - name: Check for Merge Conflict in PR

Directory.Packages.props

@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageVersion Include="AngleSharp" Version="1.1.2" />
-    <PackageVersion Include="AWSSDK.S3" Version="3.7.410.12" />
+    <PackageVersion Include="AngleSharp" Version="1.2.0" />
+    <PackageVersion Include="AWSSDK.S3" Version="3.7.411" />
     <PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
     <PackageVersion Include="Azure.Communication.Email" Version="1.0.1" />
     <PackageVersion Include="Azure.Communication.Sms" Version="1.0.1" />
@@ -24,14 +24,14 @@
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageVersion Include="Castle.Core" Version="5.1.1" />
     <PackageVersion Include="DocumentFormat.OpenXml" Version="3.2.0" />
-    <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.16.3" />
-    <PackageVersion Include="Fluid.Core" Version="2.16.0" />
+    <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.17.0" />
+    <PackageVersion Include="Fluid.Core" Version="2.17.0" />
     <PackageVersion Include="GraphQL" Version="8.2.1" />
     <PackageVersion Include="GraphQL.DataLoader" Version="8.2.1" />
     <PackageVersion Include="GraphQL.MicrosoftDI" Version="8.2.1" />
     <PackageVersion Include="GraphQL.SystemTextJson" Version="8.2.1" />
     <PackageVersion Include="Jint" Version="4.1.0" />
-    <PackageVersion Include="JsonPath.Net" Version="2.0.1" />
+    <PackageVersion Include="JsonPath.Net" Version="2.1.0" />
     <PackageVersion Include="HtmlSanitizer" Version="8.2.871-beta" />
     <PackageVersion Include="Irony" Version="1.5.3" />
     <PackageVersion Include="libphonenumber-csharp" Version="8.13.52" />

src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/AzureADSettingsConfiguration.cs

@@ -1,7 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using OrchardCore.Environment.Shell;
 using OrchardCore.Microsoft.Authentication.Services;
 using OrchardCore.Microsoft.Authentication.Settings;
 
@@ -10,17 +9,10 @@ namespace OrchardCore.Microsoft.Authentication.Configuration;
 public sealed class AzureADSettingsConfiguration : IConfigureOptions<AzureADSettings>
 {
     private readonly IAzureADService _azureADService;
-    private readonly ShellSettings _shellSettings;
-    private readonly ILogger _logger;
 
-    public AzureADSettingsConfiguration(
-        IAzureADService azureADService,
-        ShellSettings shellSettings,
-        ILogger<AzureADSettingsConfiguration> logger)
+    public AzureADSettingsConfiguration(IAzureADService azureADService)
     {
         _azureADService = azureADService;
-        _shellSettings = shellSettings;
-        _logger = logger;
     }
 
     public void Configure(AzureADSettings options)
@@ -45,11 +37,6 @@ private async Task<AzureADSettings> GetAzureADSettingsAsync()
 
         if (_azureADService.ValidateSettings(settings).Any(result => result != ValidationResult.Success))
         {
-            if (_shellSettings.IsRunning())
-            {
-                _logger.LogWarning("The AzureAD Authentication is not correctly configured.");
-            }
-
             return null;
         }
 

src/docs/README.md

@@ -1,6 +1,6 @@
 # Orchard Core
 
-Orchard Core is an open-source, modular, multi-tenant application framework and CMS for ASP.NET Core. It's a redevelopment of [Orchard CMS](https://github.com/OrchardCMS/Orchard) on [ASP.NET Core](https://docs.microsoft.com/aspnet/core/). 
+Orchard Core is an open-source, modular, multi-tenant application framework and CMS for ASP.NET Core. It's a redevelopment of [Orchard CMS](https://github.com/OrchardCMS/Orchard) on [ASP.NET Core](https://docs.microsoft.com/aspnet/core/)?
 
 Orchard Core consists of two different targets:
 

src/docs/community/contributors/README.md

@@ -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-354-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-355-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))!
@@ -491,6 +491,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/sparkie79"><img src="https://avatars.githubusercontent.com/u/4757890?v=4?s=100" width="100px;" alt="sparkie79"/><br /><sub><b>sparkie79</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=sparkie79" title="Code">💻</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/salmattia"><img src="https://avatars.githubusercontent.com/u/36173554?v=4?s=100" width="100px;" alt="Mattia Salvetti"/><br /><sub><b>Mattia Salvetti</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=salmattia" title="Code">💻</a></td>
     </tr>
+    <tr>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/cbadger-montecitobank"><img src="https://avatars.githubusercontent.com/u/123421218?v=4?s=100" width="100px;" alt="cbadger"/><br /><sub><b>cbadger</b></sub></a><br /><a href="https://github.com/OrchardCMS/OrchardCore/commits?author=cbadger-montecitobank" title="Code">💻</a></td>
+    </tr>
   </tbody>
 </table>
 

src/docs/getting-started/external-resources.md

@@ -16,3 +16,7 @@ If you want to learn or improve your knowledge about Orchard Core, you can follo
 ## Gurubase
 
 You can also ask the [Orchard Core Guru on Gurubase](https://gurubase.io/g/orchard-core) for help. It is an Orchard Core-focused AI to answer your questions.
+
+## Other Resources
+
+- [Orchard Core Basics Companion (OCBC)](https://gcl.gitbook.io/orchard-core-basics-companion-ocbc): This documentation is designed to guide developers through Orchard Core in a clear, approachable, and practical way.

test/OrchardCore.Tests/ResourceManagement/ResourceManagerTests.cs

@@ -76,7 +76,7 @@ public void FindHighestVersionedResourceFromManifest()
     }
 
     [Fact]
-    public void RegisterResouceUrl()
+    public void RegisterResourceUrl()
     {
         var resourceManager = new ResourceManager(
             new OptionsWrapper<ResourceManagementOptions>(new ResourceManagementOptions()),