Skip to content

[wasm] Build static components; include hot_reload in runtime - #54568

Merged
lambdageek merged 9 commits into
dotnet:mainfrom
lambdageek:fix-wasm-hot_reload-component
Jun 24, 2021
Merged

[wasm] Build static components; include hot_reload in runtime#54568
lambdageek merged 9 commits into
dotnet:mainfrom
lambdageek:fix-wasm-hot_reload-component

Conversation

@lambdageek

@lambdageeklambdageek commented Jun 22, 2021

Copy link
Copy Markdown
Member

Workaround until #54565 is fixed
Build the runtime always with support for hot_reload, and without diagnostics_tracing

@ghostghost added the area-Build-mono label Jun 22, 2021
@lambdageek
lambdageek requested review from lewing and radicalJune 22, 2021 18:05
@lambdageeklambdageek added the arch-wasm WebAssembly architecture label Jun 22, 2021
@ghost

ghost commented Jun 22, 2021

Copy link
Copy Markdown

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

Issue Details

Workaround until #54565 is fixed
Build the runtime always with support for hot_reload, and without diagnostics_tracing

Author:lambdageek
Assignees:-
Labels:

arch-wasm, area-Build-mono

Milestone:-

@lambdageek

lambdageek commented Jun 22, 2021

Copy link
Copy Markdown
MemberAuthor

/cc @lateralusX

lambdageek
lambdageek commented Jun 22, 2021
View reviewed changes
Comment threadsrc/mono/wasm/Makefile Outdated
@lambdageek

lambdageek commented Jun 22, 2021

Copy link
Copy Markdown
MemberAuthor

This also needs to go into .NET 6 Preview 6

@radical

radical commented Jun 22, 2021

Copy link
Copy Markdown
Member

Does this enable, or fix something?

@lambdageek

lambdageek commented Jun 22, 2021

Copy link
Copy Markdown
MemberAuthor

Does this enable, or fix something?

Yea it fixes hot reload on .NET 6 P6

@radical

radical commented Jun 22, 2021

Copy link
Copy Markdown
Member

Does this enable, or fix something?

Yea it fixes hot reload on .NET 6 P6

Is there a test that we can enable with this, so we get validation too?

@lambdageek
[wasm] Build static components; include hot_reload in runtime
be8a1e8
Workaround until dotnet#54565 is fixed
Build the runtime always with support for hot_reload, and without diagnostics_tracing
@lambdageek
lambdageekforce-pushed the fix-wasm-hot_reload-component branch from b243253 to be8a1e8CompareJune 22, 2021 18:49
thaystgand others added 2 commits June 22, 2021 16:10
@thaystg
Update wasm.proj
aa89d4c
@lambdageek
Add a browser functional test for hot reload
5da0bde
Just check that the capabilities are non-empty which is a good proxy for hot
reload being enabled in the runtime.
@lambdageek
lambdageekforce-pushed the fix-wasm-hot_reload-component branch from 74ad995 to 5da0bdeCompareJune 22, 2021 20:42
@lambdageek

lambdageek commented Jun 22, 2021

Copy link
Copy Markdown
MemberAuthor

@radical I added a new functional test for the browser. didn't try very hard to override all the build lane stuff, but at least for a default ./build.sh --os browser -c Release and running the test with dotnet.sh build /p:TargetOS=browser /p:TargetArchitecture=wasm /t:Test works for me.

@radical

radical commented Jun 23, 2021

Copy link
Copy Markdown
Member

wasm failure is #53957

radical
radical reviewed Jun 23, 2021
View reviewed changes
Comment threadsrc/libraries/System.Runtime.Loader/tests/ApplyUpdateTest.cs Outdated
radical
radical reviewed Jun 23, 2021
View reviewed changes
Comment threadsrc/mono/wasm/wasm.proj Outdated
@lambdageek
lambdageekforce-pushed the fix-wasm-hot_reload-component branch from 303e48e to 5a084cfCompareJune 23, 2021 17:13
radical
radical approved these changes Jun 23, 2021
View reviewed changes

@radicalradical left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, just nits, whatever bits I could review. The env vars stuff should be doable in the project file itself, but nothing to block this PR over.

