Skip to content
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.

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

[mono] Add metadata update for overrides #85182

Merged
merged 1 commit into from
Apr 24, 2023

Conversation

fanyang-mono
Copy link
Member

Fixes: #79043

Copy link
Member

@lambdageek lambdageek left a comment

Choose a reason for hiding this comment

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

LGTM! 🎉

@lambdageek
Copy link
Member

We can probably backport this to 7.0. Just need to check if it depends on instance field supoort. If not, I'm sure this prevents someone from updating async methods.

@lambdageek
Copy link
Member

/backport to release/7.0-staging

@github-actions
Copy link
Contributor

Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/4779675983

@github-actions
Copy link
Contributor

@lambdageek backporting to release/7.0-staging failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Add metadata update for overrides
Using index info to reconstruct a base tree...
M	src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs
M	src/mono/mono/metadata/metadata.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/metadata/metadata.c
Auto-merging src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs
CONFLICT (content): Merge conflict in src/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add metadata update for overrides
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@github-actions
Copy link
Contributor

@lambdageek an error occurred while backporting to release/7.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

@fanyang-mono fanyang-mono reopened this Apr 24, 2023
@fanyang-mono fanyang-mono merged commit 6848447 into dotnet:main Apr 24, 2023
@ghost ghost locked as resolved and limited conversation to collaborators May 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[mono] Failing test ApplyUpdateTests.AsyncMethodChanges
2 participants