Merge branch 'main' into hishamco/data-localization

.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"
       ]
     },
     {
@@ -3195,6 +3196,87 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "XopcT",
+      "name": "Vladimir Verbitsky",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8039133?v=4",
+      "profile": "https://github.com/XopcT",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "matTrabolsi",
+      "name": "matTrabolsi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/72926503?v=4",
+      "profile": "https://github.com/matTrabolsi",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "denispetrische",
+      "name": "Denis",
+      "avatar_url": "https://avatars.githubusercontent.com/u/95141776?v=4",
+      "profile": "https://github.com/denispetrische",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mohit-naroliya",
+      "name": "Mohit Naroliya",
+      "avatar_url": "https://avatars.githubusercontent.com/u/151342309?v=4",
+      "profile": "https://github.com/mohit-naroliya",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "kursataktas",
+      "name": "Kursat Aktas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17837825?v=4",
+      "profile": "https://github.com/kursataktas",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "adamradocz",
+      "name": "Adam Radocz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16503773?v=4",
+      "profile": "https://github.com/adamradocz",
+      "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"
+      ]
     }
   ],
   "skipCi": true,

.dockerignore

@@ -1,16 +1,6 @@
-# ignore all
-**
-
-# Except src for building
-!./src/*
-!Directory.Build.props
-
-# TODO : Remove this line when Docker Buildkit works in Windows
-!/.build/release/*
-
 # Ignore any App_Data folder
 **/App_Data/
 
-# Ignore all prebuild
+# Ignore all built assets
 **/[b|B]in/
 **/[O|o]bj/

.editorconfig

@@ -78,9 +78,12 @@ dotnet_diagnostic.IDE0303.severity                         = silent         # Co
 
 dotnet_diagnostic.IDE0078.severity                         = silent         # Use pattern matching
 
+dotnet_diagnostic.IDE0130.severity                         = silent         # Namespace does not match folder structure
+
 dotnet_style_prefer_conditional_expression_over_assignment = silent   # Remove redundant equality, e.g. Disabled == false
 
 dotnet_diagnostic.CA2263.severity                         = warning         # Prefer generic overload when type is known
+dotnet_diagnostic.CA1816.severity                         = none         # Dispose methods should call SuppressFinalize
 
 # Sort using and Import directives with System.* appearing first
 dotnet_sort_system_directives_first                        = true

.git-blame-ignore-revs

@@ -1 +1,7 @@
+# .git-blame-ignore-revs
+
+# Define formatting rules (#16567)
+657342d05a221dfaba1fdf46813c0161dd12d4ec
+
+# Convert to file-scope namespaces (#16539)
 05730cfeb221680240feb3d9edca563bc388a1ef

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,22 +7,29 @@ assignees: ''
 
 ---
 <!-- Please also see the docs on how we manage issues: https://docs.orchardcore.net/en/latest/docs/guides/contributing/managing-issues/. -->
+<!-- Please replace all placeholders such as this below. -->
 
 ### Describe the bug
 
+<!-- What is the issue you're seeing? -->
+
 ### 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.
+<!-- 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:
+
+<!-- Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '...'
 3. Scroll down to '...'
-4. See error
+4. See error 
+-->
 
 ### Expected behavior
-A clear and concise description of what you expected to happen.
+
+<!-- Add a clear and concise description of what you expected to happen. -->
 
 ### Logs and screenshots
-If applicable, add log files, browser console logs, and screenshots (or screen recording videos) to help explain your problem.
+
+<!-- If applicable, add log files, browser console logs, and screenshots (or screen recording videos) to help explain your problem. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,12 +7,16 @@ assignees: ''
 
 ---
 <!-- Please also see the docs on how we manage issues: https://docs.orchardcore.net/en/latest/docs/guides/contributing/managing-issues/. -->
+<!-- Please replace all placeholders such as this below. -->
 
-### Is your feature request related to a problem? Please describe.
-A clear and concise description of what the problem is.
+### Is your feature request related to a problem?
+
+<!-- Add a clear and concise description of the problem. -->
 
 ### Describe the solution you'd like
