Add managed thread ID to extractor log messages

tamasvajk · tamasvajk · commit edc93dfeb747 · 2023-09-19T14:56:27.000+02:00
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs
@@ -267,7 +267,7 @@ protected string RequireEnvironmentVariable(string name)
 
         protected DiagnosticClassifier DiagnosticClassifier { get; }
 
-        private readonly ILogger logger = new ConsoleLogger(Verbosity.Info);
+        private readonly ILogger logger = new ConsoleLogger(Verbosity.Info, logThreadId: false);
 
         private readonly IDiagnosticsWriter diagnostics;
 
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/BuildActions.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/BuildActions.cs
@@ -237,7 +237,7 @@ int IBuildActions.RunProcess(string cmd, string args, string? workingDirectory,
         int IBuildActions.RunProcess(string cmd, string args, string? workingDirectory, IDictionary<string, string>? environment, out IList<string> stdOut)
         {
             var pi = GetProcessStartInfo(cmd, args, workingDirectory, environment, true);
-            return pi.ReadOutput(out stdOut);
+            return pi.ReadOutput(out stdOut, printToConsole: false);
         }
 
         void IBuildActions.DirectoryDelete(string dir, bool recursive) => Directory.Delete(dir, recursive);
diff --git a/csharp/extractor/Semmle.Extraction.CIL.Driver/Program.cs b/csharp/extractor/Semmle.Extraction.CIL.Driver/Program.cs
@@ -38,7 +38,7 @@ public static void Main(string[] args)
             }
 
             var options = new ExtractorOptions(args);
-            using var logger = new ConsoleLogger(options.Verbosity);
+            using var logger = new ConsoleLogger(options.Verbosity, logThreadId: false);
 
             var actions = options.AssembliesToExtract
                 .Select(asm => asm.Filename)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -219,7 +219,7 @@ private void GenerateSourceFilesFromWebViews(List<FileInfo> allFiles)
             }
         }
 
-        public DependencyManager(string srcDir) : this(srcDir, DependencyOptions.Default, new ConsoleLogger(Verbosity.Info)) { }
+        public DependencyManager(string srcDir) : this(srcDir, DependencyOptions.Default, new ConsoleLogger(Verbosity.Info, logThreadId: true)) { }
 
         private IEnumerable<FileInfo> GetAllFiles()
         {
@@ -430,8 +430,8 @@ private void AnalyseProject(FileInfo project)
 
         }
 
-        private bool RestoreProject(string project, out string stdout, string? pathToNugetConfig = null) =>
-            dotnet.RestoreProjectToDirectory(project, packageDirectory.DirInfo.FullName, out stdout, pathToNugetConfig);
+        private bool RestoreProject(string project, string? pathToNugetConfig = null) =>
+            dotnet.RestoreProjectToDirectory(project, packageDirectory.DirInfo.FullName, pathToNugetConfig);
 
         private bool RestoreSolution(string solution, out IEnumerable<string> projects) =>
             dotnet.RestoreSolutionToDirectory(solution, packageDirectory.DirInfo.FullName, out projects);
@@ -454,25 +454,14 @@ private IEnumerable<string> RestoreSolutions(IEnumerable<string> solutions) =>
         /// <summary>
         /// Executes `dotnet restore` on all projects in projects.
         /// This is done in parallel for performance reasons.
-        /// To ensure that output is not interleaved, the output of each
-        /// restore is collected and printed.
         /// </summary>
         /// <param name="projects">A list of paths to project files.</param>
         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)
+            Parallel.ForEach(projects, new ParallelOptions { MaxDegreeOfParallelism = options.Threads }, project =>
             {
-                Console.WriteLine(line);
-            }
+                RestoreProject(project);
+            });
         }
 
         private void DownloadMissingPackages(List<FileInfo> allFiles)
@@ -500,38 +489,29 @@ private void DownloadMissingPackages(List<FileInfo> allFiles)
                 .Select(d => Path.GetFileName(d).ToLowerInvariant());
             var notYetDownloadedPackages = fileContent.AllPackages.Except(alreadyDownloadedPackages);
 
