Skip to content

Conversation

@thaystg
Copy link
Member

@thaystg thaystg commented Jan 7, 2022

Should read this byte only in earlier versions.
This can break features while debugging on ios/android.

This is a side-effect of this PR: #52300

I think we should backport to 6.0 or at least to 6.0maui

@thaystg thaystg requested review from lambdageek and lewing January 7, 2022 14:52
@thaystg thaystg requested a review from marek-safar as a code owner January 7, 2022 14:52
@ghost ghost added the area-Debugger-mono label Jan 7, 2022
@ghost ghost assigned thaystg Jan 7, 2022
@ghost
Copy link

ghost commented Jan 7, 2022

Tagging subscribers to this area: @thaystg
See info in area-owners.md if you want to be subscribed.

Issue Details

Should read this byte only in earlier versions.
This can break features while debugging on ios/android.

This is a side-effect of this PR: #52300

I think we should backport to 6.0 or at least to 6.0maui

Author: thaystg
Assignees: -
Labels:

area-Debugger-mono

Milestone: -

@radical
Copy link
Member

radical commented Jan 7, 2022

Does this affect wasm too? If so, then can we add a test there?
And can you mention how this shows up, in the PR description?

@thaystg
Copy link
Member Author

thaystg commented Jan 7, 2022

Does this affect wasm too? If so, then can we add a test there? And can you mention how this shows up, in the PR description?

This doesn't affect wasm, because wasm is already using 61 version.
I detected it reading the code! I was helping Ilona and saw this error.

@thaystg
Copy link
Member Author

thaystg commented Jan 10, 2022

@lewing should I backport to 6.0 or at least to 6.0maui?

@lambdageek
Copy link
Member

/backport to release/6.0-maui

@github-actions
Copy link
Contributor

Started backporting to release/6.0-maui: https://github.com/dotnet/runtime/actions/runs/1682940829

@github-actions
Copy link
Contributor

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

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

Applying: Should read this byte only in earlier versions.
Using index info to reconstruct a base tree...
M	src/mono/mono/component/debugger-agent.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/component/debugger-agent.c
CONFLICT (content): Merge conflict in src/mono/mono/component/debugger-agent.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Should read this byte only in earlier versions.
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!

@thaystg thaystg merged commit 1297ac8 into dotnet:main Jan 11, 2022
@lambdageek
Copy link
Member

@thaystg the backport bot failed, you will need to backport by hand

@thaystg
Copy link
Member Author

thaystg commented Jan 11, 2022

@thaystg the backport bot failed, you will need to backport by hand

Done: #63629

@ghost ghost locked as resolved and limited conversation to collaborators Feb 10, 2022
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.

4 participants