Merge pull request #16945 from tamasvajk/feature/buildless-determinis…

…tic-file-order C#: Order files in buildless extraction
github · Jul 10, 2024 · 57efb84 · 57efb84
2 parents f183382 + ccf56a2
commit 57efb84
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileProvider.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/FileProvider.cs
@@ -62,7 +62,7 @@ private string[] SelectTextFileNamesByExtension(string filetype, params string[]
         private string[] SelectTextFileNamesByName(string name)
         {
             var ret = allNonBinary.Value.SelectFileNamesByName(name).ToArray();
-            var ending = ret.Length == 0 ? "." : $": {string.Join(", ", ret.OrderBy(s => s))}.";
+            var ending = ret.Length == 0 ? "." : $": {string.Join(", ", ret)}.";
             logger.LogInfo($"Found {ret.Length} {name} files in {SourceDir}{ending}");
             return ret;
         }
@@ -91,7 +91,9 @@ private IEnumerable<FileInfo> SelectSmallFiles(IEnumerable<FileInfo> files)
         private FileInfo[] GetAllFiles()
         {
             logger.LogInfo($"Finding files in {SourceDir}...");
-            var files = SourceDir.GetFiles("*.*", new EnumerationOptions { RecurseSubdirectories = true });
+            var files = SourceDir
+                .GetFiles("*.*", new EnumerationOptions { RecurseSubdirectories = true })
+                .OrderBy(f => f.FullName);
 
             var filteredFiles = files.Where(f =>
             {