From 57ef6399b98f5e7a74551dd13453247c29fed347 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Tue, 15 Dec 2020 14:33:32 -0500
Subject: [PATCH 01/42] Trim wasm library tests

---
 eng/testing/tests.mobile.targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index f458c0514f87ad..b79925c195b265 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -11,6 +11,8 @@
   <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
     <!-- We need to set this in order to get extensibility on xunit category traits and other arguments we pass down to xunit via MSBuild properties -->
     <RunScriptCommand>$HARNESS_RUNNER wasm $XHARNESS_COMMAND  --app=. --engine=$(JSEngine) $(JSEngineArgs) --js-file=runtime.js --output-directory=$XHARNESS_OUT --  $(RunTestsJSArguments) --run WasmTestRunner.dll $(AssemblyName).dll</RunScriptCommand>
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimMode>link</TrimMode>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetOS)' == 'Android'">

From 3436a5f28fd7bdadc9d5742475e326c74f347c14 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Tue, 15 Dec 2020 14:36:23 -0500
Subject: [PATCH 02/42] Add SystemBuffers HelloTest and only test that

---
 .../System.Buffers/tests/ArrayPool/HelloTest.cs     | 13 +++++++++++++
 .../tests/System.Buffers.Tests.csproj               |  5 +----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 src/libraries/System.Buffers/tests/ArrayPool/HelloTest.cs

diff --git a/src/libraries/System.Buffers/tests/ArrayPool/HelloTest.cs b/src/libraries/System.Buffers/tests/ArrayPool/HelloTest.cs
new file mode 100644
index 00000000000000..a8ef995920967e
--- /dev/null
+++ b/src/libraries/System.Buffers/tests/ArrayPool/HelloTest.cs
@@ -0,0 +1,13 @@
+using Xunit;
+
+namespace System.Buffers.ArrayPool.Tests
+{
+    public class ArrayPoolHelloTest
+    {
+        [Fact]
+        public void Test1()
+        {
+
+        }
+    }
+}
diff --git a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj b/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
index 47b6b84165c322..b674943aae0513 100644
--- a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
+++ b/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
@@ -6,9 +6,6 @@
     <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="ArrayPool\ArrayPoolTest.cs" />
-    <Compile Include="ArrayPool\CollectionTests.cs" />
-    <Compile Include="ArrayPool\UnitTests.cs" />
-    <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs" />
+    <Compile Include="ArrayPool\HelloTest.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From 922086412cfc143ed597caecb4446eceb7137076 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Wed, 16 Dec 2020 14:27:22 -0500
Subject: [PATCH 03/42] Import linker from nuget to override sdk linker

---
 eng/testing/tests.mobile.targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index b79925c195b265..5b0cb261b0a928 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -197,4 +197,6 @@
           Condition="'$(IsCrossTargetingBuild)' != 'true'"
           AfterTargets="Build"
           DependsOnTargets="Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" />
+
+  <Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(TargetOS)' == 'Browser'" />
 </Project>

From 37039955de606261338996b23a563d3861a119fd Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Wed, 16 Dec 2020 14:39:33 -0500
Subject: [PATCH 04/42] Remove redundant assembly inclusions

---
 eng/testing/tests.mobile.targets | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 5b0cb261b0a928..881e8733fee757 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -168,10 +168,6 @@
       </WasmSatelliteAssemblies>
 
       <WasmAssembliesToBundle Include="$(PublishDir)\*.dll"/>
-      <WasmAssembliesToBundle Include="$(PublishDir)$(AssemblyName).dll" />
-      <!-- We need these facades for some tests. -->
-      <WasmAssembliesToBundle Include="$(PublishDir)mscorlib.dll" />
-      <WasmAssembliesToBundle Include="$(PublishDir)System.Drawing.dll" />
 
       <WasmFilesToIncludeInFileSystem Include="@(ContentWithTargetPath)" />
       <WasmFilesToIncludeInFileSystem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.BuildReference)' == 'true' and !$([System.String]::new('%(ReferenceCopyLocalPaths.Identity)').EndsWith('.resources.dll'))" />

From 4ba287b1b080f9802deff89ddc1de432bb7f69e6 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Wed, 16 Dec 2020 14:39:46 -0500
Subject: [PATCH 05/42] Add WasmTestRunner referenced assemblies

---
 eng/testing/tests.mobile.targets | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 881e8733fee757..67e909873724b4 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -168,6 +168,13 @@
       </WasmSatelliteAssemblies>
 
       <WasmAssembliesToBundle Include="$(PublishDir)\*.dll"/>
+      <!-- WasmTestRunner referenced assemblies -->
+      <WasmAssembliesToBundle Include="$(OutDir)\System.Globalization.dll" />
+      <WasmAssembliesToBundle Include="$(OutDir)\System.Reflection.dll" />
+      <WasmAssembliesToBundle Include="$(OutDir)\System.Runtime.dll" />
+      <WasmAssembliesToBundle Include="$(OutDir)\System.Runtime.Extensions.dll" />
+      <WasmAssembliesToBundle Include="$(OutDir)\System.Threading.dll" />
+      <WasmAssembliesToBundle Include="$(OutDir)\System.Xml.XDocument.dll" />
 
       <WasmFilesToIncludeInFileSystem Include="@(ContentWithTargetPath)" />
       <WasmFilesToIncludeInFileSystem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.BuildReference)' == 'true' and !$([System.String]::new('%(ReferenceCopyLocalPaths.Identity)').EndsWith('.resources.dll'))" />

From fcb5c371b9704a1d1b2118826088d0268bb21170 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Thu, 17 Dec 2020 14:24:33 -0500
Subject: [PATCH 06/42] Add properties to reduce library size

---
 eng/testing/tests.mobile.targets | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 67e909873724b4..6eefdf7e1f179f 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -13,6 +13,11 @@
     <RunScriptCommand>$HARNESS_RUNNER wasm $XHARNESS_COMMAND  --app=. --engine=$(JSEngine) $(JSEngineArgs) --js-file=runtime.js --output-directory=$XHARNESS_OUT --  $(RunTestsJSArguments) --run WasmTestRunner.dll $(AssemblyName).dll</RunScriptCommand>
     <PublishTrimmed>true</PublishTrimmed>
     <TrimMode>link</TrimMode>
+    <EventSourceSupport>false</EventSourceSupport>
+    <UseSystemResourceKeys>true</UseSystemResourceKeys>
+    <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
+    <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
+    <DebuggerSupport>false</DebuggerSupport>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetOS)' == 'Android'">
@@ -148,8 +153,6 @@
 
   </Target>
 
-  <Import Project="$(MonoProjectRoot)\wasm\build\WasmApp.targets" Condition="'$(TargetOS)' == 'Browser'" />
-
   <Target Condition="'$(TargetOS)' == 'Browser'" Name="BundleTestWasmApp" DependsOnTargets="WasmBuildApp" />
 
   <Target Condition="'$(TargetOS)' == 'Browser'" Name="PrepareForWasmBuildApp" BeforeTargets="WasmBuildApp">
@@ -201,5 +204,6 @@
           AfterTargets="Build"
           DependsOnTargets="Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" />
 
+  <Import Project="$(MonoProjectRoot)\wasm\build\WasmApp.targets" Condition="'$(TargetOS)' == 'Browser'" />
   <Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(TargetOS)' == 'Browser'" />
 </Project>

From 041001047e4c5262f9299b0832f5749a4ef6c16a Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Thu, 17 Dec 2020 14:25:44 -0500
Subject: [PATCH 07/42] Updates