-            var stdoutLines = notYetDownloadedPackages
-                .AsParallel()
-                .WithDegreeOfParallelism(options.Threads)
-                .Select(package =>
-                    {
-                        progressMonitor.NugetInstall(package);
-                        using var tempDir = new TemporaryDirectory(ComputeTempDirectory(package));
-                        var success = dotnet.New(tempDir.DirInfo.FullName, out var stdout1);
-                        if (!success)
-                        {
-                            return new[] { stdout1 };
-                        }
-
-                        success = dotnet.AddPackage(tempDir.DirInfo.FullName, package, out var stdout2);
-                        if (!success)
-                        {
-                            return new[] { stdout1, stdout2 };
-                        }
-
-                        success = RestoreProject(tempDir.DirInfo.FullName, out var stdout3, nugetConfig);
-                        // TODO: the restore might fail, we could retry with a prerelease (*-* instead of *) version of the package.
-                        if (!success)
-                        {
-                            progressMonitor.FailedToRestoreNugetPackage(package);
-                        }
-                        return new[] { stdout1, stdout2, stdout3 };
-                    })
-                .ToList();
-            foreach (var line in stdoutLines.SelectMany(l => l))
+            Parallel.ForEach(notYetDownloadedPackages, new ParallelOptions { MaxDegreeOfParallelism = options.Threads }, package =>
             {
-                Console.WriteLine(line);
-            }
+                progressMonitor.NugetInstall(package);
+                using var tempDir = new TemporaryDirectory(ComputeTempDirectory(package));
+                var success = dotnet.New(tempDir.DirInfo.FullName);
+                if (!success)
+                {
+                    return;
+                }
+
+                success = dotnet.AddPackage(tempDir.DirInfo.FullName, package);
+                if (!success)
+                {
+                    return;
+                }
+
+                success = RestoreProject(tempDir.DirInfo.FullName, nugetConfig);
+                // TODO: the restore might fail, we could retry with a prerelease (*-* instead of *) version of the package.
+                if (!success)
+                {
+                    progressMonitor.FailedToRestoreNugetPackage(package);
+                }
+            });
         }
 
         private void AnalyseSolutions(IEnumerable<string> solutions)
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
@@ -37,25 +37,18 @@ private void Info()
             }
         }
 
-        private bool RunCommand(string args, out string stdout)
-        {
-            var success = dotnetCliInvoker.RunCommand(args, out var output);
-            stdout = string.Join("\n", output);
-            return success;
-        }
-
         private static string GetRestoreArgs(string projectOrSolutionFile, string packageDirectory) =>
             $"restore --no-dependencies \"{projectOrSolutionFile}\" --packages \"{packageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true";
 
-        public bool RestoreProjectToDirectory(string projectFile, string packageDirectory, out string stdout, string? pathToNugetConfig = null)
+        public bool RestoreProjectToDirectory(string projectFile, string packageDirectory, string? pathToNugetConfig = null)
         {
             var args = GetRestoreArgs(projectFile, packageDirectory);
             if (pathToNugetConfig != null)
             {
                 args += $" --configfile \"{pathToNugetConfig}\"";
             }
 
-            return RunCommand(args, out stdout);
+            return dotnetCliInvoker.RunCommand(args);
         }
 
         public bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, out IEnumerable<string> projects)
@@ -76,16 +69,16 @@ public bool RestoreSolutionToDirectory(string solutionFile, string packageDirect
             return false;
         }
 
-        public bool New(string folder, out string stdout)
+        public bool New(string folder)
         {
             var args = $"new console --no-restore --output \"{folder}\"";
-            return RunCommand(args, out stdout);
+            return dotnetCliInvoker.RunCommand(args);
         }
 
-        public bool AddPackage(string folder, string package, out string stdout)
+        public bool AddPackage(string folder, string package)
         {
             var args = $"add \"{folder}\" package \"{package}\" --no-restore";
-            return RunCommand(args, out stdout);
+            return dotnetCliInvoker.RunCommand(args);
         }
 
         public IList<string> GetListedRuntimes() => GetListed("--list-runtimes", "runtime");
@@ -94,9 +87,8 @@ public bool AddPackage(string folder, string package, out string stdout)
 
         private IList<string> GetListed(string args, string artifact)
         {
-            if (dotnetCliInvoker.RunCommand(args, out IList<string> artifacts))
+            if (dotnetCliInvoker.RunCommand(args, out var artifacts))
             {
-                progressMonitor.LogInfo($"Found {artifact}s: {string.Join("\n", artifacts)}");
                 return artifacts;
             }
             return new List<string>();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs
@@ -19,23 +19,23 @@ public DotNetCliInvoker(ProgressMonitor progressMonitor, string exec)
             this.Exec = exec;
         }
 
