Skip to content

Merge branch dev with rel-10.2#24937

Merged
voloagent merged 1 commit intodevfrom
auto-merge/rel-10-2/4373
Feb 24, 2026
Merged

Merge branch dev with rel-10.2#24937
voloagent merged 1 commit intodevfrom
auto-merge/rel-10-2/4373

Conversation

@github-actions
Copy link
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 February 24, 2026 09:58
Copilot AI review requested due to automatic review settings February 24, 2026 09:58
@voloagent voloagent merged commit 3cbaf99 into dev Feb 24, 2026
5 checks passed
@voloagent voloagent deleted the auto-merge/rel-10-2/4373 branch February 24, 2026 09:58
Copy link
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

This PR merges the dev branch into rel-10.2 to update package versions from 10.1.0 to 10.2.0-rc.1 for the ABP Framework release candidate. The changes include version bumps across npm packages, templates, and module applications, along with some additional changes to the Identity domain and settings management modules.

Changes:

  • Updated ABP package versions from ~10.1.0 to ~10.2.0-rc.1 across all package.json and yarn.lock files
  • Updated LeptonX theme package versions from ~5.1.0 to ~5.2.0-rc.1
  • Added new methods and properties to Identity module domain entities (SetUserNameWithoutValidation, SetEmailWithoutValidation, SetPasswordHashWithoutValidation, SetLeaved, and Leaved property)
  • Removed @abp/jquery-form dependency from yarn.lock files
  • Fixed trailing whitespace in some package.json files
  • Removed trailing period from a setting display name

Reviewed changes

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

Show a summary per file
File Description
templates/module/*/package.json Version bump to 10.2.0-rc.1 for ABP theme packages
templates/app/*/package.json Version bump to 10.2.0-rc.1 for LeptonX theme packages
templates/app-nolayers/*/package.json Version bump to 10.2.0-rc.1 for LeptonX theme packages
npm/packs/*/package.json Version bump to 10.2.0-rc.1 for ABP npm packages
npm/ng-packs/packages/*/package.json Version bump to 10.2.0-rc.1 for ABP Angular packages
npm/lerna.json Version bump to 10.2.0-rc.1
modules/*/package.json Version bump to 10.2.0-rc.1 for module dependencies
modules/*/yarn.lock Updated lockfile with new versions, removed jquery-form dependency
modules/cms-kit/angular/package.json Inconsistent versions for ng.identity and ng.theme.basic (still at 10.1.0)
modules/identity/src/.../abppkg.analyze.json Added new domain methods and Leaved property
modules/setting-management/src/.../abppkg.analyze.json Removed trailing period from display name
Files not reviewed (1)
  • npm/packs/aspnetcore.mvc.ui/package-lock.json: Language not supported

"dependencies": {
"@abp/ng.account": "~10.1.0",
"@abp/ng.account": "~10.2.0-rc.1",
"@abp/ng.identity": "~10.1.0",
Copy link

Copilot AI Feb 24, 2026

Choose a reason for hiding this comment

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

Inconsistent version: @abp/ng.identity is still at ~10.1.0 while other ABP Angular packages have been updated to ~10.2.0-rc.1. This should be updated to match the other package versions for consistency.

Suggested change
"@abp/ng.identity": "~10.1.0",
"@abp/ng.identity": "~10.2.0-rc.1",

Copilot uses AI. Check for mistakes.
"@abp/ng.tenant-management": "~10.1.0",
"@abp/ng.setting-management": "~10.2.0-rc.1",
"@abp/ng.tenant-management": "~10.2.0-rc.1",
"@abp/ng.theme.basic": "~10.1.0",
Copy link

Copilot AI Feb 24, 2026

Choose a reason for hiding this comment

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

Inconsistent version: @abp/ng.theme.basic is still at ~10.1.0 while other ABP Angular packages have been updated to ~10.2.0-rc.1. This should be updated to match the other package versions for consistency.

Suggested change
"@abp/ng.theme.basic": "~10.1.0",
"@abp/ng.theme.basic": "~10.2.0-rc.1",

Copilot uses AI. Check for mistakes.
"valueType": "ToggleStringValueType",
"defaultValue": "false",
"displayName": "Allow changing email settings.",
"displayName": "Allow changing email settings",
Copy link

Copilot AI Feb 24, 2026

Choose a reason for hiding this comment

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

Removed trailing period from display name. While this is a minor change, it may affect localization strings if they rely on the exact text. Verify that all language files have been updated accordingly or that this change is intentional.

Copilot uses AI. Check for mistakes.
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