Skip to content

Commit 57efb84

Browse files
authored
Merge pull request #16945 from tamasvajk/feature/buildless-deterministic-file-order
C#: Order files in buildless extraction
2 parents f183382 + ccf56a2 commit 57efb84

File tree

1 file changed

+4
-2
lines changed
  • csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching

1 file changed

+4
-2
lines changed

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileProvider.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private string[] SelectTextFileNamesByExtension(string filetype, params string[]
6262
private string[] SelectTextFileNamesByName(string name)
6363
{
6464
var ret = allNonBinary.Value.SelectFileNamesByName(name).ToArray();
65-
var ending = ret.Length == 0 ? "." : $": {string.Join(", ", ret.OrderBy(s => s))}.";
65+
var ending = ret.Length == 0 ? "." : $": {string.Join(", ", ret)}.";
6666
logger.LogInfo($"Found {ret.Length} {name} files in {SourceDir}{ending}");
6767
return ret;
6868
}
@@ -91,7 +91,9 @@ private IEnumerable<FileInfo> SelectSmallFiles(IEnumerable<FileInfo> files)
9191
private FileInfo[] GetAllFiles()
9292
{
9393
logger.LogInfo($"Finding files in {SourceDir}...");
94-
var files = SourceDir.GetFiles("*.*", new EnumerationOptions { RecurseSubdirectories = true });
94+
var files = SourceDir
95+
.GetFiles("*.*", new EnumerationOptions { RecurseSubdirectories = true })
96+
.OrderBy(f => f.FullName);
9597

9698
var filteredFiles = files.Where(f =>
9799
{

0 commit comments

Comments
 (0)