diff --git a/src/libraries/Common/tests/TestUtilities/System/IO/FileCleanupTestBase.cs b/src/libraries/Common/tests/TestUtilities/System/IO/FileCleanupTestBase.cs index 0ef72bf88ef53e..8c576ab24a078e 100644 --- a/src/libraries/Common/tests/TestUtilities/System/IO/FileCleanupTestBase.cs +++ b/src/libraries/Common/tests/TestUtilities/System/IO/FileCleanupTestBase.cs @@ -163,7 +163,7 @@ protected static string GetNamedPipeServerStreamName() return Guid.NewGuid().ToString("N"); } - if (!PlatformDetection.IsCaseSensitiveOS) + if (!PlatformDetection.FileCreateCaseSensitive) { return $"/tmp/{Guid.NewGuid().ToString("N")}"; } diff --git a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs index a8d0ad4a98e8ce..85d0d234cc6b18 100644 --- a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs +++ b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs @@ -82,12 +82,13 @@ public static partial class PlatformDetection public static int SlowRuntimeTimeoutModifier = (PlatformDetection.IsDebugRuntime ? 5 : 1); public static bool IsCaseInsensitiveOS => IsWindows || IsOSX || IsMacCatalyst; + public static bool IsCaseSensitiveOS => !IsCaseInsensitiveOS; #if NETCOREAPP - public static bool IsCaseSensitiveOS => !IsCaseInsensitiveOS && !RuntimeInformation.RuntimeIdentifier.StartsWith("iossimulator") - && !RuntimeInformation.RuntimeIdentifier.StartsWith("tvossimulator"); + public static bool FileCreateCaseSensitive => IsCaseSensitiveOS && !RuntimeInformation.RuntimeIdentifier.StartsWith("iossimulator") + && !RuntimeInformation.RuntimeIdentifier.StartsWith("tvossimulator"); #else - public static bool IsCaseSensitiveOS => !IsCaseInsensitiveOS; + public static bool FileCreateCaseSensitive => IsCaseSensitiveOS; #endif public static bool IsThreadingSupported => !IsBrowser; diff --git a/src/libraries/System.IO.FileSystem/tests/Base/FileGetSetAttributes.cs b/src/libraries/System.IO.FileSystem/tests/Base/FileGetSetAttributes.cs index 4a43aabfb574c8..20f92242d98bd1 100644 --- a/src/libraries/System.IO.FileSystem/tests/Base/FileGetSetAttributes.cs +++ b/src/libraries/System.IO.FileSystem/tests/Base/FileGetSetAttributes.cs @@ -62,7 +62,7 @@ public void SettingInvalidAttributes_Unix(FileAttributes attributes) AssertSettingInvalidAttributes(path, attributes); } - [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsCaseSensitiveOS))] + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.FileCreateCaseSensitive))] [InlineData(FileAttributes.Hidden)] [PlatformSpecific(TestPlatforms.AnyUnix & ~(TestPlatforms.OSX | TestPlatforms.FreeBSD))] [ActiveIssue("https://github.com/dotnet/runtime/issues/67853", TestPlatforms.tvOS)] diff --git a/src/libraries/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs b/src/libraries/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs index d76ebd54f9e6ba..7ccdc8bcb3f930 100644 --- a/src/libraries/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs +++ b/src/libraries/System.IO.FileSystem/tests/Directory/GetFileSystemEntries_str_str.cs @@ -697,7 +697,7 @@ public void WindowsSearchPatternWhitespace() Assert.Empty(GetEntries(TestDirectory, "\t")); } - [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsCaseSensitiveOS))] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.FileCreateCaseSensitive))] [ActiveIssue("https://github.com/dotnet/runtime/issues/67853", TestPlatforms.tvOS)] public void SearchPatternCaseSensitive() { diff --git a/src/libraries/System.IO.FileSystem/tests/File/Create.cs b/src/libraries/System.IO.FileSystem/tests/File/Create.cs index 4a01cd24e54302..7a5eacea6322fd 100644 --- a/src/libraries/System.IO.FileSystem/tests/File/Create.cs +++ b/src/libraries/System.IO.FileSystem/tests/File/Create.cs @@ -217,7 +217,7 @@ public void LongFileName() Assert.False(File.Exists(path)); } - [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsCaseSensitiveOS))] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.FileCreateCaseSensitive))] public void CaseSensitive() { DirectoryInfo testDir = Directory.CreateDirectory(GetTestFilePath()); diff --git a/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs b/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs index 24f763de070595..b303f1e5d6f9ea 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs +++ b/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs @@ -811,9 +811,8 @@ public static void GetPermissionSet() #pragma warning restore SYSLIB0003 // Obsolete: CAS } - [Theory] + [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.FileCreateCaseSensitive))] [MemberData(nameof(TestingCreateInstanceFromObjectHandleData))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/65560", TestPlatforms.iOS | TestPlatforms.tvOS)] public static void TestingCreateInstanceFromObjectHandle(string physicalFileName, string assemblyFile, string type, string returnedFullNameType, Type exceptionType) { ObjectHandle oh = null;