---
 eng/testing/tests.mobile.targets                          | 5 +++++
 src/libraries/System.Buffers/tests/ArrayPool/HelloTest.cs | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 67e909873724b4..ff97fd14f1e8c9 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -13,6 +13,11 @@
     <RunScriptCommand>$HARNESS_RUNNER wasm $XHARNESS_COMMAND  --app=. --engine=$(JSEngine) $(JSEngineArgs) --js-file=runtime.js --output-directory=$XHARNESS_OUT --  $(RunTestsJSArguments) --run WasmTestRunner.dll $(AssemblyName).dll</RunScriptCommand>
     <PublishTrimmed>true</PublishTrimmed>
     <TrimMode>link</TrimMode>
+    <EventSourceSupport>false</EventSourceSupport>
+    <UseSystemResourceKeys>true</UseSystemResourceKeys>
+    <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
+    <HttpActivityPropagationSupport>false</HttpActivityPropagationSupport>
+    <DebuggerSupport>false</DebuggerSupport>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetOS)' == 'Android'">
diff --git a/src/libraries/System.Buffers/tests/ArrayPool/HelloTest.cs b/src/libraries/System.Buffers/tests/ArrayPool/HelloTest.cs
index a8ef995920967e..ee01641c2397b9 100644
--- a/src/libraries/System.Buffers/tests/ArrayPool/HelloTest.cs
+++ b/src/libraries/System.Buffers/tests/ArrayPool/HelloTest.cs
@@ -7,7 +7,8 @@ public class ArrayPoolHelloTest
         [Fact]
         public void Test1()
         {
-
+            bool val = true;
+            Assert.True(val, "Value should be true");
         }
     }
 }

From f33c81b759c8482b5537cb5b2f89ee7ae23c9a13 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Thu, 17 Dec 2020 14:29:15 -0500
Subject: [PATCH 08/42] Configure trimming for library tests

---
 eng/testing/tests.mobile.targets | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 6eefdf7e1f179f..73feddca593298 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -153,6 +153,15 @@
 
   </Target>
 
+  <Target Name="ConfigureTrimming"
+          BeforeTargets="PrepareForILLink">
+    <ItemGroup>
+      <ManagedAssemblyToLink Include="$(OutDir)\*xunit*">
+        <IsTrimmable>true</IsTrimmable>
+      </ManagedAssemblyToLink>
+    </ItemGroup>
+  </Target>
+
   <Target Condition="'$(TargetOS)' == 'Browser'" Name="BundleTestWasmApp" DependsOnTargets="WasmBuildApp" />
 
   <Target Condition="'$(TargetOS)' == 'Browser'" Name="PrepareForWasmBuildApp" BeforeTargets="WasmBuildApp">

From 5f2a3ba12d86979b508a60f8384da8a4f52e4626 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Fri, 18 Dec 2020 15:11:32 -0500
Subject: [PATCH 09/42] Link assemblies except for test assembly

---
 eng/testing/tests.mobile.targets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 73feddca593298..069bae57ccf767 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -158,6 +158,12 @@
     <ItemGroup>
       <ManagedAssemblyToLink Include="$(OutDir)\*xunit*">
         <IsTrimmable>true</IsTrimmable>
+        <TrimMode>link</TrimMode>
+      </ManagedAssemblyToLink>
+    </ItemGroup>
+    <ItemGroup>
+      <ManagedAssemblyToLink Condition="('%(ManagedAssemblyToLink.FileName).dll' != '$(MSBuildProjectName).dll')" >
+        <TrimMode>link</TrimMode>
       </ManagedAssemblyToLink>
     </ItemGroup>
   </Target>

From 2c17b605ea7b1df6a3bcca3f2ac9a631f4cacb9a Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Fri, 18 Dec 2020 16:07:57 -0500
Subject: [PATCH 10/42] Use another path to WasmTestRunner.dll

---
 eng/testing/tests.mobile.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 069bae57ccf767..bb4886a0456603 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -173,7 +173,7 @@
   <Target Condition="'$(TargetOS)' == 'Browser'" Name="PrepareForWasmBuildApp" BeforeTargets="WasmBuildApp">
     <PropertyGroup>
       <WasmAppDir>$(BundleDir)</WasmAppDir>
-      <WasmMainAssemblyPath>$(PublishDir)WasmTestRunner.dll</WasmMainAssemblyPath>
+      <WasmMainAssemblyPath>(WasmTestRunnerDir)\WasmTestRunner.dll</WasmMainAssemblyPath>
       <WasmMainJSPath>$(MonoProjectRoot)\wasm\runtime-test.js</WasmMainJSPath>
       <WasmInvariantGlobalization>$(InvariantGlobalization)</WasmInvariantGlobalization>
       <WasmGenerateRunV8Script>true</WasmGenerateRunV8Script>

From 036b34c2c17e3c71f8785f4f992bf6b78bb6ae21 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Fri, 18 Dec 2020 16:21:08 -0500
Subject: [PATCH 11/42] Fix typo

---
 eng/testing/tests.mobile.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index bb4886a0456603..855d1a426cb95f 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -173,7 +173,7 @@
   <Target Condition="'$(TargetOS)' == 'Browser'" Name="PrepareForWasmBuildApp" BeforeTargets="WasmBuildApp">
     <PropertyGroup>
       <WasmAppDir>$(BundleDir)</WasmAppDir>
-      <WasmMainAssemblyPath>(WasmTestRunnerDir)\WasmTestRunner.dll</WasmMainAssemblyPath>
+      <WasmMainAssemblyPath>$(WasmTestRunnerDir)\WasmTestRunner.dll</WasmMainAssemblyPath>
       <WasmMainJSPath>$(MonoProjectRoot)\wasm\runtime-test.js</WasmMainJSPath>
       <WasmInvariantGlobalization>$(InvariantGlobalization)</WasmInvariantGlobalization>
       <WasmGenerateRunV8Script>true</WasmGenerateRunV8Script>

From 6969b5a6f4916fa04b9cf1cd23aa04f14ead72a2 Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Sun, 20 Dec 2020 10:48:07 +0100
Subject: [PATCH 12/42] Setup correctly rooted assemblies

---
 eng/testing/tests.mobile.targets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 855d1a426cb95f..475020a1a7d6ec 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -165,6 +165,10 @@
       <ManagedAssemblyToLink Condition="('%(ManagedAssemblyToLink.FileName).dll' != '$(MSBuildProjectName).dll')" >
         <TrimMode>link</TrimMode>
       </ManagedAssemblyToLink>
+      <ManagedAssemblyToLink Condition="('%(ManagedAssemblyToLink.FileName).dll' == '$(AssemblyName).dll')" >
+        <TrimMode>copy</TrimMode>
+      </ManagedAssemblyToLink>
+      <TrimmerRootAssembly Include="WasmTestRunner"/>
     </ItemGroup>
   </Target>
 

From 79dc240f4c99f61af1a7e4c98d299be25f8f854e Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Sun, 20 Dec 2020 18:19:23 +0100
Subject: [PATCH 13/42] Don't copy WasmTestRunner.dll from wrong patch when
 using linker

---
 src/tasks/WasmAppBuilder/WasmAppBuilder.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.cs b/src/tasks/WasmAppBuilder/WasmAppBuilder.cs
index b1cd526fb4435c..22149f8526e97d 100644
--- a/src/tasks/WasmAppBuilder/WasmAppBuilder.cs
+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.cs
@@ -98,8 +98,8 @@ public IcuData(string name) : base(name, "icu") {}
 
     public override bool Execute ()
     {
-        if (!File.Exists(MainAssembly))
-            throw new ArgumentException($"File MainAssembly='{MainAssembly}' doesn't exist.");
+//        if (!File.Exists(MainAssembly))
+//            throw new ArgumentException($"File MainAssembly='{MainAssembly}' doesn't exist.");
         if (!File.Exists(MainJS))
             throw new ArgumentException($"File MainJS='{MainJS}' doesn't exist.");
         if (!InvariantGlobalization && string.IsNullOrEmpty(IcuDataFileName))
@@ -121,13 +121,15 @@ public override bool Execute ()
             if (asm.EndsWith("System.Private.CoreLib.dll"))
                 runtimeSourceDir = Path.GetDirectoryName(asm);
         }
