Skip to content

Commit

Permalink
Merge branch 'main' into ag/Markdig0.37.0
Browse files Browse the repository at this point in the history
  • Loading branch information
hishamco authored Jun 6, 2024
2 parents 7770812 + 6911193 commit 35c22f0
Show file tree
Hide file tree
Showing 862 changed files with 10,264 additions and 7,058 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -3140,6 +3140,15 @@
"contributions": [
"code"
]
},
{
"login": "TonyWoo",
"name": "tonywoo",
"avatar_url": "https://avatars.githubusercontent.com/u/689710?v=4",
"profile": "https://github.com/TonyWoo",
"contributions": [
"code"
]
}
],
"skipCi": true,
Expand Down
26 changes: 26 additions & 0 deletions .coderabbit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

# Schema with docs on the properties: https://coderabbit.ai/integrations/coderabbit-overrides.v2.json. Docs:
# https://docs.coderabbit.ai/guides/configure-coderabbit. This only includes overrides for defaults and mandatory
# elements.

early_access: true
reviews:
# This would allow the bot to approve a PR. Since we always need a human to approve (and merge), we don't use this,
# so it doesn't add noise to the pull request filters like
# https://github.com/OrchardCMS/OrchardCore/pulls?q=is%3Apr+is%3Aopen+review%3Anone.
request_changes_workflow: false
# Very rarely contains useful info, mostly is just noise.
high_level_summary: false
# We really don't need a poem.
poem: false
# The review status comment is useful for debugging but not otherwise.
review_status: false
# The code walkthrough's text may take a lot of space, so collapsing it is nicer UX.
collapse_walkthrough: true
# On-demand reviews are available but PRs are not reviewed automatically.
auto_review:
enabled: false
drafts: false
chat:
auto_reply: true
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +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/. -->

