Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	package.json

Author: janraj

.gitignore

@@ -3,6 +3,7 @@ node_modules
 out
 .omnisharp-*/
 .debugger
+.vscode-test
 
 install.*
 

.travis.yml

@@ -1,24 +1,32 @@
 language: node_js
 
 node_js:
-- "5.1"
+- "6"
 
-env:
-  - CXX=g++-4.8
+before_install:
+  - if [ $TRAVIS_OS_NAME == "linux" ]; then
+      export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
+      sh -e /etc/init.d/xvfb start;
+      sleep 3;
+    fi
 
 addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
     packages:
-      - g++-4.8
+      - g++-4.9
 
 install:
 - npm install
 - npm run compile
 - npm install -g vsce
 - vsce package
 
+script:
+  - npm test --silent
+  - npm run test-syntax
+
 deploy:
   provider: releases
   api_key:

CHANGELOG.md

@@ -1,12 +1,13 @@
-## 1.6.0 _(Not Yet Released)_
+## 1.6.0 (December 21, 2016)
 
 #### C# Scripting
 
-* Roslyn scripting support in CSX files! ([omnisharp-roslyn#659](https://github.com/OmniSharp/omnisharp-roslyn/pull/659)) _(Contributed by [@filipw](https://github.com/filipw))_
+* Roslyn scripting support in CSX files! ([#23](https://github.com/OmniSharp/omnisharp-vscode/issues/23), [omnisharp-roslyn#659](https://github.com/OmniSharp/omnisharp-roslyn/pull/659)) _(Contributed by [@filipw](https://github.com/filipw))_
 
 #### Project Support
 
 * Support for latest .NET Core .csproj projects updates. ([omnisharp-roslyn#705](https://github.com/OmniSharp/omnisharp-roslyn/pull/705))
+* Update 'tasks.json' and 'launch.json' generation to support .NET Core .csproj projects. ([#767](https://github.com/OmniSharp/omnisharp-vscode/issues/767))
 * Properly support `<NoWarn>` in MSBuild projects and specifically ignore the `CS1701` warning in .NET Core MSBuild projects. ([#967](https://github.com/OmniSharp/omnisharp-vscode/issues/967))
 * Fix global.json-based project search to also the top-level folders specified by the `"projects"` property and not just their children. ([#904](https://github.com/OmniSharp/omnisharp-vscode/issues/904) and [#962](https://github.com/OmniSharp/omnisharp-vscode/issues/962))
 
@@ -16,7 +17,7 @@
     * Enables debugger support for additional Linux distributions - Ubuntu 16.10, openSUSE 42, Fedora 24
     * Brings support for running all supported distros on top of Linux Kernel >= 4.6
 * Enable debugger support for Arch Linux ([#564](https://github.com/OmniSharp/omnisharp-vscode/issues/564))
-* Improve debugger install errors for -- macOS without openSSL symlinks ([#986](https://github.com/OmniSharp/omnisharp-vscode/pull/986)), and x86 Windows ([#998](https://github.com/OmniSharp/omnisharp-vscode/pull/998)).
+* Improve debugger install errors for macOS without openSSL symlinks ([#986](https://github.com/OmniSharp/omnisharp-vscode/pull/986)), and x86 Windows ([#998](https://github.com/OmniSharp/omnisharp-vscode/pull/998)).
 * Improve debugger performance using precompiled debugger binaries  ([#896](https://github.com/OmniSharp/omnisharp-vscode/issues/896))([#971](https://github.com/OmniSharp/omnisharp-vscode/issues/971)). 
 
 #### Syntax Highlighting
@@ -40,6 +41,7 @@
 * Fix exception thrown when sending `/autocomplete` request to OmniSharp server in location where no completion items are available. ([#980](https://github.com/OmniSharp/omnisharp-vscode/issues/980))
 * Add `omnisharp.maxProjectResults` setting to control the maximum number of projects to display in the 'Select Project' dropdown. The default is 250. ([#875](https://github.com/OmniSharp/omnisharp-vscode/issues/875)) _(Contributed by [@filipw](https://github.com/filipw))_
 * Fix signature help display for constructors. ([#36](https://github.com/OmniSharp/omnisharp-vscode/issues/36)) _(Contributed by [@filipw](https://github.com/filipw))_
+* Ensure that the `editor.insertSpaces` and `editor.tabSize` settings are passed to OmniSharp for formatting. Note that this behavior can be controlled with the `omnisharp.useEditorFormattingSettings` option, which defaults to true. ([#1055](https://github.com/OmniSharp/omnisharp-vscode/pull/1055)) _(Contributed by [@filipw](https://github.com/filipw))_
 
 ## 1.5.3 (November 21, 2016)
 

README.md

@@ -13,76 +13,19 @@ Welcome to the C# extension for Visual Studio Code! This preview provides the fo
 
 The C# extension is powered by [OmniSharp](https://github.com/OmniSharp/omnisharp-roslyn).
 
-
 ### Get Started Writing C# in VS Code
+
 * [Documentation](https://code.visualstudio.com/docs/languages/csharp)
 * [Video Tutorial compiling with .NET Core](https://channel9.msdn.com/Blogs/dotnet/Get-started-with-VS-Code-using-CSharp-and-NET-Core)
 
-### What's New in 1.5.3
-
-* Use value of `http.proxyStrictSSL` even when `http.proxy` is not set. ([#957](https://github.com/OmniSharp/omnisharp-vscode/issues/957))
-
-### What's New in 1.5.2
-
-* Ensure diagnostics are cleared in files when they are no longer needed. ([#858](https://github.com/OmniSharp/omnisharp-vscode/issues/858))
-* Enqueue requests for diagnostics in visible editors when the extension starts up. ([#843](https://github.com/OmniSharp/omnisharp-vscode/issues/843))
-* Provide fallback URLs for debugger downloads. ([#930](https://github.com/OmniSharp/omnisharp-vscode/issues/930))
-* Properly require .NET Framework 4.6 in the OmniSharp.exe.config file to ensure that the user is displayed a dialog on Windows machines that don't have .NET Framework 4.6 installed. ([#937](https://github.com/OmniSharp/omnisharp-vscode/issues/937))  
-* Fix issue with installing on non-English installations of Windows. ([#938](https://github.com/OmniSharp/omnisharp-vscode/issues/938))
-* Display platform information when acquiring runtime dependencies. ([#948](https://github.com/OmniSharp/omnisharp-vscode/issues/948))
-
-### What's New in 1.5.1
-
-* Fix to properly support `http.proxy` and `http.proxyStrictSSL` settings. ([#930](https://github.com/OmniSharp/omnisharp-vscode/issues/930))
-
-### What's New in 1.5
-
-#### Initial support for C# 7
-
-* New C# 7 features like pattern-matching and tuples are now supported in VS Code editor. Note: To use tuples, you will need a reference to [this NuGet package](https://www.nuget.org/packages/System.ValueTuple).
-
-#### Initial support for CSProj .NET Core Projects
-
-* With the .NET Core SDK moving to embrace MSBuild and .csproj files over project.json, we've made sure the C# extension can handle the new format. This support is preliminary and there are still several features coming to smooth out the experience.
-
-#### Broader OS Support for C# Code Editing
-
-* This release dramatically changes the runtime that OmniSharp runs on, which allows it to be run an many more operating systems than before:
-
-  * Windows: OmniSharp runs on the installed .NET Framework. In addition, OmniSharp now runs on 32-bit Windows!
-  * macOS/Linux: OmniSharp runs on a custom embedded Mono runtime. Note: Mono does not need to be installed on the system for this to work.
-
-#### Debugger
-
-* Remote debugging is now supported for attach by using the `pipeTransport` launch.json option.
-* Resolved issue with setting breakpoints when there are multple files with the same name (e.g. two 'Program.cs' files).
-
-#### New Dependency Acquisition System
-
-* This improves the acquisition and reliability of platform-specific OmniSharp and debugger dependencies.
-
-#### New Settings
-
-Several new settings have been added:
-
-* `csharp.suppressDotnetRestoreNotification`: Suppress the notification window to perform a 'dotnet restore' when dependencies can't be resolved.
-* `omnisharp.projectLoadTimeout`: The time Visual Studio Code will wait for the OmniSharp server to start. Time is expressed in seconds. _(Contributed by [@wjk](https://github.com/wjk))_
-
-#### Colorizer
-
-* A new unit testing framework for testing the colorizer grammer ([#742](https://github.com/OmniSharp/omnisharp-vscode/pull/742)) _(Contributed by [@ivanz](https://github.com/ivanz))_
-* Single-line comments after preprocessor directives ([#762](https://github.com/OmniSharp/omnisharp-vscode/pull/762)) _(Contributed by [@damieng](https://github.com/damieng))_
-
-#### Performance
-
-* Major improvements have been made to editor performance. The communication with the OmniSharp server has been rewritten to allow long-running operations (such as gathering all errors and warnings) to queue while high priority operations (such as text buffer changes) run serially. ([#902](https://github.com/OmniSharp/omnisharp-vscode/pull/902)) _(Thanks to [@david-driscoll](https://github.com/david-driscoll) for his help with this change!)_ 
+### What's New in 1.6.0
 
-#### Other Improvements
+* Better support for .NET Core .csproj projects, including .NET Core projects created with [Visual Studio 2017 RC](https://www.visualstudio.com/vs/visual-studio-2017-rc/).
+* Improved debugger performance and support for debugging on more Linux distros.
+* Roslyn scripting support with CSX files.
+* Lot's more!
 
-* The prompt to generate assets for building and debugging can now be dismissed for a workspace permanently. In addition, a new `dotnet.generateAssets` command has been added to force regeneration of the assets. ([#635](https://github.com/OmniSharp/omnisharp-vscode/issues/635))
-* Fix "running forever" issue for folder with multple .NET Core projects. ([#735](https://github.com/OmniSharp/omnisharp-vscode/issues/735)) _(Contributed by [@eamodio](https://github.com/eamodio))_
-* `ctor` snippet is now more consistent with other code snippets. ([#849](https://github.com/OmniSharp/omnisharp-vscode/pull/849)) _(Contibuted by [@Eibx](https://github.com/Eibx))_
-* Ampersands in file paths are now properly escaped on Windows ([#909](https://github.com/OmniSharp/omnisharp-vscode/pull/909)) _(Contributed by [@filipw](https://github.com/filipw))_
+See our [change log](https://github.com/OmniSharp/omnisharp-vscode/blob/master/CHANGELOG.md) for all of the updates.
 
 ### Supported Operating Systems for Debugging
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "csharp",
   "publisher": "ms-vscode",
-  "version": "1.6.0-beta6",
+  "version": "1.6.0",
   "description": "C# for Visual Studio Code (powered by OmniSharp).",
   "displayName": "C#",
   "author": "Microsoft Corporation",
@@ -11,6 +11,10 @@
   "bugs": {
     "url": "https://github.com/OmniSharp/omnisharp-vscode/issues"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/OmniSharp/omnisharp-vscode.git"
+  },
   "categories": [
     "Debuggers",
     "Languages",
@@ -19,13 +23,15 @@
   ],
   "main": "./out/src/main",
   "scripts": {
-    "compile": "node ./node_modules/vscode/bin/compile -p ./ && gulp tslint",
-    "watch": "node ./node_modules/vscode/bin/compile -watch -p ./",
-    "test": "mocha --timeout 15000 -u tdd ./out/test/*.tests.js ./out/test/**/*.tests.js",
+    "vscode:prepublish": "tsc -p ./",
+    "compile": "tsc -p ./ && gulp tslint",
+    "watch": "tsc -watch -p ./",
+    "test": "node ./node_modules/vscode/bin/test",
+    "test-syntax": "mocha --timeout 15000 --ui bdd ./out/test/syntaxes/*.test.syntax.js",
     "postinstall": "node ./node_modules/vscode/bin/install"
   },
   "dependencies": {
-    "fs-extra-promise": "^0.3.1",
+    "fs-extra": "^1.0.0",
     "http-proxy-agent": "^1.0.0",
     "https-proxy-agent": "^1.0.0",
     "lodash.debounce": "^4.0.8",
@@ -38,17 +44,24 @@
     "yauzl": "^2.5.0"
   },
   "devDependencies": {
+    "@types/chai": "^3.4.34",
+    "@types/fs-extra": "0.0.35",
+    "@types/mkdirp": "^0.3.29",
+    "@types/mocha": "^2.2.32",
+    "@types/node": "^6.0.40",
+    "@types/semver": "^5.3.30",
+    "@types/tmp": "0.0.32",
+    "chai": "^3.5.0",
     "del": "^2.0.2",
     "gulp": "^3.9.1",
     "gulp-mocha": "^2.1.3",
     "gulp-tslint": "^4.3.0",
-    "mocha": "^2.2.5",
+    "mocha": "^2.3.3",
     "tslint": "^3.15.1",
     "tslint-microsoft-contrib": "^2.0.12",
     "typescript": "^2.0.3",
-    "vscode": "^0.11.13",
     "vsce": "^1.7.0",
-    "chai": "^3.5.0",
+    "vscode": "^1.0.0",
     "vscode-textmate": "^2.1.1"
   },
   "runtimeDependencies": [
@@ -105,7 +118,7 @@
     },
     {
       "description": "OmniSharp (.NET 4.6 / x86)",
-      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.9-beta21-2.zip",
+      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.9-beta22.zip",
       "installPath": "./bin/omnisharp",
       "platforms": [
         "win32"
@@ -116,7 +129,7 @@
     },
     {
       "description": "OmniSharp (.NET 4.6 / x64)",
-      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.9-beta21-2.zip",
+      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.9-beta22.zip",
       "installPath": "./bin/omnisharp",
       "platforms": [
         "win32"
@@ -127,7 +140,7 @@
     },
     {
       "description": "OmniSharp (Mono 4.6)",
-      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-mono-1.9-beta21-2.zip",
+      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-mono-1.9-beta22.zip",
       "installPath": "./bin/omnisharp",
       "platforms": [
         "darwin",
@@ -288,7 +301,7 @@
     }
   ],
   "engines": {
-    "vscode": "^1.3.0"
+    "vscode": "^1.5.0"
   },
   "activationEvents": [
     "onLanguage:csharp",
@@ -365,6 +378,11 @@
           "type": "number",
           "default": 250,
           "description": "The maximum number of projects to be shown in the 'Select Project' dropdown (maximum 250)."
+        },
+        "omnisharp.useEditorFormattingSettings": {
+          "type": "boolean",
+          "default": true,
+          "description": "Specifes whether OmniSharp should use VS Code editor settings for C# code formatting (use of tabs, indentation size)."
         }
       }
     },
@@ -1126,4 +1144,4 @@
       }
     ]
   }
-}
+}