From fe90f4829c8098f3bfa1f34130e87813efd155dd Mon Sep 17 00:00:00 2001
From: Mike Alhayek <mike@crestapps.com>
Date: Wed, 4 Sep 2024 13:06:10 -0700
Subject: [PATCH] Release 1.8.4 (#16667)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---------

Co-authored-by: Zoltán Lehóczky <zoltan.lehoczky@lombiq.com>
---
 .gitignore                                    |   4 +-
 README.md                                     |   4 +-
 mkdocs.yml                                    |   1 +
 .../OrchardCore.Commons.props                 |   2 +-
 .../Modules/Manifest/ManifestConstants.cs     |   2 +-
 src/README.md                                 |   4 +-
 .../.template.config/dotnetcli.host.json      |  17 ++++
 .../.template.config/icon.png                 | Bin 0 -> 16651 bytes
 .../.template.config/ide.host.json            |  31 +++++++
 .../.template.config/template.json            |  79 +++++++++++++++++
 .../.template.config/dotnetcli.host.json      |  22 +++++
 .../.template.config/icon.png                 | Bin 0 -> 16651 bytes
 .../.template.config/ide.host.json            |  21 +++++
 .../.template.config/template.json            |  81 ++++++++++++++++++
 .../.template.config/dotnetcli.host.json      |  17 ++++
 .../.template.config/icon.png                 | Bin 0 -> 16651 bytes
 .../.template.config/ide.host.json            |  17 ++++
 .../.template.config/template.json            |  46 ++++++++++
 .../.template.config/dotnetcli.host.json      |  17 ++++
 .../.template.config/icon.png                 | Bin 0 -> 16651 bytes
 .../.template.config/ide.host.json            |  17 ++++
 .../.template.config/template.json            |  42 +++++++++
 .../.template.config/icon.png                 | Bin 0 -> 16651 bytes
 .../.template.config/ide.host.json            |  20 +++++
 .../.template.config/template.json            |  62 ++++++++++++++
 src/docs/getting-started/templates/README.md  |  10 +--
 src/docs/guides/add-admin-menu/README.md      |   6 +-
 .../guides/create-cms-application/README.md   |   2 +-
 .../create-modular-application-mvc/README.md  |   2 +-
 src/docs/guides/decoupled-cms/README.md       |   2 +-
 src/docs/releases/1.8.4.md                    |  14 +++
 31 files changed, 523 insertions(+), 19 deletions(-)
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/dotnetcli.host.json
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/icon.png
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/ide.host.json
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/template.json
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/dotnetcli.host.json
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/icon.png
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/ide.host.json
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/template.json
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/dotnetcli.host.json
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/icon.png
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/ide.host.json
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/template.json
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/dotnetcli.host.json
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/icon.png
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/ide.host.json
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/template.json
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config/icon.png
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config/ide.host.json
 create mode 100644 src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config/template.json
 create mode 100644 src/docs/releases/1.8.4.md

diff --git a/.gitignore b/.gitignore
index 108a49a1fa1..8887bfd29b5 100644
--- a/.gitignore
+++ b/.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/
@@ -194,6 +195,7 @@ node_modules/
 
 wwwroot
 **/Localization/**/*.po
+!test/OrchardCore.Tests/Localization/**/*.po
 !src/OrchardCore.Modules/**/wwwroot
 !src/OrchardCore.Themes/**/wwwroot
 !src/OrchardCore.Modules/**/Localization/**/*.po
@@ -201,7 +203,6 @@ wwwroot
 !src/Templates/**/content/**
 src/Templates/**/content/**/[Bb]in/
 src/Templates/**/content/**/[Oo]bj/
-.template.config/
 /OrchardCore.sln.GhostDoc.xml
 
 # Rider
@@ -209,4 +210,3 @@ src/Templates/**/content/**/[Oo]bj/
 
 # BenchmarkDotNet artifacts
 BenchmarkDotNet.Artifacts
-
diff --git a/README.md b/README.md
index 31f6bc5be18..53526901d80 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,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)
@@ -30,7 +30,7 @@ Nightly (main):
 
 ## Status
 
-### 1.8.3
+### 1.8.4
 
 The software is finished -- and by finished, we mean there are no show-stopping, little-children-killing bugs in it. That we know of. There are probably numerous lower-priority bugs triaged into the next point release or service pack, as well.
 
diff --git a/mkdocs.yml b/mkdocs.yml
index cfb154df7ec..ccf666cae4e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -242,6 +242,7 @@ nav:
       - Owners: docs/resources/owners/README.md
       - Workshops: docs/resources/workshops/README.md
   - Releases:
+      - 1.8.4: docs/releases/1.8.4.md
       - 1.8.3: docs/releases/1.8.3.md
       - 1.8.2: docs/releases/1.8.2.md
       - 1.8.1: docs/releases/1.8.1.md
diff --git a/src/OrchardCore.Build/OrchardCore.Commons.props b/src/OrchardCore.Build/OrchardCore.Commons.props
index a0400405039..221df2eaf06 100644
--- a/src/OrchardCore.Build/OrchardCore.Commons.props
+++ b/src/OrchardCore.Build/OrchardCore.Commons.props
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <LangVersion>12.0</LangVersion>
-    <VersionPrefix>1.8.3</VersionPrefix>
+    <VersionPrefix>1.8.4</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs
index 3f0ffc04ca8..7f0ed48bee4 100644
--- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs
+++ b/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";
 
diff --git a/src/README.md b/src/README.md
index d7f0abfdbc9..b776bb10560 100644
--- a/src/README.md
+++ b/src/README.md
@@ -64,8 +64,8 @@ Orchard Core CMS supports all major site building strategies:
 
 ## Status
 