-        private ProcessStartInfo MakeDotnetStartInfo(string args, bool redirectStandardOutput)
+        private ProcessStartInfo MakeDotnetStartInfo(string args)
         {
             var startInfo = new ProcessStartInfo(Exec, args)
             {
                 UseShellExecute = false,
-                RedirectStandardOutput = redirectStandardOutput
+                RedirectStandardOutput = true
             };
             // Set the .NET CLI language to English to avoid localized output.
             startInfo.EnvironmentVariables["DOTNET_CLI_UI_LANGUAGE"] = "en";
             return startInfo;
         }
 
-        private bool RunCommandAux(string args, bool redirectStandardOutput, out IList<string> output)
+        private bool RunCommandAux(string args, out IList<string> output)
         {
             progressMonitor.RunningProcess($"{Exec} {args}");
-            var pi = MakeDotnetStartInfo(args, redirectStandardOutput);
-            var exitCode = pi.ReadOutput(out output);
+            var pi = MakeDotnetStartInfo(args);
+            var exitCode = pi.ReadOutput(out output, true);
             if (exitCode != 0)
             {
                 progressMonitor.CommandFailed(Exec, args, exitCode);
@@ -45,9 +45,9 @@ private bool RunCommandAux(string args, bool redirectStandardOutput, out IList<s
         }
 
         public bool RunCommand(string args) =>
-            RunCommandAux(args, redirectStandardOutput: false, out _);
+            RunCommandAux(args, out _);
 
         public bool RunCommand(string args, out IList<string> output) =>
-            RunCommandAux(args, redirectStandardOutput: true, out output);
+            RunCommandAux(args, out output);
     }
 }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNet.cs
