Merge remote-tracking branch 'upstream/main' into srvcs_acct_to_login…

…_data

.all-contributorsrc

@@ -3149,6 +3149,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "vsezima",
+      "name": "Václav Sezima",
+      "avatar_url": "https://avatars.githubusercontent.com/u/15254338?v=4",
+      "profile": "https://github.com/vsezima",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "tmat",
+      "name": "Tomáš Matoušek",
+      "avatar_url": "https://avatars.githubusercontent.com/u/41759?v=4",
+      "profile": "https://github.com/tmat",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "skipCi": true,

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,14 +1,19 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a bug report to help us improve
 title: ''
 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/. -->
 
 ### Describe the bug
 
+### Orchard Core version
+
+Add the version of the Orchard Core NuGet packages you use, or the commit hash if you can reproduce this with the source code.
+
 ### To Reproduce
 Steps to reproduce the behavior:
 1. Go to '...'
@@ -19,5 +24,5 @@ Steps to reproduce the behavior:
 ### Expected behavior
 A clear and concise description of what you expected to happen.
 
-### Screenshots
-If applicable, add screenshots to help explain your problem.
+### Logs and screenshots
+If applicable, add log files, browser console logs, and screenshots (or screen recording videos) to help explain your problem.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
   - name: Discussions
     url: https://github.com/OrchardCMS/OrchardCore/discussions/new

.github/ISSUE_TEMPLATE/feature_request.md

@@ -6,6 +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/. -->
 
 ### Is your feature request related to a problem? Please describe.
 A clear and concise description of what the problem is.

.github/ISSUE_TEMPLATE/release.md

