Merge main

.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/target_frameworks.md

@@ -10,7 +10,12 @@ 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).

.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

.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-24.04
 
     steps:
       - name: Update Contributor Map

.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: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: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,7 +84,7 @@ 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:13.17.0
     services:
@@ -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,7 +127,7 @@ 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:13.17.0
     services:
@@ -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,7 +166,7 @@ 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:13.17.0
     services:
@@ -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

.github/workflows/mac_unit_test_ci.yml

@@ -1,6 +1,6 @@
 name: Unit Tests - MacOS
 on:
-# manual trigger
+  # manual trigger
   workflow_dispatch:
 env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
@@ -11,9 +11,7 @@ jobs:
     name: Unit Tests
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: '9.0.x'
+    - uses: ./.github/actions/setup-dotnet
     - name: Build and test
       run: |
         dotnet build -c Release /p:TreatWarningsAsErrors=true /p:RunAnalyzers=true

.github/workflows/main_ci.yml

@@ -21,15 +21,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-24.04, windows-2022]
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
         node-version: "15"
-    - uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: '9.0.x'
+    - uses: ./.github/actions/setup-dotnet
     - name: Build
       # See pr_ci.yml for the reason why we disable NuGet audit warnings.
       run: |
@@ -38,14 +36,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-24.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-24.04' && failure()
       with:
         name: Functional Test failure
         path: |

.github/workflows/pr_ci.yml

@@ -14,16 +14,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-24.04, windows-2022]
     name: Build & Test
     steps:
     - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
         node-version: "15"
-    - uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: '9.0.x'
+    - uses: ./.github/actions/setup-dotnet
     - name: Build
       # We disable NuGet audit warnings, see https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1901-nu1904.
       # Security issues being discovered in NuGet packages we use can happen at any time, and thus all our CI builds that
@@ -35,14 +33,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-24.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-24.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-24.04
     name: Build, Test, Deploy
     steps:
     - uses: actions/checkout@v4
@@ -25,10 +25,8 @@ jobs:
       if: steps.check-publish.outputs.should-publish == 'true'
       with:
         node-version: "15"
-    - uses: actions/setup-dotnet@v4
+    - uses: ./.github/actions/setup-dotnet
       if: steps.check-publish.outputs.should-publish == 'true'
-      with:
-        dotnet-version: '9.0.x'
     - name: Set build number
       if: steps.check-publish.outputs.should-publish == 'true'
       run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 16368 ))" >> $GITHUB_ENV