Skip to content

Commit 1ec4ab3

Browse files
authored
Try Fix Linux File Enumeration (#663)
* Put try around root enumeration * Update dependencies
1 parent 1e7d026 commit 1ec4ab3

File tree

6 files changed

+31
-22
lines changed

6 files changed

+31
-22
lines changed

Benchmarks/Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
12+
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
1313
<PackageReference Include="LiteDB" Version="5.0.12" />
1414
<PackageReference Include="System.Data.SQLite" Version="1.0.116" />
1515
<PackageReference Include="murmurhash" Version="1.0.3" />

Cli/Cli.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
</ItemGroup>
3636

3737
<ItemGroup>
38-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.2.0" />
39-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
40-
<PackageReference Include="Microsoft.CST.OAT.Blazor.Components" Version="1.2.16" />
41-
<PackageReference Include="Microsoft.CST.OAT.Scripting" Version="1.2.16" />
42-
<PackageReference Include="Sarif.Sdk" Version="2.4.15" />
38+
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.3.0" />
39+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
40+
<PackageReference Include="Microsoft.CST.OAT.Blazor.Components" Version="1.2.29" />
41+
<PackageReference Include="Microsoft.CST.OAT.Scripting" Version="1.2.29" />
42+
<PackageReference Include="Sarif.Sdk" Version="3.1.0" />
4343
<PackageReference Include="Tewr.Blazor.FileReader" Version="3.3.1.21360" />
4444
</ItemGroup>
4545

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<PackageReference Include="Nerdbank.GitVersioning">
5-
<Version>3.5.107</Version>
5+
<Version>3.5.113</Version>
66
<PrivateAssets>all</PrivateAssets>
77
</PackageReference>
88
</ItemGroup>

Lib/Collectors/FileSystemCollector.cs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,12 +350,21 @@ internal override void ExecuteInternal(CancellationToken cancellationToken)
350350
foreach (var Root in Roots.Where(x => !opts.SkipDirectories.Any(y => x.StartsWith(y))))
351351
{
352352
Log.Information("{0} root {1}", Strings.Get("Scanning"), Root);
353-
var directories = Directory.EnumerateDirectories(Root, "*", new System.IO.EnumerationOptions()
353+
var directories = Enumerable.Empty<string>();
354+
try
355+
{
356+
directories = Directory.EnumerateDirectories(Root, "*", new System.IO.EnumerationOptions()
357+
{
358+
ReturnSpecialDirectories = false,
359+
IgnoreInaccessible = true,
360+
RecurseSubdirectories = true
361+
}).Where(x => !opts.SkipDirectories.Any(x.StartsWith)).ToList();
362+
}
363+
catch (Exception e)
354364
{
355-
ReturnSpecialDirectories = false,
356-
IgnoreInaccessible = true,
357-
RecurseSubdirectories = true
358-
}).Where(x => !opts.SkipDirectories.Any(y => x.StartsWith(y)));
365+
Log.Debug("Failed to enumerate directories of {Root}. ({Type}:{Message})", Root, e.GetType().Name, e.Message);
366+
}
367+
359368

360369
// Process files in the root
361370
TryIterateOnDirectory(Root);

Lib/Lib.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@
3535

3636
<ItemGroup>
3737
<PackageReference Include="MedallionShell" Version="1.6.2" />
38-
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.2.0" />
39-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
40-
<PackageReference Include="Microsoft.CST.OAT" Version="1.2.16" />
38+
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.3.0" />
39+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0" />
40+
<PackageReference Include="Microsoft.CST.OAT" Version="1.2.29" />
4141
<PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.1.11" />
4242
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
43-
<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.6" />
44-
<PackageReference Include="Microsoft.PowerShell.Commands.Diagnostics" Version="7.2.5" />
45-
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.5" />
43+
<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.9" />
44+
<PackageReference Include="Microsoft.PowerShell.Commands.Diagnostics" Version="7.2.6" />
45+
<PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.6" />
4646
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
4747
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
48-
<PackageReference Include="Serilog" Version="2.11.0" />
49-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
48+
<PackageReference Include="Serilog" Version="2.12.0" />
49+
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
5050
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
5151
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
5252
<PackageReference Include="System.Management" Version="6.0.0" />
@@ -66,7 +66,7 @@
6666
<PackageReference Include="CommandLineParser" Version="2.9.1" />
6767
<PackageReference Include="sqlite" Version="3.13.0" />
6868
<PackageReference Include="Microsoft.TSS" Version="2.1.1" />
69-
<PackageReference Include="PeNet" Version="2.9.7" />
69+
<PackageReference Include="PeNet" Version="2.9.8" />
7070
</ItemGroup>
7171
<ItemGroup>
7272
<EmbeddedResource Include="..\analyses.json" Link="analyses.json" />

Tests/Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
1717
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
1818
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
1919
</ItemGroup>

0 commit comments

Comments
 (0)