Skip to content
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

[IGNORE][wasm] wasm symbols #91241

Closed
wants to merge 30 commits into from
Closed

[IGNORE][wasm] wasm symbols #91241

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b7de30c
wip
radical Aug 28, 2023
48f2359
Merge remote-tracking branch 'origin/release/8.0' into wasm-symbols-8
radical Aug 30, 2023
197255e
wip
radical Aug 30, 2023
f3d7011
wip
radical Aug 31, 2023
6bee0df
Merge remote-tracking branch 'origin/release/8.0' into wasm-symbols-8
radical Sep 5, 2023
74ee30d
wip
radical Sep 5, 2023
d728534
wip
radical Sep 5, 2023
0054c0e
wip
radical Sep 7, 2023
51c50e7
wip
radical Sep 7, 2023
9406893
seems to work
radical Sep 8, 2023
3bbf995
wip
radical Sep 8, 2023
d786ec6
Merge remote-tracking branch 'origin/release/8.0' into wasm-symbols-8
radical Sep 20, 2023
ace8b22
Merge remote-tracking branch 'origin/release/8.0' into wasm-symbols-8
radical Sep 22, 2023
1745b5f
wip
radical Sep 22, 2023
44c0d53
wip
radical Sep 22, 2023
a361b54
wip
radical Sep 23, 2023
1c1f69f
trying a fix
radical Sep 25, 2023
8694f10
wip
radical Sep 26, 2023
2bb5dd0
wip
radical Sep 26, 2023
85b5086
wip
radical Sep 26, 2023
9952061
wip
radical Sep 26, 2023
cef6b74
wip
radical Sep 26, 2023
48c3607
Merge remote-tracking branch 'origin/release/8.0' into wasm-symbols-8
radical Sep 26, 2023
665bd69
fix test
radical Sep 26, 2023
59795a1
disable non-blazor-scenario perf jobs
radical Sep 26, 2023
5836b42
add back linux job
radical Sep 26, 2023
1b21239
allow runtime-wasm-perf on release branches
radical Sep 26, 2023
9f0de9b
fix test
radical Sep 26, 2023
7ef4374
Merge remote-tracking branch 'rf/wasm-symbols-8' into wasm-symbols-8
radical Sep 26, 2023
27a7d2b
wip
radical Sep 26, 2023
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
19 changes: 14 additions & 5 deletions src/mono/wasm/build/WasmApp.Native.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
$(_BeforeWasmBuildAppDependsOn);
_SetupEmscripten;
_SetWasmBuildNativeDefaults;
_SetWasmNativeStripDefault;
_SetDebugSymbolsPropertiesDefaults;
_ReadEmccProps
</_BeforeWasmBuildAppDependsOn>

Expand Down Expand Up @@ -119,6 +119,7 @@
<_BoolPropertiesThatTriggerRelinking Include="InvariantTimezone" DefaultValueInRuntimePack="false" />
<_BoolPropertiesThatTriggerRelinking Include="InvariantGlobalization" DefaultValueInRuntimePack="false" />
<_BoolPropertiesThatTriggerRelinking Include="WasmNativeStrip" DefaultValueInRuntimePack="true" />
<_BoolPropertiesThatTriggerRelinking Include="WasmNativeDebugSymbols" DefaultValueInRuntimePack="false" />
</ItemGroup>

<PropertyGroup>
Expand Down Expand Up @@ -160,10 +161,19 @@
</PropertyGroup>
</Target>

<Target Name="_SetWasmNativeStripDefault" Condition="'$(WasmNativeStrip)' == ''">
<PropertyGroup>
<Target Name="_SetDebugSymbolsPropertiesDefaults">
<!-- Default with nothing set -->
<PropertyGroup Condition="'$(WasmNativeDebugSymbols)' == '' and '$(WasmNativeStrip)' == ''">
<!-- Build+relink+config=debug -->
<WasmNativeStrip Condition="'$(WasmBuildingForNestedPublish)' != 'true' and '$(WasmBuildNative)' == 'true' and '$(Configuration)' == 'Debug'">false</WasmNativeStrip>
<WasmNativeDebugSymbols Condition="'$(WasmBuildingForNestedPublish)' != 'true' and '$(WasmBuildNative)' == 'true' and '$(Configuration)' == 'Debug'">true</WasmNativeDebugSymbols>

<WasmNativeStrip Condition="'$(WasmNativeStrip)' == 'true'">false</WasmNativeStrip>
<WasmNativeStrip Condition="'$(WasmNativeStrip)' == 'false'">true</WasmNativeStrip>
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
<WasmNativeStrip Condition="'$(WasmNativeStrip)' == 'true'">false</WasmNativeStrip>
<WasmNativeStrip Condition="'$(WasmNativeStrip)' == 'false'">true</WasmNativeStrip>
<WasmNativeStrip Condition="'$(WasmNativeStrip)' == 'true'">false</WasmNativeStrip>
<WasmNativeStrip Condition="'$(WasmNativeStrip)' == 'false'">true</WasmNativeStrip>

This can only be '' in this PropertyGroup?

</PropertyGroup>

<PropertyGroup>
<!-- the two properties do not influence each other -->
<WasmNativeDebugSymbols Condition="'$(WasmNativeDebugSymbols)' == ''">false</WasmNativeDebugSymbols>
<WasmNativeStrip Condition="'$(WasmNativeStrip)' == ''">true</WasmNativeStrip>
</PropertyGroup>
</Target>
Expand All @@ -178,7 +188,6 @@
<_MonoAotCrossCompilerPath>@(MonoAotCrossCompiler->WithMetadataValue('RuntimeIdentifier','browser-wasm'))</_MonoAotCrossCompilerPath>
<_EmccDefaultFlagsRsp>$([MSBuild]::NormalizePath($(_WasmRuntimePackSrcDir), 'emcc-default.rsp'))</_EmccDefaultFlagsRsp>
<_EmccDefaultLinkFlagsRsp>$([MSBuild]::NormalizePath($(_WasmRuntimePackSrcDir), 'emcc-link.rsp'))</_EmccDefaultLinkFlagsRsp>
<WasmNativeDebugSymbols Condition="'$(WasmNativeDebugSymbols)' == ''">true</WasmNativeDebugSymbols>
<WasmLinkIcalls Condition="'$(WasmLinkIcalls)' == ''">$(WasmBuildNative)</WasmLinkIcalls>

<_WasmICallTablePath>$(_WasmIntermediateOutputPath)icall-table.h</_WasmICallTablePath>
Expand Down