-
+/*
+        // Main assembly can conflict in same assembly on different path already included in Assemblies
+        // TODO: remove the property
         if (MainAssembly != null)
         {
             if (!_assemblies.Contains(MainAssembly))
                 _assemblies.Add(MainAssembly);
         }
-
+*/
         var config = new WasmAppConfig ();
 
         // Create app

From d6dfd82be7fcb06b5127b89bb14dc108fc3e3300 Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Sun, 20 Dec 2020 20:10:32 +0100
Subject: [PATCH 14/42] Don't inflate publish output with packages which are
 not used for tests runs

---
 eng/testing/tests.mobile.targets | 2 ++
 eng/testing/xunit/xunit.props    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 475020a1a7d6ec..db4ed0bcda6787 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -6,6 +6,8 @@
     <RunAOTCompilation Condition="'$(TargetOS)' == 'iOS' and $(TargetArchitecture.StartsWith('arm'))">true</RunAOTCompilation>
     <JSEngine Condition="'$(TargetOS)' == 'Browser' and '$(JSEngine)' == ''">V8</JSEngine>
     <JSEngineArgs Condition="'$(JSEngine)' == 'V8'">$(JSEngineArgs) --engine-arg=--stack-trace-limit=1000</JSEngineArgs>
+
+    <PublishingTestsRun>true</PublishingTestsRun>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
diff --git a/eng/testing/xunit/xunit.props b/eng/testing/xunit/xunit.props
index 69355a452a48ee..f63b3906fccb61 100644
--- a/eng/testing/xunit/xunit.props
+++ b/eng/testing/xunit/xunit.props
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(ArchiveTests)' != 'true'">
+  <ItemGroup Condition="'$(ArchiveTests)' != 'true' AND '$(PublishingTestsRun)' != 'true'">
     <!-- Microsoft.Net.Test.Sdk brings a lot of assemblies with it. To reduce helix payload submission size we disable it on CI. -->
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)" GeneratePathProperty="true" />

From 9ef8529d4ac4afddffca5831662ed7a20b888293 Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Mon, 21 Dec 2020 11:28:21 +0100
Subject: [PATCH 15/42] Fix xunit framework files copying to publish location
 to not overwrite version copied as part of trimming publish

---
 eng/testing/tests.mobile.targets        | 5 +++--
 eng/testing/xunit/xunit.console.targets | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index db4ed0bcda6787..584973727578a9 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -193,12 +193,14 @@
 
       <WasmAssembliesToBundle Include="$(PublishDir)\*.dll"/>
       <!-- WasmTestRunner referenced assemblies -->
+      <!--
       <WasmAssembliesToBundle Include="$(OutDir)\System.Globalization.dll" />
       <WasmAssembliesToBundle Include="$(OutDir)\System.Reflection.dll" />
       <WasmAssembliesToBundle Include="$(OutDir)\System.Runtime.dll" />
       <WasmAssembliesToBundle Include="$(OutDir)\System.Runtime.Extensions.dll" />
       <WasmAssembliesToBundle Include="$(OutDir)\System.Threading.dll" />
       <WasmAssembliesToBundle Include="$(OutDir)\System.Xml.XDocument.dll" />
+      -->
 
       <WasmFilesToIncludeInFileSystem Include="@(ContentWithTargetPath)" />
       <WasmFilesToIncludeInFileSystem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.BuildReference)' == 'true' and !$([System.String]::new('%(ReferenceCopyLocalPaths.Identity)').EndsWith('.resources.dll'))" />
@@ -215,8 +217,7 @@
       <_runnerFilesToPublish Include="$(AppleTestRunnerDir)*" Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'" />
       <_runnerFilesToPublish Include="$(WasmTestRunnerDir)*" Condition="'$(TargetOS)' == 'Browser'" />
 
-      <!-- Exclude xunit assemblies as those should be resolved by our own package references -->
-      <ResolvedFileToPublish Include="@(_runnerFilesToPublish)" Condition="!$([System.String]::Copy('%(Filename)').StartsWith('xunit.'))" RelativePath="%(FileName)%(Extension)" CopyToPublishDirectory="PreserveNewest" PostprocessAssembly="true" />
+      <ResolvedFileToPublish Include="@(_runnerFilesToPublish)" RelativePath="%(FileName)%(Extension)" CopyToPublishDirectory="PreserveNewest" PostprocessAssembly="true" />
     </ItemGroup>
   </Target>
 
diff --git a/eng/testing/xunit/xunit.console.targets b/eng/testing/xunit/xunit.console.targets
index 5b71327e96450b..ba79777dde25b1 100644
--- a/eng/testing/xunit/xunit.console.targets
+++ b/eng/testing/xunit/xunit.console.targets
@@ -43,7 +43,7 @@
 
   <!-- Overwrite the runner config file with the app local one. -->
   <Target Name="OverwriteDesktopTestRunnerConfigs"
-          Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and 
+          Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and
                      '$(GenerateAppConfigurationFile)' == 'true' and
                      '@(AppConfigWithTargetPath)' != ''"
           AfterTargets="CopyFilesToOutputDirectory">
@@ -57,7 +57,7 @@
   </Target>
 
   <!-- ResolveAssemblyReferences is the target that populates ReferenceCopyLocalPaths which is what is copied to output directory. -->
-  <Target Name="CopyRunnerToOutputDirectory" BeforeTargets="ResolveAssemblyReferences">
+  <Target Name="CopyRunnerToOutputDirectory" BeforeTargets="ResolveAssemblyReferences" Condition="'$(TargetsMobile)' != 'true'">
     <ItemGroup>
       <!-- Copy test runner to output directory -->
       <None Include="$([System.IO.Path]::GetDirectoryName('$(XunitConsole472Path)'))\*"

From 076fc9370aec92cfecbdd45d4f7f896fb5c9036b Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Mon, 21 Dec 2020 12:28:51 +0100
Subject: [PATCH 16/42] Add linker descriptor for xunit code which linker
 cannot track

---
 eng/testing/ILLink.Descriptor.xunit.xml | 7 +++++++
 eng/testing/tests.mobile.targets        | 4 ++++
 2 files changed, 11 insertions(+)
 create mode 100644 eng/testing/ILLink.Descriptor.xunit.xml

diff --git a/eng/testing/ILLink.Descriptor.xunit.xml b/eng/testing/ILLink.Descriptor.xunit.xml
new file mode 100644
index 00000000000000..e39db7f3ab9283
--- /dev/null
+++ b/eng/testing/ILLink.Descriptor.xunit.xml
@@ -0,0 +1,7 @@
+<linker>
+  <assembly fullname="xunit.execution.dotnet">
+    <type fullname="Xunit.Sdk.ReflectionAssemblyInfo">
+      <method signature="System.Void .ctor(System.String)" />
+    </type>
+  </assembly>
+</linker>
diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 584973727578a9..18e02c25f485e4 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -172,6 +172,10 @@
       </ManagedAssemblyToLink>
       <TrimmerRootAssembly Include="WasmTestRunner"/>
     </ItemGroup>
+    <ItemGroup>
+      <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptor.xunit.xml">
+      </TrimmerRootDescriptor>
+    </ItemGroup>
   </Target>
 
   <Target Condition="'$(TargetOS)' == 'Browser'" Name="BundleTestWasmApp" DependsOnTargets="WasmBuildApp" />

From 79274dd697b7e29b59a451c92bc93254c75c7cf4 Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Mon, 21 Dec 2020 12:40:50 +0100
Subject: [PATCH 17/42] Add tested assembly to the test payload closure

---
 eng/testing/tests.mobile.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 18e02c25f485e4..6c5b4588fd72db 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -171,6 +171,7 @@
         <TrimMode>copy</TrimMode>
       </ManagedAssemblyToLink>
       <TrimmerRootAssembly Include="WasmTestRunner"/>
