Merge dev branch into master

.gitignore

@@ -1,5 +1,6 @@
 bin
 node_modules
 out
+.omnisharp
 
 *.vsix

.travis.yml

@@ -2,11 +2,24 @@ sudo: false
 language: node_js
 
 node_js:
-  - "5.1"
+- "5.1"
 
 os:
   -osx
   -linux
 
 install:
-  - npm install
+- npm install
+- npm install -g vsce
+- vsce package
+
+deploy:
+  provider: releases
+  api_key:
+    secure: T6OzDRQEXpIsIKM2V+X+YgSa1vPDXDdoRBOV39BCDkKv7fDH5rTHs/hVtrwIfLvLVAtJq4kDm6hSVAFLpni1nUHzx2hFCi31CCWPlqhDo31v0CMD6pMccUlCFi2iul3T3EAiT4HmoSEKoCLET8uLIKaYoQ6wc+D11z55kM9DFtv/fGwfxL8FWvbNHYaGc3KNvNOwoMcOc8VpXXGQ1Rtc1IAx62G6qS8V6Yn89sUev/AxT/wcU/wmzNW5UgdAUgnJUFbSumwzfFYFJUdkUSP5iLxjlAJJSNHjHzN5wNX1bIMfSv5DJn1P15ev5OyfjJ+EmjFFmOTJiPlgver/scrZzhrv3kvBYULI8vAAgRWde5CgESGJqv5gEIj3oSICv+2MPmB+Kjr/79AfXrCvORc3an9UASyfgQvamfIoboFLNLZTIe/66oH7UmSJ2rtcaYEKMWHo7qq9cI4yFX6SexwqQehrGPr+QFbjpxFFAhs6aJEFGGgw4i/yheEP6Z7mrKx5wqScVfSLz1iBDmPAkB8pSFhXPk4XpYPjZsCI/wzLERYZ1gBweAKosnMt2anf0Eu1USUo1nXvFmsKTH6lBdBIthVW2va2DCgW+aWQj+j/G670UXT7BoHkcx0GaOzhPc6HeS1ovA9/kX5ZBaslPNAOmGycmGJAuNs2sSvFJf9JZY4=
+  file_glob: true
+  file: "*.vsix"
+  skip_cleanup: true
+  on:
+    repo: OmniSharp/omnisharp-vscode
+    tags: true

.vscodeignore

@@ -5,6 +5,7 @@ src/**
 **/*.map
 
 .vscode/**
+.omnisharp/**
 
 coreclr-debug/debugAdapters/**
 coreclr-debug/bin/**

coreclr-debug/.gitignore

@@ -2,4 +2,6 @@ bin
 obj
 project.lock.json
 debugAdapters
-install.log
+install.log
+extension.log
+project.json

gulpfile.js

@@ -1,70 +1,31 @@
-var gulp = require('gulp');
-var decompress = require('gulp-decompress');
-var tslint = require("gulp-tslint");
-var es = require('event-stream');
-var GitHub = require('github-releases');
-var tmp = require('tmp');
-var vfs = require('vinyl-fs');
-var del = require('del');
-var fs = require('fs');
-var path = require('path');
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
 
-tmp.setGracefulCleanup();
+'use strict';
 
-function downloadOmnisharp(version) {
-	var result = es.through();
+const del = require('del');
+const gulp = require('gulp');
+const tslint = require('gulp-tslint');
+const vsce = require('vsce');
+const omnisharpDownload = require('./out/omnisharpDownload');
 
-	function onError(err) {
-		result.emit('error', err);
-	}
-
-	var repo = new GitHub({
-		repo: 'OmniSharp/omnisharp-roslyn',
-		token: process.env['GITHUB_TOKEN']
-	});
-
-	repo.getReleases({ tag_name: version }, function (err, releases) {
-		if (err) { return onError(err); }
-		if (!releases.length) { return onError(new Error('Release not found')); }
-		if (!releases[0].assets.length) { return onError(new Error('Assets not found')); }
-
-		repo.downloadAsset(releases[0].assets[0], function (err, istream) {
-			if (err) { return onError(err); }
-
-			tmp.file(function (err, tmpPath, fd, cleanupCallback) {
-				if (err) { return onError(err); }
-
-				var ostream = fs.createWriteStream(null, { fd: fd });
-				ostream.once('error', onError);
-				istream.once('error', onError);
-				ostream.once('finish', function () {
-					vfs.src(tmpPath).pipe(result);
-				});
-				istream.pipe(ostream);
-			});
-		});
-	});
-
-	return result;
-}
-
-gulp.task('omnisharp:clean', function () {
-	return del('bin');
+gulp.task('omnisharp:clean', () => {
+	return del('.omnisharp');
 });
 
-gulp.task('omnisharp:fetch', ['omnisharp:clean'], function () {
-	return downloadOmnisharp('v1.6.7.9')
-		.pipe(decompress({strip: 1}))
-		.pipe(gulp.dest('bin'));
+gulp.task('omnisharp:fetch', ['omnisharp:clean'], () => {
+	return omnisharpDownload.downloadOmnisharp();
 });
 
-var allTypeScript = [
+const allTypeScript = [
     'src/**/*.ts',
     '!**/*.d.ts',
     '!**/typings**'
 ];
 
