Address additional restore changes feedback

src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/DotnetCliHelper.cs

@@ -35,7 +35,7 @@ public DotnetCliHelper(ILoggerFactory loggerFactory)
     /// </summary>
     private async Task<string> GetDotnetSdkFolderFromDotnetExecutableAsync(string projectOutputDirectory, CancellationToken cancellationToken)
     {
-        using var process = Run("--info", workingDirectory: projectOutputDirectory, shouldLocalizeOutput: false);
+        using var process = Run(["--info"], workingDirectory: projectOutputDirectory, shouldLocalizeOutput: false);
 
         string? dotnetSdkFolderPath = null;
         process.OutputDataReceived += (_, e) =>
@@ -68,18 +68,20 @@ private async Task<string> GetDotnetSdkFolderFromDotnetExecutableAsync(string pr
         return dotnetSdkFolderPath;
     }
 
-    public Process Run(string arguments, string? workingDirectory, bool shouldLocalizeOutput)
+    public Process Run(string[] arguments, string? workingDirectory, bool shouldLocalizeOutput)
     {
         _logger.LogDebug($"Running dotnet CLI command at {_dotnetExecutablePath.Value} in directory {workingDirectory} with arguments {arguments}");
 
-        var startInfo = new ProcessStartInfo(_dotnetExecutablePath.Value, arguments)
+        var startInfo = new ProcessStartInfo(_dotnetExecutablePath.Value)
         {
             CreateNoWindow = true,
             UseShellExecute = false,
             RedirectStandardOutput = true,
-            RedirectStandardError = true
+            RedirectStandardError = true,
         };
 
+        startInfo.ArgumentList.AddRange(arguments);
+
         if (workingDirectory != null)
         {
             startInfo.WorkingDirectory = workingDirectory;

src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/LanguageServer/Handler/Restore/RestorableProjectsHandler.cs

@@ -31,23 +31,20 @@ public Task<string[]> HandleRequestAsync(RequestContext context, CancellationTok
     {
         Contract.ThrowIfNull(context.Solution);
 
-        using var _ = ArrayBuilder<string>.GetInstance(out var projectsBuilder);
+        // We use a sorted set here for the following reasons
+        //   1.  Ensures the client gets a consistent ordering in the picker (especially useful for integration tests).
+        //   2.  Removes projects with duplicate file paths (for example multi-targeted projects).  They all get restored
+        //       together by file path.
+        var projects = new SortedSet<string>();
         foreach (var project in context.Solution.Projects)
         {
             // To restore via the dotnet CLI, we must have a file path and it must be a .NET core project.
             if (project.FilePath != null && projectTargetFrameworkManager.IsDotnetCoreProject(project.Id))
             {
-                projectsBuilder.Add(project.FilePath);
+                projects.Add(project.FilePath);
             }
         }
 
-        // We may have multiple projects with the same file path in multi-targeting scenarios.
-        // They'll all get restored together so we only want one result per project file.
-        projectsBuilder.RemoveDuplicates();
-
-        // Ensure the client gets a consistent ordering.
-        projectsBuilder.Sort(StringComparer.OrdinalIgnoreCase);
-
-        return Task.FromResult(projectsBuilder.ToArray());
+        return Task.FromResult(projects.ToArray());
     }
 }

src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/LanguageServer/Handler/Restore/RestoreHandler.cs

@@ -49,13 +49,18 @@ private async Task RestoreAsync(ImmutableArray<string> pathsToRestore, BufferedP
     {
         foreach (var path in pathsToRestore)
         {
-            var arguments = $"restore \"{path}\"";
+            var arguments = new string[] { "restore", path };
             var workingDirectory = Path.GetDirectoryName(path);
             var stageName = string.Format(LanguageServerResources.Restoring_0, Path.GetFileName(path));
             ReportProgress(progress, stageName, string.Format(LanguageServerResources.Running_dotnet_restore_on_0, path));
 
             var process = dotnetCliHelper.Run(arguments, workingDirectory, shouldLocalizeOutput: true);
 
+            cancellationToken.Register(() =>
+            {
+                process?.Kill();
+            });
+
             process.OutputDataReceived += (sender, args) => ReportProgress(progress, stageName, args.Data);
             process.ErrorDataReceived += (sender, args) => ReportProgress(progress, stageName, args.Data);
             process.BeginOutputReadLine();
@@ -65,7 +70,7 @@ private async Task RestoreAsync(ImmutableArray<string> pathsToRestore, BufferedP
 
             if (process.ExitCode != 0)
             {
-                throw new InvalidOperationException(LanguageServerResources.Failed_to_run_restore_see_output_for_details);
+                ReportProgress(progress, stageName, string.Format(LanguageServerResources.Failed_to_run_restore_on_0, path));
             }
         }
 

src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/LanguageServerResources.resx

@@ -157,8 +157,8 @@
   <data name="Failed_to_read_runsettings_file_at_0:1" xml:space="preserve">
     <value>Failed to read .runsettings file at {0}:{1}</value>
   </data>
-  <data name="Failed_to_run_restore_see_output_for_details" xml:space="preserve">
-    <value>Failed to run restore, see output for details</value>
+  <data name="Failed_to_run_restore_on_0" xml:space="preserve">
+    <value>Failed to run restore on {0}</value>
   </data>
   <data name="Found_0_tests_in_1" xml:space="preserve">
     <value>Found {0} tests in {1}</value>

src/Features/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Testing/RunTestsHandler.cs

@@ -128,8 +128,7 @@ private async Task BuildAsync(Document document, BufferedProgress<RunTestsPartia
 
         // TODO - we likely need to pass the no-restore flag once we have automatic restore enabled.
         // https://github.com/dotnet/vscode-csharp/issues/5725
-        var arguments = $"build {projectFileName}";
-        using var process = dotnetCliHelper.Run(arguments, workingDirectory, shouldLocalizeOutput: true);
+        using var process = dotnetCliHelper.Run(["build", projectFileName], workingDirectory, shouldLocalizeOutput: true);
 
         process.OutputDataReceived += (sender, args) => ReportProgress(progress, args.Data);