Skip to content

Commit 6d3dbb7

Browse files
janrajjanraj
janraj
authored and
janraj
committed
Merge remote-tracking branch 'upstream/master'
2 parents 05d6836 + 2403096 commit 6d3dbb7

23 files changed

+6690
-1896
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ install:
2525

2626
script:
2727
- npm test --silent
28-
- npm run test-syntax
2928

3029
deploy:
3130
provider: releases

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ First install:
5454
* Node.js (newer than 4.3.1)
5555
* Npm (newer 2.14.12)
5656

57-
In case you get a *node-gyp* error [follow the instrutions here](https://github.com/nodejs/node-gyp/blob/master/README.md) to fix it. The *vscode-textmate* package pulls in a native node dependency and those instructions will set up the node build tool which deals with those.
58-
5957
To **run and develop** do the following:
6058

6159
* Run `npm i`

‎ThirdPartyNotices.txt‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ expressly granted, whether by implication, estoppel or otherwise.
1212
3. run-in-terminal version 0.0.2 (https://github.com/microsoft/run-in-terminal)
1313
4. semver version 5.1.0 (https://github.com/npm/node-semver)
1414
5. DefinitelyTyped version 0.0.1 (https://github.com/borisyankov/DefinitelyTyped)
15-
6. language-csharp version 0.11.0 (https://github.com/atom/language-csharp)
1615

1716
%% omnisharp-roslyn NOTICES AND INFORMATION BEGINS HERE
1817
============================================================
@@ -123,42 +122,3 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
123122
THE SOFTWARE.
124123
============================================================
125124
END OF DefinitelyTyped NOTICES AND INFORMATION
126-
127-
%% language-csharp NOTICES AND INFORMATION BEGIN HERE
128-
=========================================
129-
Copyright (c) 2014 GitHub Inc.
130-
131-
Permission is hereby granted, free of charge, to any person obtaining
132-
a copy of this software and associated documentation files (the
133-
"Software"), to deal in the Software without restriction, including
134-
without limitation the rights to use, copy, modify, merge, publish,
135-
distribute, sublicense, and/or sell copies of the Software, and to
136-
permit persons to whom the Software is furnished to do so, subject to
137-
the following conditions:
138-
139-
The above copyright notice and this permission notice shall be
140-
included in all copies or substantial portions of the Software.
141-
142-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
143-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
144-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
145-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
146-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
147-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
148-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
149-
150-
151-
This package was derived from a TextMate bundle located at
152-
https://github.com/wintermi/csharp-tmbundle by Matthew Winter @wintermi and
153-
Adam Lickel @lickel and distributed under the following license, located in
154-
`README.markdown`:
155-
156-
This bundle is dual-licensed under MIT and GPL licenses.
157-
158-
- http://www.opensource.org/licenses/mit-license.php
159-
- http://www.gnu.org/licenses/gpl.html
160-
161-
Use it, change it, fork it, sell it. Do what you will, but please leave the
162-
author attribution.
163-
=========================================
164-
END OF language-csharp NOTICES AND INFORMATION

‎debugger.md‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ File bugs and feature requests [here](https://github.com/OmniSharp/omnisharp-vsc
1414

1515
###First Time setup
1616
##### 1: Get Visual Studio Code
17-
Install Visual Studio Code (VSC). Pick the latest VSC version from here: https://code.visualstudio.com Make sure it is at least 0.10.10.
17+
Install Visual Studio Code (VSC). Pick the latest VSC version from here: https://code.visualstudio.com Make sure it is at least 1.5.
1818

1919
If you are not sure what version you have, you can see your version of VS Code:
2020

@@ -29,7 +29,7 @@ Install the .NET Core command line tools (CLI) by following the installation par
2929
##### 3: Install C# Extension for VS Code
3030
Open the command palette in VS Code (F1) and type "ext install C#" to trigger the installation of the extension. VS Code will show a message that the extension has been installed and it will restart.
3131

32-
If you have previously installed the C# extension, make sure that you have version 1.2 or newer. You can check this by opening the command palette (F1) and running 'Extensions: Show Installed Extensions'.
32+
If you have previously installed the C# extension, make sure that you have a recent version. You can check this by opening the command palette (F1) and running 'Extensions: Show Installed Extensions'.
3333

3434
##### 4: Wait for download of platform-specific files
3535
The first time that C# code is opened in VS Code, the extension will download the platform-specific files needed for debugging and editing. Debugging and editor features will not work until these steps finish.
@@ -47,20 +47,11 @@ You can start from scratch by creating an empty project with `dotnet new`:
4747
dotnet new
4848
dotnet restore
4949

50-
You can also find some example projects on https://github.com/aspnet/cli-samples
50+
If you want a web project (ASP.NET project) pass `-t web`. For web projects, makes sure to run `bower install` before running so that they can restore assets.
5151

5252
##### 2: Open the directory in VS Code
5353
Go to File->Open and open the directory in Visual Studio Code. If this is the first time that the C# extension has been activated, it will now download additional platform-specific dependencies.
5454

55-
**Troubleshooting 'Error while installing .NET Core Debugger':** If the debugger is failing to download its platform-specific dependencies, first verify that you have the 1.0.0-preview2-003121 or newer build of the .NET CLI installed, and it is functioning. You can check this by starting a bash/command prompt and running 'dotnet --info'.
56-
57-
If the CLI is installed, here are a few additional suggestions:
58-
59-
* If clicking on 'View Log' doesn't show a log this means that running the 'dotnet --info' command failed. If it succeeds in bash/command prompt, but fails from VS Code, this likely means that your computer once had an older build of .NET CLI installed, and there are still remnants of it which cause VS Code and other processes besides bash to use the older version instead of the current version. You can resolve this issue by uninstalling the .NET Core CLI, and reinstalling the version you want (see below for macOS).
60-
* If 'dotnet restore' is failing, make sure you have an internet connection to nuget.org, and make sure that if additional NuGet.Config files are being used, they have valid content. The log will indicate what NuGet.Config files were used. Try removing the files other than the one coming from the extension itself.
61-
62-
MacOS .NET CLI Reinstall Instructions: macOS doesn't have uninstall for pkg files (see [known issue](https://github.com/dotnet/core/blob/master/cli/known-issues.md#uninstallingreinstalling-the-pkg-on-os-x)), one option is to remove the dotnet cli directory with `sudo rm -rf /usr/local/share/dotnet` and then install the pkg again.
63-
6455
##### 3: Add VS Code configuration files to the workspace
6556
VS Code needs to be configured so it understands how to build your project and debug it. For this there are two files which need to be added -- .vscode/tasks.json and .vscode/launch.json.
6657

@@ -86,24 +77,15 @@ If your code has multiple projects or you would rather generate these files by h
8677
...
8778
"program": "${workspaceRoot}/MyLaunchingProject/bin/Debug/netcoreapp1.0/MyLaunchingProject.dll",
8879

89-
##### 4: Windows Only: Enable Portable PDBs
90-
In the future, this step will go away, but for now you need to [change the project.json to use portable PDBs](https://github.com/OmniSharp/omnisharp-vscode/wiki/Portable-PDBs#net-cli-projects-projectjson).
91-
92-
##### 5: Pick your debug configuration
93-
94-
The default launch.json offers several different launch configurations depending on what kind of app you are building -- one for command line, one for web, and one for attaching to a running process.
95-
96-
To configure which configuration you want, bring up the Debug view by clicking on the Debugging icon in the View Bar on the side of VS Code.
97-
98-
![Debug view icon](https://raw.githubusercontent.com/wiki/OmniSharp/omnisharp-vscode/images/debugging_debugicon.png)
99-
100-
Now open the configuration drop down from the top and select the one you want.
101-
102-
![Debug launch configuration drop down](https://raw.githubusercontent.com/wiki/OmniSharp/omnisharp-vscode/images/debug-launch-configurations.png)
80+
##### 4: Start debugging
81+
Your project is now all set. Set a breakpoint or two where you want to stop, click the debugger play button (or hit F5) and you are off.
10382

10483
###Debugging Code compiled on another computer
105-
* If the target binary is built on Linux / OSX, dotnet CLI will produce portable pdbs by default so no action is necessary.
106-
* On Windows, you will need to take additional steps to build [portable PDBs](https://github.com/OmniSharp/omnisharp-vscode/wiki/Portable-PDBs#how-to-generate-portable-pdbs).
84+
If your code was built on a different computer from where you would like to run in there are a few things to keep in mind --
85+
86+
* **Source Maps**: Unless your local source code is at exactly the same path as where the code was originally built you will need to add a [sourceFileMap](#source-file-map) to launch.json.
87+
* **Portable PDBs**: If the code was built on Windows, it might have been built using Windows PDBs instead of portable PDBs, but the C# extension only supports portable PDBs. See the [portable PDB documentation](https://github.com/OmniSharp/omnisharp-vscode/wiki/Portable-PDBs#how-to-generate-portable-pdbs) for more information.
88+
* **Debug vs. Release**: It is much easier to debug code which has been compiled in the 'Debug' configuration. So unless the issue you are looking at only reproduces with optimizations, it is much better to use Debug bits. If you do need to debug optimized code, you will need to disable [justMyCode](#just-my-code) in launch.json.
10789

10890
####More things to configure In launch.json
10991
#####Just My Code
@@ -126,7 +108,7 @@ You can optionally configure a file by file mapping by providing map following t
126108
#####Symbol Path
127109
You can optionally provide paths to symbols following this schema:
128110

129-
"symbolPath":"[ \"/Volumes/symbols\"]"
111+
"symbolPath": [ "/Volumes/symbols" ]
130112

131113
#####Environment variables
132114
Environment variables may be passed to your program using this schema:

‎package.json‎

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "csharp",
33
"publisher": "ms-vscode",
4-
"version": "1.6.2",
4+
"version": "1.7.0-beta1",
55
"description": "C# for Visual Studio Code (powered by OmniSharp).",
66
"displayName": "C#",
77
"author": "Microsoft Corporation",
@@ -27,7 +27,6 @@
2727
"compile": "tsc -p ./ && gulp tslint",
2828
"watch": "tsc -watch -p ./",
2929
"test": "node ./node_modules/vscode/bin/test",
30-
"test-syntax": "mocha --timeout 15000 --ui bdd ./out/test/syntaxes/*.test.syntax.js",
3130
"postinstall": "node ./node_modules/vscode/bin/install"
3231
},
3332
"dependencies": {
@@ -57,12 +56,12 @@
5756
"gulp-mocha": "^2.1.3",
5857
"gulp-tslint": "^4.3.0",
5958
"mocha": "^2.3.3",
59+
"plist": "^2.0.1",
6060
"tslint": "^3.15.1",
6161
"tslint-microsoft-contrib": "^2.0.12",
6262
"typescript": "^2.0.3",
6363
"vsce": "^1.7.0",
64-
"vscode": "^1.0.0",
65-
"vscode-textmate": "^2.1.1"
64+
"vscode": "^1.0.0"
6665
},
6766
"runtimeDependencies": [
6867
{
@@ -149,17 +148,17 @@
149148
},
150149
{
151150
"description": ".NET Core Debugger (Windows / x64)",
152-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-win7-x64.zip",
153-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-win7-x64.zip",
151+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-0/coreclr-debug-win7-x64.zip",
152+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-0/coreclr-debug-win7-x64.zip",
154153
"installPath": ".debugger",
155154
"runtimeIds": [
156155
"win7-x64"
157156
]
158157
},
159158
{
160159
"description": ".NET Core Debugger (macOS / x64)",
161-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-osx.10.11-x64.zip",
162-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-osx.10.11-x64.zip",
160+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-0/coreclr-debug-osx.10.11-x64.zip",
161+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-0/coreclr-debug-osx.10.11-x64.zip",
163162
"installPath": ".debugger",
164163
"runtimeIds": [
165164
"osx.10.11-x64"
@@ -171,8 +170,8 @@
171170
},
172171
{
173172
"description": ".NET Core Debugger (CentOS / x64)",
174-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-centos.7-x64.zip",
175-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-centos.7-x64.zip",
173+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-0/coreclr-debug-centos.7-x64.zip",
174+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-0/coreclr-debug-centos.7-x64.zip",
176175
"installPath": ".debugger",
177176
"runtimeIds": [
178177
"centos.7-x64"
@@ -184,8 +183,8 @@
184183
},
185184
{
186185
"description": ".NET Core Debugger (Debian / x64)",
187-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-debian.8-x64.zip",
188-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-debian.8-x64.zip",
186+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-0/coreclr-debug-debian.8-x64.zip",
187+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-0/coreclr-debug-debian.8-x64.zip",
189188
"installPath": ".debugger",
190189
"runtimeIds": [
191190
"debian.8-x64"
@@ -197,8 +196,8 @@
197196
},
198197
{
199198
"description": ".NET Core Debugger (Fedora 23 / x64)",
200-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-fedora.23-x64.zip",
201-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-fedora.23-x64.zip",
199+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-0/coreclr-debug-fedora.23-x64.zip",
200+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-0/coreclr-debug-fedora.23-x64.zip",
202201
"installPath": ".debugger",
203202
"runtimeIds": [
204203
"fedora.23-x64"
@@ -210,8 +209,8 @@
210209
},
211210
{
212211
"description": ".NET Core Debugger (Fedora 24 / x64)",
213-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-fedora.24-x64.zip",
214-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-fedora.24-x64.zip",
212+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-0/coreclr-debug-fedora.24-x64.zip",
213+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-0/coreclr-debug-fedora.24-x64.zip",
215214
"installPath": ".debugger",
216215
"runtimeIds": [
217216
"fedora.24-x64"
@@ -223,8 +222,8 @@
223222
},
224223
{
225224
"description": ".NET Core Debugger (OpenSUSE 13 / x64)",
226-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-opensuse.13.2-x64.zip",
227-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-opensuse.13.2-x64.zip",
225+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-0/coreclr-debug-opensuse.13.2-x64.zip",
226+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-0/coreclr-debug-opensuse.13.2-x64.zip",
228227
"installPath": ".debugger",
229228
"runtimeIds": [
230229
"opensuse.13.2-x64"
@@ -236,8 +235,8 @@
236235
},
237236
{
238237
"description": ".NET Core Debugger (OpenSUSE 42 / x64)",
239-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-opensuse.42.1-x64.zip",
240-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-opensuse.42.1-x64.zip",
238+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-0/coreclr-debug-opensuse.42.1-x64.zip",
239+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-0/coreclr-debug-opensuse.42.1-x64.zip",
241240
"installPath": ".debugger",
242241
"runtimeIds": [
243242
"opensuse.42.1-x64"
@@ -249,8 +248,8 @@
249248
},
250249
{
251250
"description": ".NET Core Debugger (RHEL / x64)",
252-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-rhel.7.2-x64.zip",
253-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-rhel.7.2-x64.zip",
251+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-0/coreclr-debug-rhel.7.2-x64.zip",
252+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-0/coreclr-debug-rhel.7.2-x64.zip",
254253
"installPath": ".debugger",
255254
"runtimeIds": [
256255
"rhel.7-x64"
@@ -262,8 +261,8 @@
262261
},
263262
{
264263
"description": ".NET Core Debugger (Ubuntu 14.04 / x64)",
265-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-ubuntu.14.04-x64.zip",
266-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-ubuntu.14.04-x64.zip",
264+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-0/coreclr-debug-ubuntu.14.04-x64.zip",
265+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-0/coreclr-debug-ubuntu.14.04-x64.zip",
267266
"installPath": ".debugger",
268267
"runtimeIds": [
269268
"ubuntu.14.04-x64"
@@ -275,8 +274,8 @@
275274
},
276275
{
277276
"description": ".NET Core Debugger (Ubuntu 16.04 / x64)",
278-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-ubuntu.16.04-x64.zip",
279-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-ubuntu.16.04-x64.zip",
277+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-0/coreclr-debug-ubuntu.16.04-x64.zip",
278+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-0/coreclr-debug-ubuntu.16.04-x64.zip",
280279
"installPath": ".debugger",
281280
"runtimeIds": [
282281
"ubuntu.16.04-x64"
@@ -288,8 +287,8 @@
288287
},
289288
{
290289
"description": ".NET Core Debugger (Ubuntu 16.10 / x64)",
291-
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-6-3/coreclr-debug-ubuntu.16.10-x64.zip",
292-
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-6-3/coreclr-debug-ubuntu.16.10-x64.zip",
290+
"url": "https://vsdebugger.azureedge.net/coreclr-debug-1-7-0/coreclr-debug-ubuntu.16.10-x64.zip",
291+
"fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-7-0/coreclr-debug-ubuntu.16.10-x64.zip",
293292
"installPath": ".debugger",
294293
"runtimeIds": [
295294
"ubuntu.16.10-x64"
@@ -390,13 +389,17 @@
390389
{
391390
"language": "csharp",
392391
"scopeName": "source.cs",
393-
"path": "./syntaxes/csharp.json"
392+
"path": "./syntaxes/csharp.tmLanguage"
394393
}
395394
],
396395
"jsonValidation": [
397396
{
398397
"fileMatch": "project.json",
399398
"url": "http://json.schemastore.org/project"
399+
},
400+
{
401+
"fileMatch": "omnisharp.json",
402+
"url": "http://json.schemastore.org/omnisharp"
400403
}
401404
],
402405
"commands": [

0 commit comments

Comments
 (0)