Merge pull request #25179 from abpframework/auto-merge/rel-10-2/4461

Merge branch dev with rel-10.2

Directory.Packages.props

@@ -150,7 +150,7 @@
     <PackageVersion Include="Rebus" Version="8.8.0" />
     <PackageVersion Include="Rebus.ServiceProvider" Version="10.5.0" />
     <PackageVersion Include="Riok.Mapperly" Version="4.3.1" />
-    <PackageVersion Include="Scriban" Version="6.6.0" />
+    <PackageVersion Include="Scriban" Version="7.0.0" />
     <PackageVersion Include="Serilog" Version="4.3.0" />
     <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
     <PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />

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 |
 |---------|-------------|-------------|-----|

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<object> InvokeAsync(TemplateContext context, ScriptNode callerContext, ScriptArray arguments,
-        ScriptBlockStatement blockStatement)
+    public ValueTask<object?> InvokeAsync(TemplateContext context, ScriptNode? callerContext, ScriptArray arguments,
+        ScriptBlockStatement? blockStatement)
     {
-        return new ValueTask<object>(GetString(arguments));
+        return new ValueTask<object?>(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<object>().ToArray();
         return args.Any() ? _localizer[name.ToString()!, args] : _localizer[name.ToString()!];
     }