From 4a9f91a581815c807fa6087284a768f4a4aaf8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Thu, 25 Apr 2024 15:25:16 +0200 Subject: [PATCH 1/7] Updating SixLabors.ImageSharp.Web to v3.1.2 --- src/OrchardCore.Build/Dependencies.props | 2 +- src/docs/releases/1.8.3.md | 11 +++++++++++ src/docs/resources/libraries/README.md | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 src/docs/releases/1.8.3.md diff --git a/src/OrchardCore.Build/Dependencies.props b/src/OrchardCore.Build/Dependencies.props index 11af59e2834..2145c2916c4 100644 --- a/src/OrchardCore.Build/Dependencies.props +++ b/src/OrchardCore.Build/Dependencies.props @@ -54,7 +54,7 @@ - + diff --git a/src/docs/releases/1.8.3.md b/src/docs/releases/1.8.3.md new file mode 100644 index 00000000000..e07a956f7b7 --- /dev/null +++ b/src/docs/releases/1.8.3.md @@ -0,0 +1,11 @@ +# Orchard Core 1.8.3 + +Release date: April 25, 2024 + +**This is a security release.** We recommend you update your application immediately. + +## What's Changed + +* Update `SixLabors.ImageSharp` to v3.1.2 to with a fix for [CVE-2024-27929](https://nvd.nist.gov/vuln/detail/CVE-2024-27929). + +**Full Changelog**: diff --git a/src/docs/resources/libraries/README.md b/src/docs/resources/libraries/README.md index 448904e062e..e2fa9563514 100644 --- a/src/docs/resources/libraries/README.md +++ b/src/docs/resources/libraries/README.md @@ -17,7 +17,7 @@ The below table lists the different .NET libraries used in Orchard Core: | [Fluid.Core](https://github.com/sebastienros/fluid) | .NET Liquid template engine. | 2.5.0 | [MIT](https://github.com/sebastienros/fluid/blob/dev/LICENSE) | | [GraphQL](https://github.com/graphql/graphiql) | GraphiQL & GraphQL. | 4.6.1 | [MIT](https://github.com/graphql/graphiql/blob/main/LICENSE) | | [HtmlSanitizer](https://github.com/mganss/HtmlSanitizer) | Cleans HTML to avoid XSS attacks. | 8.1.812-beta | [MIT](https://github.com/mganss/HtmlSanitizer/blob/master/LICENSE.md) | -| [Image Sharp](https://github.com/SixLabors/ImageSharp.Web) | Middleware for ASP.NET-Core for image manipulation. | 3.1.0 |[Apache-2.0](https://github.com/SixLabors/ImageSharp.Web/blob/master/LICENSE) | +| [Image Sharp](https://github.com/SixLabors/ImageSharp.Web) | Middleware for ASP.NET-Core for image manipulation. | 3.1.2 |[Apache-2.0](https://github.com/SixLabors/ImageSharp.Web/blob/master/LICENSE) | | [Irony.Core](https://github.com/daxnet/irony) | A modified version of the Irony project with .NET Core support | 1.0.7 | [MIT](https://github.com/daxnet/irony/blob/master/LICENSE) | | [Jint](https://github.com/sebastienros/jint) | Javascript Interpreter for .NET. | 3.0.0-beta-2058 | [MIT](https://github.com/sebastienros/jint/blob/dev/LICENSE) | | [libphonenumber-csharp](https://github.com/twcclegg/libphonenumber-csharp) | .NET library for parsing, formatting, and validating international phone numbers | 8.13.27 | [Apache-2.0](https://github.com/twcclegg/libphonenumber-csharp/blob/main/LICENSE) | From 74e81fe0df8ab8f68e1f630d4fa27d550faba20e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Thu, 25 Apr 2024 15:35:51 +0200 Subject: [PATCH 2/7] More docs --- README.md | 4 ++-- mkdocs.yml | 1 + 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 +- 8 files changed, 16 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index f57c922198c..31f6bc5be18 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Orchard Core consists of two distinct projects: ## Build Status -Stable (release/1.8.2): +Stable (release/1.8.3): [![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.2 +### 1.8.3 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 dd0df22d786..cfb154df7ec 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.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 - 1.8.0: docs/releases/1.8.0.md diff --git a/src/README.md b/src/README.md index 18566e087f5..d7f0abfdbc9 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.2`. -The release notes can be found on +The latest released version of Orchard Core is `1.8.3`. +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 3d84c6a439e..91113a6110c 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 - + ``` From af556f41448a8f6a2d3b4e58f537091f7f722d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Thu, 25 Apr 2024 15:36:01 +0200 Subject: [PATCH 3/7] Update ManifestConstants --- .../Modules/Manifest/ManifestConstants.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs index e01761f5c0f..3f0ffc04ca8 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.2"; + public const string OrchardCoreVersion = "1.8.3"; public const string OrchardCoreWebsite = "https://orchardcore.net"; From 0afa27863ae5857487e7807b01a0b284de0c21f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Thu, 25 Apr 2024 15:44:24 +0200 Subject: [PATCH 4/7] Update 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 84d3a48ca45..a0400405039 100644 --- a/src/OrchardCore.Build/OrchardCore.Commons.props +++ b/src/OrchardCore.Build/OrchardCore.Commons.props @@ -4,7 +4,7 @@ 12.0 - 1.8.1 + 1.8.3 $(VersionSuffix)-$(BuildNumber) true From d353d10e7fe919088637f9f90e20aa5b26b10fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Thu, 25 Apr 2024 15:45:03 +0200 Subject: [PATCH 5/7] Update Azure.Identity to v1.11.2 --- src/OrchardCore.Build/Dependencies.props | 2 +- src/docs/resources/libraries/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OrchardCore.Build/Dependencies.props b/src/OrchardCore.Build/Dependencies.props index 2145c2916c4..0bb62ff8d30 100644 --- a/src/OrchardCore.Build/Dependencies.props +++ b/src/OrchardCore.Build/Dependencies.props @@ -14,7 +14,7 @@ - + diff --git a/src/docs/resources/libraries/README.md b/src/docs/resources/libraries/README.md index e2fa9563514..6071f74ca48 100644 --- a/src/docs/resources/libraries/README.md +++ b/src/docs/resources/libraries/README.md @@ -8,7 +8,7 @@ The below table lists the different .NET libraries used in Orchard Core: | [AWSSDK S3](https://github.com/aws/aws-sdk-net) | AWS SDK for .NET. | 3.7.104.11 |[Apache-2.0 license](https://github.com/aws/aws-sdk-net/blob/master/License.txt) | | [AWSSDK SecurityToken](https://github.com/aws/aws-sdk-net) | AWS SDK for .NET. | 3.7.101.60 |[Apache-2.0 license](https://github.com/aws/aws-sdk-net/blob/master/License.txt) | | [AWSSDK Extensions Setup](https://github.com/aws/aws-sdk-net) | AWS SDK for .NET. | 3.7.7 |[Apache-2.0 license](https://github.com/aws/aws-sdk-net/blob/master/License.txt) | -| [Azure Identity](https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/identity/Azure.Identity/README.md) | Azure Active Directory token authentication support. | 1.10.4 |[MIT](https://github.com/Azure/azure-sdk-for-net/blob/master/LICENSE.txt) | +| [Azure Identity](https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/identity/Azure.Identity/README.md) | Azure Active Directory token authentication support. | 1.11.2 |[MIT](https://github.com/Azure/azure-sdk-for-net/blob/master/LICENSE.txt) | | [Azure Configuration Secrets](https://github.com/Azure/azure-sdk-for-net/blob/Azure.Extensions.AspNetCore.Configuration.Secrets_1.3.0/sdk/extensions/Azure.Extensions.AspNetCore.Configuration.Secrets/README.md) | Azure Key Vault configuration provider implementation for Microsoft.Extensions.Configuration. | 1.2.2 |[MIT](https://github.com/Azure/azure-sdk-for-net/blob/master/LICENSE.txt) | | [Azure Storage Blobs](https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/storage/Azure.Storage.Blobs/README.md) | Azure Storage Blobs client library for .NET. | 12.19.1 |[MIT](https://github.com/Azure/azure-sdk-for-net/blob/master/LICENSE.txt) | | [Azure Storage Blobs for DataProtection](https://github.com/Azure/azure-sdk-for-net/blob/Azure.Extensions.AspNetCore.DataProtection.Blobs_1.3.2/sdk/extensions/Azure.Extensions.AspNetCore.DataProtection.Blobs/README.md) | Allows storing ASP.NET Core DataProtection keys in Azure Blob Storage. | 1.3.2 |[MIT](https://github.com/Azure/azure-sdk-for-net/blob/master/LICENSE.txt) | From b9ef6b5e1a9a76b20b3ca6e1684f0c6e8b73e68a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Thu, 25 Apr 2024 15:45:47 +0200 Subject: [PATCH 6/7] Release notes --- src/docs/releases/1.8.3.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/docs/releases/1.8.3.md b/src/docs/releases/1.8.3.md index e07a956f7b7..be36b4bac12 100644 --- a/src/docs/releases/1.8.3.md +++ b/src/docs/releases/1.8.3.md @@ -6,6 +6,7 @@ Release date: April 25, 2024 ## What's Changed -* Update `SixLabors.ImageSharp` to v3.1.2 to with a fix for [CVE-2024-27929](https://nvd.nist.gov/vuln/detail/CVE-2024-27929). +* Update `SixLabors.ImageSharp` to v3.1.2 with a fix for [CVE-2024-27929](https://nvd.nist.gov/vuln/detail/CVE-2024-27929). +* Update `Azure.Identity` to v1.11.2 with a fix for [CVE-2024-29992](https://nvd.nist.gov/vuln/detail/CVE-2024-29992). **Full Changelog**: From 5e8f91a35ac4ee0fab04cae9e68c57caab884e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Thu, 25 Apr 2024 16:26:58 +0200 Subject: [PATCH 7/7] Spelling --- src/docs/resources/libraries/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/resources/libraries/README.md b/src/docs/resources/libraries/README.md index 6071f74ca48..93eeebfe789 100644 --- a/src/docs/resources/libraries/README.md +++ b/src/docs/resources/libraries/README.md @@ -17,7 +17,7 @@ The below table lists the different .NET libraries used in Orchard Core: | [Fluid.Core](https://github.com/sebastienros/fluid) | .NET Liquid template engine. | 2.5.0 | [MIT](https://github.com/sebastienros/fluid/blob/dev/LICENSE) | | [GraphQL](https://github.com/graphql/graphiql) | GraphiQL & GraphQL. | 4.6.1 | [MIT](https://github.com/graphql/graphiql/blob/main/LICENSE) | | [HtmlSanitizer](https://github.com/mganss/HtmlSanitizer) | Cleans HTML to avoid XSS attacks. | 8.1.812-beta | [MIT](https://github.com/mganss/HtmlSanitizer/blob/master/LICENSE.md) | -| [Image Sharp](https://github.com/SixLabors/ImageSharp.Web) | Middleware for ASP.NET-Core for image manipulation. | 3.1.2 |[Apache-2.0](https://github.com/SixLabors/ImageSharp.Web/blob/master/LICENSE) | +| [ImageSharp](https://github.com/SixLabors/ImageSharp.Web) | Middleware for ASP.NET-Core for image manipulation. | 3.1.2 |[Apache-2.0](https://github.com/SixLabors/ImageSharp.Web/blob/master/LICENSE) | | [Irony.Core](https://github.com/daxnet/irony) | A modified version of the Irony project with .NET Core support | 1.0.7 | [MIT](https://github.com/daxnet/irony/blob/master/LICENSE) | | [Jint](https://github.com/sebastienros/jint) | Javascript Interpreter for .NET. | 3.0.0-beta-2058 | [MIT](https://github.com/sebastienros/jint/blob/dev/LICENSE) | | [libphonenumber-csharp](https://github.com/twcclegg/libphonenumber-csharp) | .NET library for parsing, formatting, and validating international phone numbers | 8.13.27 | [Apache-2.0](https://github.com/twcclegg/libphonenumber-csharp/blob/main/LICENSE) |