C#: Code quality improvements.

michaelnebel · michaelnebel · commit 9eb13833faea · 2024-04-10T12:45:18.000+02:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyCache.cs
@@ -19,12 +19,12 @@ internal class AssemblyCache
         /// assembly cache.
         /// </param>
         /// <param name="logger">Callback for progress.</param>
-        public AssemblyCache(IEnumerable<AssemblyPath> paths, IEnumerable<string> frameworkPaths, ILogger logger)
+        public AssemblyCache(IEnumerable<AssemblyLookupLocation> paths, IEnumerable<string> frameworkPaths, ILogger logger)
         {
             this.logger = logger;
             foreach (var path in paths)
             {
-                path.Process(dllsToIndex, logger);
+                dllsToIndex.AddRange(path.GetDlls(logger));
             }
             IndexReferences(frameworkPaths);
         }
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/AssemblyLookupLocation.cs
@@ -9,13 +9,13 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
     /// Used to represent a path to an assembly or a directory containing assemblies
     /// and a selector function to determine which files to include, when indexing the assemblies.
     /// </summary>
-    internal sealed class AssemblyPath(string p, Func<string, bool> includeFileName)
+    internal sealed class AssemblyLookupLocation(string p, Func<string, bool> includeFileName)
     {
         public string Path => p;
 
-        public AssemblyPath(string p) : this(p, _ => true) { }
+        public AssemblyLookupLocation(string p) : this(p, _ => true) { }
 
-        public static implicit operator AssemblyPath(string path) => new(path);
+        public static implicit operator AssemblyLookupLocation(string path) => new(path);
 
         /// <summary>
         /// Finds all assemblies nested within the directory `path`
@@ -33,19 +33,18 @@ private void AddReferenceDirectory(List<string> dllsToIndex, ILogger logger)
                 }
                 else
                 {
-                    logger.LogInfo($"AssemblyPath: Skipping {dll.FullName}.");
+                    logger.LogInfo($"AssemblyLookupLocation: Skipping {dll.FullName}.");
                 }
             }
         }
 
         /// <summary>
-        /// Finds all assemblies in `p` that should be indexed and adds them to
-        /// the list of assembly names to index.
+        /// Returns a list of paths to all assemblies in `p` that should be indexed.
         /// </summary>
-        /// <param name="dllsToIndex">List of assembly names to index.</param>
         /// <param name="logger">Logger</param>
-        public void Process(List<string> dllsToIndex, ILogger logger)
+        public List<string> GetDlls(ILogger logger)
         {
+            var dllsToIndex = new List<string>();
             if (File.Exists(p))
             {
                 if (includeFileName(System.IO.Path.GetFileName(p)))
@@ -54,24 +53,25 @@ public void Process(List<string> dllsToIndex, ILogger logger)
                 }
                 else
                 {
-                    logger.LogInfo($"AssemblyPath: Skipping {p}.");
+                    logger.LogInfo($"AssemblyLookupLocation: Skipping {p}.");
                 }
-                return;
+                return dllsToIndex;
             }
 
             if (Directory.Exists(p))
             {
-                logger.LogInfo($"AssemblyPath: Finding reference DLLs in {p}...");
+                logger.LogInfo($"AssemblyLookupLocation: Finding reference DLLs in {p}...");
                 AddReferenceDirectory(dllsToIndex, logger);
             }
             else
             {
-                logger.LogInfo("AssemblyCache: Path not found: " + p);
+                logger.LogInfo("AssemblyLookupLocation: Path not found: " + p);
             }
+            return dllsToIndex;
         }
 
         public override bool Equals(object? obj) =>
