Fix review findings

Author: tamasvajk

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

@@ -82,7 +82,10 @@ public DependencyManager(string srcDir, ILogger logger)
                 $"dependency-manager-{DateTime.UtcNow:yyyyMMddHHmm}-{Environment.ProcessId}.jsonc"));
             this.sourceDir = new DirectoryInfo(srcDir);
 
-            tempWorkingDirectory = new TemporaryDirectory(FileUtils.GetTemporaryWorkingDirectory(out cleanupTempWorkingDirectory));
+            tempWorkingDirectory = new TemporaryDirectory(
+                FileUtils.GetTemporaryWorkingDirectory(out cleanupTempWorkingDirectory),
+                "temporary working",
+                logger);
 
             this.fileProvider = new FileProvider(sourceDir, logger);
             this.fileContent = new FileContent(logger, this.fileProvider.SmallNonBinary);
@@ -665,25 +668,9 @@ private void AnalyseProject(FileInfo project)
             }
         }
 
-        public static void DisposeTempDirectory(TemporaryDirectory? dir, string name, ILogger logger)
-        {
-            try
-            {
-                dir?.Dispose();
-            }
-            catch (Exception exc)
-            {
-                logger.LogInfo($"Couldn't delete {name} directory {exc.Message}");
-            }
-        }
-
         public void Dispose()
         {
-            if (cleanupTempWorkingDirectory)
-            {
-                DisposeTempDirectory(tempWorkingDirectory, "temporary working", logger);
-            }
-
+            tempWorkingDirectory?.Dispose();
             diagnosticsWriter?.Dispose();
             nugetPackageRestorer?.Dispose();
         }

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

@@ -43,9 +43,9 @@ public NugetPackageRestorer(
             this.logger = logger;
             this.compilationInfoContainer = compilationInfoContainer;
 
-            PackageDirectory = new TemporaryDirectory(ComputeTempDirectoryPath(fileProvider.SourceDir.FullName, "packages"));
-            legacyPackageDirectory = new TemporaryDirectory(ComputeTempDirectoryPath(fileProvider.SourceDir.FullName, "legacypackages"));
-            missingPackageDirectory = new TemporaryDirectory(ComputeTempDirectoryPath(fileProvider.SourceDir.FullName, "missingpackages"));
+            PackageDirectory = new TemporaryDirectory(ComputeTempDirectoryPath(fileProvider.SourceDir.FullName, "packages"), "package", logger);
+            legacyPackageDirectory = new TemporaryDirectory(ComputeTempDirectoryPath(fileProvider.SourceDir.FullName, "legacypackages"), "legacy package", logger);
+            missingPackageDirectory = new TemporaryDirectory(ComputeTempDirectoryPath(fileProvider.SourceDir.FullName, "missingpackages"), "missing package", logger);
         }
 
         public string? TryRestoreLatestNetFrameworkReferenceAssemblies()
@@ -275,7 +275,7 @@ private void RestoreProjects(IEnumerable<string> projects, out IEnumerable<strin
             }
 
             logger.LogInfo($"Found {notYetDownloadedPackages.Count} packages that are not yet restored");
-            using var tempDir = new TemporaryDirectory(ComputeTempDirectoryPath(fileProvider.SourceDir.FullName, "nugetconfig"));
+            using var tempDir = new TemporaryDirectory(ComputeTempDirectoryPath(fileProvider.SourceDir.FullName, "nugetconfig"), "generated nuget config", logger);
             var nugetConfig = fallbackNugetFeeds is null
                 ? GetNugetConfig()
                 : CreateFallbackNugetConfig(fallbackNugetFeeds, tempDir.DirInfo.FullName);
@@ -411,7 +411,8 @@ private static IEnumerable<string> GetRestoredPackageDirectoryNames(DirectoryInf
         private bool TryRestorePackageManually(string package, string? nugetConfig = null, PackageReferenceSource packageReferenceSource = PackageReferenceSource.SdkCsProj, bool tryWithoutNugetConfig = true)
         {
             logger.LogInfo($"Restoring package {package}...");
-            using var tempDir = new TemporaryDirectory(ComputeTempDirectoryPath(package, "missingpackages_workingdir"));
+            using var tempDir = new TemporaryDirectory(
+                ComputeTempDirectoryPath(package, "missingpackages_workingdir"), "missing package working", logger);
             var success = dotnet.New(tempDir.DirInfo.FullName);
             if (!success)
             {
@@ -675,9 +676,9 @@ private IEnumerable<string> GetFeeds(Func<IList<string>> getNugetFeeds)
 
         public void Dispose()
         {
-            DependencyManager.DisposeTempDirectory(PackageDirectory, "package", logger);
-            DependencyManager.DisposeTempDirectory(legacyPackageDirectory, "legacy package", logger);
-            DependencyManager.DisposeTempDirectory(missingPackageDirectory, "missing package", logger);
+            PackageDirectory?.Dispose();
+            legacyPackageDirectory?.Dispose();
+            missingPackageDirectory?.Dispose();
         }
 
         /// <summary>

csharp/extractor/Semmle.Util/TemporaryDirectory.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using Semmle.Util.Logging;
 
 namespace Semmle.Util
 {
@@ -9,17 +10,29 @@ namespace Semmle.Util
     /// </summary>
     public sealed class TemporaryDirectory : IDisposable
     {
+        private readonly string userReportedDirectoryPurpose;
+        private readonly ILogger logger;
+
         public DirectoryInfo DirInfo { get; }
 
-        public TemporaryDirectory(string name)
+        public TemporaryDirectory(string name, string userReportedDirectoryPurpose, ILogger logger)
         {
             DirInfo = new DirectoryInfo(name);
             DirInfo.Create();
+            this.userReportedDirectoryPurpose = userReportedDirectoryPurpose;
+            this.logger = logger;
         }
 
         public void Dispose()
         {
-            DirInfo.Delete(true);
+            try
+            {
+                DirInfo.Delete(true);
+            }
+            catch (Exception exc)
+            {
+                logger.LogInfo($"Couldn't delete {userReportedDirectoryPurpose} directory {exc.Message}");
+            }
         }
 
         public override string ToString() => DirInfo.FullName.ToString();