Merge Release 1.8.4 into main (#16668)

.gitignore

@@ -203,12 +203,10 @@ wwwroot
 !src/Templates/**/content/**
 src/Templates/**/content/**/[Bb]in/
 src/Templates/**/content/**/[Oo]bj/
-.template.config/
 /OrchardCore.sln.GhostDoc.xml
 
 # Rider
 /.idea
 
 # BenchmarkDotNet artifacts
 BenchmarkDotNet.Artifacts
-

README.md

@@ -13,7 +13,7 @@ Orchard Core consists of two distinct projects:
 
 ## Build Status
 
-Stable (`release/1.8.3`):
+Stable (`release/1.8.4`):
 
 [![Build status](https://github.com/OrchardCMS/OrchardCore/actions/workflows/release_ci.yml/badge.svg)](https://github.com/OrchardCMS/OrchardCore/actions?query=workflow%3A%22Release+-+CI%22)
 [![NuGet](https://img.shields.io/nuget/v/OrchardCore.Application.Cms.Targets.svg)](https://www.nuget.org/packages/OrchardCore.Application.Cms.Targets)
@@ -23,7 +23,7 @@ Nightly (`main`):
 [![Build status](https://github.com/OrchardCMS/OrchardCore/actions/workflows/preview_ci.yml/badge.svg)](https://github.com/OrchardCMS/OrchardCore/actions?query=workflow%3A%22Preview+-+CI%22)
 [![Cloudsmith](https://api-prd.cloudsmith.io/badges/version/orchardcore/preview/nuget/OrchardCore.Application.Cms.Targets/latest/x/?render=true&badge_token=gAAAAABey9hKFD_C-ZIpLvayS3HDsIjIorQluDs53KjIdlxoDz6Ntt1TzvMNJp7a_UWvQbsfN5nS7_0IbxCyqHZsjhmZP6cBkKforo-NqwrH5-E6QCrJ3D8%3D)](https://cloudsmith.io/~orchardcore/repos/preview/packages/detail/nuget/OrchardCore.Application.Cms.Targets/latest/)
 
-## Project Status: v1.8.3
+## Project Status: v1.8.4
 
 The software is production-ready, and capable of serving large mission-critical applications as well, and we're not aware of any fundamental bugs or missing features we deem crucial. Orchard Core continues to evolve, with each version bringing new improvements, and keeping up with the cutting-edge of .NET.
 

mkdocs.yml

@@ -271,6 +271,7 @@ nav:
       - Owners: resources/owners/README.md
       - Workshops: resources/workshops/README.md
   - Releases:
+      - 1.8.4: releases/1.8.4.md
       - 1.8.3: releases/1.8.3.md
       - 1.8.2: releases/1.8.2.md
       - 1.8.1: releases/1.8.1.md

src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs

@@ -5,7 +5,7 @@ public static class ManifestConstants
 {
     public const string OrchardCoreTeam = "The Orchard Core Team";
 
-    public const string OrchardCoreVersion = "1.8.3";
+    public const string OrchardCoreVersion = "1.8.4";
 
     public const string OrchardCoreWebsite = "https://orchardcore.net";
 

src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/dotnetcli.host.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "http://json.schemastore.org/dotnetcli.host",
+  "symbolInfo": {
+    "Framework": {
+      "longName": "framework",
+      "shortName": "fm"
+    },
+    "OrchardVersion": {
+      "longName": "orchard-version",
+      "shortName": "ov"
+    }
+  },
+  "usageExamples": [
+    "--framework net8.0",
+    "--orchard-version 1.8.4"
+  ]
+}

src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/ide.host.json

@@ -0,0 +1,31 @@
+{
+  "$schema": "http://json.schemastore.org/vs-2017.3.host",
+  "icon": "icon.png",
+  "symbolInfo": [
+    {
+      "id": "Framework",
+      "isVisible": "true"
+    },
+    {
+      "id": "AddPart",
+      "name": {
+        "text": "Add all files required for a part"
+      },
+      "isVisible": "true"
+    },
+    {
+      "id": "PartName",
+      "name": {
+        "text": "Part name (without Part suffix)"
+      },
+      "isVisible": "true"
+    },
+    {
+      "id": "OrchardVersion",
+      "name": {
+        "text": "Orchard Core Version"
+      },
+      "isVisible": "true"
+    }
+  ]
+}

src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/template.json

@@ -0,0 +1,79 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "Orchard Core Community and Contributors",
+  "classifications": [
+    "Web",
+    "Orchard Core",
+    "CMS"
+  ],
+  "name": "Orchard Core Cms Module",
+  "identity": "OrchardCore.Templates.Cms.Module",
+  "shortName": "ocmodulecms",
+  "sourceName": "OrchardCore.Templates.Cms.Module",
+  "defaultName": "OrchardCore.Cms.Module",
+  "preferNameDirectory": true,
+  "symbols": {
+    "Framework": {
+      "type": "parameter",
+      "description": "The target framework for the project.",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "net8.0",
+          "description": "Target net8.0"
+        }
+      ],
+      "replaces": "$(TemplateTargetPackageFramework)",
+      "defaultValue": "net8.0"
+    },
+    "AddPart": {
+      "type": "parameter",
+      "dataType": "bool",
+      "description": "Add dependency injection for part in Startup.cs. If PartName is not provided, default name will be used",
+      "defaultValue": "false"
+    },
+    "PartName": {
+      "type": "parameter",
+      "datatype": "string",
+      "description": "Add all files required for a part",
+      "replaces": "MyTest",
+      "fileRename": "MyTest",
+      "defaultValue": "MyTest"
+    },
+    "OrchardVersion": {
+      "type": "parameter",
+      "datatype": "string",
+      "description": "Specifies which version of Orchard Core packages to use.",
+      "replaces": "$(TemplateOrchardPackageVersion)",
+      "defaultValue": "1.8.4"
+    }
+  },
+  "sources": [
+    {
+      "modifiers": [
+        {
+          "condition": "(PartName=='' || AddPart == false)",
+          "exclude": [
+            "Migrations.cs",
+            "Drivers/MyTestPartDisplayDriver.cs",
+            "Handlers/MyTestPartHandler.cs",
+            "Models/MyTestPart.cs",
+            "Settings/MyTestPartSettings.cs",
+            "Settings/MyTestPartSettingsDisplayDriver.cs",
+            "Settings/MyTestPartSettingsViewModel.cs",
+            "ViewModels/MyTestPartViewModel.cs",
+            "Views/_ViewImports.cshtml",
+            "Views/MyTestPart.Edit.cshtml",
+            "Views/MyTestPart.liquid",
+            "Views/MyTestPart_Summary.liquid",
+            "Views/MyTestPartSettings.Edit.cshtml"
+          ]
+        }
+      ]
+    }
+  ],
+  "tags": {
+    "language": "C#",
+    "type": "project"
+  }
+}

src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/dotnetcli.host.json

@@ -0,0 +1,22 @@
+{
+  "$schema": "http://json.schemastore.org/dotnetcli.host",
+  "symbolInfo": {
+    "Framework": {
+      "longName": "framework",
+      "shortName": "fm"
+    },
+    "Logger": {
+      "longName": "logger",
+      "shortName": "lo"
+    },
+    "OrchardVersion": {
+      "longName": "orchard-version",
+      "shortName": "ov"
+    }
+  },
+  "usageExamples": [
+    "--framework net8.0",
+    "--logger none",
+    "--orchard-version 1.8.4"
+  ]
+}

src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/ide.host.json

@@ -0,0 +1,21 @@
+{
+  "$schema": "http://json.schemastore.org/vs-2017.3.host",
+  "icon": "icon.png",
+  "symbolInfo": [
+    {
+      "id": "Framework",
+      "isVisible": "true"
+    },
+    {
+      "id": "Logger",
+      "isVisible": "true"
+    },
+    {
+      "id": "OrchardVersion",
+      "name": {
+        "text": "Orchard Core Version"
+      },
+      "isVisible": "true"
+    }
+  ]
+}

src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/template.json

@@ -0,0 +1,81 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "Orchard Core Community and Contributors",
+  "classifications": [
+    "Web",
+    "Orchard Core",
+    "CMS"
+  ],
+  "name": "Orchard Core Cms Web App",
+  "identity": "OrchardCore.Templates.Cms.Web",
+  "shortName": "occms",
+  "sourceName": "OrchardCore.Templates.Cms.Web",
+  "defaultName": "OrchardCore.Cms.Web",
+  "preferNameDirectory": true,
+  "symbols": {
+    "Framework": {
+      "type": "parameter",
+      "description": "The target framework for the project.",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "net8.0",
+          "description": "Target net8.0"
+        }
+      ],
+      "replaces": "$(TemplateTargetPackageFramework)",
+      "defaultValue": "net8.0"
+    },
+    "Logger": {
+      "type": "parameter",
+      "dataType": "choice",
+      "choices": [
+        {
+          "choice": "NLog",
+          "description": "Configures NLog as the logger component."
+        },
+        {
+          "choice": "Serilog",
+          "description": "Configures Serilog as the logger component."
+        },
+        {
+          "choice": "None",
+          "description": "Do not configure logger."
+        }
+      ],
+      "description": "Configures the logger component.",
+      "defaultValue": "NLog"
+    },
+    "OrchardVersion": {
+      "type": "parameter",
+      "datatype": "string",
+      "description": "Specifies which version of Orchard Core packages to use.",
+      "replaces": "$(TemplateOrchardPackageVersion)",
+      "defaultValue": "1.8.4"
+    },
+    "UseNLog": {
+      "type": "computed",
+      "value": "(Logger == \"NLog\")"
+    },
+    "UseSerilog": {
+      "type": "computed",
+      "value": "(Logger == \"Serilog\")"
+    }
+  },
+  "sources": [
+    {
+      "modifiers": [
+        {
+          "condition": "(!UseNLog)",
+          "exclude": [
+            "NLog.config"
+          ]
+        }
+      ]
+    }
+  ],
+  "tags": {
+    "language": "C#",
+    "type": "project"
+  }
+}

src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/dotnetcli.host.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "http://json.schemastore.org/dotnetcli.host",
+  "symbolInfo": {
+    "Framework": {
+      "longName": "framework",
+      "shortName": "fm"
+    },
+    "OrchardVersion": {
+      "longName": "orchard-version",
+      "shortName": "ov"
+    }
+  },
+  "usageExamples": [
+    "--framework net8.0",
+    "--orchard-version 1.8.4"
+  ]
+}

src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/ide.host.json

@@ -0,0 +1,17 @@
+{
+  "$schema": "http://json.schemastore.org/vs-2017.3.host",
+  "icon": "icon.png",
+  "symbolInfo": [
+    {
+      "id": "Framework",
+      "isVisible": "true"
+    },
+    {
+      "id": "OrchardVersion",
+      "name": {
+        "text": "Orchard Core Version"
+      },
+      "isVisible": "true"
+    }
+  ]
+}

src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/template.json

@@ -0,0 +1,46 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "Orchard Core Community and Contributors",
+  "classifications": [
+    "Web",
+    "Orchard Core",
+    "Mvc"
+  ],
+  "name": "Orchard Core Mvc Module",
+  "identity": "OrchardCore.Templates.Mvc.Module",
+  "shortName": "ocmodulemvc",
+  "sourceName": "OrchardCore.Templates.Mvc.Module",
+  "defaultName": "OrchardCore.Mvc.Module",
+  "preferNameDirectory": true,
+  "symbols": {
+    "Framework": {
+      "type": "parameter",
+      "description": "The target framework for the project.",
+      "datatype": "choice",
+      "choices": [
+        {
+          "choice": "net8.0",
+          "description": "Target net8.0"
+        }
+      ],
+      "replaces": "$(TemplateTargetPackageFramework)",
+      "defaultValue": "net8.0"
+    },
+    "OrchardVersion": {
+      "type": "parameter",
+      "datatype": "string",
+      "description": "Specifies which version of Orchard Core packages to use.",
+      "replaces": "$(TemplateOrchardPackageVersion)",
+      "defaultValue": "1.8.4"
+    }
+  },
+  "sources": [
+    {
+      "modifiers": []
+    }
+  ],
+  "tags": {
+    "language": "C#",
+    "type": "project"
+  }
+}