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

* [wasm] Preserve members with ILLinker, issue: #2563 * cleanup
dotnet · Aug 25, 2022 · 7586fb5 · 7586fb5
1 parent 2fd6ac8
commit 7586fb5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/scripts/ci_setup.py b/scripts/ci_setup.py
@@ -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

diff --git a/src/benchmarks/micro/ILLink.Descriptors.Serialization.xml b/src/benchmarks/micro/ILLink.Descriptors.Serialization.xml
@@ -0,0 +1,5 @@
+<linker>
+  <assembly fullname="System.Private.DataContractSerialization">
+    <type fullname="System.Runtime.Serialization.DateTimeOffsetAdapter" />
+  </assembly>
+</linker>
diff --git a/src/benchmarks/micro/MicroBenchmarks.Wasm.targets b/src/benchmarks/micro/MicroBenchmarks.Wasm.targets
@@ -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>