Skip to content

Merge branch dev with rel-10.7 - #25976

Merged
voloagent merged 10 commits into
devfrom
auto-merge/rel-10-7/4767
Aug 12, 2026
Merged

Merge branch dev with rel-10.7#25976
voloagent merged 10 commits into
devfrom
auto-merge/rel-10-7/4767

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

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

@voloagent
voloagent marked this pull request as ready for review August 12, 2026 05:44
Copilot AI lite review requested due to automatic review settings August 12, 2026 05:44

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This auto-generated merge from dev into rel-10.7 primarily updates template/npm package versions to 10.7.0-rc.2 (and related 5.7.0-rc.2 theme packages) and brings in framework/UI improvements around MudBlazor action menus and text-templating culture context propagation (including tests + docs).

Changes:

  • Bump ABP npm/template package references from 10.7.0-rc.1 to 10.7.0-rc.2 across templates, module demo apps, and npm packs.
  • Add built-in global context values (abp_culture, abp_dir) to Razor/Scriban template renderers and update email layout + docs; add coverage tests.
  • Introduce AbpMudActionMenu / AbpMudActionMenuItem to improve focus behavior for dialog-opening actions; update MudBlazor-based modals accordingly and add autofocus/focus management.

Reviewed changes

Copilot reviewed 137 out of 163 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json Bump basic theme dependency to rc.2
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json Bump basic theme dependency to rc.2
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json Bump basic theme + Blazor basic theme to rc.2
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json Bump basic theme dependency to rc.2
templates/module/angular/projects/my-project-name/package.json Bump ABP Angular peer deps to rc.2
templates/module/angular/package.json Bump ABP Angular deps + schematics to rc.2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json Bump leptonxlite theme dependency to rc.2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json Bump leptonxlite theme dependency to rc.2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json Bump leptonxlite theme dependency to rc.2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json Bump leptonxlite theme + Blazor theme to rc.2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json Bump leptonxlite theme + Blazor theme to rc.2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json Bump leptonxlite theme + Blazor theme to rc.2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json Bump leptonxlite theme + Blazor theme to rc.2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json Bump leptonxlite theme dependency to rc.2
templates/app/angular/package.json Bump ABP Angular deps/schematics + lepton-x theme to rc.2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json Bump leptonxlite theme dependency to rc.2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json Bump leptonxlite theme dependency to rc.2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json Bump leptonxlite theme dependency to rc.2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json Bump leptonxlite theme dependency to rc.2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json Bump leptonxlite theme dependency to rc.2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json Bump leptonxlite theme dependency to rc.2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json Bump leptonxlite theme + Blazor theme to rc.2
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json Bump leptonxlite theme + Blazor theme to rc.2
templates/app-nolayers/angular/package.json Bump ABP Angular deps/schematics + lepton-x theme to rc.2
npm/packs/zxcvbn/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/vue/package.json Bump pack version to rc.2
npm/packs/virtual-file-explorer/package.json Bump pack version + dependencies to rc.2
npm/packs/vee-validate/package.json Bump pack version + @abp/vue dependency to rc.2
npm/packs/utils/package.json Bump pack version to rc.2
npm/packs/uppy/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/tui-editor/package.json Bump pack version + dependencies to rc.2
npm/packs/toastr/package.json Bump pack version + @abp/jquery dependency to rc.2
npm/packs/timeago/package.json Bump pack version + @abp/jquery dependency to rc.2
npm/packs/sweetalert2/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/star-rating-svg/package.json Bump pack version + @abp/jquery dependency to rc.2
npm/packs/slugify/package.json Bump pack version to rc.2
npm/packs/signalr/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/select2/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/qrcode/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/prismjs/package.json Bump pack version + dependencies to rc.2
npm/packs/popper.js/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/owl.carousel/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/moment/package.json Bump pack version to rc.2
npm/packs/markdown-it/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/malihu-custom-scrollbar-plugin/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/luxon/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/lodash/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/jstree/package.json Bump pack version + @abp/jquery dependency to rc.2
npm/packs/jquery/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/jquery-validation/package.json Bump pack version + @abp/jquery dependency to rc.2
npm/packs/jquery-validation-unobtrusive/package.json Bump pack version + dependency to rc.2
npm/packs/jquery-form/package.json Bump pack version + @abp/jquery dependency to rc.2
npm/packs/highlight.js/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/font-awesome/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/flag-icons/package.json Bump pack version to rc.2
npm/packs/flag-icon-css/package.json Bump pack version to rc.2
npm/packs/docs/package.json Bump pack version + dependencies to rc.2
npm/packs/datatables.net/package.json Bump pack version + @abp/jquery dependency to rc.2
npm/packs/datatables.net-bs5/package.json Bump pack version + datatables.net dep to rc.2
npm/packs/datatables.net-bs4/package.json Bump pack version + datatables.net dep to rc.2
npm/packs/cropperjs/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/core/package.json Bump pack version + @abp/utils dependency to rc.2
npm/packs/codemirror/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/cms-kit/package.json Bump pack version + cms-kit subpacks to rc.2
npm/packs/cms-kit.public/package.json Bump pack version + deps to rc.2
npm/packs/cms-kit.admin/package.json Bump pack version + deps to rc.2
npm/packs/clipboard/package.json Bump pack version + @abp/core dependency to rc.2
npm/packs/chart.js/package.json Bump pack version to rc.2
npm/packs/bootstrap/package.json Bump pack version + deps to rc.2
npm/packs/bootstrap-daterangepicker/package.json Bump pack version + @abp/moment dependency to rc.2
npm/packs/bootstrap-datepicker/package.json Bump pack version to rc.2
npm/packs/blogging/package.json Bump pack version + deps to rc.2
npm/packs/aspnetcore.mvc.ui/package.json Bump pack version to rc.2
npm/packs/aspnetcore.mvc.ui/package-lock.json Bump lock version to rc.2
npm/packs/aspnetcore.mvc.ui.theme.shared/package.json Bump pack version + deps to rc.2
npm/packs/aspnetcore.mvc.ui.theme.basic/package.json Bump pack version + shared theme dep to rc.2
npm/packs/aspnetcore.components.server.theming/package.json Bump pack version + deps to rc.2
npm/packs/aspnetcore.components.server.basictheme/package.json Bump pack version + theming dep to rc.2
npm/packs/anchor-js/package.json Bump pack version + @abp/core dependency to rc.2
npm/ng-packs/packages/theme-shared/package.json Bump ng pack version + ng.core dep to rc.2
npm/ng-packs/packages/theme-basic/package.json Bump ng pack version + deps to rc.2
npm/ng-packs/packages/tenant-management/package.json Bump ng pack version + deps to rc.2
npm/ng-packs/packages/setting-management/package.json Bump ng pack version + deps to rc.2
npm/ng-packs/packages/schematics/package.json Bump ng pack version to rc.2
npm/ng-packs/packages/permission-management/package.json Bump ng pack version + dep to rc.2
npm/ng-packs/packages/oauth/package.json Bump ng pack version + deps to rc.2
npm/ng-packs/packages/identity/package.json Bump ng pack version + deps to rc.2
npm/ng-packs/packages/generators/package.json Bump nx generators version to rc.2
npm/ng-packs/packages/feature-management/package.json Bump ng pack version + dep to rc.2
npm/ng-packs/packages/core/package.json Bump ng pack version + @abp/utils dep to rc.2
npm/ng-packs/packages/components/package.json Bump ng pack version + peer min versions to rc.2
npm/ng-packs/packages/cms-kit/package.json Bump ng pack version + deps to rc.2
npm/ng-packs/packages/account/package.json Bump ng pack version + deps to rc.2
npm/ng-packs/packages/account-core/package.json Bump ng pack version + deps to rc.2
npm/ng-packs/package.json Bump ng workspace dev deps to rc.2
npm/lerna.json Bump lerna version to rc.2
modules/virtual-file-explorer/app/package.json Bump demo app deps to rc.2
modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock Update lockfile to rc.2 package tarballs/versions
modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json Bump demo app deps to rc.2
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/ResourcePermissionManagementModal.razor Use Abp action menu components for actions dropdown
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor Enable autofocus on search input
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/_Imports.razor Import MudBlazorUI components namespace
modules/openiddict/app/OpenIddict.Demo.Server/package.json Bump demo app deps to rc.2
modules/openiddict/app/angular/package.json Bump Angular demo deps + schematics to rc.2
modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.MudBlazor/Components/FeatureManagementModal.razor.cs Add focus management for first feature group container
modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor.MudBlazor/Components/FeatureManagementModal.razor Add focusable container + ref wiring for first tab panel
modules/docs/app/VoloDocs.Web/package.json Bump docs app deps to rc.2
modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json Bump cms-kit host deps to rc.2
modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock Update lockfile to rc.2 package tarballs/versions
modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json Bump host deps to rc.2
modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock Update lockfile to rc.2 package tarballs/versions
modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json Bump IdentityServer deps to rc.2
modules/cms-kit/angular/projects/cms-kit/package.json Bump ABP Angular peer minimums to rc.2
modules/cms-kit/angular/package.json Bump cms-kit Angular app dependencies (note: one remains rc.1)
modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock Update lockfile to rc.2 package tarballs/versions
modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json Bump demo deps to rc.2
modules/blogging/app/Volo.BloggingTestApp/package.json Bump blogging test app deps to rc.2
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json Bump demo deps to rc.2
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json Bump demo deps to rc.2
framework/test/Volo.Abp.TextTemplating.Scriban.Tests/.../ScribanTestTemplateDefinitionProvider.cs Register culture-context sample template
framework/test/Volo.Abp.TextTemplating.Scriban.Tests/.../ScribanTemplateRenderingEngine_CultureContext_Tests.cs Add tests for culture/dir context + non-leakage
framework/test/Volo.Abp.TextTemplating.Scriban.Tests/.../SampleTemplates/CultureContext.tpl Add Scriban sample using abp_culture/abp_dir
framework/test/Volo.Abp.TextTemplating.Razor.Tests/.../RazorTestTemplates.cs Add CultureContext test template key
framework/test/Volo.Abp.TextTemplating.Razor.Tests/.../SampleTemplates/CultureContext.cshtml Add Razor sample using abp_culture/abp_dir
framework/test/Volo.Abp.TextTemplating.Razor.Tests/.../RazorTestTemplateDefinitionProvider.cs Register culture-context Razor template
framework/test/Volo.Abp.TextTemplating.Razor.Tests/.../RazorTemplateRenderingEngine_CultureContext_Tests.cs Add tests for Razor culture/dir context + non-leakage
framework/test/Volo.Abp.Emailing.Tests/.../StandardEmailTemplates_Tests.cs Add tests asserting email layout declares lang/dir
framework/test/Volo.Abp.Emailing.Tests/.../AbpEmailingTestModule.cs Enable Scriban templating module in emailing tests
framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj Reference Scriban templating project for tests
framework/src/Volo.Abp.TextTemplating.Scriban/.../ScribanTemplateRenderingEngine.cs Copy globalContext + set culture context per render
framework/src/Volo.Abp.TextTemplating.Razor/.../RazorTemplateRenderingEngine.cs Copy globalContext + set culture context per render
framework/src/Volo.Abp.TextTemplating.Core/.../TemplateRenderingEngineBase.cs Add culture/dir context keys + helpers
framework/src/Volo.Abp.MudBlazorUI/Components/MudEntityActions.razor Switch dropdown menu to AbpMudActionMenu
framework/src/Volo.Abp.MudBlazorUI/Components/MudEntityAction.razor Use AbpMudActionMenuItem for non-primary dropdown actions
framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudActionMenuItem.razor.cs New menu item wrapper that closes menu before OnClick
framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudActionMenuItem.razor Render MudMenuItem with controlled AutoClose behavior
framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudActionMenu.razor.cs New menu wrapper with default localized aria-label + CloseAsync
framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudActionMenu.razor Render MudMenu and cascade AbpMudActionMenu to items
framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/Layout.tpl Make email layout lang/dir culture-aware via global context
docs/en/framework/infrastructure/text-templating/scriban.md Document built-in abp_culture/abp_dir context values
docs/en/framework/infrastructure/text-templating/razor.md Document built-in abp_culture/abp_dir context values
docs/en/framework/infrastructure/emailing.md Update emailing docs examples to include direction + new context keys
Files not reviewed (1)
  • npm/packs/aspnetcore.mvc.ui/package-lock.json: Generated file

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

"@abp/ng.setting-management": "~10.7.0-rc.1",
"@abp/ng.tenant-management": "~10.7.0-rc.1",
"@abp/ng.theme.basic": "~10.7.0-rc.1",
"@abp/ng.account": "~10.7.0-rc.1",
@voloagent
voloagent merged commit 9c40472 into dev Aug 12, 2026
2 of 3 checks passed
@voloagent
voloagent deleted the auto-merge/rel-10-7/4767 branch August 12, 2026 06:34
@codecov

codecov Bot commented Aug 12, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 48.78%. Comparing base (9fb4345) to head (147136a).
⚠️ Report is 29 commits behind head on dev.

Additional details and impacted files
@@            Coverage Diff             @@
##              dev   #25976      +/-   ##
==========================================
- Coverage   48.78%   48.78%   -0.01%     
==========================================
  Files        3798     3804       +6     
  Lines      132064   132231     +167     
  Branches     9996    10027      +31     
==========================================
+ Hits        64434    64514      +80     
- Misses      65720    65793      +73     
- Partials     1910     1924      +14     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

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.

5 participants