@@ -52,7 +52,7 @@ Update everything in the [Translations project](https://github.com/OrchardCMS/Or
 
 - [ ] Update .po files with [PoExtractor](https://github.com/lukaskabrt/PoExtractor). This will also update [Crowdin](https://crowdin.com/project/orchard-core).
 - [ ] Publish the new version on NuGet.
-- [ ] Update the `OrchardCore.Translations.All` package reference in the main repo's _src/OrchardCore.Build/Dependencies.props_ file to refer to the new NuGet package.
+- [ ] Update the `OrchardCore.Translations.All` package reference in the main repo's _./Dependencies.Packages.props_ file to refer to the new NuGet package.
 
 ### Publish the release
 

.github/workflows/close_stale_prs_issues.yml

@@ -0,0 +1,34 @@
+# Labels PRs without updates for 60 days as stale, then closes them 15 days later.
+# Labels issues that are labeled with "needs author feedback" without updates for 15 days as stale, then closes them 7 days later.
+name: Close Stale PRs and Issues
+
+on:
+  schedule:
+    # Every day at 1:39 AM UTC. A random time to avoid GitHub Actions being overloaded by scheduled workflows.
+    - cron: '39 1 * * *'
+
+jobs:
+  close-stale-prs-issues:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-pr-message: >
+            It seems that this pull request didn't really move for quite a while. Is this something you'd like to 
+            revisit any time soon or should we close? Please comment if you'd like to pick it up.
+          stale-pr-label: stale
+          # Close the PR 15 days after marking it as stale.
+          days-before-pr-close: 15
+          close-pr-message: >
+            Closing this pull request because it has been stale for very long. If you think this is still relevant, 
+            feel free to reopen it.
+          stale-issue-message: >
+            It seems that this issue didn't really move for quite a while despite us asking the author for further 
+            feedback. Is this something you'd like to revisit any time soon or should we close? Please reply.
+          stale-issue-label: stale
+          days-before-issue-stale: 15
+          days-before-issue-close: 7
+          only-issue-labels: needs author feedback
+          close-issue-message: >
+            Closing this issue because it didn't receive further feedback from the author for very long. If you think 
+            this is still relevant, feel free to reopen it with the requested details.

.github/workflows/comment_issue_on_triage.yml

@@ -0,0 +1,33 @@
+# Adds a comment on the issue when its milestone is set.
+name: Comment Issue on Triage
+
+on:
+  issues:
+    # Note that this is triggered also when the milestone changes. Preventing that would require jumping through a lot 
+    # of hoops, and that should be rare anyway.
+    types: [milestoned]
+
+jobs:
+  comment-issue-on-triage:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    # Despite the trigger being called "issues", this would still run for setting the milestone of PRs too.
+    if: github.event.issue.pull_request == null && github.event.issue.state == 'open'
+    steps:
+      - name: Add Comment
+        run: gh issue comment "$NUMBER" --body "$BODY"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
+          # 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 
+            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/).

.github/workflows/community_metrics.yml

@@ -70,7 +70,20 @@ jobs:
       shell: pwsh
       run: |
         Get-Content ./community_metrics.md >> $env:GITHUB_STEP_SUMMARY
-          
+
+    - name: Close Previous Issue
+      shell: pwsh
+      run: |
+        # Without the --repo switch, the GH CLI will try to look it up from the current clone, which doesn't exist
+        # because we don't otherwise need checkout.
+        $issues = gh issue list --repo '${{ github.repository }}' --label 'community metrics' --state open --json number --jq '.[].number'
+        foreach ($issue in $issues)
+        {
+            gh issue close $issue --repo '${{ github.repository }}' --comment 'Closing this issue as newer community metrics are available.'
+        }
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Create Issue
       # v5.0.0
       uses: peter-evans/create-issue-from-file@24452a72d85239eacf1468b0f1982a9f3fec4c94

.github/workflows/first_time_contributor.yml

@@ -26,6 +26,8 @@ jobs:
           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: >
-          Congratulations on your first PR merge! 🎉 Thank you for your contribution! We're looking forward to welcome 
+          Congratulations on your first PR merge! 🎉 Thank you for your contribution! We're looking forward to welcoming 
           other contributions of yours in the future. @all-contributors please add @{{ author }} for code.
-        STAR_MESSAGE: If you like Orchard Core, please star our repo and join our [community channels ](https://github.com/OrchardCMS/OrchardCore/?tab=readme-ov-file#get-in-touch)
+        STAR_MESSAGE: > 
+          If you like Orchard Core, please star our repo and join our 
+          [community channels](https://github.com/OrchardCMS/OrchardCore/?tab=readme-ov-file#get-in-touch).

.github/workflows/functional_all_db.yml

@@ -21,6 +21,14 @@ env:
 jobs:
   test_functional_mvc:
     name: Functional Tests - MVC
+    # These conditions are needed because the workflow triggers on individual PR comments too, see
+    # https://github.com/orgs/community/discussions/124396.
+    # They either need to be repeated for each job, or we need to use a separate job (i.e. VM to run the condition) that
+    # triggers the others.
+    if: github.event_name == 'workflow_dispatch' ||
+        github.event_name == 'push' ||
+        github.event.review.state == 'APPROVED' ||
+        github.event.review.state == 'CHANGES_REQUESTED'
     runs-on: ubuntu-latest
     container:
       image: cypress/included:9.6.1
@@ -47,6 +55,10 @@ jobs:
 
   test_functional_cms_sqlite:
     name: Functional Tests - CMS Sqlite
+    if: github.event_name == 'workflow_dispatch' ||
+        github.event_name == 'push' ||
+        github.event.review.state == 'APPROVED' ||
+        github.event.review.state == 'CHANGES_REQUESTED'
     runs-on: ubuntu-latest
     container:
       image: cypress/included:9.6.1
@@ -74,6 +86,10 @@ jobs:
 
   test_functional_cms_postgresql:
     name: Functional Tests - CMS Postgres
+    if: github.event_name == 'workflow_dispatch' ||
+        github.event_name == 'push' ||
+        github.event.review.state == 'APPROVED' ||
+        github.event.review.state == 'CHANGES_REQUESTED'
     runs-on: ubuntu-latest
     container:
       image: cypress/included:9.6.1
@@ -116,6 +132,10 @@ jobs:
 
   test_functional_cms_mysql:
     name: Functional Tests - CMS MySql
+    if: github.event_name == 'workflow_dispatch' ||
+        github.event_name == 'push' ||
+        github.event.review.state == 'APPROVED' ||
+        github.event.review.state == 'CHANGES_REQUESTED'
     runs-on: ubuntu-latest
     container:
       image: cypress/included:9.6.1
@@ -154,6 +174,10 @@ jobs:
 
   test_functional_cms_mssql:
     name: Functional Tests - CMS SqlServer 2019
+    if: github.event_name == 'workflow_dispatch' ||
+        github.event_name == 'push' ||
+        github.event.review.state == 'APPROVED' ||
+        github.event.review.state == 'CHANGES_REQUESTED'
     runs-on: ubuntu-latest
     container:
       image: cypress/included:9.6.1

.github/workflows/preview_ci.yml

@@ -19,7 +19,7 @@ jobs:
       run: |
         $hasCommitFromLastDay = ![string]::IsNullOrEmpty((git log --oneline --since '24 hours ago'))
         Write-Output "Commits found in the last 24 hours: $hasCommitFromLastDay."
-        $shouldPublish = $hasCommitFromLastDay -and '${{ github.event_name }}' -eq 'schedule'
+        $shouldPublish = ($hasCommitFromLastDay -and '${{ github.event_name }}' -eq 'schedule') -or ('${{ github.event_name }}' -eq 'workflow_dispatch')
         "should-publish=$($shouldPublish ? 'true' : 'false')" >> $Env:GITHUB_OUTPUT
     - uses: actions/setup-node@v4
       if: steps.check-publish.outputs.should-publish == 'true'

.gitignore

@@ -16,6 +16,7 @@ build/
 app.publish/
 [Bb]in/
 [Oo]bj/
+*.binlog
 
 # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
 !packages/*/build/

Directory.Build.props

@@ -1,5 +1,7 @@
 <Project>
 
+  <Import Project="src\OrchardCore.Build\TargetFrameworks.props" />
+
   <PropertyGroup>
     <!-- https://aka.ms/vs-build-acceleration -->
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>