Restore nuget.exe and dotnet restore packages to separate folders

Author: tamasvajk

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

@@ -31,6 +31,7 @@ public sealed class DependencyManager : IDisposable
         private readonly IDotNet dotnet;
         private readonly FileContent fileContent;
         private readonly TemporaryDirectory packageDirectory;
+        private readonly TemporaryDirectory legacyPackageDirectory;
         private readonly TemporaryDirectory missingPackageDirectory;
         private readonly TemporaryDirectory tempWorkingDirectory;
         private readonly bool cleanupTempWorkingDirectory;
@@ -52,6 +53,7 @@ public DependencyManager(string srcDir, IDependencyOptions options, ILogger logg
             this.sourceDir = new DirectoryInfo(srcDir);
 
             packageDirectory = new TemporaryDirectory(ComputeTempDirectory(sourceDir.FullName));
+            legacyPackageDirectory = new TemporaryDirectory(ComputeTempDirectory(sourceDir.FullName, "legacypackages"));
             missingPackageDirectory = new TemporaryDirectory(ComputeTempDirectory(sourceDir.FullName, "missingpackages"));
 
             tempWorkingDirectory = new TemporaryDirectory(FileUtils.GetTemporaryWorkingDirectory(out cleanupTempWorkingDirectory));
@@ -89,17 +91,17 @@ public DependencyManager(string srcDir, IDependencyOptions options, ILogger logg
             {
                 try
                 {
-                    var nuget = new NugetPackages(sourceDir.FullName, packageDirectory, progressMonitor);
+                    var nuget = new NugetPackages(sourceDir.FullName, legacyPackageDirectory, progressMonitor);
                     nuget.InstallPackages();
 
-                    var nugetPackageDlls = packageDirectory.DirInfo.GetFiles("*.dll", new EnumerationOptions { RecurseSubdirectories = true });
+                    var nugetPackageDlls = legacyPackageDirectory.DirInfo.GetFiles("*.dll", new EnumerationOptions { RecurseSubdirectories = true });
                     var nugetPackageDllPaths = nugetPackageDlls.Select(f => f.FullName).ToHashSet();
                     var excludedPaths = nugetPackageDllPaths
-                        .Where(path => IsPathInSubfolder(path, packageDirectory.DirInfo.FullName, "tools"));
+                        .Where(path => IsPathInSubfolder(path, legacyPackageDirectory.DirInfo.FullName, "tools"));
 
                     foreach (var excludedPath in excludedPaths)
                     {
-                        progressMonitor.LogInfo($"Excluded DLL: {excludedPath}");
+                        progressMonitor.LogInfo($"Excluded Nuget DLL: {excludedPath}");
                     }
 
                     nugetPackageDllPaths.ExceptWith(excludedPaths);
@@ -761,6 +763,7 @@ public void Dispose(TemporaryDirectory? dir, string name)
         public void Dispose()
         {
             Dispose(packageDirectory, "package");
+            Dispose(legacyPackageDirectory, "legacy package");
             Dispose(missingPackageDirectory, "missing package");
             if (cleanupTempWorkingDirectory)
             {

csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget/Assemblies.ql

@@ -6,10 +6,15 @@ private string getPath(Assembly a) {
     result =
       s.substring(s.indexOf("GitHub/packages/") + "GitHub/packages/".length() + 16, s.length())
     or
+    result =
+      s.substring(s.indexOf("GitHub/legacypackages/") + "GitHub/legacypackages/".length() + 16,
+        s.length())
+    or
     result = s.substring(s.indexOf("lib/mono/") + "lib/mono/".length(), s.length())
     or
     result = s and
     not exists(s.indexOf("GitHub/packages/")) and
+    not exists(s.indexOf("GitHub/legacypackages/")) and
     not exists(s.indexOf("lib/mono/"))
   )
 }