C#: Only access the DotNetCliWrapper using the IDotNet interface.

Author: michaelnebel

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

@@ -27,7 +27,7 @@ public sealed class DependencyManager : IDisposable
         private int conflictedReferences = 0;
         private readonly IDependencyOptions options;
         private readonly DirectoryInfo sourceDir;
-        private readonly DotNetCliWrapper dotnet;
+        private readonly IDotNet dotnet;
         private readonly FileContent fileContent;
         private readonly TemporaryDirectory packageDirectory;
         private readonly TemporaryDirectory tempWorkingDirectory;
@@ -47,7 +47,7 @@ public DependencyManager(string srcDir, IDependencyOptions options, ILogger logg
 
             try
             {
-                this.dotnet = new DotNetCliWrapper(options, progressMonitor);
+                this.dotnet = DotNetCliWrapper.Make(options, progressMonitor);
             }
             catch
             {

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

@@ -14,15 +14,18 @@ internal partial class DotNetCliWrapper : IDotNet
         private readonly IDotNetCliInvoker dotnet;
         private readonly ProgressMonitor progressMonitor;
 
-        internal DotNetCliWrapper(IDotNetCliInvoker dotnet, ProgressMonitor progressMonitor)
+        private DotNetCliWrapper(IDotNetCliInvoker dotnet, ProgressMonitor progressMonitor)
         {
             this.progressMonitor = progressMonitor;
             this.dotnet = dotnet;
             Info();
         }
 
-        public DotNetCliWrapper(IDependencyOptions options, ProgressMonitor progressMonitor) : this(new DotNetCliInvoker(progressMonitor, Path.Combine(options.DotNetPath ?? string.Empty, "dotnet")), progressMonitor) { }
+        private DotNetCliWrapper(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);
+
+        public static IDotNet Make(IDependencyOptions options, ProgressMonitor progressMonitor) => new DotNetCliWrapper(options, progressMonitor);
 
         private void Info()
         {

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

@@ -10,11 +10,11 @@ internal class Razor
     {
         private readonly DotnetVersion sdk;
         private readonly ProgressMonitor progressMonitor;
-        private readonly DotNetCliWrapper dotNet;
+        private readonly IDotNet dotNet;
         private readonly string sourceGeneratorFolder;
         private readonly string cscPath;
 
-        public Razor(DotnetVersion sdk, DotNetCliWrapper dotNet, ProgressMonitor progressMonitor)
+        public Razor(DotnetVersion sdk, IDotNet dotNet, ProgressMonitor progressMonitor)
         {
             this.sdk = sdk;
             this.progressMonitor = progressMonitor;

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

@@ -38,7 +38,7 @@ public bool RunCommand(string args, out IList<string> output)
     public class DotNetCliWrapperTests
     {
         private static IDotNet MakeDotnet(IDotNetCliInvoker dotnetCliInvoker) =>
-            new DotNetCliWrapper(dotnetCliInvoker, new ProgressMonitor(new LoggerStub()));
+            DotNetCliWrapper.Make(dotnetCliInvoker, new ProgressMonitor(new LoggerStub()));
 
         private static IList<string> MakeDotnetRestoreOutput() =>
             new List<string> {