Skip to content

Commit

Permalink
remove omnisharp
Browse files Browse the repository at this point in the history
fixes #3167
  • Loading branch information
joaomoreno committed Feb 19, 2016
1 parent 93f1cf3 commit 90c1f7a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 40 deletions.
14 changes: 1 addition & 13 deletions build/gulpfile.vscode.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ var filter = require('gulp-filter');
var json = require('gulp-json-editor');
var remote = require('gulp-remote-src');
var shell = require("gulp-shell");
var File = require('vinyl');
var rimraf = require('rimraf');
var _ = require('underscore');
var packageJson = require('../package.json');
var util = require('./lib/util');
Expand All @@ -39,10 +37,6 @@ var baseModules = [

// Build

var builtInExtensions = {
'ms-vscode.omnisharp': '0.3.2',
};

var vscodeEntryPoints = _.flatten([
buildfile.entrypoint('vs/workbench/workbench.main'),
buildfile.base,
Expand Down Expand Up @@ -209,19 +203,13 @@ function packageTask(platform, arch, opts) {
.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], true))
.pipe(util.cleanNodeModule('weak', ['binding.gyp', 'build/**', 'src/**'], true));

var extraExtensions = util.downloadExtensions(builtInExtensions)
.pipe(rename(function (p) {
p.dirname = path.posix.join('extensions', p.dirname);
}));

var all = es.merge(
api,
packageJsonStream,
mixinProduct(),
license,
sources,
deps,
extraExtensions
deps
);

if (platform === 'win32') {
Expand Down
34 changes: 7 additions & 27 deletions build/lib/util.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

/*global require,exports,process,Buffer*/

var es = require('event-stream');
var debounce = require('debounce');
var filter = require('gulp-filter');
var azure = require('gulp-azure-storage');
var rename = require('gulp-rename');
var vzip = require('gulp-vinyl-zip');
var util = require('gulp-util');
var remote = require('gulp-remote-src');
var _ = require('underscore');
var path = require('path');
var fs = require('fs');
Expand Down Expand Up @@ -252,32 +258,6 @@ exports.rimraf = function(dir) {
};
};

exports.downloadExtensions = function(extensions) {
var streams = Object.keys(extensions).map(function (fullName) {
var version = extensions[fullName];
var match = /^([^.]+)\.([^.]+)$/.exec(fullName);

if (!match) {
throw new Error('Bad extension: ' + fullName);
}

var publisher = match[1];
var name = match[2];
var url = 'https://' + publisher + '.gallery.vsassets.io/_apis/public/gallery/publisher/'
+ publisher + '/extension/' + name + '/' + version
+ '/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage';

return remote(url, { base: '' })
.pipe(vzip.src())
.pipe(filter('extension/**'))
.pipe(rename(function (p) {
p.dirname = path.posix.join(fullName, p.dirname.replace(/^extension[/\\]?/, ''));
}));
});

return es.merge(streams);
};

exports.getVersion = function (root) {
var version = process.env['BUILD_SOURCEVERSION'];

Expand Down

0 comments on commit 90c1f7a

Please sign in to comment.