Merge pull request #732 from DustinCampbell/merge-master-into-release

Merge master into release

Author: DustinCampbell

.travis.yml

@@ -16,7 +16,7 @@ install:
 deploy:
   provider: releases
   api_key:
-    secure: T6OzDRQEXpIsIKM2V+X+YgSa1vPDXDdoRBOV39BCDkKv7fDH5rTHs/hVtrwIfLvLVAtJq4kDm6hSVAFLpni1nUHzx2hFCi31CCWPlqhDo31v0CMD6pMccUlCFi2iul3T3EAiT4HmoSEKoCLET8uLIKaYoQ6wc+D11z55kM9DFtv/fGwfxL8FWvbNHYaGc3KNvNOwoMcOc8VpXXGQ1Rtc1IAx62G6qS8V6Yn89sUev/AxT/wcU/wmzNW5UgdAUgnJUFbSumwzfFYFJUdkUSP5iLxjlAJJSNHjHzN5wNX1bIMfSv5DJn1P15ev5OyfjJ+EmjFFmOTJiPlgver/scrZzhrv3kvBYULI8vAAgRWde5CgESGJqv5gEIj3oSICv+2MPmB+Kjr/79AfXrCvORc3an9UASyfgQvamfIoboFLNLZTIe/66oH7UmSJ2rtcaYEKMWHo7qq9cI4yFX6SexwqQehrGPr+QFbjpxFFAhs6aJEFGGgw4i/yheEP6Z7mrKx5wqScVfSLz1iBDmPAkB8pSFhXPk4XpYPjZsCI/wzLERYZ1gBweAKosnMt2anf0Eu1USUo1nXvFmsKTH6lBdBIthVW2va2DCgW+aWQj+j/G670UXT7BoHkcx0GaOzhPc6HeS1ovA9/kX5ZBaslPNAOmGycmGJAuNs2sSvFJf9JZY4=
+    secure: IccNv4d/b3/c2Wg/A39L/gfNPT0nBMpcf2b5PlEy+U79ii9hKHq681hHCJ/NPhwUjWOfSfgFXRoTJVYIHuMnT7WLnSqfqiiPUo82z0ulZQOEEdt8oVHoABm5SzAPQqe6Lo/SC+2zYV6TgqP/i9qVN0TuyA1jH00hmpBjnozO98GyuJIeUYwvEBkhJttcO0HLb836td5OxG8SDRo9kFauITNZAFQA8yVlsFmCJF1Di7Oncmcjcd5aHm9PnbgQytHg+iWMhBZuHXfB9hV4J0tsMZB+XPxvkS74dASuKjEIIdB66GXoVL5BzJmopY3gQVYpK5wK+HH4PwwpdZ1BY0qW4zmUCwwlNXSIVX8IjCiRt/5Bc3hqpY8zahIFKW37ZbHSVH1kKK9+fmEt5iy4HSqGGxmSXVrQGY1VJhsol/0Yu326L9J35AKhQeYKQvIdUQy4LiIN8NTUtEZr5Nvv6+TCI0RShQgkGQrlVyknIpoq9HM915NDTRLwm3s78LptkOP6wmRk26HLOBdYG/0k15Wos7mtR6cXc+NqKZm8tPfPEn2cIzGrmQgKXuCoXu+hGoOl/2HSzDnUUxhiSVbjoCei7HRXPT+0yhDc8e+Kt1fHKDJpyj7ybICVGmexxQY41mPtAVKrX/pDBCi53QVT1a+QEAd5Y27X4S8Ko+Vqukkoq7E=
   file_glob: true
   file: "*.vsix"
   skip_cleanup: true

RuntimeLicenses/license.txt

@@ -9,7 +9,8 @@ except to the extent those have additional terms.
 IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE RIGHTS BELOW.
 
 1. INSTALLATION AND USE RIGHTS. 
-You may install and use any number of copies of the software to develop and test your applications. 
+You may only use the C# Extension for Visual Studio Code with Visual Studio Code, Visual Studio or Xamarin Studio software to
+help you develop and test your applications.
 
 2. TERMS FOR SPECIFIC COMPONENTS. 
 a. Third Party components. The software may include third party components with separate legal notices or governed by other 
@@ -78,17 +79,12 @@ material contractual obligations, the fulfillment of which facilitate the due pe
 which would endanger the purpose of this agreement and the compliance with which a party may constantly trust in (so-called
 "cardinal obligations"). In other cases of slight negligence, Microsoft will not be liable for slight negligence.
 