@@ -4,10 +4,10 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 {
     internal interface IDotNet
     {
-        bool RestoreProjectToDirectory(string project, string directory, out string stdout, string? pathToNugetConfig = null);
+        bool RestoreProjectToDirectory(string project, string directory, string? pathToNugetConfig = null);
         bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, out IEnumerable<string> projects);
-        bool New(string folder, out string stdout);
-        bool AddPackage(string folder, string package, out string stdout);
+        bool New(string folder);
+        bool AddPackage(string folder, string package);
         IList<string> GetListedRuntimes();
         IList<string> GetListedSdks();
         bool Exec(string execArgs);
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Extractor.cs
@@ -119,7 +119,7 @@ public static ExitCode Run(Options options)
             var stopwatch = new Stopwatch();
             stopwatch.Start();
 
-            using var logger = new ConsoleLogger(options.Verbosity);
+            using var logger = new ConsoleLogger(options.Verbosity, logThreadId: true);
             logger.Log(Severity.Info, "Running C# standalone extractor");
             using var a = new Analysis(logger, options);
             var sourceFileCount = a.Extraction.Sources.Count;
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Options.cs b/csharp/extractor/Semmle.Extraction.CSharp.Standalone/Options.cs
@@ -2,6 +2,7 @@
 using Semmle.Util;
 using Semmle.Util.Logging;
 using Semmle.Extraction.CSharp.DependencyFetching;
+using System;
 
 namespace Semmle.Extraction.CSharp.Standalone
 {
@@ -64,15 +65,15 @@ public override bool HandleArgument(string arg)
             var fi = new FileInfo(dependencies.SolutionFile);
             if (!fi.Exists)
             {
-                System.Console.WriteLine("Error: The solution {0} does not exist", fi.FullName);
+                System.Console.WriteLine($"[{Environment.CurrentManagedThreadId:D3}] Error: The solution {fi.FullName} does not exist");
                 Errors = true;
             }
             return true;
         }
 
         public override void InvalidArgument(string argument)
         {
-            System.Console.WriteLine($"Error: Invalid argument {argument}");
+            System.Console.WriteLine($"[{Environment.CurrentManagedThreadId:D3}] Error: Invalid argument {argument}");
             Errors = true;
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs
@@ -71,9 +71,9 @@ public static void SetInvariantCulture()
 
         public static ILogger MakeLogger(Verbosity verbosity, bool includeConsole)
         {
-            var fileLogger = new FileLogger(verbosity, GetCSharpLogPath());
+            var fileLogger = new FileLogger(verbosity, GetCSharpLogPath(), logThreadId: true);
             return includeConsole
-                ? new CombinedLogger(new ConsoleLogger(verbosity), fileLogger)
+                ? new CombinedLogger(new ConsoleLogger(verbosity, logThreadId: true), fileLogger)
                 : (ILogger)fileLogger;
         }
 
diff --git a/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs b/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs
@@ -99,7 +99,7 @@ public void TestDotnetRestoreProjectToDirectory1()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", out var _);
+            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages");
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
@@ -114,7 +114,7 @@ public void TestDotnetRestoreProjectToDirectory2()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", out var _, "myconfig.config");
+            dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", "myconfig.config");
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
@@ -164,7 +164,7 @@ public void TestDotnetNew()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.New("myfolder", out var _);
+            dotnet.New("myfolder");
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
@@ -179,7 +179,7 @@ public void TestDotnetAddPackage()
             var dotnet = MakeDotnet(dotnetCliInvoker);
 
             // Execute
-            dotnet.AddPackage("myfolder", "mypackage", out var _);
+            dotnet.AddPackage("myfolder", "mypackage");
 
             // Verify
             var lastArgs = dotnetCliInvoker.GetLastArgs();
diff --git a/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs b/csharp/extractor/Semmle.Extraction.Tests/Runtime.cs
@@ -15,23 +15,11 @@ public DotNetStub(IList<string> runtimes, IList<string> sdks)
             this.runtimes = runtimes;
             this.sdks = sdks;
         }
-        public bool AddPackage(string folder, string package, out string stdout)
-        {
-            stdout = "";
-            return true;
-        }
+        public bool AddPackage(string folder, string package) => true;
 
-        public bool New(string folder, out string stdout)
-        {
-            stdout = "";
-            return true;
-        }
+        public bool New(string folder) => true;
 
-        public bool RestoreProjectToDirectory(string project, string directory, out string stdout, string? pathToNugetConfig = null)
-        {
-            stdout = "";
-            return true;
-        }
+        public bool RestoreProjectToDirectory(string project, string directory, string? pathToNugetConfig = null) => true;
 
         public bool RestoreSolutionToDirectory(string solution, string directory, out IEnumerable<string> projects)
         {
diff --git a/csharp/extractor/Semmle.Util/Logger.cs b/csharp/extractor/Semmle.Util/Logger.cs
diff --git a/csharp/extractor/Semmle.Util/ProcessStartInfoExtensions.cs b/csharp/extractor/Semmle.Util/ProcessStartInfoExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ int IBuildActions.RunProcess(string cmd, string args, string? workingDirectory,`
`237`	`237`	`int IBuildActions.RunProcess(string cmd, string args, string? workingDirectory, IDictionary<string, string>? environment, out IList<string> stdOut)`
`238`	`238`	`{`
`239`	`239`	`var pi = GetProcessStartInfo(cmd, args, workingDirectory, environment, true);`
`240`		`- return pi.ReadOutput(out stdOut);`
	`240`	`+ return pi.ReadOutput(out stdOut, printToConsole: false);`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`void IBuildActions.DirectoryDelete(string dir, bool recursive) => Directory.Delete(dir, recursive);`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public static void Main(string[] args)`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`var options = new ExtractorOptions(args);`
`41`		`- using var logger = new ConsoleLogger(options.Verbosity);`
	`41`	`+ using var logger = new ConsoleLogger(options.Verbosity, logThreadId: false);`
`42`	`42`
`43`	`43`	`var actions = options.AssembliesToExtract`
`44`	`44`	`.Select(asm => asm.Filename)`
Original file line number	Diff line number	Diff line change
`@@ -37,25 +37,18 @@ private void Info()`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`- private bool RunCommand(string args, out string stdout)`
`41`		`- {`
`42`		`- var success = dotnetCliInvoker.RunCommand(args, out var output);`
`43`		`- stdout = string.Join("\n", output);`
`44`		`- return success;`
`45`		`- }`
`46`		`-`
`47`	`40`	`private static string GetRestoreArgs(string projectOrSolutionFile, string packageDirectory) =>`
`48`	`41`	`$"restore --no-dependencies \"{projectOrSolutionFile}\" --packages \"{packageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true";`
`49`	`42`
`50`		`- public bool RestoreProjectToDirectory(string projectFile, string packageDirectory, out string stdout, string? pathToNugetConfig = null)`
	`43`	`+ public bool RestoreProjectToDirectory(string projectFile, string packageDirectory, string? pathToNugetConfig = null)`
`51`	`44`	`{`
`52`	`45`	`var args = GetRestoreArgs(projectFile, packageDirectory);`
`53`	`46`	`if (pathToNugetConfig != null)`
`54`	`47`	`{`
`55`	`48`	`args += $" --configfile \"{pathToNugetConfig}\"";`
`56`	`49`	`}`
`57`	`50`
`58`		`- return RunCommand(args, out stdout);`
	`51`	`+ return dotnetCliInvoker.RunCommand(args);`
`59`	`52`	`}`
`60`	`53`
`61`	`54`	`public bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, out IEnumerable<string> projects)`
`@@ -76,16 +69,16 @@ public bool RestoreSolutionToDirectory(string solutionFile, string packageDirect`
`76`	`69`	`return false;`
`77`	`70`	`}`
`78`	`71`
`79`		`- public bool New(string folder, out string stdout)`
	`72`	`+ public bool New(string folder)`
`80`	`73`	`{`
`81`	`74`	`var args = $"new console --no-restore --output \"{folder}\"";`
`82`		`- return RunCommand(args, out stdout);`
	`75`	`+ return dotnetCliInvoker.RunCommand(args);`
`83`	`76`	`}`
`84`	`77`
`85`		`- public bool AddPackage(string folder, string package, out string stdout)`
	`78`	`+ public bool AddPackage(string folder, string package)`
`86`	`79`	`{`
`87`	`80`	`var args = $"add \"{folder}\" package \"{package}\" --no-restore";`
`88`		`- return RunCommand(args, out stdout);`
	`81`	`+ return dotnetCliInvoker.RunCommand(args);`
`89`	`82`	`}`
`90`	`83`
`91`	`84`	`public IList<string> GetListedRuntimes() => GetListed("--list-runtimes", "runtime");`
`@@ -94,9 +87,8 @@ public bool AddPackage(string folder, string package, out string stdout)`
`94`	`87`
`95`	`88`	`private IList<string> GetListed(string args, string artifact)`
`96`	`89`	`{`
`97`		`- if (dotnetCliInvoker.RunCommand(args, out IList<string> artifacts))`
	`90`	`+ if (dotnetCliInvoker.RunCommand(args, out var artifacts))`
`98`	`91`	`{`
`99`		`- progressMonitor.LogInfo($"Found {artifact}s: {string.Join("\n", artifacts)}");`
`100`	`92`	`return artifacts;`
`101`	`93`	`}`
`102`	`94`	`return new List<string>();`
Original file line number	Diff line number	Diff line change
`@@ -19,23 +19,23 @@ public DotNetCliInvoker(ProgressMonitor progressMonitor, string exec)`
`19`	`19`	`this.Exec = exec;`
`20`	`20`	`}`
`21`	`21`
`22`		`- private ProcessStartInfo MakeDotnetStartInfo(string args, bool redirectStandardOutput)`
	`22`	`+ private ProcessStartInfo MakeDotnetStartInfo(string args)`
`23`	`23`	`{`
`24`	`24`	`var startInfo = new ProcessStartInfo(Exec, args)`
`25`	`25`	`{`
`26`	`26`	`UseShellExecute = false,`
`27`		`- RedirectStandardOutput = redirectStandardOutput`
	`27`	`+ RedirectStandardOutput = true`
`28`	`28`	`};`
`29`	`29`	`// Set the .NET CLI language to English to avoid localized output.`
`30`	`30`	`startInfo.EnvironmentVariables["DOTNET_CLI_UI_LANGUAGE"] = "en";`
`31`	`31`	`return startInfo;`
`32`	`32`	`}`
`33`	`33`
`34`		`- private bool RunCommandAux(string args, bool redirectStandardOutput, out IList<string> output)`
	`34`	`+ private bool RunCommandAux(string args, out IList<string> output)`
`35`	`35`	`{`
`36`	`36`	`progressMonitor.RunningProcess($"{Exec} {args}");`
`37`		`- var pi = MakeDotnetStartInfo(args, redirectStandardOutput);`
`38`		`- var exitCode = pi.ReadOutput(out output);`
	`37`	`+ var pi = MakeDotnetStartInfo(args);`
	`38`	`+ var exitCode = pi.ReadOutput(out output, true);`
`39`	`39`	`if (exitCode != 0)`
`40`	`40`	`{`
`41`	`41`	`progressMonitor.CommandFailed(Exec, args, exitCode);`
`@@ -45,9 +45,9 @@ private bool RunCommandAux(string args, bool redirectStandardOutput, out IList<s`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public bool RunCommand(string args) =>`
`48`		`- RunCommandAux(args, redirectStandardOutput: false, out _);`
	`48`	`+ RunCommandAux(args, out _);`
`49`	`49`
`50`	`50`	`public bool RunCommand(string args, out IList<string> output) =>`
`51`		`- RunCommandAux(args, redirectStandardOutput: true, out output);`
	`51`	`+ RunCommandAux(args, out output);`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@ namespace Semmle.Extraction.CSharp.DependencyFetching`
`4`	`4`	`{`
`5`	`5`	`internal interface IDotNet`
`6`	`6`	`{`
`7`		`- bool RestoreProjectToDirectory(string project, string directory, out string stdout, string? pathToNugetConfig = null);`
	`7`	`+ bool RestoreProjectToDirectory(string project, string directory, string? pathToNugetConfig = null);`
`8`	`8`	`bool RestoreSolutionToDirectory(string solutionFile, string packageDirectory, out IEnumerable<string> projects);`
`9`		`- bool New(string folder, out string stdout);`
`10`		`- bool AddPackage(string folder, string package, out string stdout);`
	`9`	`+ bool New(string folder);`
	`10`	`+ bool AddPackage(string folder, string package);`
`11`	`11`	`IList<string> GetListedRuntimes();`
`12`	`12`	`IList<string> GetListedSdks();`
`13`	`13`	`bool Exec(string execArgs);`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using Semmle.Util;`
`3`	`3`	`using Semmle.Util.Logging;`
`4`	`4`	`using Semmle.Extraction.CSharp.DependencyFetching;`
	`5`	`+using System;`
`5`	`6`
`6`	`7`	`namespace Semmle.Extraction.CSharp.Standalone`
`7`	`8`	`{`
`@@ -64,15 +65,15 @@ public override bool HandleArgument(string arg)`
`64`	`65`	`var fi = new FileInfo(dependencies.SolutionFile);`
`65`	`66`	`if (!fi.Exists)`
`66`	`67`	`{`
`67`		`- System.Console.WriteLine("Error: The solution {0} does not exist", fi.FullName);`
	`68`	`+ System.Console.WriteLine($"[{Environment.CurrentManagedThreadId:D3}] Error: The solution {fi.FullName} does not exist");`
`68`	`69`	`Errors = true;`
`69`	`70`	`}`
`70`	`71`	`return true;`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`public override void InvalidArgument(string argument)`
`74`	`75`	`{`
`75`		`- System.Console.WriteLine($"Error: Invalid argument {argument}");`
	`76`	`+ System.Console.WriteLine($"[{Environment.CurrentManagedThreadId:D3}] Error: Invalid argument {argument}");`
`76`	`77`	`Errors = true;`
`77`	`78`	`}`
`78`	`79`
Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,9 @@ public static void SetInvariantCulture()`
`71`	`71`
`72`	`72`	`public static ILogger MakeLogger(Verbosity verbosity, bool includeConsole)`
`73`	`73`	`{`
`74`		`- var fileLogger = new FileLogger(verbosity, GetCSharpLogPath());`
	`74`	`+ var fileLogger = new FileLogger(verbosity, GetCSharpLogPath(), logThreadId: true);`
`75`	`75`	`return includeConsole`
`76`		`- ? new CombinedLogger(new ConsoleLogger(verbosity), fileLogger)`
	`76`	`+ ? new CombinedLogger(new ConsoleLogger(verbosity, logThreadId: true), fileLogger)`
`77`	`77`	`: (ILogger)fileLogger;`
`78`	`78`	`}`
`79`	`79`