Skip to content

Commit

Permalink
WASM: Enable System.Runtime.Serialization.Formatters tests (#38948)
Browse files Browse the repository at this point in the history
* WASM: Enable System.Runtime.Serialization.Formatters tests

We need to preserve some assemblies the BinaryFormatter needs and also skip some test cases that would cause PNSE on WebAssembly.

* Disable IsolatedStorage case too

It throws PNSE now.
  • Loading branch information
akoeplinger authored Jul 9, 2020
1 parent 0d1fd3d commit 54d1580
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 55 deletions.
16 changes: 15 additions & 1 deletion eng/testing/tests.mobile.targets
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,20 @@
<AssemblySearchPaths Include="$(PublishDir)"/>
<WasmFilesToIncludeInFileSystem Include="@(ContentWithTargetPath)" />
<WasmFilesToIncludeInFileSystem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.BuildReference)' == 'true'" />
<ExtraAssemblies Include="$(PublishDir)$(AssemblyName).dll" />
<!-- we need to preserve these facades for BinaryFormatter tests -->
<ExtraAssemblies Include="$(PublishDir)mscorlib.dll" />
<ExtraAssemblies Include="$(PublishDir)System.dll" />
<ExtraAssemblies Include="$(PublishDir)System.ComponentModel.DataAnnotations.dll" />
<ExtraAssemblies Include="$(PublishDir)System.Configuration.dll" />
<ExtraAssemblies Include="$(PublishDir)System.Core.dll" />
<ExtraAssemblies Include="$(PublishDir)System.Data.dll" />
<ExtraAssemblies Include="$(PublishDir)System.Drawing.dll" />
<ExtraAssemblies Include="$(PublishDir)System.Numerics.dll" />
<ExtraAssemblies Include="$(PublishDir)System.Runtime.Serialization.dll" />
<ExtraAssemblies Include="$(PublishDir)System.Transactions.dll" />
<ExtraAssemblies Include="$(PublishDir)System.Xml.dll" />
<ExtraAssemblies Include="$(PublishDir)WindowsBase.dll" />
</ItemGroup>

<Error Condition="!Exists('$(MicrosoftNetCoreAppRuntimePackRidDir)')" Text="MicrosoftNetCoreAppRuntimePackRidDir=$(MicrosoftNetCoreAppRuntimePackRidDir) doesn't exist" />
Expand All @@ -133,7 +147,7 @@
MicrosoftNetCoreAppRuntimePackDir="$(MicrosoftNetCoreAppRuntimePackRidDir)"
MainAssembly="$(PublishDir)WasmTestRunner.dll"
MainJS="$(MonoProjectRoot)\wasm\runtime-test.js"
ExtraAssemblies="$(PublishDir)$(AssemblyName).dll"
ExtraAssemblies="@(ExtraAssemblies)"
FilesToIncludeInFileSystem="@(WasmFilesToIncludeInFileSystem)"
AssemblySearchPaths="@(AssemblySearchPaths)" />
</Target>
Expand Down
Loading

0 comments on commit 54d1580

Please sign in to comment.