Refactor FileStatus.Unix.

src/libraries/System.IO.FileSystem/tests/Directory/SymbolicLinks.cs

@@ -47,11 +47,7 @@ protected override void AssertLinkExists(FileSystemInfo link)
             }
             else
             {
-                // Unix implementation detail:
-                // When the directory target does not exist FileStatus.GetExists returns false because:
-                // - We check _exists (which whould be true because the link itself exists).
-                // - We check InitiallyDirectory, which is the initial expected object type (which would be true).
-                // - We check _directory (false because the target directory does not exist)
+                // Unix requires the target to be a directory that exists.
                 Assert.False(link.Exists);
             }
         }

src/libraries/System.IO.FileSystem/tests/DirectoryInfo/SymbolicLinks.cs

@@ -44,11 +44,7 @@ protected override void AssertLinkExists(FileSystemInfo link)
             }
             else
             {
-                // Unix implementation detail:
-                // When the directory target does not exist FileStatus.GetExists returns false because:
-                // - We check _exists (which whould be true because the link itself exists).
-                // - We check InitiallyDirectory, which is the initial expected object type (which would be true).
-                // - We check _directory (false because the target directory does not exist)
+                // Unix requires the target to be a directory that exists.
                 Assert.False(link.Exists);
             }
         }

src/libraries/System.Private.CoreLib/src/System/IO/Enumeration/FileSystemEntry.Unix.cs

@@ -11,6 +11,7 @@ namespace System.IO.Enumeration
     public unsafe ref partial struct FileSystemEntry
    {
         private Interop.Sys.DirectoryEntry _directoryEntry;
+        private bool _isDirectory;
         private FileStatus _status;
         private Span<char> _pathBuffer;
         private ReadOnlySpan<char> _fullPath;
@@ -32,24 +33,24 @@ namespace System.IO.Enumeration
             entry._pathBuffer = pathBuffer;
             entry._fullPath = ReadOnlySpan<char>.Empty;
             entry._fileName = ReadOnlySpan<char>.Empty;
+            entry._isDirectory = false;
             entry._status.InvalidateCaches();
-            entry._status.InitiallyDirectory = false;
 
             bool isDirectory = directoryEntry.InodeType == Interop.Sys.NodeType.DT_DIR;
             bool isSymlink   = directoryEntry.InodeType == Interop.Sys.NodeType.DT_LNK;
             bool isUnknown   = directoryEntry.InodeType == Interop.Sys.NodeType.DT_UNKNOWN;
 
             if (isDirectory)
             {
-                entry._status.InitiallyDirectory = true;
+                entry._isDirectory = true;
             }
             else if (isSymlink)
             {
-                entry._status.InitiallyDirectory = entry._status.IsDirectory(entry.FullPath, continueOnError: true);
+                entry._isDirectory = entry._status.IsDirectory(entry.FullPath, continueOnError: true);
             }
             else if (isUnknown)
             {
-                entry._status.InitiallyDirectory = entry._status.IsDirectory(entry.FullPath, continueOnError: true);
+                entry._isDirectory = entry._status.IsDirectory(entry.FullPath, continueOnError: true);
                 if (entry._status.IsSymbolicLink(entry.FullPath, continueOnError: true))
                 {
                     entry._directoryEntry.InodeType = Interop.Sys.NodeType.DT_LNK;
@@ -145,16 +146,17 @@ public FileAttributes Attributes
         public DateTimeOffset CreationTimeUtc => _status.GetCreationTime(FullPath, continueOnError: true);
         public DateTimeOffset LastAccessTimeUtc => _status.GetLastAccessTime(FullPath, continueOnError: true);
         public DateTimeOffset LastWriteTimeUtc => _status.GetLastWriteTime(FullPath, continueOnError: true);
+
         public bool IsHidden => _status.IsFileSystemEntryHidden(FullPath, FileName);
         internal bool IsReadOnly => _status.IsReadOnly(FullPath, continueOnError: true);
 
-        public bool IsDirectory => _status.InitiallyDirectory;
+        public bool IsDirectory => _isDirectory;
         internal bool IsSymbolicLink => _directoryEntry.InodeType == Interop.Sys.NodeType.DT_LNK;
 
         public FileSystemInfo ToFileSystemInfo()
         {
             string fullPath = ToFullPath();
-            return FileSystemInfo.Create(fullPath, new string(FileName), ref _status);
+            return FileSystemInfo.Create(fullPath, new string(FileName), _isDirectory, ref _status);
         }
 
         /// <summary>

src/libraries/System.Private.CoreLib/src/System/IO/FileStatus.SetTimes.OSX.cs

@@ -7,7 +7,7 @@ namespace System.IO
 {
     internal partial struct FileStatus
     {
-        internal void SetCreationTime(string path, DateTimeOffset time)
+        internal void SetCreationTime(string path, DateTimeOffset time, bool asDirectory)
         {
             // Try to set the attribute on the file system entry using setattrlist,
             // if we get ENOTSUP then it means that "The volume does not support
@@ -27,11 +27,11 @@ internal void SetCreationTime(string path, DateTimeOffset time)
             }
             else if (error == Interop.Error.ENOTSUP)
             {
-                SetAccessOrWriteTimeCore(path, time, isAccessTime: false, checkCreationTime: false);
+                SetAccessOrWriteTimeCore(path, time, isAccessTime: false, checkCreationTime: false, asDirectory);
             }
             else
             {
-                Interop.CheckIo(error, path, InitiallyDirectory);
+                Interop.CheckIo(error, path, asDirectory);
             }
         }
 
@@ -54,7 +54,7 @@ private unsafe Interop.Error SetCreationTimeCore(string path, long seconds, long
             return error;
         }
 
-        private void SetAccessOrWriteTime(string path, DateTimeOffset time, bool isAccessTime) =>
-            SetAccessOrWriteTimeCore(path, time, isAccessTime, checkCreationTime: true);
+        private void SetAccessOrWriteTime(string path, DateTimeOffset time, bool isAccessTime, bool asDirectory) =>
+            SetAccessOrWriteTimeCore(path, time, isAccessTime, checkCreationTime: true, asDirectory);
     }
 }

src/libraries/System.Private.CoreLib/src/System/IO/FileStatus.SetTimes.OtherUnix.cs

@@ -7,11 +7,11 @@ namespace System.IO
 {
     internal partial struct FileStatus
     {
-        internal void SetCreationTime(string path, DateTimeOffset time) =>
-            SetLastWriteTime(path, time);
+        internal void SetCreationTime(string path, DateTimeOffset time, bool asDirectory) =>
+            SetLastWriteTime(path, time, asDirectory);
 
-        private void SetAccessOrWriteTime(string path, DateTimeOffset time, bool isAccessTime) =>
-            SetAccessOrWriteTimeCore(path, time, isAccessTime, checkCreationTime: false);
+        private void SetAccessOrWriteTime(string path, DateTimeOffset time, bool isAccessTime, bool asDirectory) =>
+            SetAccessOrWriteTimeCore(path, time, isAccessTime, checkCreationTime: false, asDirectory);
 
         // This is not used on these platforms, but is needed for source compat
         private Interop.Error SetCreationTimeCore(string path, long seconds, long nanoseconds) =>