-            obj is AssemblyPath ap && p.Equals(ap.Path);
+            obj is AssemblyLookupLocation ap && p.Equals(ap.Path);
 
         public override int GetHashCode() => p.GetHashCode();
 
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.Nuget.cs
@@ -12,7 +12,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
 {
     public sealed partial class DependencyManager
     {
-        private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<string> allProjects, IEnumerable<string> allSolutions, HashSet<AssemblyPath> dllPaths)
+        private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<string> allProjects, IEnumerable<string> allSolutions, HashSet<AssemblyLookupLocation> dllPaths)
         {
             try
             {
@@ -55,7 +55,7 @@ private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<
                 }
 
                 nugetPackageDllPaths.ExceptWith(excludedPaths);
-                dllPaths.UnionWith(nugetPackageDllPaths.Select(p => new AssemblyPath(p)));
+                dllPaths.UnionWith(nugetPackageDllPaths.Select(p => new AssemblyLookupLocation(p)));
             }
             catch (Exception exc)
             {
@@ -72,7 +72,7 @@ private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<
                 .Paths
                 .Select(d => Path.Combine(packageDirectory.DirInfo.FullName, d))
                 .ToList();
-            dllPaths.UnionWith(paths.Select(p => new AssemblyPath(p)));
+            dllPaths.UnionWith(paths.Select(p => new AssemblyLookupLocation(p)));
 
             LogAllUnusedPackages(dependencies);
             DownloadMissingPackages(allNonBinaryFiles, dllPaths);
@@ -148,7 +148,7 @@ private void RestoreProjects(IEnumerable<string> projects, out IEnumerable<strin
             CompilationInfos.Add(("Failed project restore with package source error", nugetSourceFailures.ToString()));
         }
 
-        private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<AssemblyPath> dllPaths, bool withNugetConfig = true)
+        private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<AssemblyLookupLocation> dllPaths, bool withNugetConfig = true)
         {
             var alreadyDownloadedPackages = GetRestoredPackageDirectoryNames(packageDirectory.DirInfo);
             var alreadyDownloadedLegacyPackages = GetRestoredLegacyPackageNames();
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs b/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs
@@ -91,7 +91,7 @@ public DependencyManager(string srcDir, ILogger logger)
             this.generatedSources = new();
             var allProjects = allNonBinaryFiles.SelectFileNamesByExtension(".csproj").ToList();
             var allSolutions = allNonBinaryFiles.SelectFileNamesByExtension(".sln").ToList();
-            var dllPaths = allFiles.SelectFileNamesByExtension(".dll").Select<string, AssemblyPath>(x => x).ToHashSet();
+            var dllPaths = allFiles.SelectFileNamesByExtension(".dll").Select(x => new AssemblyLookupLocation(x)).ToHashSet();
 
             logger.LogInfo($"Found {allFiles.Count} files, {nonGeneratedSources.Count} source files, {allProjects.Count} project files, {allSolutions.Count} solution files, {dllPaths.Count} DLLs.");
 
@@ -192,7 +192,7 @@ void exitCallback(int ret, string msg, bool silent)
             ]);
         }
 
-        private HashSet<string> AddFrameworkDlls(HashSet<AssemblyPath> dllPaths)
+        private HashSet<string> AddFrameworkDlls(HashSet<AssemblyLookupLocation> dllPaths)
         {
             var frameworkLocations = new HashSet<string>();
 
@@ -230,7 +230,7 @@ private HashSet<string> AddFrameworkDlls(HashSet<AssemblyPath> dllPaths)
                             continue;
                         }
 
-                        dllPaths.UnionWith(dlls.Select<string, AssemblyPath>(x => x));
+                        dllPaths.UnionWith(dlls.Select(x => new AssemblyLookupLocation(x)));
                         frameworkLocations.UnionWith(dlls);
                     }
                     catch (Exception e)
@@ -284,7 +284,7 @@ private void RemoveNugetAnalyzerReferences()
             }
         }
 
-        private void SelectNewestFrameworkPath(string frameworkPath, string frameworkType, ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)
+        private void SelectNewestFrameworkPath(string frameworkPath, string frameworkType, ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)
         {
             var versionFolders = GetPackageVersionSubDirectories(frameworkPath);
             if (versionFolders.Length > 1)
@@ -313,7 +313,7 @@ private static DirectoryInfo[] GetPackageVersionSubDirectories(string packagePat
                 .ToArray();
         }
 
-        private void RemoveFrameworkNugetPackages(ISet<AssemblyPath> dllPaths, int fromIndex = 0)
+        private void RemoveFrameworkNugetPackages(ISet<AssemblyLookupLocation> dllPaths, int fromIndex = 0)
         {
             var packagesInPrioOrder = FrameworkPackageNames.NetFrameworks;
             for (var i = fromIndex; i < packagesInPrioOrder.Length; i++)
@@ -322,7 +322,7 @@ private void RemoveFrameworkNugetPackages(ISet<AssemblyPath> dllPaths, int fromI
             }
         }
 
-        private void AddNetFrameworkDlls(ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)
+        private void AddNetFrameworkDlls(ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)
         {
             // Multiple dotnet framework packages could be present.
             // The order of the packages is important, we're adding the first one that is present in the nuget cache.
@@ -371,7 +371,7 @@ private void AddNetFrameworkDlls(ISet<AssemblyPath> dllPaths, ISet<string> frame
             if (runtimeLocation is null)
             {
                 runtimeLocation ??= Runtime.ExecutingRuntime;
-                dllPaths.Add(new AssemblyPath(runtimeLocation, name => !name.StartsWith("Semmle.")));
+                dllPaths.Add(new AssemblyLookupLocation(runtimeLocation, name => !name.StartsWith("Semmle.")));
             }
             else
             {
@@ -382,7 +382,7 @@ private void AddNetFrameworkDlls(ISet<AssemblyPath> dllPaths, ISet<string> frame
             frameworkLocations.Add(runtimeLocation);
         }
 
-        private void RemoveNugetPackageReference(string packagePrefix, ISet<AssemblyPath> dllPaths)
+        private void RemoveNugetPackageReference(string packagePrefix, ISet<AssemblyLookupLocation> dllPaths)
         {
             var packageFolder = packageDirectory.DirInfo.FullName.ToLowerInvariant();
             if (packageFolder == null)
@@ -404,7 +404,7 @@ private bool IsAspNetCoreDetected()
             return fileContent.IsNewProjectStructureUsed && fileContent.UseAspNetCoreDlls;
         }
 
-        private void AddAspNetCoreFrameworkDlls(ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)
+        private void AddAspNetCoreFrameworkDlls(ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)
         {
             if (!IsAspNetCoreDetected())
             {
@@ -426,7 +426,7 @@ private void AddAspNetCoreFrameworkDlls(ISet<AssemblyPath> dllPaths, ISet<string
             }
         }
 
-        private void AddMicrosoftWindowsDesktopDlls(ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)
+        private void AddMicrosoftWindowsDesktopDlls(ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)
         {
             if (GetPackageDirectory(FrameworkPackageNames.WindowsDesktopFramework, packageDirectory) is string windowsDesktopApp)
             {

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,12 @@ internal class AssemblyCache`
`19`	`19`	`/// assembly cache.`
`20`	`20`	`/// </param>`
`21`	`21`	`/// <param name="logger">Callback for progress.</param>`
`22`		`- public AssemblyCache(IEnumerable<AssemblyPath> paths, IEnumerable<string> frameworkPaths, ILogger logger)`
	`22`	`+ public AssemblyCache(IEnumerable<AssemblyLookupLocation> paths, IEnumerable<string> frameworkPaths, ILogger logger)`
`23`	`23`	`{`
`24`	`24`	`this.logger = logger;`
`25`	`25`	`foreach (var path in paths)`
`26`	`26`	`{`
`27`		`- path.Process(dllsToIndex, logger);`
	`27`	`+ dllsToIndex.AddRange(path.GetDlls(logger));`
`28`	`28`	`}`
`29`	`29`	`IndexReferences(frameworkPaths);`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,13 @@ namespace Semmle.Extraction.CSharp.DependencyFetching`
`9`	`9`	`/// Used to represent a path to an assembly or a directory containing assemblies`
`10`	`10`	`/// and a selector function to determine which files to include, when indexing the assemblies.`
`11`	`11`	`/// </summary>`
`12`		`- internal sealed class AssemblyPath(string p, Func<string, bool> includeFileName)`
	`12`	`+ internal sealed class AssemblyLookupLocation(string p, Func<string, bool> includeFileName)`
`13`	`13`	`{`
`14`	`14`	`public string Path => p;`
`15`	`15`
`16`		`- public AssemblyPath(string p) : this(p, _ => true) { }`
	`16`	`+ public AssemblyLookupLocation(string p) : this(p, _ => true) { }`
`17`	`17`
`18`		`- public static implicit operator AssemblyPath(string path) => new(path);`
	`18`	`+ public static implicit operator AssemblyLookupLocation(string path) => new(path);`
`19`	`19`
`20`	`20`	`/// <summary>`
`21`	`21`	/// Finds all assemblies nested within the directory `path`
`@@ -33,19 +33,18 @@ private void AddReferenceDirectory(List<string> dllsToIndex, ILogger logger)`
`33`	`33`	`}`
`34`	`34`	`else`
`35`	`35`	`{`
`36`		`- logger.LogInfo($"AssemblyPath: Skipping {dll.FullName}.");`
	`36`	`+ logger.LogInfo($"AssemblyLookupLocation: Skipping {dll.FullName}.");`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/// <summary>`
`42`		- /// Finds all assemblies in `p` that should be indexed and adds them to
`43`		`- /// the list of assembly names to index.`
	`42`	+ /// Returns a list of paths to all assemblies in `p` that should be indexed.
`44`	`43`	`/// </summary>`
`45`		`- /// <param name="dllsToIndex">List of assembly names to index.</param>`
`46`	`44`	`/// <param name="logger">Logger</param>`
`47`		`- public void Process(List<string> dllsToIndex, ILogger logger)`
	`45`	`+ public List<string> GetDlls(ILogger logger)`
`48`	`46`	`{`
	`47`	`+ var dllsToIndex = new List<string>();`
`49`	`48`	`if (File.Exists(p))`
`50`	`49`	`{`
`51`	`50`	`if (includeFileName(System.IO.Path.GetFileName(p)))`
`@@ -54,24 +53,25 @@ public void Process(List<string> dllsToIndex, ILogger logger)`
`54`	`53`	`}`
`55`	`54`	`else`
`56`	`55`	`{`
`57`		`- logger.LogInfo($"AssemblyPath: Skipping {p}.");`
	`56`	`+ logger.LogInfo($"AssemblyLookupLocation: Skipping {p}.");`
`58`	`57`	`}`
`59`		`- return;`
	`58`	`+ return dllsToIndex;`
`60`	`59`	`}`
`61`	`60`
`62`	`61`	`if (Directory.Exists(p))`
`63`	`62`	`{`
`64`		`- logger.LogInfo($"AssemblyPath: Finding reference DLLs in {p}...");`
	`63`	`+ logger.LogInfo($"AssemblyLookupLocation: Finding reference DLLs in {p}...");`
`65`	`64`	`AddReferenceDirectory(dllsToIndex, logger);`
`66`	`65`	`}`
`67`	`66`	`else`
`68`	`67`	`{`
`69`		`- logger.LogInfo("AssemblyCache: Path not found: " + p);`
	`68`	`+ logger.LogInfo("AssemblyLookupLocation: Path not found: " + p);`
`70`	`69`	`}`
	`70`	`+ return dllsToIndex;`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public override bool Equals(object? obj) =>`
`74`		`- obj is AssemblyPath ap && p.Equals(ap.Path);`
	`74`	`+ obj is AssemblyLookupLocation ap && p.Equals(ap.Path);`
`75`	`75`
`76`	`76`	`public override int GetHashCode() => p.GetHashCode();`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching`
`12`	`12`	`{`
`13`	`13`	`public sealed partial class DependencyManager`
`14`	`14`	`{`
`15`		`- private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<string> allProjects, IEnumerable<string> allSolutions, HashSet<AssemblyPath> dllPaths)`
	`15`	`+ private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<string> allProjects, IEnumerable<string> allSolutions, HashSet<AssemblyLookupLocation> dllPaths)`
`16`	`16`	`{`
`17`	`17`	`try`
`18`	`18`	`{`
`@@ -55,7 +55,7 @@ private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`nugetPackageDllPaths.ExceptWith(excludedPaths);`
`58`		`- dllPaths.UnionWith(nugetPackageDllPaths.Select(p => new AssemblyPath(p)));`
	`58`	`+ dllPaths.UnionWith(nugetPackageDllPaths.Select(p => new AssemblyLookupLocation(p)));`
`59`	`59`	`}`
`60`	`60`	`catch (Exception exc)`
`61`	`61`	`{`
`@@ -72,7 +72,7 @@ private void RestoreNugetPackages(List<FileInfo> allNonBinaryFiles, IEnumerable<`
`72`	`72`	`.Paths`
`73`	`73`	`.Select(d => Path.Combine(packageDirectory.DirInfo.FullName, d))`
`74`	`74`	`.ToList();`
`75`		`- dllPaths.UnionWith(paths.Select(p => new AssemblyPath(p)));`
	`75`	`+ dllPaths.UnionWith(paths.Select(p => new AssemblyLookupLocation(p)));`
`76`	`76`
`77`	`77`	`LogAllUnusedPackages(dependencies);`
`78`	`78`	`DownloadMissingPackages(allNonBinaryFiles, dllPaths);`
`@@ -148,7 +148,7 @@ private void RestoreProjects(IEnumerable<string> projects, out IEnumerable<strin`
`148`	`148`	`CompilationInfos.Add(("Failed project restore with package source error", nugetSourceFailures.ToString()));`
`149`	`149`	`}`
`150`	`150`
`151`		`- private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<AssemblyPath> dllPaths, bool withNugetConfig = true)`
	`151`	`+ private void DownloadMissingPackages(List<FileInfo> allFiles, ISet<AssemblyLookupLocation> dllPaths, bool withNugetConfig = true)`
`152`	`152`	`{`
`153`	`153`	`var alreadyDownloadedPackages = GetRestoredPackageDirectoryNames(packageDirectory.DirInfo);`
`154`	`154`	`var alreadyDownloadedLegacyPackages = GetRestoredLegacyPackageNames();`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public DependencyManager(string srcDir, ILogger logger)`
`91`	`91`	`this.generatedSources = new();`
`92`	`92`	`var allProjects = allNonBinaryFiles.SelectFileNamesByExtension(".csproj").ToList();`
`93`	`93`	`var allSolutions = allNonBinaryFiles.SelectFileNamesByExtension(".sln").ToList();`
`94`		`- var dllPaths = allFiles.SelectFileNamesByExtension(".dll").Select<string, AssemblyPath>(x => x).ToHashSet();`
	`94`	`+ var dllPaths = allFiles.SelectFileNamesByExtension(".dll").Select(x => new AssemblyLookupLocation(x)).ToHashSet();`
`95`	`95`
`96`	`96`	`logger.LogInfo($"Found {allFiles.Count} files, {nonGeneratedSources.Count} source files, {allProjects.Count} project files, {allSolutions.Count} solution files, {dllPaths.Count} DLLs.");`
`97`	`97`
`@@ -192,7 +192,7 @@ void exitCallback(int ret, string msg, bool silent)`
`192`	`192`	`]);`
`193`	`193`	`}`
`194`	`194`
`195`		`- private HashSet<string> AddFrameworkDlls(HashSet<AssemblyPath> dllPaths)`
	`195`	`+ private HashSet<string> AddFrameworkDlls(HashSet<AssemblyLookupLocation> dllPaths)`
`196`	`196`	`{`
`197`	`197`	`var frameworkLocations = new HashSet<string>();`
`198`	`198`
`@@ -230,7 +230,7 @@ private HashSet<string> AddFrameworkDlls(HashSet<AssemblyPath> dllPaths)`
`230`	`230`	`continue;`
`231`	`231`	`}`
`232`	`232`
`233`		`- dllPaths.UnionWith(dlls.Select<string, AssemblyPath>(x => x));`
	`233`	`+ dllPaths.UnionWith(dlls.Select(x => new AssemblyLookupLocation(x)));`
`234`	`234`	`frameworkLocations.UnionWith(dlls);`
`235`	`235`	`}`
`236`	`236`	`catch (Exception e)`
`@@ -284,7 +284,7 @@ private void RemoveNugetAnalyzerReferences()`
`284`	`284`	`}`
`285`	`285`	`}`
`286`	`286`
`287`		`- private void SelectNewestFrameworkPath(string frameworkPath, string frameworkType, ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)`
	`287`	`+ private void SelectNewestFrameworkPath(string frameworkPath, string frameworkType, ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)`
`288`	`288`	`{`
`289`	`289`	`var versionFolders = GetPackageVersionSubDirectories(frameworkPath);`
`290`	`290`	`if (versionFolders.Length > 1)`
`@@ -313,7 +313,7 @@ private static DirectoryInfo[] GetPackageVersionSubDirectories(string packagePat`
`313`	`313`	`.ToArray();`
`314`	`314`	`}`
`315`	`315`
`316`		`- private void RemoveFrameworkNugetPackages(ISet<AssemblyPath> dllPaths, int fromIndex = 0)`
	`316`	`+ private void RemoveFrameworkNugetPackages(ISet<AssemblyLookupLocation> dllPaths, int fromIndex = 0)`
`317`	`317`	`{`
`318`	`318`	`var packagesInPrioOrder = FrameworkPackageNames.NetFrameworks;`
`319`	`319`	`for (var i = fromIndex; i < packagesInPrioOrder.Length; i++)`
`@@ -322,7 +322,7 @@ private void RemoveFrameworkNugetPackages(ISet<AssemblyPath> dllPaths, int fromI`
`322`	`322`	`}`
`323`	`323`	`}`
`324`	`324`
`325`		`- private void AddNetFrameworkDlls(ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)`
	`325`	`+ private void AddNetFrameworkDlls(ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)`
`326`	`326`	`{`
`327`	`327`	`// Multiple dotnet framework packages could be present.`
`328`	`328`	`// The order of the packages is important, we're adding the first one that is present in the nuget cache.`
`@@ -371,7 +371,7 @@ private void AddNetFrameworkDlls(ISet<AssemblyPath> dllPaths, ISet<string> frame`
`371`	`371`	`if (runtimeLocation is null)`
`372`	`372`	`{`
`373`	`373`	`runtimeLocation ??= Runtime.ExecutingRuntime;`
`374`		`- dllPaths.Add(new AssemblyPath(runtimeLocation, name => !name.StartsWith("Semmle.")));`
	`374`	`+ dllPaths.Add(new AssemblyLookupLocation(runtimeLocation, name => !name.StartsWith("Semmle.")));`
`375`	`375`	`}`
`376`	`376`	`else`
`377`	`377`	`{`
`@@ -382,7 +382,7 @@ private void AddNetFrameworkDlls(ISet<AssemblyPath> dllPaths, ISet<string> frame`
`382`	`382`	`frameworkLocations.Add(runtimeLocation);`
`383`	`383`	`}`
`384`	`384`
`385`		`- private void RemoveNugetPackageReference(string packagePrefix, ISet<AssemblyPath> dllPaths)`
	`385`	`+ private void RemoveNugetPackageReference(string packagePrefix, ISet<AssemblyLookupLocation> dllPaths)`
`386`	`386`	`{`
`387`	`387`	`var packageFolder = packageDirectory.DirInfo.FullName.ToLowerInvariant();`
`388`	`388`	`if (packageFolder == null)`
`@@ -404,7 +404,7 @@ private bool IsAspNetCoreDetected()`
`404`	`404`	`return fileContent.IsNewProjectStructureUsed && fileContent.UseAspNetCoreDlls;`
`405`	`405`	`}`
`406`	`406`
`407`		`- private void AddAspNetCoreFrameworkDlls(ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)`
	`407`	`+ private void AddAspNetCoreFrameworkDlls(ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)`
`408`	`408`	`{`
`409`	`409`	`if (!IsAspNetCoreDetected())`
`410`	`410`	`{`
`@@ -426,7 +426,7 @@ private void AddAspNetCoreFrameworkDlls(ISet<AssemblyPath> dllPaths, ISet<string`
`426`	`426`	`}`
`427`	`427`	`}`
`428`	`428`
`429`		`- private void AddMicrosoftWindowsDesktopDlls(ISet<AssemblyPath> dllPaths, ISet<string> frameworkLocations)`
	`429`	`+ private void AddMicrosoftWindowsDesktopDlls(ISet<AssemblyLookupLocation> dllPaths, ISet<string> frameworkLocations)`
`430`	`430`	`{`
`431`	`431`	`if (GetPackageDirectory(FrameworkPackageNames.WindowsDesktopFramework, packageDirectory) is string windowsDesktopApp)`
`432`	`432`	`{`