From db1d1600987a6e33cebe6eb00b50c1c43b4c0199 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Mon, 4 Sep 2023 13:35:34 +0200
Subject: [PATCH 1/4] Do not trim XUnitWrapperGenerator

---
 .../Common/XUnitWrapperGenerator/XUnitWrapperGenerator.csproj    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.csproj b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.csproj
index 5b0ca2563a774..2d1d1e50b29e3 100644
--- a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.csproj
+++ b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.csproj
@@ -5,6 +5,7 @@
     <Nullable>enable</Nullable>
     <EnableDefaultItems>true</EnableDefaultItems>
     <IsRoslynComponent>true</IsRoslynComponent>
+    <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 
   <ItemGroup>

From 158327ff024e34d6488a1dd2562dc5984ff5974a Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Tue, 5 Sep 2023 15:27:41 +0200
Subject: [PATCH 2/4] Avoid including ILLink

---
 src/tests/MergedTestRunner.targets | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/tests/MergedTestRunner.targets b/src/tests/MergedTestRunner.targets
index 258b711537d2b..683ce1b487017 100644
--- a/src/tests/MergedTestRunner.targets
+++ b/src/tests/MergedTestRunner.targets
@@ -12,6 +12,12 @@
     <EmitCompilerGeneratedFiles Condition="'$(EmitCompilerGeneratedFiles)' == ''">true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
+  <!-- TODO: temporary change; we probably need to change the behavior in tests.mobile.targets that sets these properties to true as a proper fix -->
+  <PropertyGroup Condition="'$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvos'">
+    <PublishTrimmed>false</PublishTrimmed>
+    <EnableAggressiveTrimming>false</EnableAggressiveTrimming>
+  </PropertyGroup>
+
   <ItemGroup>
     <!-- string.Concat("_", string.Copy("%(Filename)").Replace("-", "_").Replace(".", "_")) -->
     <MergedWrapperProjectReference Update="**" Aliases="$([System.String]::Concat(&quot;_&quot;,$([System.String]::Copy(&quot;%(Filename)&quot;).Replace(&quot;-&quot;,&quot;_&quot;).Replace(&quot;.&quot;,&quot;_&quot;))))" />

From 407c13a9e882cd2601438563ee77c475cd695344 Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 6 Sep 2023 09:10:55 +0200
Subject: [PATCH 3/4] Publis trimmed only for exes

---
 .../XUnitWrapperGenerator/XUnitWrapperGenerator.csproj      | 1 -
 src/tests/Directory.Build.props                             | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.csproj b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.csproj
index 2d1d1e50b29e3..5b0ca2563a774 100644
--- a/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.csproj
+++ b/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.csproj
@@ -5,7 +5,6 @@
     <Nullable>enable</Nullable>
     <EnableDefaultItems>true</EnableDefaultItems>
     <IsRoslynComponent>true</IsRoslynComponent>
-    <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props
index 8ed0ec83f4065..9dbee315a5910 100644
--- a/src/tests/Directory.Build.props
+++ b/src/tests/Directory.Build.props
@@ -205,9 +205,9 @@
     <ImportProjectExtensionTargets>false</ImportProjectExtensionTargets>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetOS)' == 'ios' Or '$(TargetOS)' == 'tvos'">
-    <EnableAggressiveTrimming>true</EnableAggressiveTrimming>
-    <PublishTrimmed>true</PublishTrimmed>
+  <PropertyGroup Condition="'$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvos'">
+    <EnableAggressiveTrimming Condition="'$(OutputType)' == 'Exe'">true</EnableAggressiveTrimming>
+    <PublishTrimmed Condition="'$(OutputType)' == 'Exe'">true</PublishTrimmed>
     <SkipTestUtilitiesReference>true</SkipTestUtilitiesReference>
   </PropertyGroup>
 

From 9a40f2eb7fa5a881432ccab901eaddc9228ba0cf Mon Sep 17 00:00:00 2001
From: Simon Rozsival <simon@rozsival.com>
Date: Wed, 6 Sep 2023 09:12:04 +0200
Subject: [PATCH 4/4] Fix duplicates check in merged test runner

---
 src/tests/Common/mergedrunner.targets | 6 +++---
 src/tests/MergedTestRunner.targets    | 7 +------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/tests/Common/mergedrunner.targets b/src/tests/Common/mergedrunner.targets
index 81a9def0117f1..72ae7aeef1f19 100644
--- a/src/tests/Common/mergedrunner.targets
+++ b/src/tests/Common/mergedrunner.targets
@@ -7,7 +7,7 @@
 
     <ItemGroup>
       <_ProjectReferencesUsedByReferencePaths Include="@(ReferencePath->Metadata('ProjectReferenceOriginalItemSpec'))" />
-      <_ProjectAssemblyReferences Include="@(ProjectReference)" Condition="'%(ProjectReference.OutputItemType)' == ''" />
+      <_ProjectAssemblyReferences Include="@(ProjectReference)" Condition="'%(ProjectReference.OutputItemType)' == '' and '%(ProjectReference.ReferenceOutputAssembly)' != 'false'" />
       <_ProjectAssemblyReferences Remove="@(_ReferenceWithDisabledBuild->Metadata('OriginalItemSpec'))" />
       <_ProjectReferencesRemovedDueToConflictResolution Include="@(_ProjectAssemblyReferences)" Exclude="@(_ProjectReferencesUsedByReferencePaths)" />
     </ItemGroup>
@@ -17,6 +17,6 @@
     -->
     <Error Text="@(_ProjectReferencesRemovedDueToConflictResolution->'This project has an assembly name identical to another project, if this CoreCLRTestLibrary, you should reference %24(TestLibraryProjectPath) instead of constructing the path yourself: %(FullPath)', '&#010;')" Condition="'@(_ProjectReferencesRemovedDueToConflictResolution)' != ''"  />
   </Target>
-  
+
   <Import Project="$(RepoRoot)/src/tests/Common/mergedrunnermobile.targets" Condition="'$(TargetsMobile)' == 'true'" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/tests/MergedTestRunner.targets b/src/tests/MergedTestRunner.targets
index 683ce1b487017..686ba0d11d494 100644
--- a/src/tests/MergedTestRunner.targets
+++ b/src/tests/MergedTestRunner.targets
@@ -12,11 +12,6 @@
     <EmitCompilerGeneratedFiles Condition="'$(EmitCompilerGeneratedFiles)' == ''">true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
-  <!-- TODO: temporary change; we probably need to change the behavior in tests.mobile.targets that sets these properties to true as a proper fix -->
-  <PropertyGroup Condition="'$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvos'">
-    <PublishTrimmed>false</PublishTrimmed>
-    <EnableAggressiveTrimming>false</EnableAggressiveTrimming>
-  </PropertyGroup>
 
   <ItemGroup>
     <!-- string.Concat("_", string.Copy("%(Filename)").Replace("-", "_").Replace(".", "_")) -->
@@ -24,4 +19,4 @@
 
     <ProjectReference Include="@(MergedWrapperProjectReference)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>