diff --git a/.all-contributorsrc b/.all-contributorsrc index fdecf949f44..267af4d166e 100644 --- a/.all-contributorsrc +++ b/.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, diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index bdbcf2043ab..00000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: 2 -updates: - # Dependabot can handle at most 150 "manifests", so for NuGet, csprojs referencing packages (see docs: - # https://docs.github.com/en/enterprise-cloud@latest/code-security/supply-chain-security/understanding-your-software-supply-chain/troubleshooting-the-dependency-graph#are-there-limits-which-affect-the-dependency-graph-data). - # Thus, it would fail for the whole solution. - # Grouping updates per directories or otherwise trying to have smaller batches is unnecessary, because due to - # centralized package management, Dependabot will find all dependencies from any project. So, just processing the - # OrchardCore project. - - package-ecosystem: "nuget" - directory: "/src/OrchardCore/OrchardCore" - schedule: - interval: "weekly" - groups: - all-dependencies: - patterns: - - "*" - ignore: - # We'll update GraphQL for v3 because it's breaking, see https://github.com/OrchardCMS/OrchardCore/issues/16826. - - dependency-name: "GraphQL*" - # See the corresponding comment in Directory.Packages.props. - - dependency-name: "System.Drawing.Common" diff --git a/.github/workflows/assets_validation.yml b/.github/workflows/assets_validation.yml index 1b7582839a8..8a9eeb0e3b9 100644 --- a/.github/workflows/assets_validation.yml +++ b/.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 diff --git a/.github/workflows/close_stale_prs_issues.yml b/.github/workflows/close_stale_prs_issues.yml index f2eb455a734..02cad5d508f 100644 --- a/.github/workflows/close_stale_prs_issues.yml +++ b/.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: diff --git a/.github/workflows/comment_issue_on_triage.yml b/.github/workflows/comment_issue_on_triage.yml index 1565b6750a0..1a662f3ea1a 100644 --- a/.github/workflows/comment_issue_on_triage.yml +++ b/.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. diff --git a/.github/workflows/community_metrics.yml b/.github/workflows/community_metrics.yml index 544130a9dd3..94e16559ec7 100644 --- a/.github/workflows/community_metrics.yml +++ b/.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 diff --git a/.github/workflows/contributor_map.yml b/.github/workflows/contributor_map.yml index 139e6dbbc41..45cfe59a48a 100644 --- a/.github/workflows/contributor_map.yml +++ b/.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 diff --git a/.github/workflows/docs_validation.yml b/.github/workflows/docs_validation.yml index 2b180e35fe6..f9eba0c6ed0 100644 --- a/.github/workflows/docs_validation.yml +++ b/.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: diff --git a/.github/workflows/first_time_contributor.yml b/.github/workflows/first_time_contributor.yml index a557c023a30..bf1d650a3a2 100644 --- a/.github/workflows/first_time_contributor.yml +++ b/.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. diff --git a/.github/workflows/functional_all_db.yml b/.github/workflows/functional_all_db.yml index b4618e2a4c3..8577c53e291 100644 --- a/.github/workflows/functional_all_db.yml +++ b/.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: diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml index 7b63d95e6ee..bd1a1115c85 100644 --- a/.github/workflows/main_ci.yml +++ b/.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: | diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml index 6d35bb86e80..711a79889ca 100644 --- a/.github/workflows/pr_ci.yml +++ b/.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: | diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml index b2959185775..1f3049a8ca5 100644 --- a/.github/workflows/preview_ci.yml +++ b/.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 diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml index 7ea1340948e..9757d3cc4d7 100644 --- a/.github/workflows/release_ci.yml +++ b/.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 diff --git a/.github/workflows/validate_pr.yml b/.github/workflows/validate_pr.yml index f24a4777653..77809155ef5 100644 --- a/.github/workflows/validate_pr.yml +++ b/.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 diff --git a/Directory.Packages.props b/Directory.Packages.props index 136bb0c84f0..0b6b17d0d8c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -11,8 +11,8 @@ - - + + @@ -24,14 +24,14 @@ - - + + - + diff --git a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/AzureADSettingsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/AzureADSettingsConfiguration.cs index 4ed58e94ec5..fd04d272a3c 100644 --- a/src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/Configuration/AzureADSettingsConfiguration.cs +++ b/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 { private readonly IAzureADService _azureADService; - private readonly ShellSettings _shellSettings; - private readonly ILogger _logger; - public AzureADSettingsConfiguration( - IAzureADService azureADService, - ShellSettings shellSettings, - ILogger logger) + public AzureADSettingsConfiguration(IAzureADService azureADService) { _azureADService = azureADService; - _shellSettings = shellSettings; - _logger = logger; } public void Configure(AzureADSettings options) @@ -45,11 +37,6 @@ private async Task GetAzureADSettingsAsync() if (_azureADService.ValidateSettings(settings).Any(result => result != ValidationResult.Success)) { - if (_shellSettings.IsRunning()) - { - _logger.LogWarning("The AzureAD Authentication is not correctly configured."); - } - return null; } diff --git a/src/docs/README.md b/src/docs/README.md index d50cb711e33..39a42558ed3 100644 --- a/src/docs/README.md +++ b/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: diff --git a/src/docs/community/contributors/README.md b/src/docs/community/contributors/README.md index a00c0e029e9..70b4da18eb0 100644 --- a/src/docs/community/contributors/README.md +++ b/src/docs/community/contributors/README.md @@ -1,7 +1,7 @@ # Contributors ✨ -[![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-) 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 sparkie79
sparkie79
💻 Mattia Salvetti
Mattia Salvetti
💻 + + cbadger
cbadger
💻 + diff --git a/src/docs/getting-started/external-resources.md b/src/docs/getting-started/external-resources.md index 5c688f5d1de..f46efc8985f 100644 --- a/src/docs/getting-started/external-resources.md +++ b/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. diff --git a/test/OrchardCore.Tests/ResourceManagement/ResourceManagerTests.cs b/test/OrchardCore.Tests/ResourceManagement/ResourceManagerTests.cs index cb1c3377660..065ca41aa14 100644 --- a/test/OrchardCore.Tests/ResourceManagement/ResourceManagerTests.cs +++ b/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(new ResourceManagementOptions()),