Skip to content

Merge branch dev with rel-10.2#25173

Open
github-actions[bot] wants to merge 3 commits intodevfrom
auto-merge/rel-10-2/4460
Open

Merge branch dev with rel-10.2#25173
github-actions[bot] wants to merge 3 commits intodevfrom
auto-merge/rel-10-2/4460

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

This PR generated automatically to merge dev with rel-10.2. Please review the changed files before merging to prevent any errors that may occur.

@voloagent voloagent marked this pull request as ready for review March 27, 2026 10:56
Copilot AI review requested due to automatic review settings March 27, 2026 10:56
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Automated merge from dev into rel-10.2, bringing along a Scriban dependency upgrade and the corresponding nullability/API adjustments in the Scriban text templating integration.

Changes:

  • Bump Scriban NuGet package from 6.6.0 to 7.0.0 via central package management.
  • Update ScribanTemplateLocalizer’s IScriptCustomFunction implementation signatures to align with newer Scriban nullability expectations.
  • Adjust localization argument array typing to avoid nullable-object array mismatches.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
framework/src/Volo.Abp.TextTemplating.Scriban/Volo/Abp/TextTemplating/Scriban/ScribanTemplateLocalizer.cs Updates custom Scriban function signature nullability and ensures localization args are typed as object[].
docs/en/package-version-changes.md Documents Scriban version bump for 10.2.0-rc.4.
Directory.Packages.props Central package version bump for Scriban to 7.0.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants