From 7e55de1df89f50584920ecd389d448c5de55566a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 26 Jan 2025 15:50:40 -0800 Subject: [PATCH 1/3] Fix Null Exception with filters (#17407) Co-authored-by: Mike Alhayek --- .../OrchardCore.Facebook/Filters/FacebookPixelFilter.cs | 2 +- .../OrchardCore.Google/Analytics/GoogleAnalyticsFilter.cs | 2 +- .../OrchardCore.Google/TagManager/GoogleTagManagerFilter.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/OrchardCore.Modules/OrchardCore.Facebook/Filters/FacebookPixelFilter.cs b/src/OrchardCore.Modules/OrchardCore.Facebook/Filters/FacebookPixelFilter.cs index a4c401bff89..4a49a47fee0 100644 --- a/src/OrchardCore.Modules/OrchardCore.Facebook/Filters/FacebookPixelFilter.cs +++ b/src/OrchardCore.Modules/OrchardCore.Facebook/Filters/FacebookPixelFilter.cs @@ -39,7 +39,7 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE { var settings = await _siteService.GetSettingsAsync(); - if (settings is not null) + if (!string.IsNullOrEmpty(settings?.PixelId)) { _resourceManager.RegisterHeadScript(new HtmlContentBuilder([_preamble, _jsEncoder.Encode(settings.PixelId), _end])); } diff --git a/src/OrchardCore.Modules/OrchardCore.Google/Analytics/GoogleAnalyticsFilter.cs b/src/OrchardCore.Modules/OrchardCore.Google/Analytics/GoogleAnalyticsFilter.cs index 24d0ceaa40b..73f54df2fab 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/Analytics/GoogleAnalyticsFilter.cs +++ b/src/OrchardCore.Modules/OrchardCore.Google/Analytics/GoogleAnalyticsFilter.cs @@ -43,7 +43,7 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE { var settings = await _siteService.GetSettingsAsync(); - if (settings is not null) + if (!string.IsNullOrEmpty(settings?.TrackingID)) { _resourceManager.RegisterHeadScript(new HtmlContentBuilder([_preamble, _urlEncoder.Encode(settings.TrackingID), _middle, _jsEncoder.Encode(settings.TrackingID), _end])); } diff --git a/src/OrchardCore.Modules/OrchardCore.Google/TagManager/GoogleTagManagerFilter.cs b/src/OrchardCore.Modules/OrchardCore.Google/TagManager/GoogleTagManagerFilter.cs index 1a13e84ccd7..cf3df8bb23f 100644 --- a/src/OrchardCore.Modules/OrchardCore.Google/TagManager/GoogleTagManagerFilter.cs +++ b/src/OrchardCore.Modules/OrchardCore.Google/TagManager/GoogleTagManagerFilter.cs @@ -16,7 +16,7 @@ public sealed class GoogleTagManagerFilter : IAsyncResultFilter private readonly JavaScriptEncoder _jsEncoder; private static readonly HtmlString _preamble = new("\n\n"); + private static readonly HtmlString _end = new HtmlString("');\n"); public GoogleTagManagerFilter( IResourceManager resourceManager, @@ -39,7 +39,7 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE { var settings = await _siteService.GetSettingsAsync(); - if (settings is not null) + if (!string.IsNullOrEmpty(settings?.ContainerID)) { _resourceManager.RegisterHeadScript(new HtmlContentBuilder([_preamble, _jsEncoder.Encode(settings.ContainerID), _end])); } From b31a082f0ed5c994352f3c0462a792c142da7cbd Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Tue, 4 Feb 2025 11:52:09 -0800 Subject: [PATCH 2/3] Release 2.1.5 (#17455) --- README.md | 2 +- mkdocs.yml | 1 + .../Modules/Manifest/ManifestConstants.cs | 2 +- src/docs/README.md | 2 +- src/docs/getting-started/templates/README.md | 8 ++++---- src/docs/guides/add-admin-menu/README.md | 6 +++--- src/docs/guides/create-blazor-cms/README.md | 2 +- src/docs/guides/create-cms-application/README.md | 2 +- src/docs/guides/create-modular-application-mvc/README.md | 2 +- src/docs/guides/decoupled-cms/README.md | 2 +- src/docs/releases/2.1.5.md | 5 +++++ 11 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 src/docs/releases/2.1.5.md diff --git a/README.md b/README.md index 4847f600c85..54044ac5a6b 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Nightly (`main`): [![Build status](https://github.com/OrchardCMS/OrchardCore/actions/workflows/preview_ci.yml/badge.svg)](https://github.com/OrchardCMS/OrchardCore/actions?query=workflow%3A%22Preview+-+CI%22) [![Cloudsmith](https://api-prd.cloudsmith.io/badges/version/orchardcore/preview/nuget/OrchardCore.Application.Cms.Targets/latest/x/?render=true&badge_token=gAAAAABey9hKFD_C-ZIpLvayS3HDsIjIorQluDs53KjIdlxoDz6Ntt1TzvMNJp7a_UWvQbsfN5nS7_0IbxCyqHZsjhmZP6cBkKforo-NqwrH5-E6QCrJ3D8%3D)](https://cloudsmith.io/~orchardcore/repos/preview/packages/detail/nuget/OrchardCore.Application.Cms.Targets/latest/) -## Project Status: v2.1.4 +## Project Status: v2.1.5 The software is production-ready, and capable of serving large mission-critical applications as well, and we're not aware of any fundamental bugs or missing features we deem crucial. Orchard Core continues to evolve, with each version bringing new improvements, and keeping up with the cutting-edge of .NET. diff --git a/mkdocs.yml b/mkdocs.yml index fba3d501cdb..a34ab5f2014 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -273,6 +273,7 @@ nav: - Owners: resources/owners/README.md - Workshops: resources/workshops/README.md - Releases: + - 2.1.5: releases/2.1.5.md - 2.1.4: releases/2.1.4.md - 2.1.3: releases/2.1.3.md - 2.1.2: releases/2.1.2.md diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs index d6293f2ff88..8bbab219147 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 = "2.1.4"; + public const string OrchardCoreVersion = "2.1.5"; public const string OrchardCoreWebsite = "https://orchardcore.net"; diff --git a/src/docs/README.md b/src/docs/README.md index bb5a898ffe7..51a37afef93 100644 --- a/src/docs/README.md +++ b/src/docs/README.md @@ -58,7 +58,7 @@ Orchard Core CMS supports all major site building strategies: ## Status -The latest released version of Orchard Core is `2.1.4`. The release notes can be found under [Releases](releases/2.1.4.md). +The latest released version of Orchard Core is `2.1.5`. The release notes can be found under [Releases](releases/2.1.5.md). ## Getting Started diff --git a/src/docs/getting-started/templates/README.md b/src/docs/getting-started/templates/README.md index 6755d2dd91c..2c864483cf0 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 - + ``` diff --git a/src/docs/releases/2.1.5.md b/src/docs/releases/2.1.5.md new file mode 100644 index 00000000000..aa76ae6cde1 --- /dev/null +++ b/src/docs/releases/2.1.5.md @@ -0,0 +1,5 @@ +## Orchard Core 2.1.5 + +**Release Date:** February 4, 2025 + +This release addresses a critical bug and includes the necessary fix. From 6567b0657d7758d5825ac4035b027a7055df439d Mon Sep 17 00:00:00 2001 From: Mike Alhayek Date: Tue, 4 Feb 2025 12:08:20 -0800 Subject: [PATCH 3/3] Update OrchardCore.Commons.props --- 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 05eaa28eff7..80e1b760b69 100644 --- a/src/OrchardCore.Build/OrchardCore.Commons.props +++ b/src/OrchardCore.Build/OrchardCore.Commons.props @@ -2,7 +2,7 @@ 12.0 - 2.1.4 + 2.1.5 preview $(VersionSuffix)-$(BuildNumber) 612,618