From 4f204fafa9d76567465ccb1d5aac7e1e6a548e5d Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 27 Mar 2026 15:05:15 +0800 Subject: [PATCH 1/3] Upgrade Scriban to 7.0.0 to fix security vulnerabilities --- Directory.Packages.props | 2 +- .../Scriban/ScribanTemplateLocalizer.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 3b43d18c26..540af1030a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -150,7 +150,7 @@ - + diff --git a/framework/src/Volo.Abp.TextTemplating.Scriban/Volo/Abp/TextTemplating/Scriban/ScribanTemplateLocalizer.cs b/framework/src/Volo.Abp.TextTemplating.Scriban/Volo/Abp/TextTemplating/Scriban/ScribanTemplateLocalizer.cs index 6bf32d1a58..904a131342 100644 --- a/framework/src/Volo.Abp.TextTemplating.Scriban/Volo/Abp/TextTemplating/Scriban/ScribanTemplateLocalizer.cs +++ b/framework/src/Volo.Abp.TextTemplating.Scriban/Volo/Abp/TextTemplating/Scriban/ScribanTemplateLocalizer.cs @@ -18,16 +18,16 @@ public class ScribanTemplateLocalizer : IScriptCustomFunction _localizer = localizer; } - public object Invoke(TemplateContext context, ScriptNode callerContext, ScriptArray arguments, - ScriptBlockStatement blockStatement) + public object? Invoke(TemplateContext context, ScriptNode? callerContext, ScriptArray arguments, + ScriptBlockStatement? blockStatement) { return GetString(arguments); } - public ValueTask InvokeAsync(TemplateContext context, ScriptNode callerContext, ScriptArray arguments, - ScriptBlockStatement blockStatement) + public ValueTask InvokeAsync(TemplateContext context, ScriptNode? callerContext, ScriptArray arguments, + ScriptBlockStatement? blockStatement) { - return new ValueTask(GetString(arguments)); + return new ValueTask(GetString(arguments)); } private string GetString(ScriptArray arguments) @@ -43,7 +43,7 @@ public class ScribanTemplateLocalizer : IScriptCustomFunction return string.Empty; } - var args = arguments.Skip(1).Where(x => x != null && !x.ToString().IsNullOrWhiteSpace()).ToArray(); + var args = arguments.Skip(1).Where(x => x != null && !x.ToString().IsNullOrWhiteSpace()).Cast().ToArray(); return args.Any() ? _localizer[name.ToString()!, args] : _localizer[name.ToString()!]; } From 86463d253bec11cc80cd77798c6da068a1f94a7b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 27 Mar 2026 07:05:50 +0000 Subject: [PATCH 2/3] docs: update package version changes [skip ci] --- docs/en/package-version-changes.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/en/package-version-changes.md b/docs/en/package-version-changes.md index 90ae4ffab1..ecfae684d3 100644 --- a/docs/en/package-version-changes.md +++ b/docs/en/package-version-changes.md @@ -1,5 +1,11 @@ # Package Version Changes +## 10.2.0-rc.4 + +| Package | Old Version | New Version | PR | +|---------|-------------|-------------|-----| +| Scriban | 6.6.0 | 7.0.0 | #25170 | + ## 10.2.0-rc.3 | Package | Old Version | New Version | PR | From ba4cb21977c28b45720682cadbded4acfcaec7d8 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Tue, 31 Mar 2026 09:28:14 +0300 Subject: [PATCH 3/3] Update version to release 10.2.0 --- common.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common.props b/common.props index 082dbf3f84..05909b7e08 100644 --- a/common.props +++ b/common.props @@ -1,8 +1,8 @@ latest - 10.2.0-rc.4 - 5.2.0-rc.4 + 10.2.0 + 5.2.0 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/