Skip to content

Commit fe99c44

Browse files
[release/7.0] Implement proper File System detection for Apple OSes (#74560)
* the assert should fail on macOS * Don't use statfs on Apple systems, as for them it returns version-specific file system ids. * move mapping to a separate method and reuse it * minor improvement Co-authored-by: Adam Sitnik <[email protected]> Co-authored-by: Adam Sitnik <[email protected]>
1 parent 211930d commit fe99c44

File tree

2 files changed

+142
-130
lines changed

2 files changed

+142
-130
lines changed

src/libraries/Common/src/Interop/Unix/System.Native/Interop.UnixFileSystemTypes.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ internal static bool TryGetFileSystemType(SafeFileHandle fd, out UnixFileSystemT
155155
{
156156
uint fstatfsResult = GetFileSystemType(fd);
157157
fileSystemType = (UnixFileSystemTypes)fstatfsResult;
158-
Debug.Assert(Enum.IsDefined(fileSystemType) || fstatfsResult == 0 || !OperatingSystem.IsLinux(), $"GetFileSystemType returned {fstatfsResult}");
158+
Debug.Assert(Enum.IsDefined(fileSystemType) || fstatfsResult == 0, $"GetFileSystemType returned {fstatfsResult}");
159159
return fstatfsResult != 0;
160160
}
161161
}

0 commit comments

Comments
 (0)