[infra] Enable trimming on Helix for Apple mobile

eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml

@@ -35,7 +35,7 @@ jobs:
       testGroup: innerloop
       nameSuffix: AllSubsets_Mono
       isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }}
-      buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=true /p:BuildDarwinFrameworks=true /p:IsManualOrRollingBuild=true
+      buildArgs: -s mono+libs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:DevTeamProvisioning=- /p:RunAOTCompilation=true $(_runSmokeTestsOnlyArg) /p:BuildTestsOnHelix=true /p:EnableAdditionalTimezoneChecks=true /p:UsePortableRuntimePack=true /p:BuildDarwinFrameworks=true /p:IsManualOrRollingBuild=true /p:EnableAggressiveTrimming=true
       timeoutInMinutes: 480
       # extra steps, run tests
       postBuildSteps:

eng/testing/tests.ioslike.targets

@@ -16,7 +16,7 @@
     <!-- running aot-helix tests locally, so we can test with the same project file as CI -->
     <_AOTBuildCommand Condition="'$(ContinuousIntegrationBuild)' != 'true'">$(_AOTBuildCommand) /p:RuntimeSrcDir=$(RepoRoot) /p:RuntimeConfig=$(Configuration)</_AOTBuildCommand>
     <!-- The command below sets default properties for runtime and library tests -->
-    <_AOTBuildCommand>$(_AOTBuildCommand) /p:XHARNESS_EXECUTION_DIR=&quot;$XHARNESS_EXECUTION_DIR&quot; /p:RunAOTCompilation=$(RunAOTCompilation) /p:UseNativeAOTRuntime=$(UseNativeAOTRuntime) /p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:MonoForceInterpreter=$(MonoForceInterpreter) /p:MonoEnableLLVM=true /p:DevTeamProvisioning=$(DevTeamProvisioning) /p:UsePortableRuntimePack=true /p:Configuration=$(Configuration)</_AOTBuildCommand>
+    <_AOTBuildCommand>$(_AOTBuildCommand) /p:XHARNESS_EXECUTION_DIR=&quot;$XHARNESS_EXECUTION_DIR&quot; /p:RunAOTCompilation=$(RunAOTCompilation) /p:UseNativeAOTRuntime=$(UseNativeAOTRuntime) /p:TargetOS=$(TargetOS) /p:TargetArchitecture=$(TargetArchitecture) /p:MonoForceInterpreter=$(MonoForceInterpreter) /p:MonoEnableLLVM=true /p:DevTeamProvisioning=$(DevTeamProvisioning) /p:UsePortableRuntimePack=true /p:Configuration=$(Configuration) /p:EnableAggressiveTrimming=$(EnableAggressiveTrimming)</_AOTBuildCommand>
     <_AOTBuildCommand Condition="'$(NativeLib)' != ''">$(_AOTBuildCommand) /p:NativeLib=$(NativeLib) /p:BundlesResources=$(BundlesResources) /p:ForceLibraryModeGenerateAppBundle=$(ForceLibraryModeGenerateAppBundle)</_AOTBuildCommand>
     <_AOTBuildCommand>$(_AOTBuildCommand) </_AOTBuildCommand>
 
@@ -46,11 +46,11 @@
 
   <PropertyGroup>
     <AppleBuildDependsOn>PrepareForAppleBuildApp;$(AppleBuildDependsOn);_CopyTestArchive</AppleBuildDependsOn>
-  
+
     <BundleTestAppleAppDependsOn Condition="'$(BuildTestsOn)' == 'local'">AppleBuild</BundleTestAppleAppDependsOn>
     <BundleTestAppleAppDependsOn Condition="'$(BuildTestsOnHelix)' == 'true'">$(BundleTestAppleAppDependsOn);_BundleAOTTestAppleAppForHelix;_CopyTestArchive</BundleTestAppleAppDependsOn>
   </PropertyGroup>