### Describe the bug

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
blank_issues_enabled: true
blank_issues_enabled: false
contact_links:
- name: Discussions
url: https://github.com/OrchardCMS/OrchardCore/discussions/new
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
31 changes: 16 additions & 15 deletions .github/ISSUE_TEMPLATE/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ Update the source, so everything looks like on the new version.
- [ ] Update the `OrchardCore.Commons.props` file with `<VersionSuffix></VersionSuffix>` such that preview build numbers are not injected in packages. Verify the `VersionPrefix` tag matches the released version.
- [ ] Update module versions in `src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs`.
- [ ] Create a new milestone.
- [ ] Add final updates the to the release notes in the documentation. It should include the following, at least:
- Overview of the release's highlights and goals. What do you want people to remember this release for?
- Prerequisites. What framework version do you need, anything else to work with Orchard?
- Upgrade steps, any migration necessary from previous versions, and any breaking changes.
- [ ] Change the Orchard Core version in the project templates, more specifically in `dotnetcli.host.json` and `template.json` files.
- [ ] Add final updates to the release notes in the documentation. It should include the following, at least:
- Overview of the release's highlights and goals. What do you want people to remember this release for?
- Prerequisites. What framework version do you need, anything else to work with Orchard?
- Upgrade steps, any migration necessary from previous versions, and any breaking changes.
- [ ] Add the release notes documentation page to the documentation site's navigation in `mkdocs.yml` and remove it from `not_in_nav`.
- [ ] Update the documentation to mention the version in all places where the latest version is referenced, for example, but not limited to (do a search for the package version string): [Status in the root README](https://docs.orchardcore.net/en/latest/#status), CLI templates, commands, the [Creating a new decoupled CMS Website](https://docs.orchardcore.net/en/latest/guides/decoupled-cms/) guide.

Expand All @@ -40,9 +41,9 @@ Make sure everything works all right.

- [ ] Make sure that [`OrchardCore.Samples` works](https://github.com/OrchardCMS/OrchardCore.Samples).
- [ ] Test the [guides](https://docs.orchardcore.net/en/latest/guides/) with the NuGet packages from the Cloudsmith feed (branches under `release/` are automatically published too). Test at least the following guides:
- [Creating a modular ASP.NET Core application](https://docs.orchardcore.net/en/latest/guides/create-modular-application-mvc/)
- [Creating an Orchard Core CMS website](https://docs.orchardcore.net/en/latest/guides/create-cms-application/)
- [Creating a new decoupled CMS Website](https://docs.orchardcore.net/en/latest/guides/decoupled-cms/)
- [Creating a modular ASP.NET Core application](https://docs.orchardcore.net/en/latest/guides/create-modular-application-mvc/)
- [Creating an Orchard Core CMS website](https://docs.orchardcore.net/en/latest/guides/create-cms-application/)
- [Creating a new decoupled CMS Website](https://docs.orchardcore.net/en/latest/guides/decoupled-cms/)
- [ ] Re-certify Orchard Core for the latest major version of Red Hat Enterprise Linux if a new version has been released (e.g., v10 after v9). Refer to Orchard's [Red Hat Ecosystem Catalog profile](https://catalog.redhat.com/software/applications/detail/223797) for the previously certified version, the [Red Hat Customer Portal](https://access.redhat.com/articles/3078) for the latest version, and [our certification guide](https://docs.orchardcore.net/en/latest/topics/red-hat-ecosystem-catalog-certification/) for the certification steps.

### Prepare and publish Orchard Core Translations
Expand All @@ -59,16 +60,16 @@ Do the harder parts of making the release public. This should come after everyth

- [ ] Tag the head of `release/<version name>` with the version. Include `v` in the name, e.g. `v1.8.0`.
- [ ] Merge `release/<version name>` to `main`.
- You'll need to create a pull request.
- Merge it as a merge commit, not squash merge.
- If there are merge conflicts, then create a `release/<version name>-integration` branch and fix them there.
- You'll need to create a pull request.
- Merge it as a merge commit, not squash merge.
- If there are merge conflicts, then create a `release/<version name>-integration` branch and fix them there.
- [ ] Create and publish a release [on GitHub](https://github.com/OrchardCMS/OrchardCore/releases/new).
- Generate release notes.
- Add a link to the release notes in the docs (something like `For details on this version see the [release notes in the documentation](link here).`). Note that the docs will only be built once the branch is merged to `main`.
- Generate release notes.
- Add a link to the release notes in the docs (something like `For details on this version see the [release notes in the documentation](link here).`). Note that the docs will only be built once the branch is merged to `main`.
- [ ] Test the [guides](https://docs.orchardcore.net/en/latest/guides/) with the packages now automatically published to NuGet. Test at least the following guides:
- [Creating a modular ASP.NET Core application](https://docs.orchardcore.net/en/latest/guides/create-modular-application-mvc/)
- [Creating an Orchard Core CMS website](https://docs.orchardcore.net/en/latest/guides/create-cms-application/)
- [Creating a new decoupled CMS Website](https://docs.orchardcore.net/en/latest/guides/decoupled-cms/)
- [Creating a modular ASP.NET Core application](https://docs.orchardcore.net/en/latest/guides/create-modular-application-mvc/)
- [Creating an Orchard Core CMS website](https://docs.orchardcore.net/en/latest/guides/create-cms-application/)
- [Creating a new decoupled CMS Website](https://docs.orchardcore.net/en/latest/guides/decoupled-cms/)
- [ ] Update [Try Orchard Core](https://github.com/OrchardCMS/TryOrchardCore).

### Publicize the release
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Backport PR to branch

on:
issue_comment:
types: [created]
schedule:
# Once a day at 14:00 UTC to clean up old runs.
- cron: '0 14 * * *'

permissions:
contents: write
issues: write
pull-requests: write
actions: write

jobs:
backport:
if: ${{ contains(github.event.comment.body, '/backport to') || github.event_name == 'schedule' }}
uses: dotnet/arcade/.github/workflows/backport-base.yml@main
with:
repository_owners: 'OrchardCMS'

pr_description_template: |
Backport of #%source_pr_number% to %target_branch%
/cc %cc_users%
26 changes: 0 additions & 26 deletions .github/workflows/close_stale_prs.yml

This file was deleted.

34 changes: 34 additions & 0 deletions .github/workflows/close_stale_prs_issues.yml
Original file line number Diff line number Diff line change
@@ -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. 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 has been stale for very long. If you think this is still relevant,
feel free to reopen it.
32 changes: 32 additions & 0 deletions .github/workflows/comment_issue_on_triage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# 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
if: 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/).
6 changes: 4 additions & 2 deletions .github/workflows/first_time_contributor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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).
31 changes: 30 additions & 1 deletion .github/workflows/functional_all_db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -47,9 +55,15 @@ 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
env:
OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
steps:
- uses: actions/checkout@v4
# We need to install dotnet in the docker container.
Expand All @@ -69,9 +83,13 @@ jobs:
test/OrchardCore.Tests.Functional/cms-tests/cypress/screenshots
src/OrchardCore.Cms.Web/App_Data/logs
retention-days: 3

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
Expand All @@ -91,6 +109,7 @@ jobs:
env:
OrchardCore__ConnectionString: "User ID=postgres;Password=admin;Host=postgres;Port=5432;Database=app;"
OrchardCore__DatabaseProvider: "Postgres"
OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
steps:
- uses: actions/checkout@v4
# We need to install dotnet in the docker container.
Expand All @@ -113,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
Expand All @@ -128,6 +151,7 @@ jobs:
env:
OrchardCore__ConnectionString: "server=mysql;uid=root;pwd=test123;database=test"
OrchardCore__DatabaseProvider: "MySql"
OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
steps:
- uses: actions/checkout@v4
# We need to install dotnet in the docker container.
Expand All @@ -150,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
Expand All @@ -164,6 +192,7 @@ jobs:
env:
OrchardCore__ConnectionString: "Server=mssql;Database=tempdb;User Id=sa;Password=Password12!;Encrypt=False"
OrchardCore__DatabaseProvider: "SqlConnection"
OrchardCore__OrchardCore_YesSql__EnableThreadSafetyChecks: true
steps:
- uses: actions/checkout@v4
# We need to install dotnet in the docker container.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 0 additions & 6 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@

<AnalysisLevel>latest-Recommended</AnalysisLevel>

<!-- Member is explicitly initialized to its default value -->
<NoWarn>$(NoWarn);CA1805</NoWarn>

<!-- The behavior could vary based on the current user's locale setting -->
<NoWarn>$(NoWarn);CA1304;CA1305;CA1310</NoWarn>

Expand Down Expand Up @@ -48,9 +45,6 @@
<!-- Exception type is not sufficiently specific -->
<NoWarn>$(NoWarn);CA2201</NoWarn>

<!-- Remove the underscores from member name -->
<NoWarn>$(NoWarn);CA1707</NoWarn>

<!-- Use PascalCase for named placeholders in the logging message template -->
<NoWarn>$(NoWarn);CA1727</NoWarn>

Expand Down
1 change: 1 addition & 0 deletions OrchardCore.sln
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Workflows.Abstr
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{68F6113F-2F08-4412-B5E7-41B7164A0C7F}"
ProjectSection(SolutionItems) = preProject
.coderabbit.yaml = .coderabbit.yaml
.editorconfig = .editorconfig
gulpfile.js = gulpfile.js
package.json = package.json
Expand Down
Loading

0 comments on commit 35c22f0

Please sign in to comment.