[browser] Use whole assembly name when looking for already loaded assemblies #96018
Conversation
…name in lazy loading
maraf
added
arch-wasm
|
Tagging subscribers to 'arch-wasm': @lewing Issue DetailsIn lazy assembly loading we are checking whether the requested assembly wasn't already loaded. This was previously done by "contains" in loaded assembly URLs. Now we are storing only loaded assembly names and in lazy loading checking for whole assembly name Fixes #95381 TODO
|
ghost
assigned
|
Failure is #97092 and is unrelated |
|
/backport to release/8.0-staging |
|
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/7556764411 |
|
@maraf backporting to release/8.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Put asset name in loaderHelpers.loadedAssemblies and check for asset name in lazy loading
Applying: Update lazy loading test to match existing assembly name partially
Using index info to reconstruct a base tree...
M src/mono/wasm/testassets/WasmBasicTestApp/LazyLoadingTest.cs
M src/mono/wasm/testassets/WasmBasicTestApp/WasmBasicTestApp.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/mono/wasm/testassets/WasmBasicTestApp/App/WasmBasicTestApp.csproj
Auto-merging src/mono/wasm/testassets/WasmBasicTestApp/App/LazyLoadingTest.cs
CONFLICT (content): Merge conflict in src/mono/wasm/testassets/WasmBasicTestApp/App/LazyLoadingTest.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Update lazy loading test to match existing assembly name partially
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 128Please backport manually! |
|
@maraf an error occurred while backporting to release/8.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
In lazy assembly loading we are checking whether the requested assembly wasn't already loaded. This was previously done by "contains" in loaded assembly URLs. Now we are storing only loaded assembly names and in lazy loading checking for whole assembly name
Fixes #95381