Skip to content

Conversation

@pavelsavara
Copy link
Member

@pavelsavara pavelsavara commented Apr 25, 2023

  • Fix lazy loading assemblies transformed to webcil
  • Fix satellite assemblies transformed to webcil

@pavelsavara pavelsavara added arch-wasm WebAssembly architecture area-Build-mono labels Apr 25, 2023
@pavelsavara pavelsavara added this to the 8.0.0 milestone Apr 25, 2023
@pavelsavara pavelsavara requested a review from maraf April 25, 2023 16:30
@ghost
Copy link

ghost commented Apr 25, 2023

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

null

Author: pavelsavara
Assignees: pavelsavara, maraf
Labels:

arch-wasm, area-Build-mono

Milestone: 8.0.0

@pavelsavara pavelsavara requested a review from lewing April 25, 2023 16:32
@lewing lewing requested a review from lambdageek April 25, 2023 16:32
@lewing
Copy link
Member

lewing commented Apr 25, 2023

This might get the test to build and publish it will likely still fail at runtime

@maraf
Copy link
Member

maraf commented Apr 25, 2023

@lewing
Copy link
Member

lewing commented Apr 25, 2023

we should get away from logic based on fixed extensions all together but I'm ok with this to unblock

@maraf maraf changed the title [browser] webcil fixes [browser] Fix webcil lazy loading in Wasm SDK Apr 25, 2023
@lewing lewing closed this Apr 25, 2023
@lewing lewing reopened this Apr 25, 2023
@lewing
Copy link
Member

lewing commented Apr 26, 2023

we may need to backport this one

@maraf maraf changed the title [browser] Fix webcil lazy loading in Wasm SDK [browser] Fix webcil lazy loading and satellite assemblies in Wasm SDK Apr 26, 2023
@maraf maraf merged commit 4e5c9de into dotnet:main Apr 26, 2023
@maraf
Copy link
Member

maraf commented Apr 26, 2023

/backport to release/8.0-preview4

@github-actions
Copy link
Contributor

Started backporting to release/8.0-preview4: https://github.com/dotnet/runtime/actions/runs/4809719096

@github-actions
Copy link
Contributor

@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!

@github-actions
Copy link
Contributor

@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.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

arch-wasm WebAssembly architecture area-Build-mono

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants