From 17213a11a168f2d0edc575a9a6d2f2b40d22a6d2 Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Tue, 14 May 2024 00:19:07 +0300 Subject: [PATCH 1/3] OC project templates should shows net8.0 only --- .../.template.config.src/dotnetcli.host.json | 6 +++--- .../.template.config.src/template.json | 16 ++++++---------- .../.template.config.src/dotnetcli.host.json | 4 ++-- .../.template.config.src/template.json | 14 +++++--------- .../.template.config.src/dotnetcli.host.json | 6 +++--- .../.template.config.src/template.json | 19 +++++++------------ .../.template.config.src/dotnetcli.host.json | 6 +++--- .../.template.config.src/template.json | 17 ++++++----------- .../.template.config.src/template.json | 14 +++++--------- 9 files changed, 40 insertions(+), 62 deletions(-) diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config.src/dotnetcli.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config.src/dotnetcli.host.json index 6e9d991e607..0985e309cd1 100644 --- a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config.src/dotnetcli.host.json +++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config.src/dotnetcli.host.json @@ -11,7 +11,7 @@ } }, "usageExamples": [ - "--framework net7.0", - "--orchard-version 1.6.0" + "--framework net8.0", + "--orchard-version 1.8.3" ] -} +} \ No newline at end of file diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config.src/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config.src/template.json index 162da8f0648..48cd8a8a9ca 100644 --- a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config.src/template.json +++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config.src/template.json @@ -1,7 +1,11 @@ { "$schema": "http://json.schemastore.org/template", "author": "Orchard Core Community and Contributors", - "classifications": [ "Web", "Orchard Core", "CMS" ], + "classifications": [ + "Web", + "Orchard Core", + "CMS" + ], "name": "Orchard Core Cms Module", "identity": "OrchardCore.Templates.Cms.Module", "shortName": "ocmodulecms", @@ -14,14 +18,6 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ - { - "choice": "net6.0", - "description": "Target net6.0" - }, - { - "choice": "net7.0", - "description": "Target net7.0" - }, { "choice": "net8.0", "description": "Target net8.0" @@ -80,4 +76,4 @@ "language": "C#", "type": "project" } -} +} \ No newline at end of file diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config.src/dotnetcli.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config.src/dotnetcli.host.json index 818f82c6fb3..154ec41ee08 100644 --- a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config.src/dotnetcli.host.json +++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config.src/dotnetcli.host.json @@ -15,8 +15,8 @@ } }, "usageExamples": [ - "--framework net7.0", + "--framework net8.0", "--logger none", - "--orchard-version 1.6.0" + "--orchard-version 1.8.3" ] } diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config.src/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config.src/template.json index 2bfeabea47d..ccf772c05c6 100644 --- a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config.src/template.json +++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config.src/template.json @@ -1,7 +1,11 @@ { "$schema": "http://json.schemastore.org/template", "author": "Orchard Core Community and Contributors", - "classifications": [ "Web", "Orchard Core", "CMS" ], + "classifications": [ + "Web", + "Orchard Core", + "CMS" + ], "name": "Orchard Core Cms Web App", "identity": "OrchardCore.Templates.Cms.Web", "shortName": "occms", @@ -14,14 +18,6 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ - { - "choice": "net6.0", - "description": "Target net6.0" - }, - { - "choice": "net7.0", - "description": "Target net7.0" - }, { "choice": "net8.0", "description": "Target net8.0" diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config.src/dotnetcli.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config.src/dotnetcli.host.json index 6e9d991e607..0985e309cd1 100644 --- a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config.src/dotnetcli.host.json +++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config.src/dotnetcli.host.json @@ -11,7 +11,7 @@ } }, "usageExamples": [ - "--framework net7.0", - "--orchard-version 1.6.0" + "--framework net8.0", + "--orchard-version 1.8.3" ] -} +} \ No newline at end of file diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config.src/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config.src/template.json index 364e30383db..1ecf6f55663 100644 --- a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config.src/template.json +++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config.src/template.json @@ -1,7 +1,11 @@ { "$schema": "http://json.schemastore.org/template", "author": "Orchard Core Community and Contributors", - "classifications": [ "Web", "Orchard Core", "Mvc" ], + "classifications": [ + "Web", + "Orchard Core", + "Mvc" + ], "name": "Orchard Core Mvc Module", "identity": "OrchardCore.Templates.Mvc.Module", "shortName": "ocmodulemvc", @@ -14,14 +18,6 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ - { - "choice": "net6.0", - "description": "Target net6.0" - }, - { - "choice": "net7.0", - "description": "Target net7.0" - }, { "choice": "net8.0", "description": "Target net8.0" @@ -40,12 +36,11 @@ }, "sources": [ { - "modifiers": [ - ] + "modifiers": [] } ], "tags": { "language": "C#", "type": "project" } -} +} \ No newline at end of file diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config.src/dotnetcli.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config.src/dotnetcli.host.json index 6e9d991e607..0985e309cd1 100644 --- a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config.src/dotnetcli.host.json +++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config.src/dotnetcli.host.json @@ -11,7 +11,7 @@ } }, "usageExamples": [ - "--framework net7.0", - "--orchard-version 1.6.0" + "--framework net8.0", + "--orchard-version 1.8.3" ] -} +} \ No newline at end of file diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config.src/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config.src/template.json index 084020e3512..664c9b1b8a4 100644 --- a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config.src/template.json +++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config.src/template.json @@ -1,7 +1,11 @@ { "$schema": "http://json.schemastore.org/template", "author": "Orchard Core Community and Contributors", - "classifications": [ "Web", "Orchard Core", "Mvc" ], + "classifications": [ + "Web", + "Orchard Core", + "Mvc" + ], "name": "Orchard Core Mvc Web App", "identity": "OrchardCore.Templates.Mvc.Web", "shortName": "ocmvc", @@ -14,14 +18,6 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ - { - "choice": "net6.0", - "description": "Target net6.0" - }, - { - "choice": "net7.0", - "description": "Target net7.0" - }, { "choice": "net8.0", "description": "Target net8.0" @@ -38,8 +34,7 @@ "defaultValue": "${TemplateOrchardVersion}" } }, - "sources": [ - ], + "sources": [], "tags": { "language": "C#", "type": "project" diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config.src/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config.src/template.json index cd3f7107dcd..5b41f82aac0 100644 --- a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config.src/template.json +++ b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config.src/template.json @@ -1,7 +1,11 @@ { "$schema": "http://json.schemastore.org/template", "author": "Orchard Project", - "classifications": [ "Web", "Orchard Core", "CMS" ], + "classifications": [ + "Web", + "Orchard Core", + "CMS" + ], "name": "Orchard Core Theme", "identity": "OrchardCore.Templates.Theme", "shortName": "octheme", @@ -14,14 +18,6 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [ - { - "choice": "net6.0", - "description": "Target net6.0" - }, - { - "choice": "net7.0", - "description": "Target net7.0" - }, { "choice": "net8.0", "description": "Target net8.0" From 5e80729a7df25687873eb8327ad95188384cc04f Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Sat, 18 May 2024 02:18:02 +0300 Subject: [PATCH 2/3] Update release.md --- .github/ISSUE_TEMPLATE/release.md | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md index 885596150db..66c5c28fc20 100644 --- a/.github/ISSUE_TEMPLATE/release.md +++ b/.github/ISSUE_TEMPLATE/release.md @@ -27,10 +27,11 @@ Update the source, so everything looks like on the new version. - [ ] Update the `OrchardCore.Commons.props` file with `` 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 framework version(s) 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. @@ -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 @@ -59,16 +60,16 @@ Do the harder parts of making the release public. This should come after everyth - [ ] Tag the head of `release/` with the version. Include `v` in the name, e.g. `v1.8.0`. - [ ] Merge `release/` 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/-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/-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 From 58d4bf2aa513c604ddc69e102899696cdab5e7f2 Mon Sep 17 00:00:00 2001 From: Hisham Bin Ateya Date: Sat, 18 May 2024 18:48:31 +0300 Subject: [PATCH 3/3] Update .github/ISSUE_TEMPLATE/release.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Zoltán Lehóczky --- .github/ISSUE_TEMPLATE/release.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md index 66c5c28fc20..7b74171e51c 100644 --- a/.github/ISSUE_TEMPLATE/release.md +++ b/.github/ISSUE_TEMPLATE/release.md @@ -27,7 +27,7 @@ Update the source, so everything looks like on the new version. - [ ] Update the `OrchardCore.Commons.props` file with `` 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 framework version(s) in the project templates, more specifically in `dotnetcli.host.json` and `template.json` files. +- [ ] 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?