From 030dde1d5867897d6c9a69d0f142d3d3a80cb9a5 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Wed, 28 Apr 2021 16:09:55 -0400
Subject: [PATCH 1/2] [wasm] Add comments with linker fixes made for running
 aot tests in

.. https://github.com/dotnet/runtime/pull/51697 .
---
 .../ILLink.Descriptors.Serialization.xml        |  2 ++
 .../tests/ILLink.Descriptors.xml                | 17 +++++++++++++++++
 .../tests/ILLink.Descriptors.xml                |  4 ++++
 .../tests/ILLink.Descriptors.xml                | 11 +++++++++++
 .../System.Text.Json.Tests.csproj               |  3 ++-
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/eng/testing/ILLinkDescriptors/ILLink.Descriptors.Serialization.xml b/eng/testing/ILLinkDescriptors/ILLink.Descriptors.Serialization.xml
index 275c376871d83e..f40ef3c7144fbf 100644
--- a/eng/testing/ILLinkDescriptors/ILLink.Descriptors.Serialization.xml
+++ b/eng/testing/ILLinkDescriptors/ILLink.Descriptors.Serialization.xml
@@ -3,6 +3,8 @@
     <type fullname="System.Xml.Linq.XElement" />
   </assembly>
   <assembly fullname="System.Private.DataContractSerialization">
+
+   <!-- Issue: https://github.com/dotnet/runtime/issues/50730 -->
    <type fullname="System.Runtime.Serialization.KeyValuePairAdapter`2" />
   </assembly>
 </linker>
diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/ILLink.Descriptors.xml b/src/libraries/Microsoft.Extensions.Logging/tests/ILLink.Descriptors.xml
index e726c3e2a0f89e..eb67ab20a48b05 100644
--- a/src/libraries/Microsoft.Extensions.Logging/tests/ILLink.Descriptors.xml
+++ b/src/libraries/Microsoft.Extensions.Logging/tests/ILLink.Descriptors.xml
@@ -1,5 +1,22 @@
 <linker>
   <assembly fullname="System.Diagnostics.TraceSource">
+      <!--
+      fail: [FAIL] Microsoft.Extensions.Logging.Test.TraceSourceLoggerTest.Log_Shoud_Add_Exception_To_Message_Whether_Formatter_Is_Null_Or_Not(shouldFormatterBeNull: True)
+        info: Castle.DynamicProxy.InvalidProxyConstructorArgumentsException : Can not instantiate proxy of class: System.Diagnostics.TraceListener.
+        info: Could not find a parameterless constructor.
+        info:    at Castle.DynamicProxy.ProxyGenerator.CreateClassProxyInstance(Type proxyType, List`1 proxyArguments, Type classToProxy, Object[] constructorArguments)
+        info:    at Castle.DynamicProxy.ProxyGenerator.CreateClassProxy(Type classToProxy, Type[] additionalInterfacesToProxy, ProxyGenerationOptions options, Object[] constructorArguments, IInterceptor[] interceptors)
+        info:    at Moq.CastleProxyFactory.CreateProxy(Type mockType, IInterceptor interceptor, Type[] interfaces, Object[] arguments)
+        info:    at Moq.Mock`1[[System.Diagnostics.TraceListener, System.Diagnostics.TraceSource, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]].InitializeInstance()
+        info:    at Moq.Mock`1[[System.Diagnostics.TraceListener, System.Diagnostics.TraceSource, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]].OnGetObject()
+        info:    at Moq.Mock.get_Object()
+        info:    at Moq.Mock`1[[System.Diagnostics.TraceListener, System.Diagnostics.TraceSource, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a]].get_Object()
+        info:    at Microsoft.Extensions.Logging.Test.TraceSourceLoggerTest.<>c__DisplayClass2_0.<Log_Shoud_Add_Exception_To_Message_Whether_Formatter_Is_Null_Or_Not>b__0(ILoggingBuilder builder)
+        info:    at Microsoft.Extensions.DependencyInjection.LoggingServiceCollectionExtensions.AddLogging(IServiceCollection services, Action`1 configure)
+        info:    at Microsoft.Extensions.Logging.Test.TestLoggerBuilder.Create(Action`1 configure)
+        info:    at Microsoft.Extensions.Logging.Test.TraceSourceLoggerTest.Log_Shoud_Add_Exception_To_Message_Whether_Formatter_Is_Null_Or_Not(Boolean shouldFormatterBeNull)
+        info:    at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture)
+      -->
     <type fullname="System.Diagnostics.TraceListener">
         <method signature="System.Void .ctor()" />
     </type>
diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/ILLink.Descriptors.xml b/src/libraries/System.Reflection.MetadataLoadContext/tests/ILLink.Descriptors.xml
index cf15f17b4ba973..7781dd5790e50c 100644
--- a/src/libraries/System.Reflection.MetadataLoadContext/tests/ILLink.Descriptors.xml
+++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/ILLink.Descriptors.xml
@@ -1,3 +1,7 @@
 <linker>
+  <!--
+    error MSB3030: Could not copy the file "/__w/1/s/artifacts/bin/System.Reflection.MetadataLoadContext.Tests/net6.0-Release/browser-wasm/publish/mscorlib.dll" because it was not found.
+        [/__w/1/s/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj]
+  -->
   <assembly fullname="mscorlib" />
 </linker>
diff --git a/src/libraries/System.Reflection/tests/ILLink.Descriptors.xml b/src/libraries/System.Reflection/tests/ILLink.Descriptors.xml
index b36c80e634060b..4e8f19b9465ccd 100644
--- a/src/libraries/System.Reflection/tests/ILLink.Descriptors.xml
+++ b/src/libraries/System.Reflection/tests/ILLink.Descriptors.xml
@@ -1,4 +1,15 @@
 <linker>
+  <!--
+ IList` implementation on `ArrayList` was getting trimmed
+
+```
+  fail: [FAIL] System.Reflection.Tests.TypeInfoTests.IsAssignable(type: typeof(System.Collections.IList), c: typeof(System.Collections.ArrayList), expected: True)
+  info: Assert.Equal() Failure
+  info: Expected: True
+  info: Actual:   False
+  info:    at System.Reflection.Tests.TypeInfoTests.IsAssignable(Type type, Type c, Boolean expected) in /Users/radical/dev/r3/src/libraries/System.Reflection/tests/TypeInfoTests.cs:line 580
+  info:    at System.Reflection.RuntimeMethodInfo.Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) in /Users/radical/dev/r3/src/mono/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.cs:line 378
+  -->
   <assembly fullname="System.Private.CoreLib">
     <type fullname="System.Collections.ArrayList" />
   </assembly>
diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj
index d57047c6f3b3c0..effe2962373319 100644
--- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj
+++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj
@@ -5,7 +5,8 @@
     <!-- SYSLIB0020: JsonSerializerOptions.IgnoreNullValues is obsolete -->
     <NoWarn>$(NoWarn);SYSLIB0020</NoWarn>
 
-    <!-- these tests depend on the pdb files -->
+    <!-- these tests depend on the pdb files. Causes test failures like:
+          [FAIL] System.Text.Json.Tests.DebuggerTests.DefaultJsonElement -->
     <DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(TargetOS)' == 'Browser'">true</DebuggerSupport>
   </PropertyGroup>
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->

From a81af27e8f555c2268d532cd78d73698b44607cb Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Thu, 29 Apr 2021 17:52:56 -0400
Subject: [PATCH 2/2] Address review feedback from lewing

Update xml comment
---
 .../tests/ILLink.Descriptors.xml                             | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libraries/System.Reflection.MetadataLoadContext/tests/ILLink.Descriptors.xml b/src/libraries/System.Reflection.MetadataLoadContext/tests/ILLink.Descriptors.xml
index 7781dd5790e50c..f42a20d44d6f66 100644
--- a/src/libraries/System.Reflection.MetadataLoadContext/tests/ILLink.Descriptors.xml
+++ b/src/libraries/System.Reflection.MetadataLoadContext/tests/ILLink.Descriptors.xml
@@ -1,7 +1,8 @@
 <linker>
   <!--
-    error MSB3030: Could not copy the file "/__w/1/s/artifacts/bin/System.Reflection.MetadataLoadContext.Tests/net6.0-Release/browser-wasm/publish/mscorlib.dll" because it was not found.
-        [/__w/1/s/src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj]
+    System.Reflection.Tests.MetadataLoadContextTests.RelocatableAssembly load `mscorlib.dll` by name
+        `string mscorLibPath = Path.Combine(coreDirectory, "mscorlib.dll");`
+    Linker completely completely trims it out. So, preserve it explicitly.
   -->
   <assembly fullname="mscorlib" />
 </linker>