Merge branch dev with rel-10.6 - #25856
Merged
Merged
Conversation
voloagent
marked this pull request as ready for review
July 22, 2026 11:29
voloagent
approved these changes
Jul 22, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This automated merge PR primarily updates ABP template and npm package dependency versions to align the rel-10.6 branch with dev, moving from 10.6.0-rc.2 to 10.6.0-rc.3 (and 5.6.0-rc.2 to 5.6.0-rc.3 for LeptonX packages).
Changes:
- Bumped many template
package.jsondependencies from*-rc.2to*-rc.3(ASP.NET Core MVC/Blazor templates and Angular templates). - Bumped npm pack versions and internal dependencies in
npm/packs/*andnpm/ng-packs/*to10.6.0-rc.3and updatednpm/lerna.json. - Updated several demo apps’
package.jsonandyarn.lockfiles to reference the newrc.3package artifacts.
Reviewed changes
Copilot reviewed 109 out of 135 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 | Update basic theme dependency to 10.6.0-rc.3. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json | Update basic theme dependency to 10.6.0-rc.3. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json | Update MVC + Blazor basic theme dependencies to 10.6.0-rc.3. |
| templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json | Update basic theme dependency to 10.6.0-rc.3. |
| templates/module/angular/projects/my-project-name/package.json | Update ABP Angular peer dependencies to 10.6.0-rc.3. |
| templates/module/angular/package.json | Update ABP Angular dependencies/devDependencies to 10.6.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json | Update LeptonX Lite theme dependency to 5.6.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json | Update LeptonX Lite theme dependency to 5.6.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json | Update LeptonX Lite theme dependency to 5.6.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json | Update LeptonX Lite MVC + Blazor theme dependencies to 5.6.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json | Update LeptonX Lite MVC + Blazor theme dependencies to 5.6.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json | Update LeptonX Lite MVC + Blazor theme dependencies to 5.6.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json | Update LeptonX Lite MVC + Blazor theme dependencies to 5.6.0-rc.3. |
| templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json | Update LeptonX Lite theme dependency to 5.6.0-rc.3. |
| templates/app/angular/package.json | Update ABP Angular dependencies/devDependencies to 10.6.0-rc.3 (and lepton-x theme to 5.6.0-rc.3). |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json | Update LeptonX Lite theme dependency to 5.6.0-rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json | Update LeptonX Lite theme dependency to 5.6.0-rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json | Update LeptonX Lite theme dependency to 5.6.0-rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json | Update LeptonX Lite theme dependency to 5.6.0-rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json | Update LeptonX Lite theme dependency to 5.6.0-rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json | Update LeptonX Lite theme dependency to 5.6.0-rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json | Update LeptonX Lite MVC + Blazor theme dependencies to 5.6.0-rc.3. |
| templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json | Update LeptonX Lite MVC + Blazor theme dependencies to 5.6.0-rc.3. |
| templates/app-nolayers/angular/package.json | Update ABP Angular dependencies/devDependencies to 10.6.0-rc.3 (and lepton-x theme to 5.6.0-rc.3). |
| npm/packs/zxcvbn/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/vue/package.json | Bump pack version to 10.6.0-rc.3. |
| npm/packs/virtual-file-explorer/package.json | Bump pack version and internal dependencies to 10.6.0-rc.3. |
| npm/packs/vee-validate/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/utils/package.json | Bump pack version to 10.6.0-rc.3. |
| npm/packs/uppy/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/tui-editor/package.json | Bump pack version and internal dependencies to 10.6.0-rc.3. |
| npm/packs/toastr/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/timeago/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/sweetalert2/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/star-rating-svg/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/slugify/package.json | Bump pack version to 10.6.0-rc.3. |
| npm/packs/signalr/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/select2/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/qrcode/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/prismjs/package.json | Bump pack version and internal dependencies to 10.6.0-rc.3. |
| npm/packs/popper.js/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/owl.carousel/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/moment/package.json | Bump pack version to 10.6.0-rc.3. |
| npm/packs/markdown-it/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/malihu-custom-scrollbar-plugin/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/luxon/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/lodash/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/jstree/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/jquery/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/jquery-validation/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/jquery-validation-unobtrusive/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/jquery-form/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/highlight.js/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/font-awesome/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/flag-icons/package.json | Bump pack version to 10.6.0-rc.3. |
| npm/packs/flag-icon-css/package.json | Bump pack version to 10.6.0-rc.3. |
| npm/packs/docs/package.json | Bump pack version and internal dependencies to 10.6.0-rc.3. |
| npm/packs/datatables.net/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/datatables.net-bs5/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/datatables.net-bs4/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/cropperjs/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/core/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/codemirror/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/cms-kit/package.json | Bump pack version and internal dependencies to 10.6.0-rc.3. |
| npm/packs/cms-kit.public/package.json | Bump pack version and internal dependencies to 10.6.0-rc.3. |
| npm/packs/cms-kit.admin/package.json | Bump pack version and internal dependencies to 10.6.0-rc.3. |
| npm/packs/clipboard/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/chart.js/package.json | Bump pack version to 10.6.0-rc.3. |
| npm/packs/bootstrap/package.json | Bump pack version and internal dependencies to 10.6.0-rc.3. |
| npm/packs/bootstrap-daterangepicker/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/bootstrap-datepicker/package.json | Bump pack version to 10.6.0-rc.3. |
| npm/packs/blogging/package.json | Bump pack version and internal dependencies to 10.6.0-rc.3. |
| npm/packs/aspnetcore.mvc.ui/package.json | Bump pack version to 10.6.0-rc.3. |
| npm/packs/aspnetcore.mvc.ui/package-lock.json | Bump lockfile package version to 10.6.0-rc.3. |
| npm/packs/aspnetcore.mvc.ui.theme.shared/package.json | Bump pack version and internal dependencies to 10.6.0-rc.3. |
| npm/packs/aspnetcore.mvc.ui.theme.basic/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/aspnetcore.components.server.theming/package.json | Bump pack version and internal dependencies to 10.6.0-rc.3. |
| npm/packs/aspnetcore.components.server.basictheme/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/packs/anchor-js/package.json | Bump pack version and internal dependency to 10.6.0-rc.3. |
| npm/ng-packs/packages/theme-shared/package.json | Bump Angular package version and internal dependency to 10.6.0-rc.3. |
| npm/ng-packs/packages/theme-basic/package.json | Bump Angular package version and internal dependencies to 10.6.0-rc.3. |
| npm/ng-packs/packages/tenant-management/package.json | Bump Angular package version and internal dependencies to 10.6.0-rc.3. |
| npm/ng-packs/packages/setting-management/package.json | Bump Angular package version and internal dependencies to 10.6.0-rc.3. |
| npm/ng-packs/packages/schematics/package.json | Bump Angular schematics package version to 10.6.0-rc.3. |
| npm/ng-packs/packages/permission-management/package.json | Bump Angular package version and internal dependency to 10.6.0-rc.3. |
| npm/ng-packs/packages/oauth/package.json | Bump Angular package version and internal dependencies to 10.6.0-rc.3. |
| npm/ng-packs/packages/identity/package.json | Bump Angular package version and internal dependencies to 10.6.0-rc.3. |
| npm/ng-packs/packages/generators/package.json | Bump Nx generators package version to 10.6.0-rc.3. |
| npm/ng-packs/packages/feature-management/package.json | Bump Angular package version and internal dependency to 10.6.0-rc.3. |
| npm/ng-packs/packages/core/package.json | Bump Angular core package version and internal dependency to 10.6.0-rc.3. |
| npm/ng-packs/packages/components/package.json | Bump Angular components package version and peer dependency minimums to rc.3. |
| npm/ng-packs/packages/cms-kit/package.json | Bump Angular cms-kit package version and internal dependencies to 10.6.0-rc.3. |
| npm/ng-packs/packages/account/package.json | Bump Angular account package version and internal dependencies to 10.6.0-rc.3. |
| npm/ng-packs/packages/account-core/package.json | Bump Angular account-core package version and internal dependencies to 10.6.0-rc.3. |
| npm/ng-packs/package.json | Bump devDependencies to rc.3. |
| npm/lerna.json | Bump monorepo version to 10.6.0-rc.3. |
| modules/virtual-file-explorer/app/package.json | Update demo app dependencies to 10.6.0-rc.3. |
| modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/yarn.lock | Update resolved artifacts to rc.3. |
| modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json | Update demo app dependency to 10.6.0-rc.3. |
| modules/openiddict/app/OpenIddict.Demo.Server/package.json | Update demo server dependency to 10.6.0-rc.3. |
| modules/openiddict/app/angular/package.json | Update ABP Angular dependencies/devDependencies to rc.3. |
| modules/docs/app/VoloDocs.Web/package.json | Update docs app dependencies to rc.3. |
| modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json | Update cms-kit host dependencies to rc.3. |
| modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock | Update resolved artifacts to rc.3. |
| modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json | Update host dependency to 10.6.0-rc.3. |
| modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock | Update resolved artifacts to rc.3. |
| modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json | Update IdentityServer host dependency to 10.6.0-rc.3. |
| modules/cms-kit/angular/projects/cms-kit/package.json | Update peer dependency minimums to rc.3. |
| modules/cms-kit/angular/package.json | Update most ABP Angular dependencies to rc.3 (one remains at rc.2). |
| modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock | Update resolved artifacts to rc.3. |
| modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json | Update demo app dependency to 10.6.0-rc.3. |
| modules/blogging/app/Volo.BloggingTestApp/package.json | Update blogging test app dependencies to rc.3. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock | Update resolved artifacts to rc.3. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json | Update demo app dependencies to rc.3. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock | Update resolved artifacts to rc.3. |
| modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json | Update demo app dependencies to rc.3. |
Files not reviewed (1)
- npm/packs/aspnetcore.mvc.ui/package-lock.json: Generated file
| "@abp/ng.account": "~10.6.0-rc.3", | ||
| "@abp/ng.identity": "~10.6.0-rc.3", | ||
| "@abp/ng.setting-management": "~10.6.0-rc.3", | ||
| "@abp/ng.tenant-management": "~10.6.0-rc.2", |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR generated automatically to merge dev with rel-10.6. Please review the changed files before merging to prevent any errors that may occur.