[browser] Extension agnostic lazy assembly loading#104793
Merged
maraf merged 5 commits intodotnet:mainfrom Jul 23, 2024
Merged
Conversation
maraf
added
arch-wasm
This was referenced Jul 12, 2024
Open
maraf
force-pushed
the
BrowserLazyNoExtension
branch
from
f63516c to
2f3258e
Compare
maraf
requested review from
akoeplinger,
ilonatommy,
lewing,
pavelsavara and
thaystg
as code owners
ilonatommy
approved these changes
Jul 22, 2024
src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/GenerateWasmBootJson.cs
Show resolved
Hide resolved
pavelsavara
reviewed
Jul 22, 2024
maraf
force-pushed
the
BrowserLazyNoExtension
branch
2 times, most recently
from
1a97a61 to
0dba4ab
Compare
This was referenced Jul 22, 2024
maraf
force-pushed
the
BrowserLazyNoExtension
branch
from
0dba4ab to
4d3cbd8
Compare
Member
Author
Member
Author
|
/backport to release/9.0-preview7 |
Contributor
|
Started backporting to release/9.0-preview7: https://github.com/dotnet/runtime/actions/runs/10053241202 |
Contributor
|
@maraf backporting to release/9.0-preview7 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Compare lazy assemblies without extension during build
Using index info to reconstruct a base tree...
M src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/GenerateWasmBootJson.cs
Falling back to patching base and 3-way merge...
Auto-merging src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/GenerateWasmBootJson.cs
CONFLICT (content): Merge conflict in src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/GenerateWasmBootJson.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Compare lazy assemblies without extension during build
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@maraf an error occurred while backporting to release/9.0-preview7, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
maraf
added a commit
to maraf/runtime
that referenced
this pull request
Jul 23, 2024
2 tasks
carlossanlop
pushed a commit
that referenced
this pull request
Jul 24, 2024
…ding (#105298) * [browser] Use StaticWebAssets fingerprinting in Wasm SDK (#103755) * Build and publish integration * Make fingerpring work at runtime for assemblies * Make fingerpring work at runtime for icu * Remove version fingerprint check * Check core assembly extension * Typescript nits * JSModules and SatelliteAssemblies * DEBUG require newer SDK for testing * Fix fingerprint for new publish assets * Lazy loading and FP mapping boot json * WBT file on disk checks * WBT file on disk checks * WBT file on disk checks * WBT testmain no fingerprint * WBT revert debug message * AOT * WBT fix ordering * Fingerprinting without webcil * Fix GenerateWasmBootJson when FP is off * NoFingerprint WBT variant * DEBUG try to run WBT without fingerprinting * WBT make entry comparison order agnostic * WBT smoke tests for no-fingerprinting * Update sendtohelix-browser.targets * Remove debug log * Fix typo * Fix regex matching * Remove test for dotnet.js FP since we don't support that anymore * Fix check for System.Private.CoreLib * FP for dotnet.globalization.js * Fingerprinting pdbs * WBT fix file check * Fingerprint segmentation-rules.json * Fix loading pdb for fingerprinted lazy assembly * Ensure lazy pdb is loaded * Remove non-WasmSDK tests from non-FP category * Revert drop for dotnet.js finterprinting * Compute non-Fingerprinted virtualPath for pdb and resource as well * Make debugger working with fingerprinted assemblies and pdbs * DEBUG latest SDK for WBT * DEBUG fix wbt installation * Add WorkloadBuildTasks to WasmBuild.sln * Fix WBT * Revert escaping URL in debugger * Fix lazy loading test and message emit in release config * Fixes for MT after merge * Skip WBT without workloads and without fingerprinting * Turn off fingerprinting when targeting downlevel versions * Git ignore *.d.ts.sha256 * Fix * Update source-build-reference-packages to latest * Revert "Update source-build-reference-packages to latest" This reverts commit bef50ee. * Fix the references * Update Versions.props * Update Versions.props --------- Co-authored-by: Larry Ewing <lewing@microsoft.com> * [browser] Extension agnostic lazy assembly loading (#104793) * Fix damage from branch merging --------- Co-authored-by: Larry Ewing <lewing@microsoft.com>
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Fixes #94132