+      <TrimmerRootAssembly Include="$(AssemblyName)"/>
     </ItemGroup>
     <ItemGroup>
       <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptor.xunit.xml">

From c46f92bc56c10c82dd8de60f2c63568e42076e3e Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Mon, 21 Dec 2020 12:45:37 +0100
Subject: [PATCH 18/42] One more method to preserve

---
 eng/testing/ILLink.Descriptor.xunit.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eng/testing/ILLink.Descriptor.xunit.xml b/eng/testing/ILLink.Descriptor.xunit.xml
index e39db7f3ab9283..9ffb65ba3d674d 100644
--- a/eng/testing/ILLink.Descriptor.xunit.xml
+++ b/eng/testing/ILLink.Descriptor.xunit.xml
@@ -3,5 +3,8 @@
     <type fullname="Xunit.Sdk.ReflectionAssemblyInfo">
       <method signature="System.Void .ctor(System.String)" />
     </type>
+    <type fullname="Xunit.Sdk.TestFrameworkProxy">
+      <method signature="System.Void .ctor(System.Object,System.Object,System.Object)" />
+    </type>
   </assembly>
 </linker>

From 72e600d4d5846ba7c8d59b999dcb718295df5b00 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Mon, 21 Dec 2020 17:59:36 -0500
Subject: [PATCH 19/42] Preserving some xunit types to make sure we can
 actually discover the tests

---
 eng/testing/ILLink.Descriptor.xunit.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eng/testing/ILLink.Descriptor.xunit.xml b/eng/testing/ILLink.Descriptor.xunit.xml
index 9ffb65ba3d674d..fd224bd0e60a34 100644
--- a/eng/testing/ILLink.Descriptor.xunit.xml
+++ b/eng/testing/ILLink.Descriptor.xunit.xml
@@ -6,5 +6,9 @@
     <type fullname="Xunit.Sdk.TestFrameworkProxy">
       <method signature="System.Void .ctor(System.Object,System.Object,System.Object)" />
     </type>
+    <type fullname="Xunit.Sdk.FactDiscoverer" />
+  </assembly>
+  <assembly fullname="xunit.core">
+    <namespace fullname="Xunit" />
   </assembly>
 </linker>

From 4fa8c51a8f0f271ed4f8909a482380fb95370efd Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Mon, 21 Dec 2020 18:30:20 -0500
Subject: [PATCH 20/42] Put Wasm.targets import in the right spot

---
 eng/testing/tests.mobile.targets | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 3b6f8473c3c734..84b0a17adef377 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -179,11 +179,6 @@
     </ItemGroup>
   </Target>
 
-  <Import Project="$(MonoProjectRoot)\wasm\build\WasmApp.targets" Condition="'$(TargetOS)' == 'Browser'" />
-  <PropertyGroup>
-      <WasmBuildAppDependsOn>PrepareForWasmBuildApp;$(WasmBuildAppDependsOn)</WasmBuildAppDependsOn>
-  </PropertyGroup>
-
   <Target Condition="'$(TargetOS)' == 'Browser'" Name="BundleTestWasmApp" DependsOnTargets="WasmBuildApp" />
 
   <Target Condition="'$(TargetOS)' == 'Browser'" Name="PrepareForWasmBuildApp">
@@ -238,5 +233,8 @@
           DependsOnTargets="Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" />
 
   <Import Project="$(MonoProjectRoot)\wasm\build\WasmApp.targets" Condition="'$(TargetOS)' == 'Browser'" />
+  <PropertyGroup>
+      <WasmBuildAppDependsOn>PrepareForWasmBuildApp;$(WasmBuildAppDependsOn)</WasmBuildAppDependsOn>
+  </PropertyGroup>
   <Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(TargetOS)' == 'Browser'" />
 </Project>

From 4f52ee304cb5ff60f4da066dc34ae1bb06bc404e Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Tue, 22 Dec 2020 11:11:00 -0500
Subject: [PATCH 21/42] Add a mode where we can run the regular system.buffers
 tests

---
 .../System.Buffers/tests/System.Buffers.Tests.csproj        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj b/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
index b674943aae0513..9df5b2dac285ad 100644
--- a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
+++ b/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
@@ -8,4 +8,10 @@
   <ItemGroup>
     <Compile Include="ArrayPool\HelloTest.cs" />
   </ItemGroup>
+  <ItemGroup Condition="'$(RunNormal)' == 'true'">
+    <Compile Include="ArrayPool\ArrayPoolTest.cs" />
+    <Compile Include="ArrayPool\CollectionTests.cs" />
+    <Compile Include="ArrayPool\UnitTests.cs" />
+    <Compile Include="$(CommonTestPath)System\Diagnostics\Tracing\TestEventListener.cs" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

From 4fa5e03263b35bb87f2f9e0c0fd3c98b324ea0f6 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Tue, 22 Dec 2020 13:12:59 -0500
Subject: [PATCH 22/42] Dont link out Microsoft.DotNet.RemoteExecutor

---
 eng/testing/tests.mobile.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 84b0a17adef377..73dab276065b4c 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -164,7 +164,7 @@
       </ManagedAssemblyToLink>
     </ItemGroup>
     <ItemGroup>
-      <ManagedAssemblyToLink Condition="('%(ManagedAssemblyToLink.FileName).dll' != '$(MSBuildProjectName).dll')" >
+      <ManagedAssemblyToLink Condition="('%(ManagedAssemblyToLink.FileName).dll' != '$(MSBuildProjectName).dll') and ('%(ManagedAssemblyToLink.FileName).dll' != 'Microsoft.DotNet.RemoteExecutor.dll')" >
         <TrimMode>link</TrimMode>
       </ManagedAssemblyToLink>
       <ManagedAssemblyToLink Condition="('%(ManagedAssemblyToLink.FileName).dll' == '$(AssemblyName).dll')" >

From 948ad2bf8bcb102f4d360fbce0080fcfad8a2648 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Tue, 22 Dec 2020 13:32:01 -0500
Subject: [PATCH 23/42] Move Microsoft.DotNet.RemoteExecutor inclusion to xml

---
 eng/testing/ILLink.Descriptor.xunit.xml | 5 +++++
 eng/testing/tests.mobile.targets        | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/eng/testing/ILLink.Descriptor.xunit.xml b/eng/testing/ILLink.Descriptor.xunit.xml
index fd224bd0e60a34..059f8945da1b4f 100644
--- a/eng/testing/ILLink.Descriptor.xunit.xml
+++ b/eng/testing/ILLink.Descriptor.xunit.xml
@@ -11,4 +11,9 @@
   <assembly fullname="xunit.core">
     <namespace fullname="Xunit" />
   </assembly>
+  <assembly fullname="Microsoft.DotNet.RemoteExecutor">
+    <type fullname="Microsoft.DotNet.RemoteExecutor.Program">
+      <method signature="System.Int32 Main(System.String[])" />
+    </type>
+  </assembly>
 </linker>
diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 73dab276065b4c..84b0a17adef377 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -164,7 +164,7 @@
       </ManagedAssemblyToLink>
     </ItemGroup>
     <ItemGroup>
-      <ManagedAssemblyToLink Condition="('%(ManagedAssemblyToLink.FileName).dll' != '$(MSBuildProjectName).dll') and ('%(ManagedAssemblyToLink.FileName).dll' != 'Microsoft.DotNet.RemoteExecutor.dll')" >
+      <ManagedAssemblyToLink Condition="('%(ManagedAssemblyToLink.FileName).dll' != '$(MSBuildProjectName).dll')" >
         <TrimMode>link</TrimMode>
       </ManagedAssemblyToLink>
       <ManagedAssemblyToLink Condition="('%(ManagedAssemblyToLink.FileName).dll' == '$(AssemblyName).dll')" >

From 7b0d350a774a376272ee25a989074808fdf3b47f Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Wed, 23 Dec 2020 11:19:17 -0500
Subject: [PATCH 24/42] Consolidate ConfigureTrimming itemgroups

---
 eng/testing/tests.mobile.targets | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 84b0a17adef377..b9d2a0a0b139b8 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -162,8 +162,6 @@
         <IsTrimmable>true</IsTrimmable>
         <TrimMode>link</TrimMode>
       </ManagedAssemblyToLink>
-    </ItemGroup>
-    <ItemGroup>
       <ManagedAssemblyToLink Condition="('%(ManagedAssemblyToLink.FileName).dll' != '$(MSBuildProjectName).dll')" >
         <TrimMode>link</TrimMode>
       </ManagedAssemblyToLink>
@@ -172,10 +170,7 @@
       </ManagedAssemblyToLink>
       <TrimmerRootAssembly Include="WasmTestRunner"/>
       <TrimmerRootAssembly Include="$(AssemblyName)"/>
-    </ItemGroup>
-    <ItemGroup>
-      <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptor.xunit.xml">
-      </TrimmerRootDescriptor>
+      <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptor.xunit.xml" />
     </ItemGroup>
   </Target>
 

From 1b447f0ba5bf291f2d221efc18086daa0a7d5135 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Wed, 23 Dec 2020 11:20:01 -0500
Subject: [PATCH 25/42] Build PrepareForWasmBuildApp before WasmBuildApp

---
 eng/testing/tests.mobile.targets | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index b9d2a0a0b139b8..c59011cfeda6ef 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -176,7 +176,7 @@
 
   <Target Condition="'$(TargetOS)' == 'Browser'" Name="BundleTestWasmApp" DependsOnTargets="WasmBuildApp" />
 
-  <Target Condition="'$(TargetOS)' == 'Browser'" Name="PrepareForWasmBuildApp">
+  <Target Condition="'$(TargetOS)' == 'Browser'" Name="PrepareForWasmBuildApp" BeforeTargets="WasmBuildApp">
     <PropertyGroup>
       <WasmAppDir>$(BundleDir)</WasmAppDir>
       <WasmAotDir>$(PublishDir)</WasmAotDir>
@@ -228,8 +228,5 @@
           DependsOnTargets="Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" />
 
   <Import Project="$(MonoProjectRoot)\wasm\build\WasmApp.targets" Condition="'$(TargetOS)' == 'Browser'" />
-  <PropertyGroup>
-      <WasmBuildAppDependsOn>PrepareForWasmBuildApp;$(WasmBuildAppDependsOn)</WasmBuildAppDependsOn>
-  </PropertyGroup>
   <Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(TargetOS)' == 'Browser'" />
 </Project>

From c0f503a094d4bc2b39b4c501f170929ce1e8a28c Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Wed, 23 Dec 2020 11:20:36 -0500
Subject: [PATCH 26/42] Remove manual import of WasmTestRunner assemblies

---
 eng/testing/tests.mobile.targets | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index c59011cfeda6ef..a8bfb8551b6281 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -193,15 +193,6 @@
       </WasmSatelliteAssemblies>
 
       <WasmAssembliesToBundle Include="$(PublishDir)\*.dll"/>
-      <!-- WasmTestRunner referenced assemblies -->
-      <!--
-      <WasmAssembliesToBundle Include="$(OutDir)\System.Globalization.dll" />
-      <WasmAssembliesToBundle Include="$(OutDir)\System.Reflection.dll" />
-      <WasmAssembliesToBundle Include="$(OutDir)\System.Runtime.dll" />
-      <WasmAssembliesToBundle Include="$(OutDir)\System.Runtime.Extensions.dll" />
-      <WasmAssembliesToBundle Include="$(OutDir)\System.Threading.dll" />
-      <WasmAssembliesToBundle Include="$(OutDir)\System.Xml.XDocument.dll" />
-      -->
 
       <WasmFilesToIncludeInFileSystem Include="@(ContentWithTargetPath)" />
       <WasmFilesToIncludeInFileSystem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.BuildReference)' == 'true' and !$([System.String]::new('%(ReferenceCopyLocalPaths.Identity)').EndsWith('.resources.dll'))" />

From fd8e34c8774696ea1e2cfdebac907b1b5e35afad Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Wed, 23 Dec 2020 11:20:57 -0500
Subject: [PATCH 27/42] Remove temporary HelloTest from System.Buffers

---
 .../System.Buffers/tests/ArrayPool/HelloTest.cs    | 14 --------------
 .../tests/System.Buffers.Tests.csproj              |  3 ---
 2 files changed, 17 deletions(-)
 delete mode 100644 src/libraries/System.Buffers/tests/ArrayPool/HelloTest.cs

diff --git a/src/libraries/System.Buffers/tests/ArrayPool/HelloTest.cs b/src/libraries/System.Buffers/tests/ArrayPool/HelloTest.cs
deleted file mode 100644
index ee01641c2397b9..00000000000000
--- a/src/libraries/System.Buffers/tests/ArrayPool/HelloTest.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Xunit;
-
-namespace System.Buffers.ArrayPool.Tests
-{
-    public class ArrayPoolHelloTest
-    {
-        [Fact]
-        public void Test1()
-        {
-            bool val = true;
-            Assert.True(val, "Value should be true");
-        }
-    }
-}
diff --git a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj b/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
index 9df5b2dac285ad..47b6b84165c322 100644
--- a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
+++ b/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
@@ -6,9 +6,6 @@
     <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="ArrayPool\HelloTest.cs" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(RunNormal)' == 'true'">
     <Compile Include="ArrayPool\ArrayPoolTest.cs" />
     <Compile Include="ArrayPool\CollectionTests.cs" />
     <Compile Include="ArrayPool\UnitTests.cs" />

From 15f7f0d3724a2b6a5b9a0450aff33576cc44c276 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Wed, 23 Dec 2020 11:52:20 -0500
Subject: [PATCH 28/42] Added flag to not aggressively link by default

---
 eng/testing/tests.mobile.targets              | 23 ++++++-------------
 eng/testing/tests.props                       |  4 ++++
 .../tests/System.Buffers.Tests.csproj         |  3 ---
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 84b0a17adef377..e357a52f4c18d3 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -13,8 +13,6 @@
   <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
     <!-- We need to set this in order to get extensibility on xunit category traits and other arguments we pass down to xunit via MSBuild properties -->
     <RunScriptCommand>$HARNESS_RUNNER wasm $XHARNESS_COMMAND  --app=. --engine=$(JSEngine) $(JSEngineArgs) --js-file=runtime.js --output-directory=$XHARNESS_OUT --  $(RunTestsJSArguments) --run WasmTestRunner.dll $(AssemblyName).dll</RunScriptCommand>
-    <PublishTrimmed>true</PublishTrimmed>
-    <TrimMode>link</TrimMode>
     <EventSourceSupport>false</EventSourceSupport>
     <UseSystemResourceKeys>true</UseSystemResourceKeys>
     <EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
@@ -155,7 +153,8 @@
 
   </Target>
 
-  <Target Name="ConfigureTrimming"
+  <Target Condition="'$(TargetOS)' == 'Browser' and '$(EnableAggressiveTrimming)' == 'true'"
+          Name="ConfigureTrimming"
           BeforeTargets="PrepareForILLink">
     <ItemGroup>
       <ManagedAssemblyToLink Include="$(OutDir)\*xunit*">
@@ -179,6 +178,11 @@
     </ItemGroup>
   </Target>
 
+  <Import Project="$(MonoProjectRoot)\wasm\build\WasmApp.targets" Condition="'$(TargetOS)' == 'Browser'" />
+  <PropertyGroup>
+      <WasmBuildAppDependsOn>PrepareForWasmBuildApp;$(WasmBuildAppDependsOn)</WasmBuildAppDependsOn>
+  </PropertyGroup>
+
   <Target Condition="'$(TargetOS)' == 'Browser'" Name="BundleTestWasmApp" DependsOnTargets="WasmBuildApp" />
 
   <Target Condition="'$(TargetOS)' == 'Browser'" Name="PrepareForWasmBuildApp">
