Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
6 changes: 6 additions & 0 deletions docs/en/package-version-changes.md
Original file line number Diff line number Diff line change
@@ -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 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ public ScribanTemplateLocalizer(IStringLocalizer localizer)
_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)
Expand All @@ -43,7 +43,7 @@ private string GetString(ScriptArray arguments)
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()!];
}

Expand Down