C#: Use ASP.NET dlls when needed and available.

Author: michaelnebel

csharp/extractor/Semmle.Extraction.CSharp.Standalone/BuildAnalysis.cs

@@ -63,12 +63,19 @@ public BuildAnalysis(Options options, ProgressMonitor progressMonitor)
 
             var dllDirNames = options.DllDirs.Select(Path.GetFullPath).ToList();
 
-            // Find DLLs in the .Net Framework
+            // Find DLLs in the .Net / Asp.Net Framework
             if (options.ScanNetFrameworkDlls)
             {
-                var runtimeLocation = new Runtime(dotnet).GetRuntime(options.UseSelfContainedDotnet);
-                progressMonitor.Log(Util.Logging.Severity.Info, $"Runtime location selected: {runtimeLocation}");
+                var runtime = new Runtime(dotnet);
+                var runtimeLocation = runtime.GetRuntime(options.UseSelfContainedDotnet);
+                progressMonitor.LogInfo($".NET runtime location selected: {runtimeLocation}");
                 dllDirNames.Add(runtimeLocation);
+
+                if (UseAspNetDlls() && runtime.GetAspRuntime() is string aspRuntime)
+                {
+                    progressMonitor.LogInfo($"ASP.NET runtime location selected: {aspRuntime}");
+                    dllDirNames.Add(aspRuntime);
+                }
             }
 
             if (options.UseMscorlib)

csharp/extractor/Semmle.Extraction.CSharp.Standalone/Runtime.cs

@@ -159,12 +159,6 @@ public string GetRuntime(bool useSelfContained)
                 return netCoreVersion.FullPath;
             }
 
-            // Location of the newest ASP.NET Core Runtime.
-            if (newestRuntimes.TryGetValue(aspNetCoreApp, out var aspNetCoreVersion))
-            {
-                return aspNetCoreVersion.FullPath;
-            }
-
             if (DesktopRuntimes.Any())
             {
                 return DesktopRuntimes.First();
@@ -173,5 +167,17 @@ public string GetRuntime(bool useSelfContained)
             // A bad choice if it's the self-contained runtime distributed in codeql dist.
             return ExecutingRuntime;
         }
+
+        public string? GetAspRuntime()
+        {
+            var newestRuntimes = GetNewestRuntimes();
+
+            // Location of the newest ASP.NET Core Runtime.
+            if (newestRuntimes.TryGetValue(aspNetCoreApp, out var aspNetCoreVersion))
+            {
+                return aspNetCoreVersion.FullPath;
+            }
+            return null;
+        }
     }
 }