Skip to content

Merge branch rel-10.2 with rel-10.1#25086

Merged
voloagent merged 8 commits intorel-10.2from
auto-merge/rel-10-1/4427
Mar 16, 2026
Merged

Merge branch rel-10.2 with rel-10.1#25086
voloagent merged 8 commits intorel-10.2from
auto-merge/rel-10-1/4427

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

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

@voloagent voloagent marked this pull request as ready for review March 13, 2026 16:10
Copilot AI review requested due to automatic review settings March 13, 2026 16:10
@voloagent voloagent enabled auto-merge March 13, 2026 16:10
Copy link
Copy Markdown
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

Automated merge PR bringing changes from rel-10.2 into rel-10.1, including dependency alignment in Angular tooling, a fix to initialize profile management page context on POST, and a Swagger OIDC security requirement correction.

Changes:

  • Bump vite devDependency from ^7.0.0 to ^8.0.0 in npm/ng-packs.
  • Initialize ProfileManagementPageCreationContext and run contributors in ManageModel.OnPostAsync().
  • Fix Swagger OIDC security requirement scheme reference from "oauth2" to "oidc".

Reviewed changes

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

File Description
npm/ng-packs/package.json Updates frontend tooling dependency (vite) as part of the branch merge.
modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs Ensures profile-management context is built on POST, avoiding null/invalid UI state.
framework/src/Volo.Abp.Swashbuckle/Microsoft/Extensions/DependencyInjection/AbpSwaggerGenServiceCollectionExtensions.cs Corrects OIDC security requirement to reference the proper "oidc" scheme.

Comment on lines +50 to +54
public virtual async Task<IActionResult> OnPostAsync()
{
return Task.FromResult<IActionResult>(Page());
ProfileManagementPageCreationContext = new ProfileManagementPageCreationContext(ServiceProvider);

foreach (var contributor in Options.Contributors)
@voloagent voloagent merged commit 556f78e into rel-10.2 Mar 16, 2026
2 of 3 checks passed
@voloagent voloagent deleted the auto-merge/rel-10-1/4427 branch March 16, 2026 06:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants