Skip to content

Merge branch dev with rel-10.5#25643

Merged
voloagent merged 1 commit into
devfrom
auto-merge/rel-10-5/4662
Jun 16, 2026
Merged

Merge branch dev with rel-10.5#25643
voloagent merged 1 commit into
devfrom
auto-merge/rel-10-5/4662

Conversation

@github-actions

Copy link
Copy Markdown
Contributor

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

@voloagent voloagent marked this pull request as ready for review June 16, 2026 09:34
Copilot AI review requested due to automatic review settings June 16, 2026 09:34
@voloagent voloagent merged commit 0296994 into dev Jun 16, 2026
1 check passed
@voloagent voloagent deleted the auto-merge/rel-10-5/4662 branch June 16, 2026 09:34

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 PR updates ABP JavaScript/TypeScript package versions across templates, npm packs, Angular ng-packs, and demo apps from *-rc.2 to *-rc.3 to align the rel-10.5 line with dev.

Changes:

  • Bump ABP npm package versions (and their internal dependency ranges) from 10.5.0-rc.2 to 10.5.0-rc.3.
  • Update template and demo app package.json files to reference the *-rc.3 ABP packages (including LeptonX Lite 5.5.0-rc.3 where applicable).
  • Refresh affected yarn.lock / package-lock.json entries to match the new rc.3 packages.

Reviewed changes

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