-  
+
   <Target Name="BundleTestAppleApp" DependsOnTargets="$(BundleTestAppleAppDependsOn)" />
 
   <UsingTask Condition="'$(BuildTestsOnHelix)' == 'true'"
@@ -61,7 +61,7 @@
     <PropertyGroup>
       <AppBundlePath>$(BundleDir)publish</AppBundlePath>
     </PropertyGroup>
-    
+
     <PropertyGroup>
       <_MainAssemblyPath Condition="'%(AppleAssembliesToBundle.FileName)' == $(AssemblyName) and '%(AppleAssembliesToBundle.Extension)' == '.dll'">%(AppleAssembliesToBundle.Identity)</_MainAssemblyPath>
       <RuntimeConfigFilePath>$([System.IO.Path]::ChangeExtension($(_MainAssemblyPath), '.runtimeconfig.json'))</RuntimeConfigFilePath>
@@ -76,6 +76,8 @@
       <BundleFiles Include="$(MonoProjectRoot)\msbuild\apple\data\*" TargetDir="publish" />
       <ExtraFiles Condition="'%(AppleAssembliesToBundle._IsNative)' == 'true'"
                    Include="@(AppleAssembliesToBundle)"          TargetDir="extraFiles\%(AppleAssembliesToBundle.RecursiveDir)" />
+      <ExtraFiles Condition="Exists(%(TrimmerRootDescriptor.Identity))"
+                   Include="@(TrimmerRootDescriptor)"            TargetDir="extraFiles" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(UseNativeAOTRuntime)' == 'true' and '$(HybridGlobalization)' == 'false'" >
@@ -104,41 +106,69 @@
 
       <_RuntimePackFiles Include="$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)**\*.*" />
       <_RuntimePackFiles Include="$(MicrosoftNetCoreAppRuntimePackNativeDir)*.*" />
-      
+
       <_UnusedRuntimePackFiles Include="@(_PublishBundleFiles)" Exclude="@(_RuntimePackFiles->'$(AppBundlePath)/%(FileName)%(Extension)')" />
       <_UsedRuntimePackFiles Include="@(_PublishBundleFiles)" Exclude="@(_UnusedRuntimePackFiles)" />
-      
+
       <_RuntimePackFilesToDelete Include="@(_RuntimePackFiles->'$(AppBundlePath)/%(FileName)%(Extension)')" />
+      <!-- ILLink properties -->
+      <AppleReferenceSharedPathFiles Include="%(ReferencePath.Identity)" Condition="Exists('@(ReferencePath->'$(LibrariesSharedFrameworkBinArtifactsPath)%(FileName)%(Extension)')')" />
+      <ReferenceExtraPathFiles Include="%(ReferencePath.Identity)" Condition="!Exists('@(ReferencePath->'$(LibrariesSharedFrameworkBinArtifactsPath)%(FileName)%(Extension)')')" />
     </ItemGroup>
 
     <!-- Remove the runtime pack parts from the self contained app.  We'll restore on helix -->
     <Delete Condition="'$(UsePortableRuntimePack)' == 'true'" Files="@(_RuntimePackFilesToDelete)" />
+    <!-- Copy ILLink.Substitutions files -->
+    <Copy SourceFiles="%(ReferenceExtraPathFiles.Identity)" DestinationFolder="$(BundleDir)\extraFiles" />
 
     <!-- To recreate the original project on helix, we need to set the apple properties also, same as the
          library test project. Eg. $(InvariantGlobalization) -->
     <ItemGroup>
-      <_ApplePropertyNames Include="InvariantGlobalization" />
-      <_ApplePropertyNames Include="HybridGlobalization" />
+      <!-- Configuration properties -->
       <_ApplePropertyNames Include="AssemblyName" />
-      <_ApplePropertyNames Include="MonoEnableLLVM" />
+      <_ApplePropertyNames Include="IncludesTestRunner" />
       <_ApplePropertyNames Include="MainLibraryFileName" />
