Merge remote-tracking branch 'upstream/master'

Author: rajkumar42

CHANGELOG.md

@@ -1,3 +1,47 @@
+## 1.7.0 _(Not Yet Released)_
+
+#### Syntax Hightlighting
+
+* Introduced a brand new TextMate grammar written from scratch that provides much more robust C# syntax highlighting. ([#101](https://github.com/OmniSharp/omnisharp-vscode/issues/101), [#225](https://github.com/OmniSharp/omnisharp-vscode/issues/225), [#268](https://github.com/OmniSharp/omnisharp-vscode/issues/268), [#316](https://github.com/OmniSharp/omnisharp-vscode/issues/316), [#674](https://github.com/OmniSharp/omnisharp-vscode/issues/674), [#706](https://github.com/OmniSharp/omnisharp-vscode/issues/706), [#731](https://github.com/OmniSharp/omnisharp-vscode/issues/731), [#746](https://github.com/OmniSharp/omnisharp-vscode/issues/746), [#782](https://github.com/OmniSharp/omnisharp-vscode/issues/782), [#802](https://github.com/OmniSharp/omnisharp-vscode/issues/802), [#816](https://github.com/OmniSharp/omnisharp-vscode/issues/816), [#829](https://github.com/OmniSharp/omnisharp-vscode/issues/829), [#830](https://github.com/OmniSharp/omnisharp-vscode/issues/830), [#861](https://github.com/OmniSharp/omnisharp-vscode/issues/861), [#1078](https://github.com/OmniSharp/omnisharp-vscode/issues/1078), [#1084](https://github.com/OmniSharp/omnisharp-vscode/issues/1084), [#1086](https://github.com/OmniSharp/omnisharp-vscode/issues/1086), [#1091](https://github.com/OmniSharp/omnisharp-vscode/issues/1091), [#1096](https://github.com/OmniSharp/omnisharp-vscode/issues/1096), [#1097](https://github.com/OmniSharp/omnisharp-vscode/issues/1097), [#1106](https://github.com/OmniSharp/omnisharp-vscode/issues/1106), [#1115](https://github.com/OmniSharp/omnisharp-vscode/issues/1108))
+* The C# TextMate grammar has a new home! Issues and contributions are welcome at [https://github.com/dotnet/csharp-tmLanguage](https://github.com/dotnet/csharp-tmLanguage).
+
+### Project Support
+
+* Updated with the latest changes for .NET Core .csproj projects. ([omnisharp-roslyn#738](https://github.com/OmniSharp/omnisharp-roslyn/pull/738))
+* Properly handle .csproj projects in .sln files that were added via .NET CLI commands. ([omnisharp-roslyn#741](https://github.com/OmniSharp/omnisharp-roslyn/pull/741))
+* Respect `nowarn` in project.json projects ([omnisharp#734](https://github.com/OmniSharp/omnisharp-roslyn/pull/734)) _(Contributed by [@filipw](https://github.com/filipw))_
+* Correctly update project when dotnet restore is performed on a .NET Core .csproj project. ([#1114](https://github.com/OmniSharp/omnisharp-vscode/issues/1114))
+
+### Debugging
+
+* Enable debugger support for Zorin OS 12 ([#1160](https://github.com/OmniSharp/omnisharp-vscode/issues/1160)) _(Contributed by [@mkaziz](https://github.com/mkaziz))_
+
+### C# Scripting
+
+* Support resolving `#r` references from the GAC ([omnisharp-roslyn#721](https://github.com/OmniSharp/omnisharp-roslyn/pull/721)) _(Contributed by [@filipw](https://github.com/filipw))_
+* Include System.ValueTuple in C# scripts implicitly ([omnisharp-roslyn#722](https://github.com/OmniSharp/omnisharp-roslyn/pull/722)) _(Contributed by [@filipw](https://github.com/filipw))_
+
+### Completion List
+
+* A namespace icon should be displayed for namespaces in the completion list. ([#1125](https://github.com/OmniSharp/omnisharp-vscode/issues/1124)) _(Contributed by [@filipw](https://github.com/filipw))_
+* Add icons for several symbol kinds in the completion list, fixing many symbols that incorrectly displayed a property "wrench" icon. ([#1145](https://github.com/OmniSharp/omnisharp-vscode/issues/1145))
+
+### Other Updates and Fixes
+
+* Add schema validation for omnisharp.json files. ([#1082](https://github.com/OmniSharp/omnisharp-vscode/pull/1082)) _(Contributed by [@Thaina](https://github.com/Thaina))_
+* Fix running and debugging of tests defined in nested classes. ([#743](https://github.com/OmniSharp/omnisharp-vscode/issues/743), [#1151](https://github.com/OmniSharp/omnisharp-vscode/issues/1151))
+* Fix error when 'tasks.json' does not contain a 'tasks' node, or contains os-specific 'tasks' nodes. ([#1140](https://github.com/OmniSharp/omnisharp-vscode/issues/1140))
+* Better detection of Windows architecture (x86 or x64) when determining extension dependencies to download. The detection logic now uses well-known environment variables rather than launching 'wmic'. ([#1110](https://github.com/OmniSharp/omnisharp-vscode/issues/1110), [#1125](https://github.com/OmniSharp/omnisharp-vscode/issues/1125))
+* Improvements to the OmniSharp Log ([#1155](https://github.com/OmniSharp/omnisharp-vscode/pull/1155))
+* Add new values to the `omnisharp.logginglevel` option to allow more granualar control of OmniSharp logging. ([#993](https://github.com/OmniSharp/omnisharp-vscode/issues/993)) _(Contributed by [@filipw](https://github.com/filipw))_
+* Fix `dotnet restore` Visual Studio Code command to handle .csproj .NET Core projects. ([#1175](https://github.com/OmniSharp/omnisharp-vscode/issues/1175))
+
+### Known Issues
+
+* Running and debugging of tests are not supported in .csproj-based .NET Core projects. However, there will still be clickable "run test" and "debug test" indicators above test methods. ([#1100](https://github.com/OmniSharp/omnisharp-vscode/issues/1100))
+* Auto-restore for NuGet packages is not yet implemented. If you change a project file and need to restore packages, you should do so by running `dotnet restore` with the .NET CLI. Once packages are restored, you can force the C# extension to "see" the new references by restarting OmniSharp with the `OmniSharp: Restart OmniSharp` command. ([#770](https://github.com/OmniSharp/omnisharp-vscode/issues/770))
+* When opening a .csproj-based .NET Core project in VS Code, the C# extension will not activate until a C# file is opened in the editor. ([#1150](https://github.com/OmniSharp/omnisharp-vscode/issues/1150))
+
 ## 1.6.2 (December 24, 2016)
 
 * Fix performance issue when editing type names containing multiple generic type parameters. ([#1088](https://github.com/OmniSharp/omnisharp-vscode/issues/1088), [#1086](https://github.com/OmniSharp/omnisharp-vscode/issues/1086))

README.md

@@ -34,7 +34,7 @@ See our [change log](https://github.com/OmniSharp/omnisharp-vscode/blob/master/C
   * Windows (64-bit only)
   * macOS
   * Ubuntu 14.04 / Linux Mint 17 / Linux Mint 18 / Elementary OS 0.3
-  * Ubuntu 16.04 / Elementary OS 0.4 / Arch
+  * Ubuntu 16.04 / Elementary OS 0.4 / Arch / Zorin OS 12
   * Ubuntu 16.10
   * Debian 8.2
   * CentOS 7.1 / Oracle Linux 7

package.json

@@ -1,7 +1,7 @@
 {
   "name": "csharp",
   "publisher": "ms-vscode",
-  "version": "1.7.0-beta1",
+  "version": "1.7.0-beta3",
   "description": "C# for Visual Studio Code (powered by OmniSharp).",
   "displayName": "C#",
   "author": "Microsoft Corporation",
@@ -66,7 +66,7 @@
   "runtimeDependencies": [
     {
       "description": "Mono Runtime (Linux / x86)",
-      "url": "https://omnisharpdownload.blob.core.windows.net/ext/mono.linux-x86-4.6.1.zip",
+      "url": "https://omnisharpdownload.blob.core.windows.net/ext/mono.linux-x86-4.8.0.478.zip",
       "installPath": "./bin",
       "platforms": [
         "linux"
@@ -81,7 +81,7 @@
     },
     {
       "description": "Mono Runtime (Linux / x64)",
-      "url": "https://omnisharpdownload.blob.core.windows.net/ext/mono.linux-x86_64-4.6.1.zip",
+      "url": "https://omnisharpdownload.blob.core.windows.net/ext/mono.linux-x86_64-4.8.0.478.zip",
       "installPath": "./bin",
       "platforms": [
         "linux"
@@ -96,7 +96,7 @@
     },
     {
       "description": "Mono Runtime (macOS)",
-      "url": "https://omnisharpdownload.blob.core.windows.net/ext/mono.osx-4.6.1.zip",
+      "url": "https://omnisharpdownload.blob.core.windows.net/ext/mono.osx-4.8.0.478.zip",
       "installPath": "./bin",
       "platforms": [
         "darwin"
@@ -108,7 +108,7 @@
     },
     {
       "description": "Mono Framework Assemblies",
-      "url": "https://omnisharpdownload.blob.core.windows.net/ext/framework-4.6.1.zip",
+      "url": "https://omnisharpdownload.blob.core.windows.net/ext/framework-4.8.0.478.zip",
       "installPath": "./bin/framework",
       "platforms": [
         "darwin",
@@ -117,7 +117,7 @@
     },
     {
       "description": "OmniSharp (.NET 4.6 / x86)",
-      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.9-beta22.zip",
+      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.9-beta24.zip",
       "installPath": "./bin/omnisharp",
       "platforms": [
         "win32"
@@ -128,7 +128,7 @@
     },
     {
       "description": "OmniSharp (.NET 4.6 / x64)",
-      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.9-beta22.zip",
+      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.9-beta24.zip",
       "installPath": "./bin/omnisharp",
       "platforms": [
         "win32"
@@ -139,7 +139,7 @@
     },
     {
       "description": "OmniSharp (Mono 4.6)",
-      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-mono-1.9-beta22.zip",
+      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-mono-1.9-beta24.zip",
       "installPath": "./bin/omnisharp",
       "platforms": [
         "darwin",
@@ -356,10 +356,14 @@
         },
         "omnisharp.loggingLevel": {
           "type": "string",
-          "default": "default",
+          "default": "information",
           "enum": [
-            "default",
-            "verbose"
+            "trace",
+            "debug",
+            "information",
+            "warning",
+            "error",
+            "critical"
           ],
           "description": "Specifies the level of logging output from the OmniSharp server."
         },
@@ -421,7 +425,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);
         }
     });
@@ -397,7 +393,7 @@ function getBuildOperations(tasksJsonPath: string) {
 
                     let buildTasks = getBuildTasks(tasksConfiguration);
 
-                    resolve({ updateTasksJson: (buildTasks.length > 0) });
+                    resolve({ updateTasksJson: buildTasks.length === 0 });
                 });
             }
             else {

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/features/processPicker.ts

@@ -6,6 +6,7 @@
 import * as os from 'os';
 import * as vscode from 'vscode';
 import * as child_process from 'child_process';
+import { PlatformInformation } from '../platform';
 
 export interface AttachItem extends vscode.QuickPickItem {
     id: string;
@@ -389,33 +390,51 @@ function execChildProcess(process: string, workingDirectory: string): Promise<st
     });
 }
 
+// VSCode cannot find the path "c:\windows\system32\bash.exe" as bash.exe is only available on 64bit OS. 
+// It can be invoked from "c:\windows\sysnative\bash.exe", so adding "c:\windows\sysnative" to path if we identify
+// VSCode is running in windows and doesn't have it in the path.
+function GetSysNativePathIfNeeded() : Promise<any> {
+    return PlatformInformation.GetCurrent().then(platformInfo => { 
+        let env = process.env;
+        if (platformInfo.isWindows && platformInfo.architecture === "x86_64") {
+            let sysnative : String = process.env.WINDIR + "\\sysnative";
+            env.Path = process.env.PATH + ";" + sysnative;                   
+        }
+        
+        return env;
+    });
+}
+
 function execChildProcessAndOutputErrorToChannel(process: string, workingDirectory: string, channel: vscode.OutputChannel): Promise<string> {
-    channel.appendLine(`Executing: ${process}`);
+    channel.appendLine(`Executing: ${process}`);    
+
     return new Promise<string>((resolve, reject) => {
-        child_process.exec(process, { cwd: workingDirectory, maxBuffer: 500 * 1024 }, (error: Error, stdout: string, stderr: string) => {
-            let channelOutput = "";
-            
-            if (stdout && stdout.length > 0) {
-                channelOutput.concat(stdout);
-            }
+        return GetSysNativePathIfNeeded().then(newEnv => {
+            child_process.exec(process, { cwd: workingDirectory, env: newEnv, maxBuffer: 500 * 1024 }, (error: Error, stdout: string, stderr: string) => {
+                let channelOutput = "";
+                
+                if (stdout && stdout.length > 0) {
+                    channelOutput.concat(stdout);
+                }
 
-            if (stderr && stderr.length > 0) {
-                channelOutput.concat(stderr);
-            }
+                if (stderr && stderr.length > 0) {
+                    channelOutput.concat(stderr);
+                }
 
-            if (error) {
-                channelOutput.concat(error.message);
-            }
+                if (error) {
+                    channelOutput.concat(error.message);
+                }
 
 
-            if (error || (stderr && stderr.length > 0)) {
-                channel.append(channelOutput);
-                channel.show();
-                reject(new Error("See remote-attach output"));
-                return;
-            }
+                if (error || (stderr && stderr.length > 0)) {
+                    channel.append(channelOutput);
+                    channel.show();
+                    reject(new Error("See remote-attach output"));
+                    return;
+                }
 
-            resolve(stdout);
+                resolve(stdout);
+            });
         });
     });
 

src/omnisharp/options.ts

@@ -33,7 +33,12 @@ export class Options {
             ? csharpConfig.get<boolean>('omnisharpUsesMono')
             : omnisharpConfig.get<boolean>('useMono');
 
-        const loggingLevel = omnisharpConfig.get<string>('loggingLevel');
+        // support the legacy "verbose" level as "debug"
+        let loggingLevel = omnisharpConfig.get<string>('loggingLevel');
+        if (loggingLevel.toLowerCase() === 'verbose') {
+            loggingLevel = 'debug';
+        }
+
         const autoStart = omnisharpConfig.get<boolean>('autoStart', true);
 
         const projectLoadTimeout = omnisharpConfig.get<number>('projectLoadTimeout', 60);

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;
 }