Skip to content

Conversation

@thaystg
Copy link
Member

@thaystg thaystg commented Jul 3, 2023

Backport #87154 #87870 #87979

Customer Impact
Fixes #87407.
ExecutionContextDestroy and ExecutionContextCleared were CDP messages ignored by vscode-js-debug, and now they implemented the correct support for it, so we also need to implement the correct support on BrowserDebugProxy otherwise it will not be possible to debug Blazor apps with authentication.

Testing:
Try setting a breakpoint on a page guarded by authentication.

Risk
Medium, It's removing the debugging contexts that are not valid anymore.

@thaystg thaystg requested a review from radical as a code owner July 3, 2023 15:31
@ghost ghost added the area-Debugger-mono label Jul 3, 2023
@ghost ghost assigned thaystg Jul 3, 2023
@ghost
Copy link

ghost commented Jul 3, 2023

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

Issue Details

Backport #87154 #87870 #87979

Customer Impact
Fixes #87407.

Testing:
Try setting a breakpoint on a page guarded by authentication.

Risk
Medium, It's removing the debugging contexts that are not valid anymore.

Author: thaystg
Assignees: -
Labels:

area-Debugger-mono

Milestone: -

@thaystg
Copy link
Member Author

thaystg commented Jul 3, 2023

/backport to release/6.0-staging

@github-actions
Copy link
Contributor

github-actions bot commented Jul 3, 2023

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

@github-actions
Copy link
Contributor

github-actions bot commented Jul 3, 2023

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

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

Applying: Backport #87154 #87870 #87979
Using index info to reconstruct a base tree...
M	src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs
A	src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs
M	src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
Falling back to patching base and 3-way merge...
Auto-merging src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
CONFLICT (content): Merge conflict in src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
CONFLICT (modify/delete): src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs deleted in HEAD and modified in Backport #87154 #87870 #87979. Version Backport #87154 #87870 #87979 of src/mono/wasm/debugger/BrowserDebugProxy/Firefox/FirefoxMonoProxy.cs left in tree.
Auto-merging src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.cs
CONFLICT (content): Merge conflict in src/mono/wasm/debugger/BrowserDebugProxy/DevToolsHelper.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 Backport #87154 #87870 #87979
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

github-actions bot commented Jul 3, 2023

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

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

@thaystg thaystg added the Servicing-consider Issue for next servicing release review label Jul 3, 2023
@rbhanda rbhanda added Servicing-approved Approved for servicing release and removed Servicing-consider Issue for next servicing release review labels Jul 6, 2023
@rbhanda rbhanda added this to the 7.0.11 milestone Jul 6, 2023
@carlossanlop
Copy link
Contributor

carlossanlop commented Jul 10, 2023

@thaystg @ilonatommy - Reminder: Code Complete for the August Release is tomorrow Monday July 10th. If you intend to include this fix in that release, please make sure to merge it before 4pm because that's when I'll start the staging merge process into internal.

@thaystg thaystg merged commit f7f2471 into dotnet:release/7.0-staging Jul 10, 2023
@radical radical mentioned this pull request Aug 3, 2023
@ghost ghost locked as resolved and limited conversation to collaborators Aug 13, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-Debugger-mono Servicing-approved Approved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants