-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
[browser] Fix webcil lazy loading and satellite assemblies in Wasm SDK #85335
Conversation
pavelsavara
commented
Apr 25, 2023
•
edited by maraf
Loading
edited by maraf
- Fix lazy loading assemblies transformed to webcil
- Fix satellite assemblies transformed to webcil
Tagging subscribers to 'arch-wasm': @lewing Issue Detailsnull
|
This might get the test to build and publish it will likely still fail at runtime |
Probably needs runtime change in https://github.com/dotnet/aspnetcore/blob/main/src/Components/Web.JS/src/Platform/Mono/MonoPlatform.ts#L396 |
we should get away from logic based on fixed extensions all together but I'm ok with this to unblock |
we may need to backport this one |
/backport to release/8.0-preview4 |
Started backporting to release/8.0-preview4: https://github.com/dotnet/runtime/actions/runs/4809719096 |
@maraf backporting to release/8.0-preview4 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: fix
Applying: Revert webcil from tasks.csproj
Applying: Expect webcil
Applying: Fix converting satellite assemblies to webcil
Applying: Fix computing path for satellite assemblies
Applying: Fix publishing satellite assemblies as webcil
Applying: fix the fix
Using index info to reconstruct a base tree...
M eng/testing/tests.browser.targets
Falling back to patching base and 3-way merge...
Auto-merging eng/testing/tests.browser.targets
CONFLICT (content): Merge conflict in eng/testing/tests.browser.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0007 fix the fix
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! |
@maraf an error occurred while backporting to release/8.0-preview4, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |