C#: Include all (legacy) nuget restored folders in standalone references

tamasvajk · tamasvajk · commit 2273bb13b8ab · 2023-11-08T14:02:41.000+01:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -91,6 +91,7 @@ public DependencyManager(string srcDir, IDependencyOptions options, ILogger logg
                 {
                     var nuget = new NugetPackages(sourceDir.FullName, packageDirectory, progressMonitor);
                     nuget.InstallPackages();
+                    dllPaths.UnionWith(GetAllPackageDirectories());
                 }
                 catch (FileNotFoundException)
                 {
diff --git a/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget/Assemblies.expected b/csharp/ql/integration-tests/posix-only/standalone_dependencies_nuget/Assemblies.expected
@@ -239,3 +239,4 @@
 | 4.8-api/WindowsBase.dll |
 | 4.8-api/cscompmgd.dll |
 | 4.8-api/mscorlib.dll |
+| /Newtonsoft.Json.6.0.4/lib/portable-net45+wp80+win8+wpa81/Newtonsoft.Json.dll |

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ public DependencyManager(string srcDir, IDependencyOptions options, ILogger logg`
`91`	`91`	`{`
`92`	`92`	`var nuget = new NugetPackages(sourceDir.FullName, packageDirectory, progressMonitor);`
`93`	`93`	`nuget.InstallPackages();`
	`94`	`+ dllPaths.UnionWith(GetAllPackageDirectories());`
`94`	`95`	`}`
`95`	`96`	`catch (FileNotFoundException)`
`96`	`97`	`{`