Merge pull request #194 from DustinCampbell/merge-master

Merge master into dev

Author: DustinCampbell

package.json

@@ -1,7 +1,7 @@
 {
   "name": "csharp",
   "publisher": "ms-vscode",
-  "version": "1.0.0-rc2",
+  "version": "1.0.1-rc2",
   "description": "C# for Visual Studio Code (powered by OmniSharp).",
   "displayName": "C#",
   "author": "Microsoft Corporation",

src/coreclr-debug/main.ts

@@ -332,28 +332,28 @@ function createProjectJson(targetRuntime: string): any
             emitEntryPoint: true
         },
         dependencies: {
-            "Microsoft.VisualStudio.clrdbg": "14.0.25201-preview-2911579",
+            "Microsoft.VisualStudio.clrdbg": "14.0.25208-preview-2924185",
             "Microsoft.VisualStudio.clrdbg.MIEngine": "14.0.30401-preview-1",
             "Microsoft.VisualStudio.OpenDebugAD7": "1.0.20405-preview-1",
-            "NETStandard.Library": "1.5.0-rc2-23931",
+            "NETStandard.Library": "1.5.0-rc2-24008",
             "Newtonsoft.Json": "7.0.1",
             "Microsoft.VisualStudio.Debugger.Interop.Portable": "1.0.1",
-            "System.Collections.Specialized":  "4.0.1-rc2-23931",
-            "System.Collections.Immutable": "1.2.0-rc2-23931", 
-            "System.Diagnostics.Process" : "4.1.0-rc2-23931",
-            "System.Diagnostics.StackTrace":  "4.0.1-rc2-23931",  
-            "System.Dynamic.Runtime": "4.0.11-rc2-23931",
-            "Microsoft.CSharp": "4.0.1-rc2-23931",
-            "System.Threading.Tasks.Dataflow": "4.6.0-rc2-23931",
-            "System.Threading.Thread": "4.0.0-rc2-23931", 
-            "System.Xml.XDocument": "4.0.11-rc2-23931",
-            "System.Xml.XmlDocument": "4.0.1-rc2-23931",  
-            "System.Xml.XmlSerializer": "4.0.11-rc2-23931",
-            "System.ComponentModel":  "4.0.1-rc2-23931",  
-            "System.ComponentModel.Annotations":  "4.1.0-rc2-23931",  
-            "System.ComponentModel.EventBasedAsync":  "4.0.11-rc2-23931",
-            "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23931",
-            "System.Net.Http":  "4.0.1-rc2-23931"
+            "System.Collections.Specialized":  "4.0.1-rc2-24008",
+            "System.Collections.Immutable": "1.2.0-rc2-24008", 
+            "System.Diagnostics.Process" : "4.1.0-rc2-24008",
+            "System.Diagnostics.StackTrace":  "4.0.1-rc2-24008",  
+            "System.Dynamic.Runtime": "4.0.11-rc2-24008",
+            "Microsoft.CSharp": "4.0.1-rc2-24008",
+            "System.Threading.Tasks.Dataflow": "4.6.0-rc2-24008",
+            "System.Threading.Thread": "4.0.0-rc2-24008", 
+            "System.Xml.XDocument": "4.0.11-rc2-24008",
+            "System.Xml.XmlDocument": "4.0.1-rc2-24008",  
+            "System.Xml.XmlSerializer": "4.0.11-rc2-24008",
+            "System.ComponentModel":  "4.0.1-rc2-24008",  
+            "System.ComponentModel.Annotations":  "4.1.0-rc2-24008",  
+            "System.ComponentModel.EventBasedAsync":  "4.0.11-rc2-24008",
+            "System.Runtime.Serialization.Primitives": "4.1.1-rc2-24008",
+            "System.Net.Http":  "4.0.1-rc2-24008"
         },
         frameworks: {
             "netstandardapp1.5": {

src/omnisharpPath.ts

@@ -10,8 +10,8 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 
 const runFileName = process.platform === 'win32' ? 'run.cmd' : 'run';
-const omnisharpFileName = process.platform === 'win32' ? 'omnisharp.cmd' : 'omnisharp';
-const omnisharpExeFileName = process.platform === 'win32' ? 'omnisharp.exe' : 'omnisharp';
+const omnisharpFileName = process.platform === 'win32' ? 'OmniSharp.cmd' : 'OmniSharp';
+const omnisharpExeFileName = process.platform === 'win32' ? 'OmniSharp.exe' : 'OmniSharp';
 
 function getLaunchFilePath(filePathOrFolder: string): Promise<string> {
     return fs.lstatAsync(filePathOrFolder).then(stats => {