Show a summary per file
File Description
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json Bump Basic MVC UI theme dependency to 10.5.0-rc.3.
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json Bump Basic MVC UI theme dependency to 10.5.0-rc.3.
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json Bump Basic MVC UI + Blazor server basic theme dependencies to 10.5.0-rc.3.
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json Bump Basic MVC UI theme dependency to 10.5.0-rc.3.
templates/module/angular/projects/my-project-name/package.json Bump Angular peer dependencies for ABP packages to 10.5.0-rc.3.
templates/module/angular/package.json Bump ABP Angular package dependencies/devDependencies to 10.5.0-rc.3.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json Bump LeptonX Lite MVC UI theme dependency to 5.5.0-rc.3.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json Bump LeptonX Lite MVC UI theme dependency to 5.5.0-rc.3.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json Bump LeptonX Lite MVC UI theme dependency to 5.5.0-rc.3.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json Bump LeptonX Lite MVC UI + Blazor server theme dependencies to 5.5.0-rc.3.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json Bump LeptonX Lite MVC UI + Blazor server theme dependencies to 5.5.0-rc.3.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json Bump LeptonX Lite MVC UI + Blazor server theme dependencies to 5.5.0-rc.3.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json Bump LeptonX Lite MVC UI + Blazor server theme dependencies to 5.5.0-rc.3.
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json Bump LeptonX Lite MVC UI theme dependency to 5.5.0-rc.3.
templates/app/angular/package.json Bump ABP Angular app template dependencies/devDependencies to 10.5.0-rc.3 (and Lepton-X theme 5.5.0-rc.3).
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json Bump LeptonX Lite MVC UI theme dependency to 5.5.0-rc.3.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json Bump LeptonX Lite MVC UI theme dependency to 5.5.0-rc.3.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json Bump LeptonX Lite MVC UI theme dependency to 5.5.0-rc.3.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json Bump LeptonX Lite MVC UI theme dependency to 5.5.0-rc.3.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json Bump LeptonX Lite MVC UI theme dependency to 5.5.0-rc.3.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json Bump LeptonX Lite MVC UI theme dependency to 5.5.0-rc.3.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json Bump LeptonX Lite MVC UI + Blazor server theme dependencies to 5.5.0-rc.3.
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json Bump LeptonX Lite MVC UI + Blazor server theme dependencies to 5.5.0-rc.3.
templates/app-nolayers/angular/package.json Bump ABP Angular no-layers app template dependencies/devDependencies to 10.5.0-rc.3 (and Lepton-X theme 5.5.0-rc.3).
npm/packs/zxcvbn/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/vue/package.json Bump pack version to 10.5.0-rc.3.
npm/packs/virtual-file-explorer/package.json Bump pack version and internal dependencies to 10.5.0-rc.3.
npm/packs/vee-validate/package.json Bump pack version and @abp/vue dependency to 10.5.0-rc.3.
npm/packs/utils/package.json Bump pack version to 10.5.0-rc.3.
npm/packs/uppy/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/tui-editor/package.json Bump pack version and internal dependencies to 10.5.0-rc.3.
npm/packs/toastr/package.json Bump pack version and @abp/jquery dependency to 10.5.0-rc.3.
npm/packs/timeago/package.json Bump pack version and @abp/jquery dependency to 10.5.0-rc.3.
npm/packs/sweetalert2/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/star-rating-svg/package.json Bump pack version and @abp/jquery dependency to 10.5.0-rc.3.
npm/packs/slugify/package.json Bump pack version to 10.5.0-rc.3.
npm/packs/signalr/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/select2/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/qrcode/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/prismjs/package.json Bump pack version and internal dependencies to 10.5.0-rc.3.
npm/packs/popper.js/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/owl.carousel/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/moment/package.json Bump pack version to 10.5.0-rc.3.
npm/packs/markdown-it/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/malihu-custom-scrollbar-plugin/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/luxon/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/lodash/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/jstree/package.json Bump pack version and @abp/jquery dependency to 10.5.0-rc.3.
npm/packs/jquery/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/jquery-validation/package.json Bump pack version and @abp/jquery dependency to 10.5.0-rc.3.
npm/packs/jquery-validation-unobtrusive/package.json Bump pack version and @abp/jquery-validation dependency to 10.5.0-rc.3.
npm/packs/jquery-form/package.json Bump pack version and @abp/jquery dependency to 10.5.0-rc.3.
npm/packs/highlight.js/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/font-awesome/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/flag-icons/package.json Bump pack version to 10.5.0-rc.3.
npm/packs/flag-icon-css/package.json Bump pack version to 10.5.0-rc.3.
npm/packs/docs/package.json Bump pack version and internal dependencies to 10.5.0-rc.3.
npm/packs/datatables.net/package.json Bump pack version and @abp/jquery dependency to 10.5.0-rc.3.
npm/packs/datatables.net-bs5/package.json Bump pack version and @abp/datatables.net dependency to 10.5.0-rc.3.
npm/packs/datatables.net-bs4/package.json Bump pack version and @abp/datatables.net dependency to 10.5.0-rc.3.
npm/packs/cropperjs/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/core/package.json Bump pack version and @abp/utils dependency to 10.5.0-rc.3.
npm/packs/codemirror/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/cms-kit/package.json Bump pack version and internal dependencies to 10.5.0-rc.3.
npm/packs/cms-kit.public/package.json Bump pack version and internal dependencies to 10.5.0-rc.3.
npm/packs/cms-kit.admin/package.json Bump pack version and internal dependencies to 10.5.0-rc.3.
npm/packs/clipboard/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/packs/chart.js/package.json Bump pack version to 10.5.0-rc.3.
npm/packs/bootstrap/package.json Bump pack version and internal dependencies to 10.5.0-rc.3.
npm/packs/bootstrap-daterangepicker/package.json Bump pack version and @abp/moment dependency to 10.5.0-rc.3.
npm/packs/bootstrap-datepicker/package.json Bump pack version to 10.5.0-rc.3.
npm/packs/blogging/package.json Bump pack version and internal dependencies to 10.5.0-rc.3.
npm/packs/aspnetcore.mvc.ui/package.json Bump pack version to 10.5.0-rc.3.
npm/packs/aspnetcore.mvc.ui/package-lock.json Update lockfile version entry to 10.5.0-rc.3.
npm/packs/aspnetcore.mvc.ui.theme.shared/package.json Bump pack version and internal dependencies to 10.5.0-rc.3.
npm/packs/aspnetcore.mvc.ui.theme.basic/package.json Bump pack version and theme.shared dependency to 10.5.0-rc.3.
npm/packs/aspnetcore.components.server.theming/package.json Bump pack version and internal dependencies to 10.5.0-rc.3.
npm/packs/aspnetcore.components.server.basictheme/package.json Bump pack version and server.theming dependency to 10.5.0-rc.3.
npm/packs/anchor-js/package.json Bump pack version and @abp/core dependency to 10.5.0-rc.3.
npm/ng-packs/packages/theme-shared/package.json Bump ng-pack version and @abp/ng.core dependency to 10.5.0-rc.3.
npm/ng-packs/packages/theme-basic/package.json Bump ng-pack version and internal dependencies to 10.5.0-rc.3.
npm/ng-packs/packages/tenant-management/package.json Bump ng-pack version and internal dependencies to 10.5.0-rc.3.
npm/ng-packs/packages/setting-management/package.json Bump ng-pack version and internal dependencies to 10.5.0-rc.3.
npm/ng-packs/packages/schematics/package.json Bump ng-pack version to 10.5.0-rc.3.
npm/ng-packs/packages/permission-management/package.json Bump ng-pack version and internal dependencies to 10.5.0-rc.3.
npm/ng-packs/packages/oauth/package.json Bump ng-pack version and internal dependencies to 10.5.0-rc.3.
npm/ng-packs/packages/identity/package.json Bump ng-pack version and internal dependencies to 10.5.0-rc.3.
npm/ng-packs/packages/generators/package.json Bump ng-pack version to 10.5.0-rc.3.
npm/ng-packs/packages/feature-management/package.json Bump ng-pack version and internal dependencies to 10.5.0-rc.3.
npm/ng-packs/packages/core/package.json Bump ng-pack version and @abp/utils dependency to 10.5.0-rc.3.
npm/ng-packs/packages/components/package.json Bump ng-pack version and peerDependency minimums to >=10.5.0-rc.3.
npm/ng-packs/packages/cms-kit/package.json Bump ng-pack version and internal dependencies to 10.5.0-rc.3.
npm/ng-packs/packages/account/package.json Bump ng-pack version and internal dependencies to 10.5.0-rc.3.
npm/ng-packs/packages/account-core/package.json Bump ng-pack version and internal dependencies to 10.5.0-rc.3.
npm/ng-packs/package.json Bump ng-packs workspace devDependencies to *-rc.3.
npm/lerna.json Bump lerna-managed version to 10.5.0-rc.3.
modules/virtual-file-explorer/app/package.json Bump demo app dependencies to 10.5.0-rc.3.
modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock Update yarn.lock to resolve ABP packages at 10.5.0-rc.3.
modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json Bump demo app Basic theme dependency to 10.5.0-rc.3.
modules/openiddict/app/OpenIddict.Demo.Server/package.json Bump demo app Basic theme dependency to 10.5.0-rc.3.
modules/openiddict/app/angular/package.json Bump Angular demo app ABP dependencies/devDependencies to 10.5.0-rc.3 (and Lepton-X theme 5.5.0-rc.3).
modules/docs/app/VoloDocs.Web/package.json Bump docs test app dependencies to 10.5.0-rc.3.
modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json Bump CMS Kit host dependencies to 10.5.0-rc.3.
modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock Update yarn.lock to resolve ABP packages at 10.5.0-rc.3.
modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json Bump CMS Kit host Basic theme dependency to 10.5.0-rc.3.
modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock Update yarn.lock to resolve ABP packages at 10.5.0-rc.3.
modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json Bump CMS Kit IdentityServer host Basic theme dependency to 10.5.0-rc.3.
modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock Update yarn.lock to resolve ABP packages at 10.5.0-rc.3.
modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json Bump client-simulation demo Basic theme dependency to 10.5.0-rc.3.
modules/blogging/app/Volo.BloggingTestApp/package.json Bump blogging test app dependencies to 10.5.0-rc.3.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock Update yarn.lock to resolve ABP packages at 10.5.0-rc.3.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json Bump Basic theme demo dependencies to 10.5.0-rc.3.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock Update yarn.lock to resolve ABP packages at 10.5.0-rc.3.
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json Bump Bootstrap demo dependencies to 10.5.0-rc.3.
modules/cms-kit/angular/projects/cms-kit/package.json Bump CMS Kit Angular peerDependency minimums to >=10.5.0-rc.3.
modules/cms-kit/angular/package.json Bump CMS Kit Angular app dependencies to 10.5.0-rc.3.
Files not reviewed (1)
  • npm/packs/aspnetcore.mvc.ui/package-lock.json: Generated file

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.

2 participants