Skip to content

Fix parallel merge with new usage of renamed method #118246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 31, 2025
Merged

Fix parallel merge with new usage of renamed method #118246

merged 1 commit into from
Jul 31, 2025

Conversation

bartonjs
Copy link
Member

No description provided.

@Copilot Copilot AI review requested due to automatic review settings July 31, 2025 18:49
Copilot
Copilot AI reviewed Jul 31, 2025
View reviewed changes
Copy link
Contributor

@Copilot 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 fixes a method call to use the renamed ImportSlhDsaPrivateKey method instead of the previously named ImportSlhDsaSecretKey method in the SlhDSA cryptography tests.

  • Updates method call to use the correct renamed method
  • Ensures tests continue to function after API rename

@dotnet-policy-service Dotnet Policy Service
Copy link
Contributor

Tagging subscribers to this area: @dotnet/area-system-security, @bartonjs, @vcsjones
See info in area-owners.md if you want to be subscribed.

@AaronRobinsonMSFT
Copy link
Member

@bartonjs If you are confident of this change and it looks correct to me too, I would merge this as soon as one of the legs gets past the current failure.

@AaronRobinsonMSFT AaronRobinsonMSFT mentioned this pull request Jul 31, 2025
Merged
@PranavSenthilnathan PranavSenthilnathan mentioned this pull request Jul 31, 2025
Closed
@PranavSenthilnathan
Copy link
Member

/ba-g failing leg passes with these changes

Previous run with error: https://github.com/dotnet/runtime/pull/118232/checks?check_run_id=47144319285
This PR without error: https://github.com/dotnet/runtime/pull/118246/checks?check_run_id=47149214431

@bartonjs bartonjs merged commit 211b051 into dotnet:main Jul 31, 2025
59 of 88 checks passed
This was referenced Jul 31, 2025
Open
Open
@EgorBo
Copy link
Member

EgorBo commented Jul 31, 2025 •
edited
Loading

@bartonjs this PR broke main?

src/libraries/System.Security.Cryptography.Pkcs/tests/SignedCms/SignedCmsTests.cs(1851,48): error CS0117: (NETCORE_ENGINEERING_TELEMETRY=Build) 'SlhDsa' does not contain a definition for 'ImportSlhDsaSecretKey'

@AaronRobinsonMSFT
Copy link
Member

@EgorBo No, this PR fixes that.

@bartonjs bartonjs deleted the fix_build_break branch July 31, 2025 22:39
@github-actions github-actions bot locked and limited conversation to collaborators Aug 31, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

Copilot code review Copilot Copilot left review comments

@stephentoub stephentoub stephentoub approved these changes

@PranavSenthilnathan PranavSenthilnathan PranavSenthilnathan approved these changes

@AaronRobinsonMSFT AaronRobinsonMSFT AaronRobinsonMSFT approved these changes

Assignees

@bartonjs bartonjs

Labels

area-System.Security

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@bartonjs @AaronRobinsonMSFT @PranavSenthilnathan @EgorBo @stephentoub