Merge pull request #6270 from hvitved/csharp/standalone-nuget-restore

C#: Skip `dotnet restore` in standalone extraction when `nuget_restore: false` is set

Author: hvitved

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

@@ -108,7 +108,10 @@ public BuildAnalysis(Options options, IProgressMonitor progress)
                         new[] { options.SolutionFile } :
                         sourceDir.GetFiles("*.sln", SearchOption.AllDirectories).Select(d => d.FullName);
 
-                RestoreSolutions(solutions);
+                if (options.UseNuGet)
+                {
+                    RestoreSolutions(solutions);
+                }
                 dllDirNames.Add(packageDirectory.DirInfo.FullName);
                 assemblyCache = new BuildAnalyser.AssemblyCache(dllDirNames, progress);
                 AnalyseSolutions(solutions);
@@ -324,7 +327,16 @@ private void AnalyseProject(FileInfo project)
 
         private void Restore(string projectOrSolution)
         {
-            var exit = DotNet.RestoreToDirectory(projectOrSolution, packageDirectory.DirInfo.FullName);
+            int exit;
+            try
+            {
+                exit = DotNet.RestoreToDirectory(projectOrSolution, packageDirectory.DirInfo.FullName);
+            }
+            catch (FileNotFoundException)
+            {
+                exit = 2;
+            }
+
             switch (exit)
             {
                 case 0: