diff --git a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs index cc378dcc8872a..db8416cf5ddd1 100644 --- a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs +++ b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs @@ -280,6 +280,7 @@ public static bool IsMetadataTokenSupported // Changed to `true` when trimming public static bool IsBuiltWithAggressiveTrimming => IsNativeAot; public static bool IsNotBuiltWithAggressiveTrimming => !IsBuiltWithAggressiveTrimming; + public static bool IsTrimmedWithILLink => IsBuiltWithAggressiveTrimming && !IsNativeAot; // Windows - Schannel supports alpn from win8.1/2012 R2 and higher. // Linux - OpenSsl supports alpn from openssl 1.0.2 and higher. diff --git a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj index 03138144a9db7..0ad5f15337a6e 100644 --- a/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj +++ b/src/libraries/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.csproj @@ -72,19 +72,20 @@ - + - - - %(ResolvedFileToPublish.FullPath) - - - - + + copy + + + copy + + diff --git a/src/libraries/System.Runtime/tests/System.Reflection.Tests/MemberInfoTests.cs b/src/libraries/System.Runtime/tests/System.Reflection.Tests/MemberInfoTests.cs index e30d8f8a16bd1..411d947e7405a 100644 --- a/src/libraries/System.Runtime/tests/System.Reflection.Tests/MemberInfoTests.cs +++ b/src/libraries/System.Runtime/tests/System.Reflection.Tests/MemberInfoTests.cs @@ -166,7 +166,8 @@ public void MethodInfoReflectedTypeDoesNotSurviveRuntimeHandles() } [Fact] - [ActiveIssue("https://github.com/dotnet/runtimelab/issues/830", typeof(PlatformDetection), nameof(PlatformDetection.IsNativeAot))] + [ActiveIssue("https://github.com/dotnet/linker/issues/2078", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming)), + /* Stripping ComVisible because descriptors tell us so */] public void GetCustomAttributesData() { MemberInfo[] m = typeof(MemberInfoTests).GetMember("SampleClass"); diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests/System.Runtime.Tests.csproj b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System.Runtime.Tests.csproj index ca223dc873277..6514d08c8f284 100644 --- a/src/libraries/System.Runtime/tests/System.Runtime.Tests/System.Runtime.Tests.csproj +++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System.Runtime.Tests.csproj @@ -14,6 +14,8 @@ true + + true