C#: Address review comments.

Author: michaelnebel

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

@@ -352,10 +352,10 @@ private void AnalyseProject(FileInfo project)
 
         }
 
-        private bool RestoreProject(string project, string? pathToNugetConfig = null) =>
-            dotnet.RestoreProjectToDirectory(project, packageDirectory.DirInfo.FullName, pathToNugetConfig);
+        private bool RestoreProject(string project, out string stdout, string? pathToNugetConfig = null) =>
+            dotnet.RestoreProjectToDirectory(project, packageDirectory.DirInfo.FullName, out stdout, pathToNugetConfig);
 
-        private bool RestoreSolution(string solution, out IList<string> projects) =>
+        private bool RestoreSolution(string solution, out IEnumerable<string> projects) =>
             dotnet.RestoreSolutionToDirectory(solution, packageDirectory.DirInfo.FullName, out projects);
 
         /// <summary>
@@ -370,8 +370,22 @@ private IEnumerable<string> RestoreSolutions(IEnumerable<string> solutions) =>
                     return restoredProjects;
                 });
 
-        private void RestoreProjects(IEnumerable<string> projects) =>
-            Parallel.ForEach(projects, new ParallelOptions { MaxDegreeOfParallelism = options.Threads }, project => RestoreProject(project));
+        private void RestoreProjects(IEnumerable<string> projects)
+        {
+            var stdoutLines = projects
+                .AsParallel()
+                .WithDegreeOfParallelism(options.Threads)
+                .Select(project =>
+                    {
+                        RestoreProject(project, out var stdout);
+                        return stdout;
+                    })
+                .ToList();
+            foreach (var line in stdoutLines)
+            {
+                Console.WriteLine(line);
+            }
+        }
 
         private void DownloadMissingPackages(List<FileInfo> allFiles)
         {
@@ -412,7 +426,8 @@ private void DownloadMissingPackages(List<FileInfo> allFiles)
                     continue;
                 }
 
-                success = RestoreProject(tempDir.DirInfo.FullName, nugetConfig);
+                success = RestoreProject(tempDir.DirInfo.FullName, out var stdout, nugetConfig);
+                Console.WriteLine(stdout);
 
                 // TODO: the restore might fail, we could retry with a prerelease (*-* instead of *) version of the package.
                 if (!success)

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

@@ -33,12 +33,17 @@ private void Info()
             }
         }
 
-        private ProcessStartInfo MakeDotnetStartInfo(string args, bool redirectStandardOutput) =>
-            new ProcessStartInfo(dotnet, args)
+        private ProcessStartInfo MakeDotnetStartInfo(string args, bool redirectStandardOutput)
+        {
+            var startInfo = new ProcessStartInfo(dotnet, args)
             {
                 UseShellExecute = false,
                 RedirectStandardOutput = redirectStandardOutput
             };
+            // Set the .NET CLI language to English to avoid localized output.
+            startInfo.EnvironmentVariables["DOTNET_CLI_UI_LANGUAGE"] = "en";
+            return startInfo;
+        }
 
         private bool RunCommand(string args)
         {
@@ -70,17 +75,19 @@ private bool RunCommand(string args, out IList<string> output)
         private static string GetRestoreArgs(string projectOrSolutionFile, string packageDirectory) =>
             $"restore --no-dependencies \"{projectOrSolutionFile}\" --packages \"{packageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true";
 
-        public bool RestoreProjectToDirectory(string projectFile, string packageDirectory, string? pathToNugetConfig = null)
+        public bool RestoreProjectToDirectory(string projectFile, string packageDirectory, out string stdout, string? pathToNugetConfig = null)
         {
             var args = GetRestoreArgs(projectFile, packageDirectory);
             if (pathToNugetConfig != null)
             {
                 args += $" --configfile \"{pathToNugetConfig}\"";
             }
-            return RunCommand(args);
+            var success = RunCommand(args, out var output);
+            stdout = string.Join("\n", output);
+            return success;
         }
 
-        public bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, out IList<string> projects)
+        public bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, out IEnumerable<string> projects)
         {
             var args = GetRestoreArgs(solutionFile, packageDirectory);
             args += " --verbosity normal";
@@ -90,12 +97,11 @@ public bool RestoreSolutionToDirectory(string solutionFile, string packageDirect
                 projects = output
                     .Select(line => regex.Match(line))
                     .Where(match => match.Success)
-                    .Select(match => match.Groups[1].Value)
-                    .ToList();
+                    .Select(match => match.Groups[1].Value);
                 return true;
             }
 
-            projects = new List<string>();
+            projects = Array.Empty<string>();
             return false;
         }
 

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

@@ -4,8 +4,8 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 {
     internal interface IDotNet
     {
-        bool RestoreProjectToDirectory(string project, string directory, string? pathToNugetConfig = null);
-        bool RestoreSolutionToDirectory(string solution, string directory, out IList<string> projects);
+        bool RestoreProjectToDirectory(string project, string directory, out string stdout, string? pathToNugetConfig = null);
+        bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, out IEnumerable<string> projects);
         bool New(string folder);
         bool AddPackage(string folder, string package);
         IList<string> GetListedRuntimes();

csharp/extractor/Semmle.Extraction.Tests/Runtime.cs

@@ -1,4 +1,5 @@
 using Xunit;
+using System;
 using System.Collections.Generic;
 using Semmle.Extraction.CSharp.DependencyFetching;
 
@@ -18,11 +19,15 @@ public DotNetStub(IList<string> runtimes, IList<string> sdks)
 
         public bool New(string folder) => true;
 
-        public bool RestoreProjectToDirectory(string project, string directory, string? pathToNugetConfig = null) => true;
+        public bool RestoreProjectToDirectory(string project, string directory, out string stdout, string? pathToNugetConfig = null)
+        {
+            stdout = "";
+            return true;
+        }
 
-        public bool RestoreSolutionToDirectory(string solution, string directory, out IList<string> projects)
+        public bool RestoreSolutionToDirectory(string solution, string directory, out IEnumerable<string> projects)
         {
-            projects = new List<string>();
+            projects = Array.Empty<string>();
             return true;
         }