Repository navigation
Auto-merge forward rel-10.7 → dev - #26246
Merged
Merged
Conversation
Contributor
|
Merge conflict forwarding Please resolve conflicts against |
Contributor
There was a problem hiding this comment.
Copilot review overview
🟡 Changes recommended
Several Angular manifests retain prerelease constraints, and the updated lockfile contains conflicting root package versions.
Review effort: Balanced
Findings: 5
Open (5)
What changed in this PR
Promotes ABP npm packages and application templates from 10.7 release candidates to stable 10.7 versions.
Changes:
- Updates ABP package versions and internal dependencies to
10.7.0. - Updates template and demo theme dependencies to stable releases.
| File | Description |
|---|---|
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/package.json |
Stabilizes Basic theme dependency. |
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/package.json |
Stabilizes Basic theme dependency. |
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/package.json |
Stabilizes Blazor theme dependencies. |
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/package.json |
Stabilizes Basic theme dependency. |
templates/module/angular/projects/my-project-name/package.json |
Stabilizes shared Angular theme dependency. |
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json |
Stabilizes LeptonX Lite dependency. |
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json |
Stabilizes LeptonX Lite dependency. |
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json |
Stabilizes LeptonX Lite dependency. |
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/package.json |
Stabilizes Blazor theme dependencies. |
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/package.json |
Stabilizes tiered Blazor dependencies. |
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json |
Stabilizes Blazor Server dependencies. |
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json |
Stabilizes tiered server dependencies. |
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json |
Stabilizes LeptonX Lite dependency. |
templates/app/angular/package.json |
Stabilizes Lepton X dependency. |
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json |
Stabilizes MVC theme dependency. |
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json |
Stabilizes MongoDB MVC theme. |
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json |
Stabilizes host theme dependency. |
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json |
Stabilizes MongoDB host theme. |
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/package.json |
Stabilizes WebAssembly server theme. |
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/package.json |
Stabilizes MongoDB WebAssembly theme. |
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json |
Stabilizes Blazor Server themes. |
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json |
Stabilizes MongoDB Blazor themes. |
templates/app-nolayers/angular/package.json |
Stabilizes Lepton X dependency. |
npm/packs/zxcvbn/package.json |
Promotes package to 10.7.0. |
npm/packs/vue/package.json |
Promotes package to 10.7.0. |
npm/packs/virtual-file-explorer/package.json |
Promotes package and dependencies. |
npm/packs/vee-validate/package.json |
Promotes package and Vue dependency. |
npm/packs/utils/package.json |
Promotes package to 10.7.0. |
npm/packs/uppy/package.json |
Promotes package and core dependency. |
npm/packs/tui-editor/package.json |
Promotes package and dependencies. |
npm/packs/toastr/package.json |
Promotes package and jQuery dependency. |
npm/packs/timeago/package.json |
Promotes package and jQuery dependency. |
npm/packs/sweetalert2/package.json |
Promotes package and core dependency. |
npm/packs/star-rating-svg/package.json |
Promotes package and jQuery dependency. |
npm/packs/slugify/package.json |
Promotes package to 10.7.0. |
npm/packs/signalr/package.json |
Promotes package and core dependency. |
npm/packs/select2/package.json |
Promotes package and core dependency. |
npm/packs/qrcode/package.json |
Promotes package and core dependency. |
npm/packs/prismjs/package.json |
Promotes package and dependencies. |
npm/packs/popper.js/package.json |
Promotes package and core dependency. |
npm/packs/owl.carousel/package.json |
Promotes package and core dependency. |
npm/packs/moment/package.json |
Promotes package to 10.7.0. |
npm/packs/markdown-it/package.json |
Promotes package and core dependency. |
npm/packs/malihu-custom-scrollbar-plugin/package.json |
Promotes package and core dependency. |
npm/packs/luxon/package.json |
Promotes package and core dependency. |
npm/packs/lodash/package.json |
Promotes package and core dependency. |
npm/packs/jstree/package.json |
Promotes package and jQuery dependency. |
npm/packs/jquery/package.json |
Promotes package and core dependency. |
npm/packs/jquery-validation/package.json |
Promotes validation package dependencies. |
npm/packs/jquery-validation-unobtrusive/package.json |
Promotes validation dependency. |
npm/packs/jquery-form/package.json |
Promotes package and jQuery dependency. |
npm/packs/highlight.js/package.json |
Promotes package and core dependency. |
npm/packs/font-awesome/package.json |
Promotes package and core dependency. |
npm/packs/flag-icons/package.json |
Promotes package to 10.7.0. |
npm/packs/flag-icon-css/package.json |
Promotes package to 10.7.0. |
npm/packs/docs/package.json |
Promotes docs package dependencies. |
npm/packs/datatables.net/package.json |
Promotes package and jQuery dependency. |
npm/packs/datatables.net-bs5/package.json |
Promotes Bootstrap 5 table package. |
npm/packs/datatables.net-bs4/package.json |
Promotes Bootstrap 4 table package. |
npm/packs/cropperjs/package.json |
Promotes package and core dependency. |
npm/packs/core/package.json |
Promotes core and utils dependency. |
npm/packs/codemirror/package.json |
Promotes package and core dependency. |
npm/packs/cms-kit/package.json |
Promotes CMS Kit dependencies. |
npm/packs/cms-kit.public/package.json |
Promotes public CMS dependencies. |
npm/packs/cms-kit.admin/package.json |
Promotes administrative CMS dependencies. |
npm/packs/clipboard/package.json |
Promotes package and core dependency. |
npm/packs/chart.js/package.json |
Promotes package to 10.7.0. |
npm/packs/bootstrap/package.json |
Promotes Bootstrap wrapper dependencies. |
npm/packs/bootstrap-daterangepicker/package.json |
Promotes Moment dependency. |
npm/packs/bootstrap-datepicker/package.json |
Promotes package to 10.7.0. |
npm/packs/blogging/package.json |
Promotes blogging UI dependencies. |
npm/packs/aspnetcore.mvc.ui/package.json |
Promotes MVC UI package. |
npm/packs/aspnetcore.mvc.ui/package-lock.json |
Updates lockfile top-level version. |
npm/packs/aspnetcore.mvc.ui.theme.shared/package.json |
Promotes shared theme dependency graph. |
npm/packs/aspnetcore.mvc.ui.theme.basic/package.json |
Promotes Basic theme package. |
npm/packs/aspnetcore.components.server.theming/package.json |
Promotes server theming package. |
npm/packs/aspnetcore.components.server.basictheme/package.json |
Promotes server Basic theme. |
npm/packs/anchor-js/package.json |
Promotes package and core dependency. |
npm/ng-packs/packages/theme-shared/package.json |
Promotes shared Angular theme. |
npm/ng-packs/packages/theme-basic/package.json |
Promotes Basic Angular theme. |
npm/ng-packs/packages/tenant-management/package.json |
Promotes tenant management package. |
npm/ng-packs/packages/setting-management/package.json |
Promotes setting management package. |
npm/ng-packs/packages/schematics/package.json |
Promotes schematics package. |
npm/ng-packs/packages/permission-management/package.json |
Promotes permission management package. |
npm/ng-packs/packages/oauth/package.json |
Promotes OAuth package dependencies. |
npm/ng-packs/packages/identity/package.json |
Promotes identity package dependencies. |
npm/ng-packs/packages/generators/package.json |
Promotes Nx generators. |
npm/ng-packs/packages/feature-management/package.json |
Promotes feature management package. |
npm/ng-packs/packages/core/package.json |
Promotes Angular core package. |
npm/ng-packs/packages/components/package.json |
Promotes component peer requirements. |
npm/ng-packs/packages/cms-kit/package.json |
Promotes Angular CMS Kit. |
npm/ng-packs/packages/account/package.json |
Promotes Angular account package. |
npm/ng-packs/packages/account-core/package.json |
Promotes account core package. |
npm/ng-packs/package.json |
Promotes workspace ABP dependencies. |
npm/lerna.json |
Sets monorepo version to 10.7.0. |
modules/virtual-file-explorer/app/package.json |
Stabilizes demo dependencies. |
modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/package.json |
Stabilizes demo theme dependency. |
modules/openiddict/app/OpenIddict.Demo.Server/package.json |
Stabilizes server theme dependency. |
modules/openiddict/app/angular/package.json |
Stabilizes Lepton X dependency. |
modules/docs/app/VoloDocs.Web/package.json |
Stabilizes documentation app dependencies. |
modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json |
Stabilizes unified CMS dependencies. |
modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json |
Stabilizes CMS host theme. |
modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json |
Stabilizes identity server theme. |
modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json |
Stabilizes simulation demo theme. |
modules/blogging/app/Volo.BloggingTestApp/package.json |
Stabilizes blogging test dependencies. |
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json |
Stabilizes Basic theme demo dependencies. |
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json |
Stabilizes Bootstrap demo dependencies. |
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.tenant-management": "~10.7.0-rc.4", | ||
| "@abp/ng.theme.shared": "~10.7.0-rc.4", | ||
| "@abp/ng.theme.lepton-x": "~5.7.0-rc.5", | ||
| "@abp/ng.theme.lepton-x": "~5.7.0", |
| { | ||
| "name": "@abp/aspnetcore.mvc.ui", | ||
| "version": "10.7.0-rc.5", | ||
| "version": "10.7.0", |
| "@abp/ng.setting-management": "~10.7.0-rc.4", | ||
| "@abp/ng.tenant-management": "~10.7.0-rc.4", | ||
| "@abp/ng.theme.lepton-x": "~5.7.0-rc.5", | ||
| "@abp/ng.theme.lepton-x": "~5.7.0", |
| "@abp/ng.setting-management": "~10.7.0-rc.4", | ||
| "@abp/ng.tenant-management": "~10.7.0-rc.4", | ||
| "@abp/ng.theme.lepton-x": "~5.7.0-rc.5", | ||
| "@abp/ng.theme.lepton-x": "~5.7.0", |
| "@angular/core": "~21.2.0", | ||
| "@abp/ng.core": "~10.7.0-rc.4", | ||
| "@abp/ng.theme.shared": "~10.7.0-rc.4" | ||
| "@abp/ng.theme.shared": "~10.7.0" |
sumeyyeKurtulus
approved these changes
Oct 6, 2026
sumeyyeKurtulus
left a comment
sumeyyeKurtulus
left a comment
Contributor
There was a problem hiding this comment.
waiting for the lepton release for the failing action
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.
Automated forward merge of
rel-10.7intodev.Merge conflict: this branch is `${SOURCE}` as-is. Resolve against `${TARGET}` before merging.