+      <_ApplePropertyNames Include="MonoEnableLLVM" />
+      <_ApplePropertyNames Include="ShouldILStrip" />
       <_ApplePropertyNames Include="UseConsoleUITemplate" />
       <_ApplePropertyNames Include="UseRuntimeComponents" />
-      <_ApplePropertyNames Include="IncludesTestRunner" />
-      <_ApplePropertyNames Include="ShouldILStrip" />
+
+      <!-- Globalization properties -->
+      <_ApplePropertyNames Include="HybridGlobalization" />
+      <_ApplePropertyNames Include="InvariantGlobalization" />
+
+      <!-- ILLink properties -->
+      <_ApplePropertyNames Include="_NetCoreAppToolCurrent" />
+      <_ApplePropertyNames Include="DebuggerSupport" />
+      <_ApplePropertyNames Include="EventSourceSupport" />
+      <_ApplePropertyNames Include="JsonSerializerIsReflectionEnabledByDefault" />
+      <_ApplePropertyNames Include="MetadataUpdaterSupport" />
+
+
+      <_AppleUsedRuntimePackFiles
+                         Include="@(_UsedRuntimePackFiles->'%(FileName)%(Extension)')"
+                         RemoveMetadata="_IsNative;TargetDir" />
 
       <_ApplePropertiesToPass
-        Include="$(%(_ApplePropertyNames.Identity))"
-        Name="%(_ApplePropertyNames.Identity)"
-        ConditionToUse__="%(_ApplePropertyNames.ConditionToUse__)" />
-
-      <_AppleUsedRuntimePackFiles 
-        Include="@(_UsedRuntimePackFiles->'%(FileName)%(Extension)')" 
-        RemoveMetadata="_IsNative;TargetDir" />
-
+                         Include="$(%(_ApplePropertyNames.Identity))"
+                         Name="%(_ApplePropertyNames.Identity)"
+                         ConditionToUse__="%(_ApplePropertyNames.ConditionToUse__)" />
+
       <_AppleItemsToPass Include="@(_AppleUsedRuntimePackFiles)"
                          OriginalItemName__="_AppleUsedRuntimePackFiles" />
 
+      <_AppleItemsToPass Include="@(AppleReferenceSharedPathFiles->'%(FileName)%(Extension)')"
+                         OriginalItemName__="AppleReferenceSharedPathFiles" />
+
+      <_AppleItemsToPass Include="@(ReferenceExtraPathFiles->'%(FileName)%(Extension)')"
+                         OriginalItemName__="AppleReferenceExtraPathFiles" />
+
+      <_AppleItemsToPass Include="@(RuntimeHostConfigurationOption)"
+                         OriginalItemName__="_AppleUsedRuntimeHostConfigurationOption" />
+
+      <_AppleItemsToPass Include="@(TrimmerRootAssembly)"
+                         OriginalItemName__="TrimmerRootAssembly" />
+
       <!-- Example of passing items to the project
 
           <_AppleItemsToPass Include="@(BundleFiles)" OriginalItemName__="BundleFiles" ConditionToUse__="'$(Foo)' != 'true'" />
@@ -164,7 +194,7 @@
       <IncludesTestRunner Condition="'$(IncludesTestRunner)' == ''">true</IncludesTestRunner>
       <Optimized Condition="'$(Configuration)' == 'Release'">true</Optimized>
       <MainLibraryFileName Condition="'$(MainLibraryFileName)' == '' and '$(IsRuntimeTests)' != 'true' and '$(IncludesTestRunner)' == 'true'">AppleTestRunner.dll</MainLibraryFileName>
-    
+
       <AppleBuildDir>$(PublishDir)</AppleBuildDir>
       <AppleBundleDir>$(BundleDir)</AppleBundleDir>
     </PropertyGroup>
@@ -181,7 +211,7 @@
         <_InternalForceInterpret>true</_InternalForceInterpret>
         <_IsNative>true</_IsNative>
       </AppleAssembliesToBundle>
-      
+
       <_PublishAssemblies Include="$(PublishDir)\**\*.dll" Exclude="$(PublishDir)\**\*.resources.dll" />
       <_SatelliteAssemblies Include="$(PublishDir)\**\*.resources.dll" />
 
@@ -212,4 +242,4 @@
     <RemoveDir Condition="'$(NeedsToBuildAppsOnHelixLocal)' != 'true'" Directories="$(OutDir)" />
   </Target>
 
-</Project>
+</Project>

eng/testing/tests.mobile.targets

@@ -24,7 +24,7 @@
     <DotnetPgoToolPath>$([MSBuild]::NormalizePath('$(DotnetPgoToolDir)', 'dotnet-pgo'))</DotnetPgoToolPath>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(EnableAggressiveTrimming)' == 'true' or '$(EnableSoftTrimming)' == 'true'">
+  <PropertyGroup Condition="('$(EnableAggressiveTrimming)' == 'true' or '$(EnableSoftTrimming)' == 'true') and '$(BuildTestsOnHelix)' != 'true'">
     <PublishTrimmed>true</PublishTrimmed>
     <!-- Suppress trimming warnings as these are tests -->
     <SuppressTrimAnalysisWarnings>true</SuppressTrimAnalysisWarnings>
@@ -124,7 +124,7 @@
            as a root -->
       <TrimmerRootAssembly
           Condition="$([System.String]::Copy('%(ResolvedFileToPublish.FileName)%(ResolvedFileToPublish.Extension)').EndsWith('TestRunner.dll'))"
-          Include="%(ResolvedFileToPublish.FullPath)" />
+          Include="%(ResolvedFileToPublish.FileName)" />
     </ItemGroup>
 
     <ItemGroup>

src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs

@@ -283,7 +283,7 @@ public static bool IsMetadataTokenSupported
         public static bool UsesMobileAppleCrypto => IsMacCatalyst || IsiOS || IstvOS;
 
         // Changed to `true` when trimming
-        public static bool IsBuiltWithAggressiveTrimming => IsNativeAot;
+        public static bool IsBuiltWithAggressiveTrimming => IsNativeAot || IsAppleMobile;
         public static bool IsNotBuiltWithAggressiveTrimming => !IsBuiltWithAggressiveTrimming;
         public static bool IsTrimmedWithILLink => IsBuiltWithAggressiveTrimming && !IsNativeAot;
 

src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Common/ConfigurationBinderTests.cs

