From 7e673bd97c0259c744d92279450acc7ebf043c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 23 May 2023 08:09:50 +0200 Subject: [PATCH] [7.0] Disable DllImportSearchPathsTest in mobile Port of https://github.com/dotnet/runtime/pull/86576 to 7.0 --- .../DllImportSearchPaths/DllImportSearchPathsTest.cs | 7 ++++++- src/tests/issues.targets | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.cs b/src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.cs index 31e69aeab90f72..04e5a4e9ae0682 100644 --- a/src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.cs +++ b/src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.cs @@ -19,7 +19,12 @@ public static void AssemblyDirectory_NotFound() } public static bool CanLoadAssemblyInSubdirectory => - !TestLibrary.Utilities.IsNativeAot && !TestLibrary.PlatformDetection.IsMonoLLVMFULLAOT; + !TestLibrary.Utilities.IsNativeAot && + !TestLibrary.PlatformDetection.IsMonoLLVMFULLAOT && + !OperatingSystem.IsAndroid() && + !OperatingSystem.IsIOS() && + !OperatingSystem.IsTvOS() && + !OperatingSystem.IsBrowser(); [ConditionalFact(nameof(CanLoadAssemblyInSubdirectory))] public static void AssemblyDirectory_Found() diff --git a/src/tests/issues.targets b/src/tests/issues.targets index aa3693e3f715c9..6d1ae189b60f92 100644 --- a/src/tests/issues.targets +++ b/src/tests/issues.targets @@ -3857,6 +3857,9 @@ https://github.com/dotnet/runtime/issues/67359 + + Loads an assembly from file +