hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup of dotnet CLI invocations

Browse Source
This commit is contained in:
Tamas Vajk
2023-08-16 14:47:13 +02:00
parent ad3cc8e1c7
commit ba0cc76da1
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
View File

@@ -22,31 +22,24 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
private void Info()
{
// TODO: make sure the below `dotnet` version is matching the one specified in global.json
progressMonitor.RunningProcess($"{dotnet} --info");
using var proc = Process.Start(dotnet, "--info");
proc.WaitForExit();
var ret = proc.ExitCode;
if (ret != 0)
var res = RunCommand("--info");
if (!res)
{
progressMonitor.CommandFailed(dotnet, "--info", ret);
throw new Exception($"{dotnet} --info failed with exit code {ret}.");
throw new Exception($"{dotnet} --info failed.");
}
}
private static ProcessStartInfo MakeDotnetStartInfo(string args) =>
private static ProcessStartInfo MakeDotnetStartInfo(string args, bool redirectStandardOutput) =>
new ProcessStartInfo(dotnet, args)
{
UseShellExecute = false,
RedirectStandardOutput = true
RedirectStandardOutput = redirectStandardOutput
};
private bool RunCommandAux(string args, bool silent)
private bool RunCommand(string args)
{
progressMonitor.RunningProcess($"{dotnet} {args}");
using var proc = silent
? Process.Start(MakeDotnetStartInfo(args))
: Process.Start(dotnet, args);
using var proc = Process.Start(MakeDotnetStartInfo(args, redirectStandardOutput: false));
proc?.WaitForExit();
var exitCode = proc?.ExitCode ?? -1;
if (exitCode != 0)
@@ -57,12 +50,6 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
return true;
}
private bool RunCommand(string args) =>
RunCommandAux(args, false);
private bool RunCommandSilently(string args) =>
RunCommandAux(args, true);
public bool RestoreToDirectory(string projectOrSolutionFile, string packageDirectory, string? pathToNugetConfig = null)
{
var args = $"restore --no-dependencies \"{projectOrSolutionFile}\" --packages \"{packageDirectory}\" /p:DisableImplicitNuGetFallbackFolder=true";
@@ -90,7 +77,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
private IList<string> GetListed(string args, string artifact)
{
progressMonitor.RunningProcess($"{dotnet} {args}");
var pi = MakeDotnetStartInfo(args);
var pi = MakeDotnetStartInfo(args, redirectStandardOutput: true);
var exitCode = pi.ReadOutput(out var artifacts);
if (exitCode != 0)
{
@@ -104,7 +91,6 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
public bool Exec(string execArgs)
{
var args = $"exec {execArgs}";
//return RunCommandSilently(args);
return RunCommand(args);
}
}