@@ -2118,7 +2118,7 @@ public void ComplexObj_As_Enumerable_Element()
         }
 
 #if !BUILDING_SOURCE_GENERATOR_TESTS
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBrowser))]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBrowser), nameof(PlatformDetection.IsNotAppleMobile))]
         public void TraceSwitchTest()
         {
             var dic = new Dictionary<string, string>
@@ -2147,7 +2147,7 @@ private void ValidateGeolocation(IGeolocation location)
 
         [Fact]
 #if !BUILDING_SOURCE_GENERATOR_TESTS
-        [ActiveIssue("Investigate Build browser-wasm linux Release LibraryTests_EAT CI failure for reflection impl", TestPlatforms.Browser)]
+        [ActiveIssue("Investigate Build browser-wasm linux Release LibraryTests_EAT CI failure for reflection impl", TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
 #endif
         public void TestGraphWithUnsupportedMember()
         {

src/libraries/Microsoft.VisualBasic.Core/tests/NewLateBindingTests.cs

@@ -96,6 +96,7 @@ public static IEnumerable<object[]> LateCall_OptionalValues_Data()
 
         [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsReflectionEmitSupported))]
         [ActiveIssue("https://github.com/dotnet/runtime/issues/51834", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/51834", typeof(PlatformDetection), nameof(PlatformDetection.IsMonoRuntime), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsAppleMobile))]
         [MemberData(nameof(LateCall_OptionalValues_Data))]
         public void LateCall_OptionalValues(string memberName, object[] arguments, Type[] typeArguments, string expectedValue)
         {

src/libraries/System.Configuration.ConfigurationManager/tests/ILLink.Descriptors.xml

@@ -0,0 +1,6 @@
+<linker>
+  <assembly fullname="System" />
+  <assembly fullname="System.Private.CoreLib" />
+  <assembly fullname="System.Configuration" />
+  <assembly fullname="System.Configuration.ConfigurationManager" />
+</linker>

src/libraries/System.Configuration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj

@@ -97,6 +97,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\System.Configuration.ConfigurationManager.csproj" />
+    <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptors.xml" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <Reference Include="System.Configuration" />

src/libraries/System.Data.Common/tests/ILLink.Descriptors.xml

@@ -0,0 +1,3 @@
+<linker>
+  <assembly fullname="System.Data" />
+</linker>

src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj

@@ -123,5 +123,6 @@
   <ItemGroup>
     <PackageReference Include="System.Data.Common.TestData" Version="$(SystemDataCommonTestDataVersion)" />
     <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
+    <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptors.xml" />
   </ItemGroup>
 </Project>

src/libraries/System.Data.Common/tests/System/Data/XmlDataReaderTest.cs

@@ -36,6 +36,7 @@ public class XmlDataReaderTest
     {
         [Fact]
         [ActiveIssue("https://github.com/dotnet/runtime/issues/51369", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/51369", typeof(PlatformDetection), nameof(PlatformDetection.IsMonoRuntime), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsAppleMobile))]
         public void XmlLoadTest()
         {
             var ds = new DataSet();

src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/ILLink.Descriptors.xml

@@ -0,0 +1,3 @@
+<linker>
+  <assembly fullname="System.Diagnostics.FileVersionInfo.TestAssembly" />
+</linker>

src/libraries/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/System.Diagnostics.FileVersionInfo.Tests.csproj

@@ -52,5 +52,6 @@
     <!-- R2R testing does not tolerate the combination of a regular project reference and a content reference. -->
     <!-- This is a bug in the SDK tracked here: https://github.com/dotnet/sdk/issues/30718 -->
     <PublishReadyToRunExclude Include="System.Diagnostics.FileVersionInfo.TestAssembly.dll" />
+    <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptors.xml" />
   </ItemGroup>
 </Project>

src/libraries/System.Linq.Queryable/tests/TrimCompatibilityTests.cs

@@ -17,6 +17,7 @@ public class TrimCompatibilityTests
         /// </summary>
         [Fact]
         [ActiveIssue("https://github.com/dotnet/runtime/issues/50712", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/50712", typeof(PlatformDetection), nameof(PlatformDetection.IsMonoRuntime), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsAppleMobile))]
         public static void QueryableMethodsContainCorrectDynamicDependency()
         {
             IEnumerable<MethodInfo> dependentMethods =

src/libraries/System.Linq/tests/ILLink.Descriptors.xml

@@ -0,0 +1,5 @@
+<linker>
+  <assembly fullname="System.Linq" />
+  <assembly fullname="System.Linq.Tests" />
+  <assembly fullname="System.Runtime" />
+</linker>

src/libraries/System.Linq/tests/System.Linq.Tests.csproj

@@ -5,6 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <RdXmlFile Include="default.rd.xml" />
+    <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)ILLink.Descriptors.xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AggregateTests.cs" />

src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj

@@ -5,7 +5,7 @@
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent)-osx;$(NetCoreAppCurrent)-ios</TargetFrameworks>
     <IgnoreForCI Condition="'$(TargetOS)' == 'browser'">true</IgnoreForCI>
     <EnablePreviewFeatures>true</EnablePreviewFeatures>
-    <EventSourceSupport Condition="'$(TestNativeAot)' == 'true'">true</EventSourceSupport>
+    <EventSourceSupport Condition="'$(TestNativeAot)' == 'true' or '$(TargetsAppleMobile)' == 'true'">true</EventSourceSupport>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />

src/libraries/System.ObjectModel/tests/ObservableCollection/ObservableCollection_Serialization.cs

@@ -28,6 +28,7 @@ public void SerializeDeserialize_Roundtrips(ObservableCollection<int> c)
 
         [Fact]
         [ActiveIssue("https://github.com/dotnet/runtime/issues/57588", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
+        [ActiveIssue("https://github.com/dotnet/runtime/issues/57588", typeof(PlatformDetection), nameof(PlatformDetection.IsMonoRuntime), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsAppleMobile))]
         public void OnDeserialized_MonitorNotInitialized_ExpectSuccess()
         {
             var observableCollection = new ObservableCollection<int>();

src/libraries/System.Reflection.Metadata/tests/Metadata/Decoding/SignatureDecoderTests.cs

@@ -129,7 +129,7 @@ public static void VarArgsCaller()
         }
 
         // Test as much as we can with simple C# examples inline below.
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.HasAssemblyFiles))]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.HasAssemblyFiles), nameof(PlatformDetection.IsNotAppleMobile))]
         public void SimpleSignatureProviderCoverage()
         {
             using (FileStream stream = File.OpenRead(AssemblyPathHelper.GetAssemblyLocation(typeof(SignaturesToDecode<>).GetTypeInfo().Assembly)))

src/libraries/System.Reflection.MetadataLoadContext/tests/ILLink.Descriptors.xml

@@ -6,4 +6,5 @@
   -->
   <assembly fullname="mscorlib" />
   <assembly fullname="TestILAssembly" />
+  <assembly fullname="System.Private.CoreLib" />
 </linker>

src/libraries/System.Reflection.MetadataLoadContext/tests/System.Reflection.MetadataLoadContext.Tests.csproj

@@ -86,7 +86,7 @@
     <Compile Include="$(CommonTestPath)System\ModifiedTypeTests.cs" Link="Common\System\ModifiedTypeTests.cs" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetOS)' == 'browser'">
+  <ItemGroup Condition="'$(TargetOS)' == 'browser' or ('$(EnableAggressiveTrimming)' == 'true' and '$(UseNativeAotRuntime)' != 'true')">
     <WasmFilesToIncludeFromPublishDir Include="System.Private.CoreLib.dll" />
     <WasmFilesToIncludeFromPublishDir Include="System.Reflection.MetadataLoadContext.Tests.dll" />
     <WasmFilesToIncludeFromPublishDir Include="mscorlib.dll" />

src/libraries/System.Reflection.TypeExtensions/tests/ILLink.Descriptors.xml

@@ -0,0 +1,3 @@
+<linker>
+  <assembly fullname="TinyAssembly" />
+</linker>

src/libraries/System.Reflection.TypeExtensions/tests/ModuleTests.cs

@@ -24,6 +24,7 @@ public void GetModuleVersionId_HasModuleVersionId_BehaveConsistently()
 
         // This calls Assembly.Load, but xUnit turn is into a LoadFrom because TinyAssembly is just a Content item in the project.
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsAssemblyLoadingSupported))]
+        [SkipOnPlatform(TestPlatforms.Browser | TestPlatforms.iOS | TestPlatforms.MacCatalyst | TestPlatforms.tvOS, "TinyAssembly GUID differs when trimming is enabled.")]
         public void GetModuleVersionId_KnownAssembly_ReturnsExpected()
         {
             Module module = Assembly.Load(new AssemblyName("TinyAssembly")).ManifestModule;

src/libraries/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.csproj

@@ -22,5 +22,6 @@
       <Link>TinyAssembly.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <TrimmerRootDescriptor Condition="'$(TargetsAppleMobile)' == 'true' and '$(EnableAggressiveTrimming)' == 'true' and '$(UseNativeAotRuntime)' != 'true'" Include="$(MSBuildThisFileDirectory)ILLink.Descriptors.xml" />
   </ItemGroup>
-</Project>
+</Project>