@@ -198,15 +202,6 @@
       </WasmSatelliteAssemblies>
 
       <WasmAssembliesToBundle Include="$(PublishDir)\*.dll"/>
-      <!-- WasmTestRunner referenced assemblies -->
-      <!--
-      <WasmAssembliesToBundle Include="$(OutDir)\System.Globalization.dll" />
-      <WasmAssembliesToBundle Include="$(OutDir)\System.Reflection.dll" />
-      <WasmAssembliesToBundle Include="$(OutDir)\System.Runtime.dll" />
-      <WasmAssembliesToBundle Include="$(OutDir)\System.Runtime.Extensions.dll" />
-      <WasmAssembliesToBundle Include="$(OutDir)\System.Threading.dll" />
-      <WasmAssembliesToBundle Include="$(OutDir)\System.Xml.XDocument.dll" />
-      -->
 
       <WasmFilesToIncludeInFileSystem Include="@(ContentWithTargetPath)" />
       <WasmFilesToIncludeInFileSystem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.BuildReference)' == 'true' and !$([System.String]::new('%(ReferenceCopyLocalPaths.Identity)').EndsWith('.resources.dll'))" />
@@ -232,9 +227,5 @@
           AfterTargets="Build"
           DependsOnTargets="Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" />
 
-  <Import Project="$(MonoProjectRoot)\wasm\build\WasmApp.targets" Condition="'$(TargetOS)' == 'Browser'" />
-  <PropertyGroup>
-      <WasmBuildAppDependsOn>PrepareForWasmBuildApp;$(WasmBuildAppDependsOn)</WasmBuildAppDependsOn>
-  </PropertyGroup>
   <Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(TargetOS)' == 'Browser'" />
 </Project>
diff --git a/eng/testing/tests.props b/eng/testing/tests.props
index bf54e899d4d11e..b84e791ba6c99e 100644
--- a/eng/testing/tests.props
+++ b/eng/testing/tests.props
@@ -30,6 +30,10 @@
     <RuntimeIdentifier>$(PackageRID)</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetOS)' == 'Browser' and '$(EnableAggressiveTrimming)' == 'true'">
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimMode>link</TrimMode>
+  </PropertyGroup>
 
   <!-- Provide runtime options to Mono (interpreter, aot, debugging, etc) -->
   <ItemGroup Condition="'$(MonoEnvOptions)' != '' and '$(TargetsMobile)' != 'true'">
diff --git a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj b/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
index 9df5b2dac285ad..47b6b84165c322 100644
--- a/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
+++ b/src/libraries/System.Buffers/tests/System.Buffers.Tests.csproj
@@ -6,9 +6,6 @@
     <TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="ArrayPool\HelloTest.cs" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(RunNormal)' == 'true'">
     <Compile Include="ArrayPool\ArrayPoolTest.cs" />
     <Compile Include="ArrayPool\CollectionTests.cs" />
     <Compile Include="ArrayPool\UnitTests.cs" />

From a9259ece052fcab4a60dcb7ca1fa0c148802bde2 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Wed, 23 Dec 2020 11:44:37 -0500
Subject: [PATCH 29/42] Revert import and build order changes

---
 eng/testing/tests.mobile.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index d56160b09e3f52..41cf31e2edff15 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -180,7 +180,7 @@
 
   <Target Condition="'$(TargetOS)' == 'Browser'" Name="BundleTestWasmApp" DependsOnTargets="WasmBuildApp" />
 
-  <Target Condition="'$(TargetOS)' == 'Browser'" Name="PrepareForWasmBuildApp" BeforeTargets="WasmBuildApp">
+  <Target Condition="'$(TargetOS)' == 'Browser'" Name="PrepareForWasmBuildApp">
     <PropertyGroup>
       <WasmAppDir>$(BundleDir)</WasmAppDir>
       <WasmAotDir>$(PublishDir)</WasmAotDir>

From a97fb56eeb47522a4af1e7e47acd3595cf48271e Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Wed, 23 Dec 2020 12:09:46 -0500
Subject: [PATCH 30/42] Condition trimming related changes on
 EnableAggressiveTrimming

---
 eng/testing/tests.mobile.targets        | 7 ++++---
 eng/testing/xunit/xunit.console.targets | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 41cf31e2edff15..cd006df4bd1d61 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -7,7 +7,7 @@
     <JSEngine Condition="'$(TargetOS)' == 'Browser' and '$(JSEngine)' == ''">V8</JSEngine>
     <JSEngineArgs Condition="'$(JSEngine)' == 'V8'">$(JSEngineArgs) --engine-arg=--stack-trace-limit=1000</JSEngineArgs>
 
-    <PublishingTestsRun>true</PublishingTestsRun>
+    <PublishingTestsRun Condition="'$(EnableAggressiveTrimming)' == 'true'">true</PublishingTestsRun>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
@@ -213,7 +213,8 @@
       <_runnerFilesToPublish Include="$(AppleTestRunnerDir)*" Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'" />
       <_runnerFilesToPublish Include="$(WasmTestRunnerDir)*" Condition="'$(TargetOS)' == 'Browser'" />
 
-      <ResolvedFileToPublish Include="@(_runnerFilesToPublish)" RelativePath="%(FileName)%(Extension)" CopyToPublishDirectory="PreserveNewest" PostprocessAssembly="true" />
+      <ResolvedFileToPublish Include="@(_runnerFilesToPublish)" Condition="'$(EnableAggressiveTrimming)' == 'true'" RelativePath="%(FileName)%(Extension)" CopyToPublishDirectory="PreserveNewest" PostprocessAssembly="true" />
+      <ResolvedFileToPublish Include="@(_runnerFilesToPublish)" Condition="'$(EnableAggressiveTrimming)' != 'true' and !$([System.String]::Copy('%(Filename)').StartsWith('xunit.'))" RelativePath="%(FileName)%(Extension)" CopyToPublishDirectory="PreserveNewest" PostprocessAssembly="true" />
     </ItemGroup>
   </Target>
 
@@ -222,5 +223,5 @@
           AfterTargets="Build"
           DependsOnTargets="Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" />
 
-  <Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(TargetOS)' == 'Browser'" />
+  <Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(TargetOS)' == 'Browser' and '$(EnableAggressiveTrimming)' == 'true'" />
 </Project>
diff --git a/eng/testing/xunit/xunit.console.targets b/eng/testing/xunit/xunit.console.targets
index ba79777dde25b1..ed1fb1043a7729 100644
--- a/eng/testing/xunit/xunit.console.targets
+++ b/eng/testing/xunit/xunit.console.targets
@@ -57,7 +57,7 @@
   </Target>
 
   <!-- ResolveAssemblyReferences is the target that populates ReferenceCopyLocalPaths which is what is copied to output directory. -->
-  <Target Name="CopyRunnerToOutputDirectory" BeforeTargets="ResolveAssemblyReferences" Condition="'$(TargetsMobile)' != 'true'">
+  <Target Name="CopyRunnerToOutputDirectory" BeforeTargets="ResolveAssemblyReferences" Condition="'$(TargetsMobile)' != 'true' or '$(EnableAggressiveTrimming)' != 'true'">
     <ItemGroup>
       <!-- Copy test runner to output directory -->
       <None Include="$([System.IO.Path]::GetDirectoryName('$(XunitConsole472Path)'))\*"

From 316f98e6a423f5039a8e842b2444ff7434517b37 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Wed, 23 Dec 2020 12:25:34 -0500
Subject: [PATCH 31/42] Revert "Don't copy WasmTestRunner.dll from wrong patch
 when using linker" as MainAssembly is back to
 $(PublishDir)\WasmTestRunner.dll This reverts commit
 79dc240f4c99f61af1a7e4c98d299be25f8f854e.

