diff --git a/Directory.Packages.props b/Directory.Packages.props index d4e2d6a70a..008660ae8c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -150,7 +150,7 @@ - + diff --git a/docs/en/package-version-changes.md b/docs/en/package-version-changes.md index 6b453dc1bd..fd43f004a0 100644 --- a/docs/en/package-version-changes.md +++ b/docs/en/package-version-changes.md @@ -7,7 +7,13 @@ # Package Version Changes -## 10.3.0-rc.1 +## 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 | |---------|-------------|-------------|-----| 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()!]; }