C#: try again.

Author: michaelnebel

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

@@ -24,18 +24,8 @@ public DependencyDirectory(string subfolderName, string userReportedDirectoryPur
             this.logger = logger;
             this.userReportedDirectoryPurpose = userReportedDirectoryPurpose;
 
-            string path;
-            // if (EnvironmentVariables.GetBuildlessDependencyDir() is string dir)
-            // {
-            //     path = dir;
-            //     attemptCleanup = false;
-            // }
-            // else
-            // {
-            path = FileUtils.GetTemporaryWorkingDirectory(out _);
             attemptCleanup = true;
-            //}
-            DirInfo = new DirectoryInfo(Path.Combine(path, subfolderName));
+            DirInfo = new DirectoryInfo(Path.Combine(FileUtils.GetTemporaryWorkingDirectory(out _), subfolderName));
             DirInfo.Create();
         }
 

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

@@ -28,12 +28,12 @@ internal class NugetExeWrapper : IDisposable
         /// This will be in the Cached or Temp location
         /// so as to not trample the source tree.
         /// </summary>
-        private readonly TemporaryDirectory packageDirectory;
+        private readonly DependencyDirectory packageDirectory;
 
         /// <summary>
         /// Create the package manager for a specified source tree.
         /// </summary>
-        public NugetExeWrapper(FileProvider fileProvider, TemporaryDirectory packageDirectory, Semmle.Util.Logging.ILogger logger)
+        public NugetExeWrapper(FileProvider fileProvider, DependencyDirectory packageDirectory, Semmle.Util.Logging.ILogger logger)
         {
             this.fileProvider = fileProvider;
             this.packageDirectory = packageDirectory;

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

@@ -24,7 +24,7 @@ internal sealed partial class NugetPackageRestorer : IDisposable
         private readonly IDotNet dotnet;
         private readonly DependabotProxy? dependabotProxy;
         private readonly IDiagnosticsWriter diagnosticsWriter;
-        private readonly TemporaryDirectory legacyPackageDirectory;
+        private readonly DependencyDirectory legacyPackageDirectory;
         private readonly DependencyDirectory missingPackageDirectory;
         private readonly ILogger logger;
         private readonly ICompilationInfoContainer compilationInfoContainer;
@@ -49,7 +49,7 @@ public NugetPackageRestorer(
             this.compilationInfoContainer = compilationInfoContainer;
 
             PackageDirectory = new DependencyDirectory("packages", "package", logger);
-            legacyPackageDirectory = new TemporaryDirectory(ComputeTempDirectoryPath("legacypackages"), "legacy package", logger);
+            legacyPackageDirectory = new DependencyDirectory("legacypackages", "legacy package", logger);
             missingPackageDirectory = new DependencyDirectory("missingpackages", "missing package", logger);
         }