Merge master into release #1204
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…mmar" package to the latest stable and replaces the grammar under "syntaxes".
… features such as static usings.
Merge release back into master
# Conflicts: # package.json
Merge release into master
Add jsonValidation with prototyped omnisharp
Merge 1.6.2 changes from release to master
added auto-closing and surrounding pairs configuration
Take latest C# TextMate grammar, fixing a few bugs
Fix 'dotnet restore' when the extension tries to run it for a specific project
This uses the new tasks.json support in VS Code 1.9 to allow tasks to run different commands. So, now you should be able to build with <kbd>Cmd+Shift+B</kbd> in VS Code.
Fix silly bug in dotnet restore
…elete gulp task for running tests Since we use VS Code's infrastructure for running tests (allowing us to access VS Code objects inside tests), the right way to run tests inside VS Code is to launch the debugger with the 'Launch Tests' configuration. At the command-line, the 'npm test' command runs tests. However, that downloads a build of VS Code to run the tests, which doesn't support being launched while other instances of VS Code or open.
Update build task to launch "npm run compile"
…re only warnings C# for VS Code is a little over-excited about showing the message that there were problems loading projects. Essentially, it will show it if there were warnings or errors. This changes that behavior to only show it if there are errors because it's perfectly reasonable for a project to contain warnings and not complain to the user every time they open it.
…ings Don't show message about projects having trouble loading when there are only warnings
Update version, OmniSharp and changelog for 1.7
Rajkumar42/wsl/changelog
In fixing dotnet restore for .csproj, I unintentionally broke it for project.json. The problem here is that OmniSharp returns different information for `Path` with regard to project.json or .csproj. For project.json, it's the directory that the project.json lives in, and for .csproj, it's the actually file path. This change addresses that by adding a `FilePath` property to our `ProjectDescriptor` which represents the real file path and renamed `Path` to `Directory` to be a bit clearer.
…roject-json Fix dotnet restore for project.json
v1.7.0-beta4 -> v1.7.0-beta5
* Adding pipeArgs documentation. * Ran "gulp generateOptionsSchema" to update package.json. Fixed instructions in the readme.md
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.