Skip to content

Merge master into dev #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 15, 2016
Merged

Merge master into dev #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
42988a9
Merge pull request #151 from DustinCampbell/merge-dev
DustinCampbell Apr 6, 2016
5e77b92
Don't search for OmniSharp launcher case-insensitively
DustinCampbell Apr 6, 2016
210a7c3
Merge pull request #153 from DustinCampbell/fix-case-sensitivity
DustinCampbell Apr 6, 2016
04632ad
Update CoreCLR to rc2-24008
gregg-miskelly Apr 8, 2016
d646e1c
Merge pull request #163 from gregg-miskelly/UpdateCoreCLRVer
gregg-miskelly Apr 9, 2016
05b34ef
Merge branch 'master' into merge-master
DustinCampbell Apr 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
36 changes: 18 additions & 18 deletions src/coreclr-debug/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions src/omnisharpPath.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down