diff --git a/NuGet.config b/NuGet.config index 9c288d73da8..fdb4bf7ac2a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,10 +1,10 @@ - - - - - - - + + + + + + + diff --git a/README.md b/README.md index d9021b94872..aacc0652d60 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Orchard Core consists of two distinct projects: ## Build Status -Stable (release/1.6): +Stable (release/1.7): [![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.6.0 +### 1.7.0 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 43296c10fe3..8c0e8b858f9 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -238,6 +238,7 @@ nav: - Owners: docs/resources/owners/README.md - Workshops: docs/resources/workshops/README.md - Releases: + - 1.7.0: docs/releases/1.7.0.md - 1.6.0: docs/releases/1.6.0.md - 1.5.0: docs/releases/1.5.0.md - 1.4.0: docs/releases/1.4.0.md diff --git a/src/OrchardCore.Build/Dependencies.props b/src/OrchardCore.Build/Dependencies.props index d26ce2dd3c9..f3c57cf1cc2 100644 --- a/src/OrchardCore.Build/Dependencies.props +++ b/src/OrchardCore.Build/Dependencies.props @@ -51,7 +51,7 @@ - + diff --git a/src/OrchardCore.Build/OrchardCore.Commons.props b/src/OrchardCore.Build/OrchardCore.Commons.props index df4d3d3c814..4902dd03c71 100644 --- a/src/OrchardCore.Build/OrchardCore.Commons.props +++ b/src/OrchardCore.Build/OrchardCore.Commons.props @@ -5,7 +5,7 @@ 10.0 1.7.0 - preview + $(VersionSuffix)-$(BuildNumber) true 612,618 diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs index e0a9b0f7175..abb0e9ec17c 100644 --- a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs +++ b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs @@ -1,14 +1,13 @@ -namespace OrchardCore.Modules.Manifest +namespace OrchardCore.Modules.Manifest; + +public static class ManifestConstants { - public static class ManifestConstants - { - public const string OrchardCoreTeam = "The Orchard Core Team"; + public const string OrchardCoreTeam = "The Orchard Core Team"; - public const string OrchardCoreVersion = "1.6.0"; + public const string OrchardCoreVersion = "1.7.0"; - public const string OrchardCoreWebsite = "https://orchardcore.net"; + public const string OrchardCoreWebsite = "https://orchardcore.net"; - public const string AdminTag = "Admin"; - } + public const string AdminTag = "Admin"; } diff --git a/src/README.md b/src/README.md index 93000c1aa6c..d1cfc567f8f 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.6.0`. -The release notes can be found on +The latest released version of Orchard Core is `1.7.0`. +The release notes can be found on Here is a more detailed [roadmap](https://github.com/OrchardCMS/OrchardCore/wiki/Roadmap). diff --git a/src/docs/getting-started/templates/README.md b/src/docs/getting-started/templates/README.md index 785df781936..dcd6f0aa877 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 - + ``` This will add the packages from Orchard Core CMS diff --git a/src/docs/releases/1.7.0.md b/src/docs/releases/1.7.0.md index fce2ea6f421..afafa135ec9 100644 --- a/src/docs/releases/1.7.0.md +++ b/src/docs/releases/1.7.0.md @@ -1,6 +1,6 @@ # Orchard Core 1.7.0 -Release date: Not yet released +Release date: September 2023 ## Breaking Changes diff --git a/src/docs/topics/publishing-releases/README.md b/src/docs/topics/publishing-releases/README.md index fe6794a695d..29a6592bf1b 100644 --- a/src/docs/topics/publishing-releases/README.md +++ b/src/docs/topics/publishing-releases/README.md @@ -24,7 +24,8 @@ Do some housekeeping on GitHub in the [main repo](https://github.com/OrchardCMS/ Update the source so everything looks like on the new version. -- [ ] Create a `release/` branch out of `main`, e.g. `release/1.3.1`. +- [ ] Create a `release/` branch out of `main`, e.g. `release/1.8`. +- [ ] Check the [release_ci](https://github.com/OrchardCMS/OrchardCore/blob/main/.github/workflows/release_ci.yml) workflow is using the expected .NET version to build the Docker images. - [ ] 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`. - [ ] Update the version in the command lines in from all documentation files. @@ -87,6 +88,7 @@ Let the whole world know about our shiny new release. Savor this part! These ste ### After the release is done - [ ] Create a new milestone with the next release number. +- [ ] Create a new release notes documentation file for the next version in the OrchardCore.Docs project. (e.g, `/releases/1.8.0.md`). - [ ] Update the `OrchardCore.Commons.props` file with the next release number, and `preview` such that preview builds use the new one. ```