-The latest released version of Orchard Core is `1.8.3`.
-The release notes can be found on <https://github.com/OrchardCMS/OrchardCore/releases/tag/v1.8.3>
+The latest released version of Orchard Core is `1.8.4`.
+The release notes can be found on <https://github.com/OrchardCMS/OrchardCore/releases/tag/v1.8.4>
 
 Here is a more detailed [roadmap](https://github.com/OrchardCMS/OrchardCore/wiki/Roadmap).
 
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/dotnetcli.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/dotnetcli.host.json
new file mode 100644
index 00000000000..083436a5e7f
--- /dev/null
+++ b/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"
+  ]
+}
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/icon.png b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..42fa3fdc5e8ea383a5442396bfebdc097ebd0284
GIT binary patch
literal 16651
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
N=M&(4c-9wd{s{zsN;&`l

literal 0
HcmV?d00001

diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/ide.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/ide.host.json
new file mode 100644
index 00000000000..36ebf986ed5
--- /dev/null
+++ b/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"
+    }
+  ]
+}
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/template.json
new file mode 100644
index 00000000000..8bd50a5fd70
--- /dev/null
+++ b/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"
+  }
+}
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/dotnetcli.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/dotnetcli.host.json
new file mode 100644
index 00000000000..bb51792d075
--- /dev/null
+++ b/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"
+  ]
+}
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/icon.png b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..42fa3fdc5e8ea383a5442396bfebdc097ebd0284
GIT binary patch
literal 16651
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
N=M&(4c-9wd{s{zsN;&`l

literal 0
HcmV?d00001

diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/ide.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/ide.host.json
new file mode 100644
index 00000000000..4d0597e37e8
--- /dev/null
+++ b/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"
+    }
+  ]
+}
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/template.json
new file mode 100644
index 00000000000..29542d256ba
--- /dev/null
+++ b/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"
+  }
+}
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/dotnetcli.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/dotnetcli.host.json
new file mode 100644
index 00000000000..083436a5e7f
--- /dev/null
+++ b/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"
+  ]
+}
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/icon.png b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..42fa3fdc5e8ea383a5442396bfebdc097ebd0284
GIT binary patch
literal 16651
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
N=M&(4c-9wd{s{zsN;&`l

literal 0
HcmV?d00001

diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/ide.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/ide.host.json
new file mode 100644
index 00000000000..d2c4bb98198
--- /dev/null
+++ b/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"
+    }
+  ]
+}
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/template.json
new file mode 100644
index 00000000000..d181bddfca6
--- /dev/null
+++ b/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"
+  }
+}
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/dotnetcli.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/dotnetcli.host.json
new file mode 100644
index 00000000000..083436a5e7f
--- /dev/null
+++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.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"
+  ]
+}
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/icon.png b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..42fa3fdc5e8ea383a5442396bfebdc097ebd0284
GIT binary patch
literal 16651
zcmeI4X;>5I7RM(n5`!orJE$?%4GGzUi6MZ1LX|~87IA4v2FNuVNsx$GgMg@DL93vM
zqD4ih3RM&l1c?i+l}fD^YP~MSrGQG*tKxnqtZ{_7-g|qW`(^SxVdlK&J^wTFd*5?1
zUxxKT0dvf7_Ba3l%=~=4gQ25`?u#7;{Vf&7-+&IoWxkOL02o=X`(jRPTJ{hCSeJyM
z5y}Yvd2GH^?7|aBqd^yySO(1o0FJv##^WyomH22dRw!{JbXM09@IrwbA)Mh)_Lq5q
zaYElDIT(@@5Xw(l#%Bo#?pz#4#fAjLppu7IiA53xTjfUR)@4KIx?vIl-#taS%#Glw
zONfu~55jv%<shEn!XWa=6gu9O<w9Xl=rbtJcq*AfBavw&3XMpivdJtqg@Nz=5V$z#
zj3XDsu!Fs4_ojm^H$t3JDPxmJiHV6Wi8L3fJeEXZu~;NBl|-cyp&3NQ3W<`ZB1#k!
zdqnzlyg>zDE|e*SQVCwC%ZrvKDBTDIU84R^?|q47{fQ)sUUm>gl8PrIQC!HR!GZ+*
z{uo(;T-1GO0zL^8fnrdiR6uc*LE~g`Ql(T8CmkYXzkA5U(3<%B_vaq;dd1>FQ!A7{
z%OM24NC%BngszZ*q+n1XO_1|JpXJc4OdRa)mBN^T#rZ%<=Na<aL6vZbFrB9-ta~f;
ztPlsfSGJcN<SC`{P^nbJ?b&5PeF*VhUihiuLWw|{sF=nf!DkOF^?(rQ%~OJ0Dw#@w
zHX)Hh52di!R2rL3n@*;&$z(l|o|!NWf2lwiv!YLfN+eT=RAwlJ#%3_tWQM+m-b}a#
zR5}8llJ`j}`g8Sk1blXkR4(Qzxk52779`0eu^iICpx(^>4aN47illPrvOq44LmF&Y
zFRFW!vHc_pB~QW!{k*x*fQwKlU{hu=>Cp^V0a3tU#t<1y`V1m3hA$w}DReTE8cnCh
zFrvF5`uppLe<bZK<tOM0rB_-2NwZw(3;~r45(P}MfJmj$qlwTE6#~oxSqv7H!QfH)
zr1io-k`9y$p(e)@>CMqy{lA-H5Sfos`3e=#)?A^tWucAR-Nr(|_zy?>93o+NJCgC_
z3Q$*UZiK#S>+fIv?MWBYU9@Z-U)RXEd|fSo0uJee(SghAkL(Q-e!PI6M!82{FMQ}6
ziE*F=si1nKx@Qe7qL9WY6M1sbGZxwt|Dw!$1V4;`D|1M?o-Y#q57t1zTmIjzz^9ea
zf3N~WwWI&b3JmOBejHB{3ktZTzHQq#@M(+Ivy>m!Q(qhSxc)f0-yb$qyU;%3b=M5k
zGd>y{$lNnOLRW*LgzouJtD!MwkSJv6(;KSqhKEKXhw8iGp#zZ%Btj*Z+M5kFtQV#G
zk?d*XA<*+2$YnAZGzNzRABIN+300sd!dnRSTZOKRFzLN9aL1s5kwXRQIeG(omP+r*
ztGoPqMxp0A=#i4t|4jK&W%l>3zw%_@j{Ztjm=>A@1_aqeaUt`8c~M+2Ajl?)3z-kh
zi{gR-K{iob$b4X46c-E#vWenC<^%JhxL`n#O%xY0AD9=#1p|U?qPURxz`Q6f7!YI=
z#f8iV=0$PAfFPSFE@VD1FNzBW1ldG!A@hNGQCu(}$R>&lnGej1;(`G|Hc?#2d|+M_
z7YqopiQ+=$1M{M|U_g*f6c;idm>0zb1A=U#xRCk4yeKXh5M&d@h0F)$MRCD^Ae$&I
zWIix2iVFq=*+g+6^MQF$TreQWCW;H056p|=f&oD`QC!G;U|tj#3<$D`hzmFHmL@2H
zUd>E|-oeC+r%Z(2-^BBMgZ%*@X%YaaQvu-Rd+68(010FOX#WBL*xLZWM!I?Fx!C|P
z?6{w|XQ=Ahm8exYxgnOTkH<xY9WvWzf%6*Xb2Q&?e^K0z7OO2c)(SIP9IqUFc;@o#
z{iKb5%lE7Bo4bB=!jasP-+s;wWo~DR!^ThjJ)_CV>E-<zS|>-*S@nW@>2=NPSFLZJ
z6|8*3s=NPXL0Jc8j}2w<h_pn*+baAbgS4$4U2f*%3^eZB+EZk%<`O_d#TNi+Z`In%
z2cBhqu5I*)Fi6{>)&}A^HaYJMG>1H97-AK{W7TwgvLn`g6t8@Jt&t`+MXL!lz?)$+
z)v~~}wXfUo<^jeUQ+o$>MoKwzJv0!Dcf4u~RG4V2HpZPOypW<@E5PKKrq#`K>VmSG
zXkMhqaOPhbY2JCXWKOfeW?*g$@X0pVO3dxy4XmG@Y{;@y6B@=OTbYkE)-W+@iE&!0
zYTw&?<j#u+fNjf4PS3{|7^NK=qdHSzG|Nb1n9HuoivvC<PT6((!tA?C_Zspr=DRAI
zz=Usr@|RDSsmm1>H5Y6X01arJv^Cv$cT@D{ct85}z?asq8gV#}z|>o-Q^;kbH)j7l
z*1Gbt*I}T-NHfgy)^PlTT!Zrs2gc0wvA~9(1j?`B56;EejW3!$BBj|n3V7v^)tR^E
ze8Zp2)JH{PASd^7mnD-sI~)6|&`2|HxZ1#LYUz%OQRXgpu*AYq`!fm53bRWkuZ{<o
z^G_O`p1}KJrRVnbxOaSyuHj|*&qo908}COR?#dmWR%~SB7GiwbyuNGNFmRaN^Be9S
zCoHj2|D4DBtfLfLb_edksm<)~{o>JbWp~h5Uggv&cb<QL_4`vx>Q_dbiRv)f?X|A1
zGd^a2Jtpm~M~kcaaidXDsnwfo99x-fa?5AJ`Qwds3x@d$vf_<)x8OUuK3Zkind+(I
z)Q$H0aVB?TOfKHDjJn`H3Y+a9SoN)Kv1$I7>o7S#O)1(S+-nF_X7~z!>#`{#f+<o*
zY>n6r|6qdi`>?O(R!la+zHkuaMO}!z<ItRzNxFdlp><wnd+VchnviMI1BQ!EHopxm
zwym3=$9-x`x!SM*Q&#eJ!qIA{?S_tbyUNZQ+t(i374*Y)Yjbt&gpli{9r5`^Sq;gp
zg;%uVr)pWoJ^q*2*t@Cbz=P25U$@LZue{l{GGXK<leE|L@#C==51PwTV`Gf-i}Ht_
zEsMh=pQyFrjSbgx-X+ahUX%(1?H`^jY8&fwY~i`^&Ui7m^z58UHQ?CVF@19JwfHww
z8{qkza^pWrOdTv^9FiZ-IDQ2*O^)5c#d(UyI@&ETf1cjjQk5&Lb=$1Xo9G*zWmQ8h
zIr4PvL?FF(MMGRy?PImpzp){kFb{0}uEjdac|_Cv@iz;eGLj3EuFJo9bz=G-1xu`}
zZ!e>_J@`7lrkQPf6G*eGttzG09NmX&vU{ZceD-A59nzhIC7TN43q2M(UOKFPq|6Uu
z*+0PW6cZfB?V8p0C^8q|+;wQ4drKU9GR7$wtL|{la^DwMu(0&@TMBn#C_$8(Wn|a1
ziFV9XEpwacdaPi32}V=ab&GggeV}UA>~xGeeAS!#rZ@ilLj@eRNDCNQRcV?cTYNg~
z#H3o>KQ<cFwO_P%(Z0|YpL4~n-%tTO{Ep@<R~-+vY6hOwtc^W5D?2rq+cfGl)-%O#
z<oQvf4Gxx9tXsXdF6orto`xXLpS%|f4=%A)R@H0wdvq<gNHR#2n;o5eIDAifVBUy5
z0r5_|Zc5M6G-o?T%wL*dk(GTjH$jvfp3Vg|EzO!O4TZk|<f2V%Z|VF$sVz;_EgB<_
zT}6dsi>CQWa>MLaf6ZG|E6$u(wP(_TW(!yHo!5ZF!XKNzUH$0SwNbIvbF+h(owS|h
ztp(uE&)U7?ZO36WQ_}7|Jhk@m&PBi9Ns7AirgQZ9n?GRuBhI{t&)GuUaxdFfFv9HG
z)R$}0*BB48+nJ)B6j0NW+te|m%rz_X8}@G#odu1izdKb!En`%Q*4{KSPit6OoT9Y~
zSlrn9ZOOKs2M*`@Z9Qk5bZB1aQRVh?g5sC?7uS&qBF&Vl#+B($yeogaRJo|OPWE0#
za42$VHHl2fWjklL*Pj(+oaq=rs!!2iCeJr@+2At9g6Wjx);@)1=xD`msI3nR2(Ua-
z`Rk6S&sZKRo5cK$hMLL~{7Jr_wH4IkPJUK)@5zc%PX0nt*Q8C{9S-A;jK@2VwJs>y
z>sB!DzROWVKl+=gd8dyCx3!7bH#@hEwy)iON^{V=ZS2)mJI_pb5|(je+~56=><oOq
z>wR%^>${np?7z2LUEf@t`pac^%EP+^vDM10At_o<yvXL*m+#F0m2->X-c6a7x_?*T
N=M&(4c-9wd{s{zsN;&`l

literal 0
HcmV?d00001

diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/ide.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/ide.host.json
new file mode 100644
index 00000000000..d2c4bb98198
--- /dev/null
+++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.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"
+    }
+  ]
+}
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/template.json
new file mode 100644
index 00000000000..ab818dcccab
--- /dev/null
+++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/template.json
@@ -0,0 +1,42 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "Orchard Core Community and Contributors",
+  "classifications": [
+    "Web",
+    "Orchard Core",
+    "Mvc"
+  ],
+  "name": "Orchard Core Mvc Web App",
+  "identity": "OrchardCore.Templates.Mvc.Web",
+  "shortName": "ocmvc",
+  "sourceName": "OrchardCore.Templates.Mvc.Web",
+  "defaultName": "OrchardCore.Mvc.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"
+    },
+    "OrchardVersion": {
+      "type": "parameter",
+      "datatype": "string",
+      "description": "Specifies which version of Orchard Core packages to use.",
+      "replaces": "$(TemplateOrchardPackageVersion)",
+      "defaultValue": "1.8.4"
+    }
+  },
+  "sources": [],
+  "tags": {
+    "language": "C#",
+    "type": "project"
+  }
+}
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config/icon.png b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..42fa3fdc5e8ea383a5442396bfebdc097ebd0284
GIT binary patch
literal 16651
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
N=M&(4c-9wd{s{zsN;&`l

literal 0
HcmV?d00001

diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config/ide.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config/ide.host.json
new file mode 100644
index 00000000000..42114fed0b5
--- /dev/null
+++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config/ide.host.json
@@ -0,0 +1,20 @@
+{
+  "$schema": "http://json.schemastore.org/vs-2017.3.host",
+  "icon": "icon.png",
+  "symbolInfo": [
+    {
+      "id": "AddLiquid",
+      "name": {
+        "text": "Add .liquid files in Views"
+      },
+      "isVisible": "true"
+    },
+    {
+      "id": "OrchardVersion",
+      "name": {
+        "text": "Orchard Version"
+      },
+      "isVisible": "true"
+    }
+  ]
+}
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config/template.json
new file mode 100644
index 00000000000..5a043c1f757
--- /dev/null
+++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config/template.json
@@ -0,0 +1,62 @@
+{
+  "$schema": "http://json.schemastore.org/template",
+  "author": "Orchard Project",
+  "classifications": [
+    "Web",
+    "Orchard Core",
+    "CMS"
+  ],
+  "name": "Orchard Core Theme",
+  "identity": "OrchardCore.Templates.Theme",
+  "shortName": "octheme",
+  "sourceName": "OrchardCore.Templates.Theme",
+  "defaultName": "OrchardCore.Theme",
+  "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"
+    },
+    "AddLiquid": {
+      "type": "parameter",
+      "dataType": "bool",
+      "description": "Add .liquid files in Views",
+      "defaultValue": "true"
+    },
+    "OrchardVersion": {
+      "type": "parameter",
+      "datatype": "string",
+      "description": "Specifies which version of Orchard Core packages to use.",
+      "replaces": "$(TemplateOrchardPackageVersion)",
+      "defaultValue": "1.8.4"
+    }
+  },
+  "sources": [
+    {
+      "modifiers": [
+        {
+          "condition": "(!AddLiquid)",
+          "exclude": [
+            "Views/Layout.liquid",
+            "Views/Menu.liquid",
+            "Views/MenuItem.liquid",
+            "Views/MenuItemLink-LinkMenuItem.liquid"
+          ]
+        }
+      ]
+    }
+  ],
+  "tags": {
+    "language": "C#",
+    "type": "project"
+  }
+}
diff --git a/src/docs/getting-started/templates/README.md b/src/docs/getting-started/templates/README.md
index 91113a6110c..7f3f9687f43 100644
--- a/src/docs/getting-started/templates/README.md
+++ b/src/docs/getting-started/templates/README.md
@@ -9,13 +9,13 @@ More information about `dotnet new` can be found at <https://docs.microsoft.com/
 Once the .NET Core SDK has been installed, type the following command to install the templates for creating Orchard Core web applications:
 
 ```CMD
-dotnet new install OrchardCore.ProjectTemplates::1.8.3
+dotnet new install OrchardCore.ProjectTemplates::1.8.4
 ```
 
 This will use the most stable release of Orchard Core. In order to use the latest `main` branch of Orchard Core, the following command can be used:
 
 ```CMD
-dotnet new install OrchardCore.ProjectTemplates::1.8.3-* --nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json  
+dotnet new install OrchardCore.ProjectTemplates::1.8.4-* --nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json  
 ```
 
 ## Create a new website
@@ -25,7 +25,7 @@ dotnet new install OrchardCore.ProjectTemplates::1.8.3-* --nuget-source https://
 #### Generate an Orchard Cms Web Application
 
 !!! warning
-    Due to a bug in the current published version, the following `dotnet new` commands will require the extra argument `--orchard-version 1.8.3`. For instance, instead of typing `dotnet new occms` use `dotnet new occms --orchard-version 1.8.3`
+    Due to a bug in the current published version, the following `dotnet new` commands will require the extra argument `--orchard-version 1.8.4`. For instance, instead of typing `dotnet new occms` use `dotnet new occms --orchard-version 1.8.4`
 
 ```CMD
 dotnet new occms
@@ -47,7 +47,7 @@ Options:
 
   -ov|--orchard-version  Specifies which version of Orchard Core packages to use.
                          string - Optional
-                         Default: 1.8.3
+                         Default: 1.8.4
 ```
 
 Logging can be ignored with this command:
@@ -134,7 +134,7 @@ Options:
 
   -ov|--orchard-version  Specifies which version of Orchard Core packages to use.
                          string - Optional
-                         Default: 1.8.3
+                         Default: 1.8.4
 ```
 
 ```CMD
diff --git a/src/docs/guides/add-admin-menu/README.md b/src/docs/guides/add-admin-menu/README.md
index 78209f46c8d..3638cc7c502 100644
--- a/src/docs/guides/add-admin-menu/README.md
+++ b/src/docs/guides/add-admin-menu/README.md
@@ -19,7 +19,7 @@ There are different ways to create sites and modules for Orchard Core. You can l
 
 You can install the latest released templates using this command:
 
-```dotnet new install OrchardCore.ProjectTemplates::1.8.3-*```
+```dotnet new install OrchardCore.ProjectTemplates::1.8.4-*```
  
 !!! note
     To use the development branch of the template add `--nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json`
@@ -40,10 +40,10 @@ The next step is to reference the module from the application, by adding a proje
 
 We also need a reference to the `OrchardCore.Admin` package in order to be able to implement the required interfaces:
 
-```dotnet add .\MyModule\MyModule.csproj package OrchardCore.Admin --version 1.8.3-*```
+```dotnet add .\MyModule\MyModule.csproj package OrchardCore.Admin --version 1.8.4-*```
 
 !!! note
-    To use the development branch of the template add ` --source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json --version 1.8.3-*`
+    To use the development branch of the template add ` --source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json --version 1.8.4-*`
 
 ## Adding our controller and views
 
diff --git a/src/docs/guides/create-cms-application/README.md b/src/docs/guides/create-cms-application/README.md
index 4d16c445c5a..aade4ccf868 100644
--- a/src/docs/guides/create-cms-application/README.md
+++ b/src/docs/guides/create-cms-application/README.md
@@ -13,7 +13,7 @@ There are different ways to create sites and modules for Orchard Core. You can l
 
 In this guide we will use our "Code Generation Templates". You can install the latest stable release of the templates using this command:
 
-```dotnet new install OrchardCore.ProjectTemplates::1.8.3-*```
+```dotnet new install OrchardCore.ProjectTemplates::1.8.4-*```
 
 !!! note
     To use the development branch of the template add `--nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json`
diff --git a/src/docs/guides/create-modular-application-mvc/README.md b/src/docs/guides/create-modular-application-mvc/README.md
index 36b94d05bb0..e82b270917f 100644
--- a/src/docs/guides/create-modular-application-mvc/README.md
+++ b/src/docs/guides/create-modular-application-mvc/README.md
@@ -18,7 +18,7 @@ There are different ways to create sites and modules for Orchard Core. You can l
 
 In this guide we will use our [Code Generation Templates](../../getting-started/templates/). You can install the latest stable release of the templates using this command:
 
-```dotnet new install OrchardCore.ProjectTemplates::1.8.3-*```
+```dotnet new install OrchardCore.ProjectTemplates::1.8.4-*```
 
 !!! note
     To use the development branch of the template add `--nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json`
diff --git a/src/docs/guides/decoupled-cms/README.md b/src/docs/guides/decoupled-cms/README.md
index c31e8d36eed..4d560c55fce 100644
--- a/src/docs/guides/decoupled-cms/README.md
+++ b/src/docs/guides/decoupled-cms/README.md
@@ -69,7 +69,7 @@ This will allow for the Razor Pages to be reloaded without the need to recompile
 
 ```xml
 <ItemGroup>
-  <PackageReference Include="OrchardCore.Application.Cms.Core.Targets" Version="1.8.3" />
+  <PackageReference Include="OrchardCore.Application.Cms.Core.Targets" Version="1.8.4" />
 </ItemGroup>
 ```
 
diff --git a/src/docs/releases/1.8.4.md b/src/docs/releases/1.8.4.md
new file mode 100644
index 00000000000..f055f8e5c38
--- /dev/null
+++ b/src/docs/releases/1.8.4.md
@@ -0,0 +1,14 @@
+# Orchard Core 1.8.4
+
+Release date: September 4, 2024
+
+This is a maintenance release, containing essential bug fixes.
+
+## What's Changed
+
+* Fix Elasticsearch Query API by @github-actions in https://github.com/OrchardCMS/OrchardCore/pull/16426
+* Fix Sitemap timestamp format by @github-actions in https://github.com/OrchardCMS/OrchardCore/pull/16522
+* Use invariant culture for rendering iso date and time by @github-actions in https://github.com/OrchardCMS/OrchardCore/pull/16523
+* Optimizing Sitemap Creation with Batched Content Items by @MikeAlhayek in https://github.com/OrchardCMS/OrchardCore/pull/16643
+
+**Full Changelog**: https://github.com/OrchardCMS/OrchardCore/compare/v1.8.3...v1.8.4