---
 src/tasks/WasmAppBuilder/WasmAppBuilder.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.cs b/src/tasks/WasmAppBuilder/WasmAppBuilder.cs
index 22149f8526e97d..b1cd526fb4435c 100644
--- a/src/tasks/WasmAppBuilder/WasmAppBuilder.cs
+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.cs
@@ -98,8 +98,8 @@ public IcuData(string name) : base(name, "icu") {}
 
     public override bool Execute ()
     {
-//        if (!File.Exists(MainAssembly))
-//            throw new ArgumentException($"File MainAssembly='{MainAssembly}' doesn't exist.");
+        if (!File.Exists(MainAssembly))
+            throw new ArgumentException($"File MainAssembly='{MainAssembly}' doesn't exist.");
         if (!File.Exists(MainJS))
             throw new ArgumentException($"File MainJS='{MainJS}' doesn't exist.");
         if (!InvariantGlobalization && string.IsNullOrEmpty(IcuDataFileName))
@@ -121,15 +121,13 @@ public override bool Execute ()
             if (asm.EndsWith("System.Private.CoreLib.dll"))
                 runtimeSourceDir = Path.GetDirectoryName(asm);
         }
-/*
-        // Main assembly can conflict in same assembly on different path already included in Assemblies
-        // TODO: remove the property
+
         if (MainAssembly != null)
         {
             if (!_assemblies.Contains(MainAssembly))
                 _assemblies.Add(MainAssembly);
         }
-*/
+
         var config = new WasmAppConfig ();
 
         // Create app

From 49009075897480133984e6e26bdb63f91b829326 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Mon, 28 Dec 2020 13:06:00 -0500
Subject: [PATCH 32/42] Add comment to note temporary RemoteExecutor assembly
 inclusion

---
 eng/testing/ILLink.Descriptor.xunit.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/testing/ILLink.Descriptor.xunit.xml b/eng/testing/ILLink.Descriptor.xunit.xml
index 059f8945da1b4f..35cd144c620c2c 100644
--- a/eng/testing/ILLink.Descriptor.xunit.xml
+++ b/eng/testing/ILLink.Descriptor.xunit.xml
@@ -11,6 +11,7 @@
   <assembly fullname="xunit.core">
     <namespace fullname="Xunit" />
   </assembly>
+  <!-- Temporary until https://github.com/mono/linker/issues/1713 is resolved -->
   <assembly fullname="Microsoft.DotNet.RemoteExecutor">
     <type fullname="Microsoft.DotNet.RemoteExecutor.Program">
       <method signature="System.Int32 Main(System.String[])" />

From 00022b5da3c98c9d7693a93fe586034febd46c65 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Mon, 28 Dec 2020 13:06:38 -0500
Subject: [PATCH 33/42] Move props from general tests to mobile tests

---
 eng/testing/tests.mobile.targets | 5 +++++
 eng/testing/tests.props          | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index cd006df4bd1d61..3d1535e026c9bc 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -20,6 +20,11 @@
     <DebuggerSupport>false</DebuggerSupport>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetOS)' == 'Browser' and '$(EnableAggressiveTrimming)' == 'true'">
+    <PublishTrimmed>true</PublishTrimmed>
+    <TrimMode>link</TrimMode>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(TargetOS)' == 'Android'">
     <RunScriptCommand>$HARNESS_RUNNER android test --instrumentation="net.dot.MonoRunner" --package-name="net.dot.$(AssemblyName)" --app=$EXECUTION_DIR/bin/$(TestProjectName).apk --output-directory=$XHARNESS_OUT -v --</RunScriptCommand>
   </PropertyGroup>
diff --git a/eng/testing/tests.props b/eng/testing/tests.props
index b84e791ba6c99e..bf54e899d4d11e 100644
--- a/eng/testing/tests.props
+++ b/eng/testing/tests.props
@@ -30,10 +30,6 @@
     <RuntimeIdentifier>$(PackageRID)</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetOS)' == 'Browser' and '$(EnableAggressiveTrimming)' == 'true'">
-    <PublishTrimmed>true</PublishTrimmed>
-    <TrimMode>link</TrimMode>
-  </PropertyGroup>
 
   <!-- Provide runtime options to Mono (interpreter, aot, debugging, etc) -->
   <ItemGroup Condition="'$(MonoEnvOptions)' != '' and '$(TargetsMobile)' != 'true'">

From 03bb47219fb3e6e6a5e67435402943eb7d0df95b Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Tue, 29 Dec 2020 14:49:08 -0500
Subject: [PATCH 34/42] Revert "Condition trimming related changes on
 EnableAggressiveTrimming"

This reverts commit a97fb56eeb47522a4af1e7e47acd3595cf48271e.
---
 eng/testing/tests.mobile.targets        | 7 +++----
 eng/testing/xunit/xunit.console.targets | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 3d1535e026c9bc..803ba57086be58 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -7,7 +7,7 @@
     <JSEngine Condition="'$(TargetOS)' == 'Browser' and '$(JSEngine)' == ''">V8</JSEngine>
     <JSEngineArgs Condition="'$(JSEngine)' == 'V8'">$(JSEngineArgs) --engine-arg=--stack-trace-limit=1000</JSEngineArgs>
 
-    <PublishingTestsRun Condition="'$(EnableAggressiveTrimming)' == 'true'">true</PublishingTestsRun>
+    <PublishingTestsRun>true</PublishingTestsRun>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetOS)' == 'Browser'">
@@ -218,8 +218,7 @@
       <_runnerFilesToPublish Include="$(AppleTestRunnerDir)*" Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'" />
       <_runnerFilesToPublish Include="$(WasmTestRunnerDir)*" Condition="'$(TargetOS)' == 'Browser'" />
 
-      <ResolvedFileToPublish Include="@(_runnerFilesToPublish)" Condition="'$(EnableAggressiveTrimming)' == 'true'" RelativePath="%(FileName)%(Extension)" CopyToPublishDirectory="PreserveNewest" PostprocessAssembly="true" />
-      <ResolvedFileToPublish Include="@(_runnerFilesToPublish)" Condition="'$(EnableAggressiveTrimming)' != 'true' and !$([System.String]::Copy('%(Filename)').StartsWith('xunit.'))" RelativePath="%(FileName)%(Extension)" CopyToPublishDirectory="PreserveNewest" PostprocessAssembly="true" />
+      <ResolvedFileToPublish Include="@(_runnerFilesToPublish)" RelativePath="%(FileName)%(Extension)" CopyToPublishDirectory="PreserveNewest" PostprocessAssembly="true" />
     </ItemGroup>
   </Target>
 
@@ -228,5 +227,5 @@
           AfterTargets="Build"
           DependsOnTargets="Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" />
 
-  <Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(TargetOS)' == 'Browser' and '$(EnableAggressiveTrimming)' == 'true'" />
+  <Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(TargetOS)' == 'Browser'" />
 </Project>
diff --git a/eng/testing/xunit/xunit.console.targets b/eng/testing/xunit/xunit.console.targets
index ed1fb1043a7729..ba79777dde25b1 100644
--- a/eng/testing/xunit/xunit.console.targets
+++ b/eng/testing/xunit/xunit.console.targets
@@ -57,7 +57,7 @@
   </Target>
 
   <!-- ResolveAssemblyReferences is the target that populates ReferenceCopyLocalPaths which is what is copied to output directory. -->
-  <Target Name="CopyRunnerToOutputDirectory" BeforeTargets="ResolveAssemblyReferences" Condition="'$(TargetsMobile)' != 'true' or '$(EnableAggressiveTrimming)' != 'true'">
+  <Target Name="CopyRunnerToOutputDirectory" BeforeTargets="ResolveAssemblyReferences" Condition="'$(TargetsMobile)' != 'true'">
     <ItemGroup>
       <!-- Copy test runner to output directory -->
       <None Include="$([System.IO.Path]::GetDirectoryName('$(XunitConsole472Path)'))\*"

