Merge branch 'main' into ma/roles-abstractions

.all-contributorsrc

@@ -1444,7 +1444,8 @@
       "avatar_url": "https://avatars0.githubusercontent.com/u/13678304?v=4",
       "profile": "https://github.com/Habbni",
       "contributions": [
-        "translation"
+        "translation",
+        "code"
       ]
     },
     {
@@ -3249,6 +3250,42 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "jbytes1027",
+      "name": "James Pretorius",
+      "avatar_url": "https://avatars.githubusercontent.com/u/50090107?v=4",
+      "profile": "https://github.com/jbytes1027",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sparkie79",
+      "name": "sparkie79",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4757890?v=4",
+      "profile": "https://github.com/sparkie79",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "salmattia",
+      "name": "Mattia Salvetti",
+      "avatar_url": "https://avatars.githubusercontent.com/u/36173554?v=4",
+      "profile": "https://github.com/salmattia",
+      "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/ISSUE_TEMPLATE/bug_report.md

@@ -6,7 +6,7 @@ labels: 'bug :bug:'
 assignees: ''
 
 ---
-<!-- Please also see the docs on how we manage issues: https://docs.orchardcore.net/en/latest/docs/guides/contributing/managing-issues/. -->
+<!-- Please also see the docs on how we manage issues: https://docs.orchardcore.net/en/latest/docs/contributing/managing-issues/. -->
 <!-- Please replace all placeholders such as this below. -->
 
 ### Describe the bug

.github/ISSUE_TEMPLATE/feature_request.md

@@ -6,7 +6,7 @@ labels: enhancement
 assignees: ''
 
 ---
-<!-- Please also see the docs on how we manage issues: https://docs.orchardcore.net/en/latest/docs/guides/contributing/managing-issues/. -->
+<!-- Please also see the docs on how we manage issues: https://docs.orchardcore.net/en/latest/docs/contributing/managing-issues/. -->
 <!-- Please replace all placeholders such as this below. -->
 
 ### Is your feature request related to a problem?

.github/ISSUE_TEMPLATE/patch_release.md

@@ -20,8 +20,7 @@ assignees: ''
 ### Create Pull Request:
 
   - [ ] From the release branch (e.g., `release/2.1`), create a new temporary branch for your release (e.g., `release-notes/2.1.1`).
-  - [ ] Update version references in the documentation. Refer to [this PR](https://github.com/OrchardCMS/OrchardCore/pull/17065/files) for an example.
-  - [ ] **Version Updates Checklist**:
+  - [ ] Update version references in the documentation. Refer to [this PR](https://github.com/OrchardCMS/OrchardCore/pull/17065/files) for an example. Version Updates Checklist:
      - **Update `OrchardCore.Commons.props`**: Set `<VersionSuffix></VersionSuffix>` to the new version you're preparing for release.
      - **Update Module Versions**: Modify `src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs` to reflect the new version.
      - **Release Notes**: Finalize the release notes in the documentation, including:
@@ -33,6 +32,8 @@ assignees: ''
        - [Status in the root README](https://docs.orchardcore.net/en/latest/#status)
        - CLI templates and commands.
        - Relevant guides, such as the [Creating a new decoupled CMS Website](https://docs.orchardcore.net/en/latest/guides/decoupled-cms/) guide.
+  - [ ] Create a **Documentation PR** titled "Release with the new version number" (e.g., `Release 2.1.1`) from the documentation branch (e.g., `release-notes/2.1.1`) into the release branch (e.g., `release/2.1`)
+  - [ ] Merge the Documentation PR.
   - [ ] In GitHub, manually run the `Preview - CI` workflow on your branch (NOT `main`). This will release a new preview version on CloudSmith for testing.
 
 ## Step 3: Validation

.github/ISSUE_TEMPLATE/targetframeworks.md → .github/ISSUE_TEMPLATE/target_frameworks.md

@@ -10,10 +10,30 @@ assignees: ''
 Use the minimal SDK version required, the `rollForward` rule will pick the latest version available on the machine. It's up to the user to update their SDK to the version they want in case there is an update and we don't want to force them into a newer version in case they can't install it.
 - [ ] Update `src/OrchardCore.Build/TargetFrameworks.props`.
 - [ ] Add a custom `AspNetCorePackagesVersion` for each TFM in `Directory.Packages.props`
-- [ ] Update all `uses: actions/setup-dotnet` tasks to the required SDK version.
+- [ ] Update `.github/actions/setup-dotnet/action.yml` to the required SDK versions. If dual targeting frameworks, add both, e.g.:
+```yaml
+dotnet-version: | 
+  8.0.x
+  9.0.x
+```
 - [ ] Update all `dotnet publish`, `dotnet build` and `dotnet test` calls to the latest TFM, if specified.
 - [ ] Update all `tasks.json` files to target the latest TFM
 - [ ] Update the list of template **choices** (see the `template.json` files).
 - [ ] Update docker file base images.
 - [ ] Update documentation pages specifying a TFM (search for `<TargetFramework>`).
 - [ ] Add a note about the supported .NET versions to the upcoming release notes.
+- [ ] When dual-targeting framework versions, configure Renovate in the `renovate.json5` file (in the repository root) to update packages targeting the older framework only up to their compatible versions. An example package rule for the `packageRules` section that will update the <9.0.0 (i.e. 8.x) version of the matching packages only up to 8.x:
+  ```json5
+  {
+      // The .NET 8 versions of these packages need to stay on 8.x. We maintain a separate reference to the 
+      // .NET 9 versions in Directory.Packages.props, which is only active when building for .NET 9.
+      matchPackageNames: [
+          '/^Microsoft\\.AspNetCore.*$/',
+          '/^Microsoft\\.Extensions.*$/',
+          'Serilog.AspNetCore',
+          'System.Text.Json',
+      ],
+      allowedVersions: '<9.0.0',
+      matchCurrentVersion: '<9.0.0',
+  }
+  ```

.github/actions/setup-dotnet/action.yml

@@ -0,0 +1,12 @@
+name: Set Up .NET
+description: Centralized actions/setup-dotnet for easier updates.
+
+runs:
+  using: composite
+  steps:
+    - name: Set Up .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: | 
+          8.0.x
+          9.0.x

.github/pull_request_template.md

@@ -1 +1 @@
-<!--- Please make sure that you're familiar with our contribution guidelines before submitting a pull request: https://docs.orchardcore.net/en/latest/guides/contributing/. -->
+<!--- Please make sure that you're familiar with our contribution guidelines before submitting a pull request: https://docs.orchardcore.net/en/latest/contributing/. -->

.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-24.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-24.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-24.04
     permissions:
       issues: write
     # Despite the trigger being called "issues", this would still run for setting the milestone of PRs too.
@@ -24,10 +24,10 @@ jobs:
           # The double empty lines in the body are necessary; it'll show up as a single empty line in the comment.
           BODY: >
             We triaged this issue and set the milestone according to the priority we think is appropriate (see 
-            [the docs](https://docs.orchardcore.net/en/latest/docs/guides/contributing/managing-issues/) on how we 
+            [the docs](https://docs.orchardcore.net/en/latest/docs/contributing/managing-issues/) on how we 
             triage and prioritize issues).
 
 
             This indicates when the core team may start working on it. However, if you'd like to contribute, we'd 
             warmly welcome you to do that anytime. See our guide on contributions 
-            [here](https://docs.orchardcore.net/en/latest/docs/guides/contributing/).
+            [here](https://docs.orchardcore.net/en/latest/docs/contributing/).

.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-24.04
     steps:
     - name: Get Dates For Last Month
       shell: pwsh
@@ -86,8 +86,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Create Issue
-      # v5.0.0
-      uses: peter-evans/create-issue-from-file@24452a72d85239eacf1468b0f1982a9f3fec4c94
+      uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5.0.1
       with:
         title: Monthly community metrics report for ${{ env.LAST_MONTH }}
         token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/contributor_map.yml

@@ -9,11 +9,10 @@ on:
 jobs:
   update-contributor-map:
     name: Update Contributor Map
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Update Contributor Map
-        # v1.1
-        uses: tunaitis/contributor-map@bf97d201f9b59abe463fa4ef3b5c4478d22f606d
+        uses: tunaitis/contributor-map@bf97d201f9b59abe463fa4ef3b5c4478d22f606d # renovate: tag=v1.1
         with:
             output: src/docs/community/contributors/images/contributors-map.svg

.github/workflows/docs_validation.yml

@@ -20,18 +20,15 @@ concurrency:
 jobs:
   validate-building-documentation:
     name: Validating Building the Documentation
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
       with:
         # Necessary to avoid mkdocs-git-revision-date-localized-plugin warnings.
         fetch-depth: 0
 
     - name: Install Dependencies
-      # Installing pip v22.0.3 is only necessary because unbuntu-latest runners include v22.0.2, which has a bug. That
-      # line can be removed once the runners are updated, see https://github.com/actions/runner-images?tab=readme-ov-file#available-images.
       run: |
-        python -m pip install pip==22.0.3
         pip install -r src/docs/requirements.txt -v
 
     - name: Build Documentation

.github/workflows/first_time_contributor.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   first-time-contributor-welcome:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.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.
@@ -21,10 +21,10 @@ jobs:
           Thank you for submitting your first issue, awesome! 🚀 We're thrilled to receive your input. If you haven't
           completed the template yet, please take a moment to do so. This ensures that we fully understand your feature
           request or bug report. On what happens next, see 
-          [the docs](https://docs.orchardcore.net/en/latest/guides/contributing/managing-issues/#what-happens-after-you-open-an-issue).
+          [the docs](https://docs.orchardcore.net/en/latest/contributing/managing-issues/#what-happens-after-you-open-an-issue).
         FIRST_PR_COMMENT: >
           Thank you for submitting your first pull request, awesome! 🚀 If you haven't already, please take a moment
-          to review our [contribution guide](https://docs.orchardcore.net/en/latest/guides/contributing/). This
+          to review our [contribution guide](https://docs.orchardcore.net/en/latest/contributing/). This
           guide provides helpful information to ensure your contribution aligns with our standards. A core team member
           will review your pull request.
         FIRST_PR_MERGED_COMMENT: >

.github/workflows/functional_all_db.yml

@@ -29,15 +29,12 @@ jobs:
         github.event_name == 'push' ||
         github.event.review.state == 'APPROVED' ||
         github.event.review.state == 'CHANGES_REQUESTED'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     container:
-      image: cypress/included:9.6.1
+      image: cypress/included:13.17.0
     steps:
     - uses: actions/checkout@v4
-      # We need to install dotnet in the docker container.
-    - uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: '9.0.x'
+    - uses: ./.github/actions/setup-dotnet
     - uses: actions/setup-node@v4
       with:
         node-version: "15"
@@ -59,17 +56,14 @@ jobs:
         github.event_name == 'push' ||
         github.event.review.state == 'APPROVED' ||
         github.event.review.state == 'CHANGES_REQUESTED'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     container:
-      image: cypress/included:9.6.1
+      image: cypress/included:13.17.0
     env:
       OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
     steps:
     - uses: actions/checkout@v4
-      # We need to install dotnet in the docker container.
-    - uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: '9.0.x'
+    - uses: ./.github/actions/setup-dotnet
     - name: Functional Tests
       run: |
         cd test/OrchardCore.Tests.Functional
@@ -90,9 +84,9 @@ jobs:
         github.event_name == 'push' ||
         github.event.review.state == 'APPROVED' ||
         github.event.review.state == 'CHANGES_REQUESTED'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     container:
-      image: cypress/included:9.6.1
+      image: cypress/included:13.17.0
     services:
       postgres:
         image: postgres:11
@@ -112,10 +106,7 @@ jobs:
       OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
     steps:
     - uses: actions/checkout@v4
-      # We need to install dotnet in the docker container.
-    - uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: '9.0.x'
+    - uses: ./.github/actions/setup-dotnet
     - name: Functional Tests
       run: |
         cd test/OrchardCore.Tests.Functional
@@ -136,9 +127,9 @@ jobs:
         github.event_name == 'push' ||
         github.event.review.state == 'APPROVED' ||
         github.event.review.state == 'CHANGES_REQUESTED'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     container:
-      image: cypress/included:9.6.1
+      image: cypress/included:13.17.0
     services:
       mysql:
         image: mysql:8
@@ -154,10 +145,7 @@ jobs:
       OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
     steps:
     - uses: actions/checkout@v4
-      # We need to install dotnet in the docker container.
-    - uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: '9.0.x'
+    - uses: ./.github/actions/setup-dotnet
     - name: Functional Tests
       run: |
         cd test/OrchardCore.Tests.Functional
@@ -178,9 +166,9 @@ jobs:
         github.event_name == 'push' ||
         github.event.review.state == 'APPROVED' ||
         github.event.review.state == 'CHANGES_REQUESTED'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     container:
-      image: cypress/included:9.6.1
+      image: cypress/included:13.17.0
     services:
       mssql:
         image: mcr.microsoft.com/mssql/server:2019-latest
@@ -195,10 +183,7 @@ jobs:
       OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
     steps:
     - uses: actions/checkout@v4
-      # We need to install dotnet in the docker container.
-    - uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: '9.0.x'
+    - uses: ./.github/actions/setup-dotnet
     - name: Functional Tests
       run: |
         cd test/OrchardCore.Tests.Functional