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

[wasm] Fix failures due to illinker not preserving enough #2574

Merged
merged 2 commits into from
Aug 25, 2022
Merged

[wasm] Fix failures due to illinker not preserving enough #2574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43fdc09
[wasm] Preserve members with ILLinker, issue: https://github.com/dotn…
radical Aug 17, 2022
49b69c8
cleanup
radical Aug 17, 2022
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
2 changes: 1 addition & 1 deletion scripts/ci_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def add_arguments(parser: ArgumentParser) -> ArgumentParser:

def __is_valid_dotnet_path(dp: str) -> str:
if not os.path.isdir(dp):
raise ArgumentTypeError('Path {} does not exist'.format(dp))
raise ArgumentTypeError('Directory {} does not exist'.format(dp))
if not os.path.isfile(os.path.join(dp, 'dotnet')):
raise ArgumentTypeError('Could not find dotnet in {}'.format(dp))
return dp
Expand Down
5 changes: 5 additions & 0 deletions src/benchmarks/micro/ILLink.Descriptors.Serialization.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<linker>
<assembly fullname="System.Private.DataContractSerialization">
<type fullname="System.Runtime.Serialization.DateTimeOffsetAdapter" />
</assembly>
</linker>
2 changes: 2 additions & 0 deletions src/benchmarks/micro/MicroBenchmarks.Wasm.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
</PropertyGroup>

<ItemGroup>
<TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptors.Serialization.xml" />

<_AOT_InternalForceInterpretAssemblies Include="Microsoft.CodeAnalysis.CSharp.dll" />
<_AOT_InternalForceInterpretAssemblies Include="Microsoft.CodeAnalysis.dll" />
</ItemGroup>
Expand Down