From 2d35f3a4718f91aa78dc5bfcfe29f0562483f023 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Wed, 30 Dec 2020 13:12:11 -0500
Subject: [PATCH 35/42] Broaden trimming options for all mobile targets

---
 eng/testing/tests.mobile.targets | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 803ba57086be58..46c3e8568a6f7e 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -158,7 +158,7 @@
 
   </Target>
 
-  <Target Condition="'$(TargetOS)' == 'Browser' and '$(EnableAggressiveTrimming)' == 'true'"
+  <Target Condition="'$(EnableAggressiveTrimming)' == 'true'"
           Name="ConfigureTrimming"
           BeforeTargets="PrepareForILLink">
     <ItemGroup>
@@ -172,7 +172,9 @@
       <ManagedAssemblyToLink Condition="('%(ManagedAssemblyToLink.FileName).dll' == '$(AssemblyName).dll')" >
         <TrimMode>copy</TrimMode>
       </ManagedAssemblyToLink>
-      <TrimmerRootAssembly Include="WasmTestRunner"/>
+      <TrimmerRootAssembly Condition="'$(TargetOS)' == 'Android'" Include="AndroidTestRunner"/>
+      <TrimmerRootAssembly Condition="'$(TargetOS)' == 'Browser'" Include="WasmTestRunner"/>
+      <TrimmerRootAssembly Condition="'$(TargetOS)' == 'iOS'" Include="AppleTestRunner"/>
       <TrimmerRootAssembly Include="$(AssemblyName)"/>
       <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptor.xunit.xml" />
     </ItemGroup>

From ce113f2768cb6086fcfeb008ec651831c7678770 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Mon, 4 Jan 2021 09:19:32 -0500
Subject: [PATCH 36/42] Enable PublishTrimmed regardless of OS when
 aggressively trimming

---
 eng/testing/tests.mobile.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 46c3e8568a6f7e..0ad4ca83f74e6d 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -20,7 +20,7 @@
     <DebuggerSupport>false</DebuggerSupport>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetOS)' == 'Browser' and '$(EnableAggressiveTrimming)' == 'true'">
+  <PropertyGroup Condition="'$(EnableAggressiveTrimming)' == 'true'">
     <PublishTrimmed>true</PublishTrimmed>
     <TrimMode>link</TrimMode>
   </PropertyGroup>

From 28e694fe42b3affee814894c2f169dc2f9fa0c88 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Mon, 4 Jan 2021 09:20:14 -0500
Subject: [PATCH 37/42] Move trimming specific property to ConfigureTrimming

---
 eng/testing/tests.mobile.targets | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 0ad4ca83f74e6d..a67836c39ecce0 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -22,7 +22,6 @@
 
   <PropertyGroup Condition="'$(EnableAggressiveTrimming)' == 'true'">
     <PublishTrimmed>true</PublishTrimmed>
-    <TrimMode>link</TrimMode>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetOS)' == 'Android'">
@@ -161,6 +160,10 @@
   <Target Condition="'$(EnableAggressiveTrimming)' == 'true'"
           Name="ConfigureTrimming"
           BeforeTargets="PrepareForILLink">
+    <PropertyGroup>
+      <TrimMode>link</TrimMode>
+    </PropertyGroup>
+
     <ItemGroup>
       <ManagedAssemblyToLink Include="$(OutDir)\*xunit*">
         <IsTrimmable>true</IsTrimmable>

From 07568bb075c526bf0a580a09f592c904e6e7904a Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Mon, 4 Jan 2021 09:20:59 -0500
Subject: [PATCH 38/42] Import NuGet linker in mobile tests by default

---
 eng/testing/tests.mobile.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index a67836c39ecce0..c75d372ac21442 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -232,5 +232,5 @@
           AfterTargets="Build"
           DependsOnTargets="Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" />
 
-  <Import Project="$(RepositoryEngineeringDir)illink.targets" Condition="'$(TargetOS)' == 'Browser'" />
+  <Import Project="$(RepositoryEngineeringDir)illink.targets"" />
 </Project>

From 32629120efd5beb6e174e312141f806e84720a2b Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Mon, 4 Jan 2021 09:25:18 -0500
Subject: [PATCH 39/42] Add file description

---
 eng/testing/ILLink.Descriptor.xunit.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/testing/ILLink.Descriptor.xunit.xml b/eng/testing/ILLink.Descriptor.xunit.xml
index 35cd144c620c2c..d228d7789a1abc 100644
--- a/eng/testing/ILLink.Descriptor.xunit.xml
+++ b/eng/testing/ILLink.Descriptor.xunit.xml
@@ -1,3 +1,4 @@
+<!-- Some assembly methods are not tracked by the linker, so we add them here  -->
 <linker>
   <assembly fullname="xunit.execution.dotnet">
     <type fullname="Xunit.Sdk.ReflectionAssemblyInfo">

From 7da7b827f13e34ebc1f88bc2537b0903572740f2 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Mon, 4 Jan 2021 10:06:52 -0500
Subject: [PATCH 40/42] Add detail to ILLink XML descriptor file

---
 eng/testing/ILLink.Descriptor.xunit.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/testing/ILLink.Descriptor.xunit.xml b/eng/testing/ILLink.Descriptor.xunit.xml
index d228d7789a1abc..a3c03694f26b16 100644
--- a/eng/testing/ILLink.Descriptor.xunit.xml
+++ b/eng/testing/ILLink.Descriptor.xunit.xml
@@ -1,4 +1,4 @@
-<!-- Some assembly methods are not tracked by the linker, so we add them here  -->
+<!-- xunit 2.x version is not under development. We make xunit trimming compatible in methods which ILLink cannot track by providing XML descriptor to keep the dependencies -->
 <linker>
   <assembly fullname="xunit.execution.dotnet">
     <type fullname="Xunit.Sdk.ReflectionAssemblyInfo">

From d00ea59f7255fc442f48e5d6bec831f53fd6517f Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Mon, 4 Jan 2021 10:07:30 -0500
Subject: [PATCH 41/42] Reformat ConfigureTrimming target tag

---
 eng/testing/tests.mobile.targets | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index c75d372ac21442..2f0d5c42754f24 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -157,9 +157,7 @@
 
   </Target>
 
-  <Target Condition="'$(EnableAggressiveTrimming)' == 'true'"
-          Name="ConfigureTrimming"
-          BeforeTargets="PrepareForILLink">
+  <Target Name="ConfigureTrimming" Condition="'$(EnableAggressiveTrimming)' == 'true'" BeforeTargets="PrepareForILLink">
     <PropertyGroup>
       <TrimMode>link</TrimMode>
     </PropertyGroup>

From 41e177b9a17adcfa84b2ba1b774b30825bac4b31 Mon Sep 17 00:00:00 2001
From: Mitchell Hwang <mitchell.hwang@microsoft.com>
Date: Mon, 4 Jan 2021 10:26:42 -0500
Subject: [PATCH 42/42] Fix typo

---
 eng/testing/tests.mobile.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/testing/tests.mobile.targets b/eng/testing/tests.mobile.targets
index 2f0d5c42754f24..790063c67d45c3 100644
--- a/eng/testing/tests.mobile.targets
+++ b/eng/testing/tests.mobile.targets
@@ -230,5 +230,5 @@
           AfterTargets="Build"
           DependsOnTargets="Publish;BundleTestAppleApp;BundleTestAndroidApp;BundleTestWasmApp;ArchiveTests" />
 
-  <Import Project="$(RepositoryEngineeringDir)illink.targets"" />
+  <Import Project="$(RepositoryEngineeringDir)illink.targets" />
 </Project>