Comment thread...ssembly/Browser/HotReload/ApplyUpdateReferencedAssembly/ApplyUpdateReferencedAssembly.csproj Outdated
Comment thread...ests/FunctionalTests/WebAssembly/Browser/HotReload/WebAssembly.Browser.HotReload.Test.csproj
Condition="'$(TargetOS)' == 'Browser'">
<ItemGroup>
<!-- FIXME: this belongs in eng/testing/tests.wasm.targets -->
<!-- FIXME: Can we do something on the Content items in the referenced projects themselves to get this for free? -->

@radicalradicalJun 23, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

soon ;)

Comment thread...ests/FunctionalTests/WebAssembly/Browser/HotReload/WebAssembly.Browser.HotReload.Test.csproj
Comment threadsrc/tests/FunctionalTests/WebAssembly/Browser/HotReload/Program.cs Outdated
@lambdageek

lambdageek commented Jun 23, 2021

Copy link
Copy Markdown
MemberAuthor

/backport to release/6.0-preview6

@github-actions

github-actionsBot commented Jun 23, 2021

Copy link
Copy Markdown
Contributor

Started backporting to release/6.0-preview6: https://github.com/dotnet/runtime/actions/runs/965256876

@github-actionsgithub-actionsBot mentioned this pull request Jun 23, 2021
Merged
@lambdageek
lambdageek merged commit 93f407d into dotnet:mainJun 24, 2021
@lambdageeklambdageek mentioned this pull request Jun 24, 2021
Merged
@karelzkarelz mentioned this pull request Jun 24, 2021
Closed
steveisok pushed a commit that referenced this pull request Jun 24, 2021
@github-actions@lambdageek@thaystg
[release/6.0-preview6] [wasm] Build static components; include hot_re…
12c92e8
…load in runtime (#54622)
Backport of #54568 to release/6.0-preview6
Workaround until #54565 is fixed
Build the runtime always with support for hot_reload, and without diagnostics_tracing
Co-authored-by: Aleksey Kliger <alklig@microsoft.com>
Co-authored-by: Thays Grazia <thaystg@gmail.com>
thaystg added a commit to thaystg/runtime that referenced this pull request Jun 24, 2021
@thaystg
Merge remote-tracking branch 'origin/main' into thays_componentize_de…
06c3999
…bugger2
* origin/main: (107 commits)
Disable MacCatalyst arm64 PR test runs on staging pipeline (dotnet#54678)
[WASM] Fix async/await in config loading (dotnet#54652)
Fix for heap_use_after_free flagged by sanitizer (dotnet#54679)
[wasm] Bump emscripten to 2.0.23 (dotnet#53603)
Fix compiler references when building inside VS (dotnet#54614)
process more TLS frames at one when available (dotnet#50815)
Add PeriodicTimer (dotnet#53899)
UdpClient with span support (dotnet#53429)
exclude fragile tests (dotnet#54671)
get last error before calling a method that might fail as well (dotnet#54667)
[FileStream] add tests for device and UNC paths (dotnet#54545)
Fix sporadic double fd close (dotnet#54660)
Remove Version.Clone from AssemblyName.Clone (dotnet#54621)
[wasm] Enable fixed libraries tests (dotnet#54641)
[wasm] Fix blazor/aot builds (dotnet#54651)
[mono][wasm] Fix compilation error on wasm (dotnet#54659)
Fix telemetry for Socket connects to Dns endpoints (dotnet#54071)
[wasm] Build static components; include hot_reload in runtime (dotnet#54568)
[wasm][debugger] Reuse debugger-agent on wasm debugger (dotnet#52300)
Put Crossgen2 in sync with dotnet#54235 (dotnet#54438)
...
@ghostghost locked as resolved and limited conversation to collaborators Jul 24, 2021
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@radicalradicalradical approved these changes
@marek-safarmarek-safarAwaiting requested review from marek-safar
@lewinglewingAwaiting requested review from lewinglewing is a code owner

Assignees

No one assigned

Labels

arch-wasmWebAssembly architecturearea-Build-mono

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@lambdageek@radical@thaystg