merge main branch into this branch

.all-contributorsrc

@@ -3177,6 +3177,42 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "davidpuplava",
+      "name": "David Puplava",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5144137?v=4",
+      "profile": "https://www.davidpuplava.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "shinexyt",
+      "name": "Hanming Xing",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12826837?v=4",
+      "profile": "https://github.com/shinexyt",
+      "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"
+      ]
     }
   ],
   "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

@@ -1,7 +1,14 @@
+# Define rule severity for each diagnostic rule ID which should be displayed or hidden in the Error List window
+# dotnet_diagnostic.<rule ID>.severity = <severity>
+
+# Severity levels: (https://learn.microsoft.com/visualstudio/code-quality/use-roslyn-analyzers?view=vs-2019#rule-severity)
+# suggestion, error, and warning show up in the editor and Error List.
+# silent shows up only in the editor as a light bulb code-refactoring action.
+# none shows up in neither.
+
 root = true
 
 [*]
-end_of_line = crlf
 charset = utf-8
 indent_style = space
 indent_size = 4
@@ -23,16 +30,70 @@ csharp_new_line_before_finally                             = true
 csharp_new_line_before_members_in_object_initializers      = true
 csharp_new_line_before_members_in_anonymous_types          = true
 
-dotnet_diagnostic.IDE0290.severity                         = none
-dotnet_diagnostic.IDE0305.severity                         = none
+dotnet_diagnostic.IDE0290.severity                         = none           # Use primary constructor
+csharp_style_prefer_primary_constructors                   = false
+
+dotnet_diagnostic.IDE0305.severity                         = none           # Use collection expression for fluent
+dotnet_style_prefer_collection_expression                  = when_types_exactly_match
+
+# Block bodies
+dotnet_diagnostic.IDE0021.severity                         = none           # Use block body for constructor
+csharp_style_expression_bodied_constructors                = false
+dotnet_diagnostic.IDE0022.severity                         = none           # Use block body for method
+dotnet_diagnostic.IDE0023.severity                         = none           # Use block body for conversion operator
+csharp_style_expression_bodied_operators                   = when_on_single_line
+dotnet_diagnostic.IDE0025.severity                         = silent         # Use expression body for property
+csharp_style_expression_bodied_properties                  = when_on_single_line
+dotnet_diagnostic.IDE0026.severity                         = none           # Use expression body for indexers
+csharp_style_expression_bodied_indexers                    = when_on_single_line
+dotnet_diagnostic.IDE0027.severity                         = none           # Use block body for accessors
+csharp_style_expression_bodied_accessors                   = when_on_single_line
+dotnet_diagnostic.IDE0028.severity                         = silent          # Collection initialization can be simplified
+dotnet_diagnostic.IDE0061.severity                         = silent         # Use body for local function
+
+dotnet_diagnostic.IDE0032.severity                         = silent         # Use auto property
+dotnet_diagnostic.IDE0040.severity                         = warning        # Accessibility modifiers required
+dotnet_diagnostic.IDE0041.severity                         = silent         # Null check can be simplified
+dotnet_diagnostic.IDE0051.severity                         = warning        # Make field readonly
+dotnet_diagnostic.IDE0074.severity                         = silent         # Use compound assignment
+dotnet_diagnostic.IDE0090.severity                         = silent         # New expression can be simplified
+dotnet_diagnostic.IDE1006.severity                         = silent         # Name rule violation: missing prefix
+
+dotnet_diagnostic.IDE0011.severity                         = warning        # If statement can be simplified
+dotnet_diagnostic.IDE0045.severity                         = silent         # If statement can be simplified
+dotnet_diagnostic.IDE0046.severity                         = silent         # If statement can be simplified
+dotnet_diagnostic.IDE0047.severity                         = silent         # Parentheses can be removed
+dotnet_diagnostic.IDE0060.severity                         = warning        # Use Remove unused parameter if not part of a shipped public API
+dotnet_diagnostic.IDE0051.severity                         = warning        # Private member is unused
+dotnet_diagnostic.IDE0052.severity                         = warning        # Private member can be removed as the value assigned to it is never read
+dotnet_diagnostic.IDE0065.severity                         = warning        # Using directives must be placed outside of a namespace declaration
+csharp_using_directive_placement             4              = outside_namespace
+
+dotnet_diagnostic.IDE0100.severity                         = silent         # Use block body for constructor
+dotnet_diagnostic.IDE0200.severity                         = silent         # Lambda expression can be removed
+dotnet_diagnostic.IDE0300.severity                         = silent         # Collection expression can be simplified
+dotnet_diagnostic.IDE0301.severity                         = silent         # Collection initialization can be simplified
+dotnet_diagnostic.IDE0302.severity                         = silent         # Collection initialization can be simplified
+dotnet_diagnostic.IDE0303.severity                         = silent         # Collection initialization can be simplified
+
+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
 
 # Sort using and Import directives with System.* appearing first
 dotnet_sort_system_directives_first                        = true
 
 # Code-block preferences
