C#: Use latest asp.net core/windows desktop framework DLLs from nuget folder

Author: tamasvajk

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

@@ -230,6 +230,31 @@ private void RemoveNugetAnalyzerReferences()
             }
         }
 
+        private void SelectNewestFrameworkPath(string frameworkPath, string frameworkType, ISet<string> dllPaths, ISet<string> frameworkLocations)
+        {
+            var versionFolders = new DirectoryInfo(frameworkPath)
+                .EnumerateDirectories("*", new EnumerationOptions { MatchCasing = MatchCasing.CaseInsensitive, RecurseSubdirectories = false })
+                .OrderByDescending(d => d.Name) // TODO: Improve sorting to handle pre-release versions.
+                .ToArray();
+
+            if (versionFolders.Length > 1)
+            {
+                var versions = string.Join(", ", versionFolders.Select(d => d.Name));
+                progressMonitor.LogInfo($"Found multiple {frameworkType} DLLs in NuGet packages at {frameworkPath}. Using the latest version ({versionFolders[0].Name}) from: {versions}.");
+            }
+
+            var selectedFrameworkFolder = versionFolders.FirstOrDefault()?.FullName;
+            if (selectedFrameworkFolder is null)
+            {
+                progressMonitor.LogInfo($"Found {frameworkType} DLLs in NuGet packages at {frameworkPath}, but no version folder was found.");
+                selectedFrameworkFolder = frameworkPath;
+            }
+
+            dllPaths.Add(selectedFrameworkFolder);
+            frameworkLocations.Add(selectedFrameworkFolder);
+            progressMonitor.LogInfo($"Found {frameworkType} DLLs in NuGet packages at {selectedFrameworkFolder}. Not adding installation directory.");
+        }
+
         private void AddNetFrameworkDlls(ISet<string> dllPaths, ISet<string> frameworkLocations)
         {
             // Multiple dotnet framework packages could be present.
@@ -242,27 +267,7 @@ private void AddNetFrameworkDlls(ISet<string> dllPaths, ISet<string> frameworkLo
 
             if (frameworkPath.Path is not null)
             {
-                var versionFolders = new DirectoryInfo(frameworkPath.Path)
-                    .EnumerateDirectories("*", new EnumerationOptions { MatchCasing = MatchCasing.CaseInsensitive, RecurseSubdirectories = false })
-                    .OrderByDescending(d => d.Name) // TODO: Improve sorting to handle pre-release versions.
-                    .ToArray();
-
-                if (versionFolders.Length > 1)
-                {
-                    var versions = string.Join(", ", versionFolders.Select(d => d.Name));
-                    progressMonitor.LogInfo($"Found multiple .NET Framework DLLs in NuGet packages at {frameworkPath.Path}. Using the latest version ({versionFolders[0].Name}) from: {versions}.");
-                }
-
-                var selectedFrameworkFolder = versionFolders.FirstOrDefault()?.FullName;
-                if (selectedFrameworkFolder is null)
-                {
-                    progressMonitor.LogInfo($"Found .NET Framework DLLs in NuGet packages at {frameworkPath.Path}, but no version folder was found.");
-                    selectedFrameworkFolder = frameworkPath.Path;
-                }
-
-                dllPaths.Add(selectedFrameworkFolder);
-                frameworkLocations.Add(selectedFrameworkFolder);
-                progressMonitor.LogInfo($"Found .NET Core/Framework DLLs in NuGet packages at {selectedFrameworkFolder}. Not adding installation directory.");
+                SelectNewestFrameworkPath(frameworkPath.Path, ".NET Framework", dllPaths, frameworkLocations);
 
                 for (var i = frameworkPath.Index + 1; i < packagesInPrioOrder.Length; i++)
                 {
@@ -326,9 +331,7 @@ private void AddAspNetCoreFrameworkDlls(ISet<string> dllPaths, ISet<string> fram
             // First try to find ASP.NET Core assemblies in the NuGet packages
             if (GetPackageDirectory(FrameworkPackageNames.AspNetCoreFramework) is string aspNetCorePackage)
             {
-                progressMonitor.LogInfo($"Found ASP.NET Core in NuGet packages. Not adding installation directory.");
-                dllPaths.Add(aspNetCorePackage);
-                frameworkLocations.Add(aspNetCorePackage);
+                SelectNewestFrameworkPath(aspNetCorePackage, "ASP.NET Core", dllPaths, frameworkLocations);
                 return;
             }
 
@@ -344,9 +347,7 @@ private void AddMicrosoftWindowsDesktopDlls(ISet<string> dllPaths, ISet<string>
         {
             if (GetPackageDirectory(FrameworkPackageNames.WindowsDesktopFramework) is string windowsDesktopApp)
             {
-                progressMonitor.LogInfo($"Found Windows Desktop App in NuGet packages.");
-                dllPaths.Add(windowsDesktopApp);
-                frameworkLocations.Add(windowsDesktopApp);
+                SelectNewestFrameworkPath(windowsDesktopApp, "Windows Desktop App", dllPaths, frameworkLocations);
             }
         }