From 8650170c25b62e35289b2fca141008e6f135f312 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Fri, 13 Oct 2023 11:14:34 -0700 Subject: [PATCH 1/4] Release 1.7.1 --- README.md | 4 ++-- mkdocs.yml | 1 + src/OrchardCore.Build/OrchardCore.Commons.props | 2 +- .../Modules/Manifest/ManifestConstants.cs | 2 +- src/README.md | 4 ++-- src/docs/getting-started/templates/README.md | 10 +++++----- src/docs/guides/add-admin-menu/README.md | 6 +++--- src/docs/guides/create-cms-application/README.md | 2 +- .../guides/create-modular-application-mvc/README.md | 2 +- src/docs/guides/decoupled-cms/README.md | 2 +- src/docs/releases/1.2.1.md | 11 +++++++---- src/docs/releases/1.7.1.md | 11 +++++++++++ 12 files changed, 36 insertions(+), 21 deletions(-) create mode 100644 src/docs/releases/1.7.1.md diff --git a/README.md b/README.md index aacc0652d60..45ad2b93e9f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Orchard Core consists of two distinct projects: ## Build Status -Stable (release/1.7): +Stable (release/1.7.1): [![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.7.0 +### 1.7.1 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 8c0e8b858f9..55f42883049 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.1: docs/releases/1.7.1.md - 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 diff --git a/src/OrchardCore.Build/OrchardCore.Commons.props b/src/OrchardCore.Build/OrchardCore.Commons.props index 4902dd03c71..dcfe594f973 100644 --- a/src/OrchardCore.Build/OrchardCore.Commons.props +++ b/src/OrchardCore.Build/OrchardCore.Commons.props @@ -4,7 +4,7 @@ 10.0 - 1.7.0 + 1.7.1 $(VersionSuffix)-$(BuildNumber) true diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs index abb0e9ec17c..b0a8f420cb1 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.7.0"; + public const string OrchardCoreVersion = "1.7.1"; public const string OrchardCoreWebsite = "https://orchardcore.net"; diff --git a/src/README.md b/src/README.md index d1cfc567f8f..556f20b11c3 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.7.0`. -The release notes can be found on +The latest released version of Orchard Core is `1.7.1`. +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 dcd6f0aa877..d8145c0710c 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.2.1.md b/src/docs/releases/1.2.1.md index 7a13e66f408..64dbe9504f1 100644 --- a/src/docs/releases/1.2.1.md +++ b/src/docs/releases/1.2.1.md @@ -1,11 +1,14 @@ -# Orchard Core 1.2.1 +# Orchard Core 1.7.1 -Release date: January 2022 +Release date: October 2023 This is a security release fixing multiple Cross-Site-Scripting vulnerabilities. ## What's Changed -* Fix encoding issues by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/11008 +* Release 1.7.1 by @MikeAlhayek in https://github.com/OrchardCMS/OrchardCore/pull/14397 +* Fix workflow module page list issue when using PostgreSQL by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/14428 +* Release 1.7.1 by @MikeAlhayek in https://github.com/OrchardCMS/OrchardCore/pull/14474 +* Fix mysql functional tests by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/14502 -**Full Changelog**: https://github.com/OrchardCMS/OrchardCore/compare/v1.2.0...v1.2.1 \ No newline at end of file +**Full Changelog**: https://github.com/OrchardCMS/OrchardCore/compare/v1.7.0...v1.7.1 \ No newline at end of file diff --git a/src/docs/releases/1.7.1.md b/src/docs/releases/1.7.1.md new file mode 100644 index 00000000000..7a13e66f408 --- /dev/null +++ b/src/docs/releases/1.7.1.md @@ -0,0 +1,11 @@ +# Orchard Core 1.2.1 + +Release date: January 2022 + +This is a security release fixing multiple Cross-Site-Scripting vulnerabilities. + +## What's Changed +* Fix encoding issues by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/11008 + + +**Full Changelog**: https://github.com/OrchardCMS/OrchardCore/compare/v1.2.0...v1.2.1 \ No newline at end of file From 5ab8a2827c4f8e70893e59de621aeb5f7d2b2893 Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Fri, 13 Oct 2023 11:16:39 -0700 Subject: [PATCH 2/4] update release notes. --- src/docs/releases/1.2.1.md | 11 ++++------- src/docs/releases/1.7.1.md | 11 +++++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/docs/releases/1.2.1.md b/src/docs/releases/1.2.1.md index 64dbe9504f1..46623d975c3 100644 --- a/src/docs/releases/1.2.1.md +++ b/src/docs/releases/1.2.1.md @@ -1,14 +1,11 @@ -# Orchard Core 1.7.1 +# Orchard Core 1.2.1 -Release date: October 2023 +Release date: January 2022 This is a security release fixing multiple Cross-Site-Scripting vulnerabilities. ## What's Changed -* Release 1.7.1 by @MikeAlhayek in https://github.com/OrchardCMS/OrchardCore/pull/14397 -* Fix workflow module page list issue when using PostgreSQL by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/14428 -* Release 1.7.1 by @MikeAlhayek in https://github.com/OrchardCMS/OrchardCore/pull/14474 -* Fix mysql functional tests by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/14502 +* Fix encoding issues by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/11008 -**Full Changelog**: https://github.com/OrchardCMS/OrchardCore/compare/v1.7.0...v1.7.1 \ No newline at end of file +**Full Changelog**: https://github.com/OrchardCMS/OrchardCore/compare/v1.2.0...v1.2.1 diff --git a/src/docs/releases/1.7.1.md b/src/docs/releases/1.7.1.md index 7a13e66f408..bf367566ecf 100644 --- a/src/docs/releases/1.7.1.md +++ b/src/docs/releases/1.7.1.md @@ -1,11 +1,14 @@ -# Orchard Core 1.2.1 +# Orchard Core 1.7.1 -Release date: January 2022 +Release date: October 2023 This is a security release fixing multiple Cross-Site-Scripting vulnerabilities. ## What's Changed -* Fix encoding issues by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/11008 +* Release 1.7.1 by @MikeAlhayek in https://github.com/OrchardCMS/OrchardCore/pull/14397 +* Fix workflow module page list issue when using PostgreSQL by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/14428 +* Release 1.7.1 by @MikeAlhayek in https://github.com/OrchardCMS/OrchardCore/pull/14474 +* Fix mysql functional tests by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/14502 -**Full Changelog**: https://github.com/OrchardCMS/OrchardCore/compare/v1.2.0...v1.2.1 \ No newline at end of file +**Full Changelog**: https://github.com/OrchardCMS/OrchardCore/compare/v1.7.0...v1.7.1 From edd0925ce8ef71f25744757c618ef39a6e56c2bb Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Fri, 13 Oct 2023 11:52:17 -0700 Subject: [PATCH 3/4] Reverting VersionPrefix --- src/OrchardCore.Build/OrchardCore.Commons.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OrchardCore.Build/OrchardCore.Commons.props b/src/OrchardCore.Build/OrchardCore.Commons.props index dcfe594f973..4902dd03c71 100644 --- a/src/OrchardCore.Build/OrchardCore.Commons.props +++ b/src/OrchardCore.Build/OrchardCore.Commons.props @@ -4,7 +4,7 @@ 10.0 - 1.7.1 + 1.7.0 $(VersionSuffix)-$(BuildNumber) true From dea0bb65ef3b0b9dfde8c43d950ea49b307ff451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Ros?= Date: Fri, 13 Oct 2023 11:56:08 -0700 Subject: [PATCH 4/4] Update src/docs/releases/1.7.1.md --- src/docs/releases/1.7.1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/releases/1.7.1.md b/src/docs/releases/1.7.1.md index bf367566ecf..6927a7b6f15 100644 --- a/src/docs/releases/1.7.1.md +++ b/src/docs/releases/1.7.1.md @@ -6,7 +6,7 @@ This is a security release fixing multiple Cross-Site-Scripting vulnerabilities. ## What's Changed * Release 1.7.1 by @MikeAlhayek in https://github.com/OrchardCMS/OrchardCore/pull/14397 -* Fix workflow module page list issue when using PostgreSQL by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/14428 +* Fix workflow module page list issue when using PostgreSQL by @emrahtokalak in https://github.com/OrchardCMS/OrchardCore/pull/14428 * Release 1.7.1 by @MikeAlhayek in https://github.com/OrchardCMS/OrchardCore/pull/14474 * Fix mysql functional tests by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/14502