This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
Remove premature throw #24450
Merged
Remove premature throw #24450
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ResolveUsingEvent is no longer the last resort for Assembly resolution and should not be throwing simply because the Assembly.Resolve event did not find the Assembly
sdmaclea
commented
May 8, 2019
| @@ -6925,20 +6927,27 @@ HRESULT RuntimeInvokeHostAssemblyResolver(INT_PTR pManagedAssemblyLoadContextToB | |||
| pAssemblyBindingContext = pLoadedPEAssembly->GetHostAssembly(); | |||
| } | |||
|
|
|||
| #ifdef FEATURE_COMINTEROP | |||
| if (AreSameBinderInstance(pAssemblyBindingContext, GetAppDomain()->GetWinRtBinder())) | |||
| if (fResolvedAssembly) | |||
There was a problem hiding this comment.
Code was written assuming line 6884 above threw...
Mostly whitepace below
sdmaclea
commented
May 8, 2019
| } | ||
| else | ||
| { | ||
| hr = COR_E_FILENOTFOUND; |
There was a problem hiding this comment.
Return COR_E_FILENOTFOUND instead of throwing FILENOTFOUND
|
Do we need a test for this? How did we find the issue that this is fixing? |
jkotas
approved these changes
May 9, 2019
Ben Watson reported this. He was debugging in Visual Studio plugin isolation. He enabled breaking on first chance exceptions and he was seeing these exception despite successfully loading with the AppDomain.AssemblyResolve event. Not sure if I can catch it in a test with a AppDomain.FirstChance exception handler. I'll give it a try |
sdmaclea
added a commit
to sdmaclea/coreclr
that referenced
this pull request
May 10, 2019
This reverts commit 597e5fa.
sdmaclea
added a commit
to sdmaclea/coreclr
that referenced
this pull request
May 10, 2019
This reverts commit 74f26ab.
picenka21
pushed a commit
to picenka21/runtime
that referenced
this pull request
Feb 18, 2022
* Remove premature throw ResolveUsingEvent is no longer the last resort for Assembly resolution and should not be throwing simply because the Assembly.Resolve event did not find the Assembly * Delay throw FileNotFound until after AppDomain.AssemblyResolve Commit migrated from dotnet/coreclr@597e5fa
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ResolveUsingEvent is no longer the last resort for Assembly resolution
and should not be throwing simply because the Assembly.Resolve event did
not find the Assembly