Merge pull request #1176 from DustinCampbell/fix-dotnet-restore-command

.NET: Restore Packages command should work with .NET Core .csproj projects

Author: DustinCampbell

package.json

@@ -421,7 +421,7 @@
       {
         "command": "dotnet.restore",
         "title": "Restore Packages",
-        "category": "dotnet"
+        "category": ".NET"
       },
       {
         "command": "csharp.downloadDebugger",

src/assets.ts

@@ -95,7 +95,7 @@ export class AssetGenerator {
                 this.hasProject = true;
                 this.projectPath = path.dirname(targetMSBuildProject.Path);
                 this.projectFilePath = targetMSBuildProject.Path;
-                this.targetFramework = findNetCoreAppTargetFramework(targetMSBuildProject).ShortName;
+                this.targetFramework = protocol.findNetCoreAppTargetFramework(targetMSBuildProject).ShortName;
                 this.executableName = targetMSBuildProject.AssemblyName + ".dll";
                 this.configurationName = configurationName;
                 return;
@@ -284,15 +284,11 @@ export class AssetGenerator {
     }
 }
 
-function findNetCoreAppTargetFramework(project: protocol.MSBuildProject): protocol.TargetFramework {
-    return project.TargetFrameworks.find(tf => tf.ShortName.startsWith('netcoreapp'));
-}
-
 function findExecutableMSBuildProjects(projects: protocol.MSBuildProject[]) {
     let result: protocol.MSBuildProject[] = [];
 
     projects.forEach(project => {
-        if (project.IsExe && findNetCoreAppTargetFramework(project) !== undefined) {
+        if (project.IsExe && protocol.findNetCoreAppTargetFramework(project) !== undefined) {
             result.push(project);
         }
     });

src/features/commands.ts

@@ -83,7 +83,7 @@ interface Command {
     execute(): Thenable<any>;
 }
 
-function projectsToCommands(projects: protocol.DotNetProject[]): Promise<Command>[] {
+function projectsToCommands(projects: protocol.ProjectDescriptor[]): Promise<Command>[] {
     return projects.map(project => {
         let projectDirectory = project.Path;
 
@@ -117,11 +117,13 @@ export function dotnetRestoreAllProjects(server: OmniSharpServer) {
 
     return serverUtils.requestWorkspaceInformation(server).then(info => {
 
-        if (!info.DotNet || info.DotNet.Projects.length < 1) {
+        let projectDescriptors = protocol.getDotNetCoreProjectDescriptors(info);
+
+        if (projectDescriptors.length === 0) {
             return Promise.reject("No .NET Core projects found");
         }
 
-        let commandPromises = projectsToCommands(info.DotNet.Projects);
+        let commandPromises = projectsToCommands(projectDescriptors);
 
         return Promise.all(commandPromises).then(commands => {
             return vscode.window.showQuickPick(commands);

src/omnisharp/protocol.ts

@@ -5,6 +5,8 @@
 
 'use strict';
 
+import * as path from 'path';
+
 export module Requests {
     export const AddToProject = '/addtoproject';
     export const AutoComplete = '/autocomplete';
@@ -509,4 +511,38 @@ export namespace V2 {
         Failure: string;
         Pass: boolean;
     }
+}
+
+export function findNetCoreAppTargetFramework(project: MSBuildProject): TargetFramework {
+    return project.TargetFrameworks.find(tf => tf.ShortName.startsWith('netcoreapp'));
+}
+
+export function findNetStandardTargetFramework(project: MSBuildProject): TargetFramework {
+    return project.TargetFrameworks.find(tf => tf.ShortName.startsWith('netstandard'));
+}
+
+export interface ProjectDescriptor {
+    Name: string;
+    Path: string;
+}
+
+export function getDotNetCoreProjectDescriptors(info: WorkspaceInformationResponse): ProjectDescriptor[] {
+    let result = [];
+
+    if (info.DotNet && info.DotNet.Projects.length > 0) {
+        for (let project of info.DotNet.Projects) {
+            result.push({ Name: project.Name, Path: project.Path });
+        }
+    }
+
+    if (info.MsBuild && info.MsBuild.Projects.length > 0) {
+        for (let project of info.MsBuild.Projects) {
+            if (findNetCoreAppTargetFramework(project) !== undefined ||
+                findNetStandardTargetFramework(project) !== undefined) {
+                result.push({ Name: path.basename(project.Path), Path: project.Path });
+            }
+        }
+    }
+
+    return result;
 }