Release v2.4.17

.github/workflows/prepare-release.yml

@@ -48,12 +48,12 @@ jobs:
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v4.5.0
+        uses: gittools/actions/gitversion/setup@v4.7.0
         with:
           versionSpec: '6.x'
 
       - name: Determine Version
-        uses: gittools/actions/gitversion/execute@v4.5.0
+        uses: gittools/actions/gitversion/execute@v4.7.0
         with:
           useConfigFile: true
         id: gitversion

.github/workflows/publish.yml

@@ -32,12 +32,12 @@ jobs:
     # from git history + GitVersion.yml during build. We still run the CLI here to
     # capture the SemVer for use in subsequent steps (push, template dispatch).
     - name: Install GitVersion
-      uses: gittools/actions/gitversion/setup@v4.5.0
+      uses: gittools/actions/gitversion/setup@v4.7.0
       with:
         versionSpec: '6.x'
 
     - name: Determine Version
-      uses: gittools/actions/gitversion/execute@v4.5.0
+      uses: gittools/actions/gitversion/execute@v4.7.0
       with:
         useConfigFile: true
       id: gitversion # step id used as reference for output values

Directory.Packages.props

@@ -8,7 +8,7 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.14.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0" />
-    <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="5.3.0" />
+    <PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="5.6.0" />
     <PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.203" />
     <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.14.0" />
@@ -17,13 +17,13 @@
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.7" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.7" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.9" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.7" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
     <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
-    <PackageVersion Include="Spectre.Console" Version="0.57.1" />
+    <PackageVersion Include="Spectre.Console" Version="0.57.2" />
     <PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.1.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageVersion Include="xunit.v3" Version="3.2.2" />
@@ -52,7 +52,7 @@
     <PackageVersion Include="Moq" Version="4.20.72" />
     <PackageVersion Include="ReportGenerator" Version="5.5.9" />
     <PackageVersion Include="coverlet.collector" Version="10.0.0" />
-    <PackageVersion Include="GitVersion.MsBuild" Version="6.7.0" />
+    <PackageVersion Include="GitVersion.MsBuild" Version="6.8.1" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <PackageVersion Include="Terminal.Gui" Version="2.0.0" />

Terminal.Gui/FileServices/FileSystemTreeBuilder.cs

@@ -72,5 +72,15 @@ private IEnumerable<IFileSystemInfo> TryGetChildren (IFileSystemInfo entry)
         }
     }
 
-    internal static bool IsReparsePoint (IFileSystemInfo entry) => (entry.Attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint;
+    internal static bool IsReparsePoint (IFileSystemInfo entry)
+    {
+        try
+        {
+            return (entry.Attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint;
+        }
+        catch (Exception)
+        {
+            return false; // treat an unreadable entry as not a reparse point / not expandable
+        }
+    }
 }

Terminal.Gui/Views/FileDialogs/FileDialogState.cs

@@ -4,6 +4,10 @@ namespace Terminal.Gui.Views;
 
 internal class FileDialogState
 {
+    // AttributesToSkip defaults to Hidden | System; clear it so hidden/system entries (e.g. dotfiles on Unix)
+    // remain visible, matching the behavior of the GetDirectories ()/GetFileSystemInfos () calls this replaced.
+    private static readonly EnumerationOptions _ignoreInaccessibleEnumerationOptions = new () { IgnoreInaccessible = true, AttributesToSkip = FileAttributes.None };
+
     public FileDialogState (IDirectoryInfo dir, FileDialog parent)
     {
         Parent = parent;
@@ -60,17 +64,31 @@ private void AddReadableChildren (List<FileSystemInfoStats> children, IDirectory
     {
         try
         {
-            IEnumerable<IFileSystemInfo> entries;
-
-            // if directories only
-            if (Parent.OpenMode == OpenMode.Directory)
-            {
-                entries = dir.GetDirectories ();
-            }
-            else
+            foreach (IFileSystemInfo entry in EnumerateReadableEntries (dir))
             {
-                entries = dir.GetFileSystemInfos ();
+                AddReadableChild (children, entry);
             }
+        }
+        catch (NotSupportedException)
+        {
+            // Some IFileSystem implementations (e.g. System.IO.Abstractions.TestingHelpers MockFileSystem)
+            // do not support clearing EnumerationOptions.AttributesToSkip; fall back to the eager listing
+            // methods, which never skip hidden/system entries.
+            AddReadableChildrenEagerly (children, dir);
+        }
+        catch (Exception)
+        {
+            // Access permission exceptions, missing directories, etc.
+        }
+    }
+
+    private void AddReadableChildrenEagerly (List<FileSystemInfoStats> children, IDirectoryInfo dir)
+    {
+        try
+        {
+            IEnumerable<IFileSystemInfo> entries = Parent.OpenMode == OpenMode.Directory
+                                                       ? dir.GetDirectories ()
+                                                       : dir.GetFileSystemInfos ();
 
             foreach (IFileSystemInfo entry in entries)
             {
@@ -83,6 +101,17 @@ private void AddReadableChildren (List<FileSystemInfoStats> children, IDirectory
         }
     }
 
+    private IEnumerable<IFileSystemInfo> EnumerateReadableEntries (IDirectoryInfo dir)
+    {
+        // if directories only
+        if (Parent.OpenMode == OpenMode.Directory)
+        {
+            return dir.EnumerateDirectories ("*", _ignoreInaccessibleEnumerationOptions);
+        }
+
+        return dir.EnumerateFileSystemInfos ("*", _ignoreInaccessibleEnumerationOptions);
+    }
+
     private void AddReadableChild (List<FileSystemInfoStats> children, IFileSystemInfo entry)
     {
         try

Tests/UnitTestsParallelizable/FileServices/FileSystemTreeBuilderTests.cs

@@ -0,0 +1,37 @@
+using System.IO.Abstractions;
+using Moq;
+
+namespace FileServicesTests;
+
+public class FileSystemTreeBuilderTests
+{
+    [Fact]
+    public void CanExpand_DirectoryWithUnreadableAttributes_DoesNotThrowAndReturnsFalse ()
+    {
+        Mock<IDirectoryInfo> directory = new ();
+        directory.SetupGet (d => d.Attributes).Throws (new UnauthorizedAccessException ("Access denied"));
+        directory.SetupGet (d => d.Exists).Returns (true);
+        directory.Setup (d => d.GetFileSystemInfos ()).Returns ([]);
+
+        FileSystemTreeBuilder builder = new ();
+
+        bool canExpand = builder.CanExpand (directory.Object);
+
+        Assert.False (canExpand);
+    }
+
+    [Fact]
+    public void GetChildren_DirectoryWithUnreadableAttributes_DoesNotThrowAndReturnsEmpty ()
+    {
+        Mock<IDirectoryInfo> directory = new ();
+        directory.SetupGet (d => d.Attributes).Throws (new UnauthorizedAccessException ("Access denied"));
+        directory.SetupGet (d => d.Exists).Returns (true);
+        directory.Setup (d => d.GetFileSystemInfos ()).Returns ([]);
+
+        FileSystemTreeBuilder builder = new ();
+
+        IEnumerable<IFileSystemInfo> children = builder.GetChildren (directory.Object);
+
+        Assert.Empty (children);
+    }
+}