Skip to content

[wasm] Misc follow up improvements for workloads testing #55647

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.

Sign up for GitHub

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

Merged
lewing merged 7 commits into from
Jul 15, 2021
Merged

[wasm] Misc follow up improvements for workloads testing #55647

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb24b84
[wasm] Move UseMonoRuntime=true to WasmApp.props
radical Jul 14, 2021
92a0ac8
Move workloads installation for testing bits to
radical Jul 14, 2021
975a3f0
[wasm] EmccCompile: don't log `stderr` messages as warnings
radical Jul 14, 2021
b6e098e
[wasm] Fix helix work item prefix
radical Jul 14, 2021
73683a3
improve readability of messages from parallel EmccCompile
radical Jul 14, 2021
ace85a9
Improve emscripten version mismatch message, and convert to a warning
radical Jul 14, 2021
e533384
Fix typo, so WBT runs can be differentiated correctly
radical Jul 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
[wasm] Move UseMonoRuntime=true to WasmApp.props
  • Loading branch information
@radical
radical committed Jul 14, 2021
commit eb24b84b48468d81bee414b092b492db11b655fd
4 changes: 0 additions & 4 deletions src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Sdk/Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<Project>
<PropertyGroup>
<UseMonoRuntime Condition="'$(RuntimeIdentifier)' == 'Browser-wasm'">true</UseMonoRuntime>
</PropertyGroup>

<Import Project="$(MSBuildThisFileDirectory)\RuntimeConfigParserTask.props" />
<Import Project="$(MSBuildThisFileDirectory)\RuntimeComponentManifest.props" />
</Project>
3 changes: 0 additions & 3 deletions src/mono/wasm/build/WasmApp.LocalBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
<Import Project="$(MSBuildThisFileDirectory)WasmApp.props" />

<PropertyGroup>
<!-- needed by the sdk, for net6.0, to include the correct runtime packs -->
<UseMonoRuntime>true</UseMonoRuntime>

<_NetCoreAppToolCurrent>net6.0</_NetCoreAppToolCurrent>
</PropertyGroup>

Expand Down
1 change: 0 additions & 1 deletion src/mono/wasm/build/WasmApp.LocalBuild.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<PropertyGroup>
<PublishTrimmed>true</PublishTrimmed>
<TrimMode>link</TrimMode>
<UseMonoRuntime>true</UseMonoRuntime>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)' != 'Debug'">
Expand Down
1 change: 1 addition & 0 deletions src/mono/wasm/build/WasmApp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<TargetArchitecture>wasm</TargetArchitecture>
<TargetOS>Browser</TargetOS>
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
<UseMonoRuntime>true</UseMonoRuntime>

<WasmBuildAppAfterThisTarget Condition="'$(WasmBuildAppAfterThisTarget)' == ''">Publish</WasmBuildAppAfterThisTarget>
<WasmBuildAppDependsOn>
Expand Down