-csharp_prefer_braces = true
+csharp_prefer_braces                                       = true
 csharp_prefer_simple_using_statement                       = true
-csharp_style_namespace_declarations                        = file_scoped:suggestion
+csharp_style_namespace_declarations                        = file_scoped:warning
+# Note that currently both IDE* rules and csharp_style_* rules are necessary, because only IDE rules will be enforced
+# during build, see: https://github.com/dotnet/roslyn/issues/44201.
+dotnet_diagnostic.IDE0161.severity                         = warning
 
 # Range operator
 csharp_style_prefer_range_operator                         = false:warning

.git-blame-ignore-revs

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

.gitattributes

@@ -1,7 +1,3 @@
 * text=auto
 
 **/wwwroot/Scripts/* linguist-vendored
-
-# Keep LF line endings in webroot assets files. Otherwise, building them under Windows would change the line endings to CLRF and cause changes without actually editing the source files.
-**/wwwroot/**/*.js text eol=lf
-**/wwwroot/**/*.css text eol=lf

.github/ISSUE_TEMPLATE/release.md

@@ -27,7 +27,6 @@ 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.
-- [ ] 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?

.github/dependabot.yml

@@ -1,11 +1,21 @@
 version: 2
 updates:
-  - package-ecosystem: "nuget" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  # Dependabot can handle at most 150 "manifests", so for NuGet, csprojs referencing packages (see docs:
+  # https://docs.github.com/en/enterprise-cloud@latest/code-security/supply-chain-security/understanding-your-software-supply-chain/troubleshooting-the-dependency-graph#are-there-limits-which-affect-the-dependency-graph-data).
+  # Thus, it would fail for the whole solution.
+  # Grouping updates per directories or otherwise trying to have smaller batches is unnecessary, because due to
+  # centralized package management, Dependabot will find all dependencies from any project. So, just processing the
+  # OrchardCore project.
+  - package-ecosystem: "nuget"
+    directory: "/src/OrchardCore/OrchardCore"
     schedule:
       interval: "weekly"
     groups:
-       # Grouped version updates configuration
        all-dependencies:
           patterns:
             - "*"
+    ignore:
+      # We'll update GraphQL for v3 because it's breaking, see https://github.com/OrchardCMS/OrchardCore/issues/16826.
+      - dependency-name: "GraphQL*"
+      # See the corresponding comment in Directory.Packages.props.
+      - dependency-name: "System.Drawing.Common"

.github/workflows/first_time_contributor.yml

@@ -16,6 +16,7 @@ jobs:
     # directly.
     - uses: OrchardCMS/welcome-action@task/update-to-node-20
       with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         FIRST_ISSUE_COMMENT: >
           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

.gitignore

@@ -195,19 +195,19 @@ node_modules/
 
 wwwroot
 **/Localization/**/*.po
+!test/OrchardCore.Tests/Localization/**/*.po
 !src/OrchardCore.Modules/**/wwwroot
 !src/OrchardCore.Themes/**/wwwroot
 !src/OrchardCore.Modules/**/Localization/**/*.po
 !src/OrchardCore.Themes/**/Localization/**/*.po
-!src/Templates/**/content/**
-src/Templates/**/content/**/[Bb]in/
-src/Templates/**/content/**/[Oo]bj/
-.template.config/
 /OrchardCore.sln.GhostDoc.xml
 
+# Templates
+# .template.config folders are generated by our own msbuild task that injects the build version
+src/Templates/**/content/**/.template.config/
+
 # Rider
 /.idea
 
 # BenchmarkDotNet artifacts
 BenchmarkDotNet.Artifacts
-

Directory.Build.props

@@ -47,9 +47,6 @@
     <!-- Exception type is not sufficiently specific -->
     <NoWarn>$(NoWarn);CA2201</NoWarn>
 
-    <!-- Use PascalCase for named placeholders in the logging message template -->
-    <NoWarn>$(NoWarn);CA1727</NoWarn>
-
     <!-- CA1861: Prefer 'static readonly' fields over constant array arguments if the called method is called repeatedly and is not mutating the passed array -->
     <NoWarn>$(NoWarn);CA1861</NoWarn>