-var lintReporter = function (output, file, options) {
+const lintReporter = (output, file, options) => {
 	//emits: src/helloWorld.c:5:3: warning: implicit declaration of function ‘prinft’
 	var relativeBase = file.base.substring(file.cwd.length + 1).replace('\\', '/');
 	output.forEach(function(e) {
@@ -73,48 +34,19 @@ var lintReporter = function (output, file, options) {
 	});
 };
 
-gulp.task('tslint', function () {
+gulp.task('tslint', () => {
 	gulp.src(allTypeScript)
-	.pipe(tslint({
-		rulesDirectory: "node_modules/tslint-microsoft-contrib"
-	}))
-	.pipe(tslint.report(lintReporter, {
-		summarizeFailureOutput: false,
-		emitError: false
-	}))
-});
-
-gulp.task('omnisharp:fixscripts', ['omnisharp:fetch'], function () {
-
-	var _fixes = Object.create(null);
-	_fixes['./bin/omnisharp.cmd'] = '@"%~dp0packages\\dnx-clr-win-x86.1.0.0-beta4\\bin\\dnx.exe" "%~dp0packages\\OmniSharp\\1.0.0\\root" run %*';
-	_fixes['./bin/omnisharp'] = '#!/bin/bash\n\
-SOURCE="${BASH_SOURCE[0]}"\n\
-while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink\n\
-  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"\n\
-  SOURCE="$(readlink "$SOURCE")"\n\
-  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located\n\
-done\n\
-DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"\n\
-export SET DNX_APPBASE="$DIR/packages/OmniSharp/1.0.0/root"\n\
-export PATH=/usr/local/bin:/Library/Frameworks/Mono.framework/Commands:$PATH # this is required for the users of the Homebrew Mono package\n\
-exec "$DIR/packages/dnx-mono.1.0.0-beta4/bin/dnx" "$DNX_APPBASE" run "$@"\n\
-\n';
-
-	var promises = Object.keys(_fixes).map(function (key) {
-		return new Promise(function(resolve, reject) {
-			fs.writeFile(path.join(__dirname, key), _fixes[key], function (err) {
-				if (err) {
-					reject(err);
-				} else {
-					resolve();
-				}
-			})
-		});
-	});
-
-	return Promise.all(promises)
+	    .pipe(tslint({
+            rulesDirectory: "node_modules/tslint-microsoft-contrib"
+        }))
+        .pipe(tslint.report(lintReporter, {
+            summarizeFailureOutput: false,
+            emitError: false
+        }))
 });
 
+gulp.task('omnisharp', ['omnisharp:fetch']);
 
-gulp.task('omnisharp', ['omnisharp:fixscripts']);
+gulp.task('package', () => {
+    vsce(['', '', 'package']);
+});