-12. LEGAL EFFECT. This agreement describes certain legal rights. You may have other rights under the laws of your country. You 
-may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights
-under the laws of your country if the laws of your country do not permit it to do so.
+12. DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED "AS-IS." YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS
+WARRANTIES, GUARANTEES OR CONDITIONS. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
 
-13. DISCLAIMER OF WARRANTY. DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED “AS-IS.” YOU BEAR THE RISK OF USING IT. MICROSOFT
-GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE
-IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. 
-
-14. LIMITATION ON AND EXCLUSION OF DAMAGES. LIMITATION ON AND EXCLUSION OF DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS 
-SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS,
-SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.
+13. LIMITATION ON AND EXCLUSION OF DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S.
+$5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.
 This limitation applies to (a) anything related to the software, services, content (including code) on third party Internet
 sites, or third party applications; and (b) claims for breach of contract, breach of warranty, guarantee or condition, strict
 liability, negligence, or other tort to the extent permitted by applicable law.

gulpfile.js

@@ -17,6 +17,7 @@ const debugInstall = require('./out/coreclr-debug/install.js');
 const fs_extra = require('fs-extra-promise');
 const omnisharp = require('./out/omnisharp/omnisharp');
 const download = require('./out/omnisharp/download');
+const logger = require('./out/omnisharp/logger');
 const platform = require('./out/platform');
 const child_process = require('child_process');
 
@@ -35,8 +36,11 @@ gulp.task('clean', ['omnisharp:clean',  'debugger:clean', 'package:clean'], () =
 
 /// Omnisharp Tasks
 function installOmnisharp(omnisharps) {
-    const logger = (message) => { console.log(message); };
-    const promises = omnisharps.map((omni) => download.go(omni.flavor, omni.platform, logger));
+    const promises = omnisharps.map((omni, index) => {
+        const log = new logger.Logger(message => process.stdout.write(message), index.toString());
+
+        return download.go(omni.flavor, omni.platform, log);
+    });
 
     return Promise.all(promises);
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "csharp",
   "publisher": "ms-vscode",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "C# for Visual Studio Code (powered by OmniSharp).",
   "displayName": "C#",
   "author": "Microsoft Corporation",
@@ -70,6 +70,43 @@
         "configuration": "./csharp.configuration.json"
       }
     ],
+    "configuration": {
+      "title": "C# configuration",
+      "properties": {
+        "csharp.suppressDotnetInstallWarning": {
+          "type": "boolean",
+          "default": false,
+          "description": "Suppress the warning that the .NET CLI is not on the path."
+        },
+        "omnisharp.path": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "default": null,
+          "description": "Specifies the full path to the OmniSharp server."
+        },
+        "omnisharp.useMono": {
+          "type": "boolean",
+          "default": false,
+          "description": "Launch OmniSharp with Mono."
+        },
+        "omnisharp.loggingLevel": {
+          "type": "string",
+          "default": "default",
+          "enum": [
+            "default",
+            "verbose"
+          ],
+          "description": "Specifies the level of logging output from the OmniSharp server."
+        },
+        "omnisharp.autoStart": {
+          "type": "boolean",
+          "default": true,
+          "description": "Specifies whether the OmniSharp server will be automatically started or not. If false, OmniSharp can be started with the 'Restart OmniSharp' command"
+        }
+      }
+    },
     "grammars": [
       {
         "language": "csharp",

src/assets.ts

@@ -17,6 +17,7 @@ interface DebugConfiguration {
     name: string,
     type: string,
     request: string,
+    internalConsoleOptions?: string,
     sourceFileMap?: any,
 }
 
@@ -158,7 +159,8 @@ function createLaunchConfiguration(projectData: TargetProjectData): ConsoleLaunc
         args: [],
         cwd: '${workspaceRoot}',
         externalConsole: false,
-        stopAtEntry: false
+        stopAtEntry: false,
+        internalConsoleOptions: "openOnSessionStart"
     }
 }
 
@@ -172,6 +174,7 @@ function createWebLaunchConfiguration(projectData: TargetProjectData): WebLaunch
         args: [],
         cwd: '${workspaceRoot}',
         stopAtEntry: false,
+        internalConsoleOptions: "openOnSessionStart",
         launchBrowser: {
             enabled: true,
             args: '${auto-detect-url}',