-A clear and concise description of what you want to happen.
+
+<!-- Add a clear and concise description of what you want to happen. -->
 
 ### Describe alternatives you've considered
-A clear and concise description of any alternative solutions or features you've considered.
+
+<!-- Add a clear and concise description of any alternative solutions or features you've considered. -->

.github/ISSUE_TEMPLATE/patch_release.md

@@ -0,0 +1,77 @@
+---
+name: Publish a patch release
+about: Publish a new Orchard Core patch release
+title: 'Release v'
+labels: release
+assignees: ''
+
+---
+
+# Release Patch Preparation Guide
+
+## Step 1: Backporting Pull Requests
+
+1. **Identify Pull Requests**: Review any pull requests (PRs) that need to be backported to the release branch.
+2. **Backporting Process**: For PRs merged into the `main` branch that need to be applied to the release branch (e.g., `release/2.1`), comment on the merged PR with `/backport to release/2.1`. This comment will trigger a GitHub Action to create a new PR with the same changes for the `release/2.1` branch.
+3. **Merge PRs**: Once all necessary PRs are created, merge them into the `release/2.1` branch.
+
+## Step 2: Code and Documentation Updates
+
+### 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 `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:
+       - Highlights and goals of the release.
+       - Prerequisites for running the new version.
+       - Upgrade steps and any breaking changes.
+     - **Update Documentation Navigation**: Add the release notes page to `mkdocs.yml` navigation and remove it from `not_in_nav`.
+     - **Version Mentions**: Update all references to the new version throughout the documentation, including:
+       - [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
+
+1. **Check Functionality**: Update [`OrchardCore.Samples`](https://github.com/OrchardCMS/OrchardCore.Samples) to the latest preview version generated in the previous step. Ensure the samples work as expected.
+2. **Test Guides**: Test the following guides with NuGet packages from the CloudSmith feed:
+   - [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/)
+
+## Step 4: Create New Release
+
+1. Navigate to the [GitHub Releases page](https://github.com/OrchardCMS/OrchardCore/releases/new).
+2. In the "**Choose a tag**" menu, enter the new version number, including `v` (e.g., `v2.1.1`), and select "**+ Create tag: v... on publish**."
+3. Change the target branch from `main` to your target branch (e.g., `release/2.1`).
+4. Enter the version number in the Title field (e.g., `2.1.1`).
+5. Click **Generate release notes** to auto-generate release notes.
+6. Ensure the "Set as the latest release" checkbox is checked, then click **Publish release**.
+
+## Step 5: Align Branches
+
+1. **Merge to Main**: After releasing the new version, merge the release branch into the main branch to ensure `main` contains all administrative changes.
+   - Create a pull request from the release branch into `main`.
+   - **Important**: DO NOT resolve conflicts using GitHub's interface; use external tools (e.g., Fork) to manage conflicts and avoid auto-merging `main` into the release branch. Resolving conflicts using GitHub's interface will automatically merge `main` into the release branch, which must be avoided.
+   - Once conflicts are resolved, merge the PR into `main` using the following steps:
+     - Fetch the latest changes from the Git repository.
+     - Checkout the `main` branch.
+     - Merge the release branch (e.g., `release/2.1`) into `main`.
+     - Resolve any conflicts.
+     - Force push the changes to `main`. This action requires a user with the ability to force-push into `main`, as it is protected by default.
+
+## Step 6: Housekeeping
+
+- [ ] Assign the milestone for the release version to this issue.
+- [ ] Close any remaining issues for this version or assign them to the next release.
+
+## Step 7: Publicize the Release
+
+- [ ] Post about the release on X (formerly Twitter) via the Orchard Core X (Twitter) repo.
+- [ ] Post in the [Orchard Core LinkedIn group](https://www.linkedin.com/groups/13605669/).
+- [ ] Share on the [Orchard Core Facebook page](https://www.facebook.com/OrchardCore/).