From a3da11a9622308c2724fc047e43ba440ff99e3c4 Mon Sep 17 00:00:00 2001 From: Michael Nebel Date: Tue, 19 Sep 2023 11:12:36 +0200 Subject: [PATCH] C#: Rename DotNetCliWrapper to DotNet. --- .../DependencyManager.cs | 2 +- .../{DotNetCliWrapper.cs => DotNet.cs} | 30 +++++++++---------- .../{DotNetCliWrapper.cs => DotNet.cs} | 4 +-- 3 files changed, 18 insertions(+), 18 deletions(-) rename csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/{DotNetCliWrapper.cs => DotNet.cs} (72%) rename csharp/extractor/Semmle.Extraction.Tests/{DotNetCliWrapper.cs => DotNet.cs} (98%) diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs index 239553b30e8..9a3bfeb624e 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs @@ -47,7 +47,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching try { - this.dotnet = DotNetCliWrapper.Make(options, progressMonitor); + this.dotnet = DotNet.Make(options, progressMonitor); } catch { diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliWrapper.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs similarity index 72% rename from csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliWrapper.cs rename to csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs index b11945aec40..4e2e7354436 100644 --- a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliWrapper.cs +++ b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs @@ -9,31 +9,31 @@ namespace Semmle.Extraction.CSharp.DependencyFetching /// /// Utilities to run the "dotnet" command. /// - internal partial class DotNetCliWrapper : IDotNet + internal partial class DotNet : IDotNet { - private readonly IDotNetCliInvoker dotnet; + private readonly IDotNetCliInvoker dotnetCliInvoker; private readonly ProgressMonitor progressMonitor; - private DotNetCliWrapper(IDotNetCliInvoker dotnet, ProgressMonitor progressMonitor) + private DotNet(IDotNetCliInvoker dotnetCliInvoker, ProgressMonitor progressMonitor) { this.progressMonitor = progressMonitor; - this.dotnet = dotnet; + this.dotnetCliInvoker = dotnetCliInvoker; Info(); } - private DotNetCliWrapper(IDependencyOptions options, ProgressMonitor progressMonitor) : this(new DotNetCliInvoker(progressMonitor, Path.Combine(options.DotNetPath ?? string.Empty, "dotnet")), progressMonitor) { } + private DotNet(IDependencyOptions options, ProgressMonitor progressMonitor) : this(new DotNetCliInvoker(progressMonitor, Path.Combine(options.DotNetPath ?? string.Empty, "dotnet")), progressMonitor) { } - internal static IDotNet Make(IDotNetCliInvoker dotnet, ProgressMonitor progressMonitor) => new DotNetCliWrapper(dotnet, progressMonitor); + internal static IDotNet Make(IDotNetCliInvoker dotnetCliInvoker, ProgressMonitor progressMonitor) => new DotNet(dotnetCliInvoker, progressMonitor); - public static IDotNet Make(IDependencyOptions options, ProgressMonitor progressMonitor) => new DotNetCliWrapper(options, progressMonitor); + public static IDotNet Make(IDependencyOptions options, ProgressMonitor progressMonitor) => new DotNet(options, progressMonitor); private void Info() { // TODO: make sure the below `dotnet` version is matching the one specified in global.json - var res = dotnet.RunCommand("--info"); + var res = dotnetCliInvoker.RunCommand("--info"); if (!res) { - throw new Exception($"{dotnet.Exec} --info failed."); + throw new Exception($"{dotnetCliInvoker.Exec} --info failed."); } } @@ -47,7 +47,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching { args += $" --configfile \"{pathToNugetConfig}\""; } - var success = dotnet.RunCommand(args, out var output); + var success = dotnetCliInvoker.RunCommand(args, out var output); stdout = string.Join("\n", output); return success; } @@ -56,7 +56,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching { var args = GetRestoreArgs(solutionFile, packageDirectory); args += " --verbosity normal"; - if (dotnet.RunCommand(args, out var output)) + if (dotnetCliInvoker.RunCommand(args, out var output)) { var regex = RestoreProjectRegex(); projects = output @@ -73,13 +73,13 @@ namespace Semmle.Extraction.CSharp.DependencyFetching public bool New(string folder) { var args = $"new console --no-restore --output \"{folder}\""; - return dotnet.RunCommand(args); + return dotnetCliInvoker.RunCommand(args); } public bool AddPackage(string folder, string package) { var args = $"add \"{folder}\" package \"{package}\" --no-restore"; - return dotnet.RunCommand(args); + return dotnetCliInvoker.RunCommand(args); } public IList GetListedRuntimes() => GetListed("--list-runtimes", "runtime"); @@ -88,7 +88,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching private IList GetListed(string args, string artifact) { - if (dotnet.RunCommand(args, out var artifacts)) + if (dotnetCliInvoker.RunCommand(args, out var artifacts)) { progressMonitor.LogInfo($"Found {artifact}s: {string.Join("\n", artifacts)}"); return artifacts; @@ -99,7 +99,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching public bool Exec(string execArgs) { var args = $"exec {execArgs}"; - return dotnet.RunCommand(args); + return dotnetCliInvoker.RunCommand(args); } [GeneratedRegex("Restored\\s+(.+\\.csproj)", RegexOptions.Compiled)] diff --git a/csharp/extractor/Semmle.Extraction.Tests/DotNetCliWrapper.cs b/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs similarity index 98% rename from csharp/extractor/Semmle.Extraction.Tests/DotNetCliWrapper.cs rename to csharp/extractor/Semmle.Extraction.Tests/DotNet.cs index 2dd2f599f79..fda9e4c49fc 100644 --- a/csharp/extractor/Semmle.Extraction.Tests/DotNetCliWrapper.cs +++ b/csharp/extractor/Semmle.Extraction.Tests/DotNet.cs @@ -35,10 +35,10 @@ namespace Semmle.Extraction.Tests public string GetLastArgs() => lastArgs; } - public class DotNetCliWrapperTests + public class DotNetTests { private static IDotNet MakeDotnet(IDotNetCliInvoker dotnetCliInvoker) => - DotNetCliWrapper.Make(dotnetCliInvoker, new ProgressMonitor(new LoggerStub())); + DotNet.Make(dotnetCliInvoker, new ProgressMonitor(new LoggerStub())); private static IList MakeDotnetRestoreOutput() => new List {