ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix install-sqltoolsservice build task (#593)

Browse Source
This commit is contained in:
Karl Burtram
2018-01-31 18:03:57 -05:00
committed by GitHub
parent 642514fd94
commit 8a350809fd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/gulpfile.vscode.js
View File

@@ -32,7 +32,8 @@ const product = require('../product.json');
const crypto = require('crypto'); const crypto = require('crypto');
const i18n = require('./lib/i18n'); const i18n = require('./lib/i18n');
// {{SQL CARBON EDIT}} // {{SQL CARBON EDIT}}
const serviceInstaller = require('extensions-modules/lib/languageservice/serviceInstallerUtil'); var del = require('del');
const serviceInstaller = require('../extensions-modules/lib/languageservice/serviceInstallerUtil');
const glob = require('glob'); const glob = require('glob');
const deps = require('./dependencies'); const deps = require('./dependencies');
const getElectronVersion = require('./lib/electron').getElectronVersion; const getElectronVersion = require('./lib/electron').getElectronVersion;

2
extensions-modules/src/configurations/config.ts
View File

@@ -78,7 +78,7 @@ export default class Config implements IConfig {
public loadConfig(): any { public loadConfig(): any {
let configContent = undefined; let configContent = undefined;
if (this._fromBuild) { if (this._fromBuild) {
let remainingPath = '../../../../../extensions/' + this._extensionConfigSectionName + '/client/out/config.json'; let remainingPath = '../../../extensions/' + this._extensionConfigSectionName + '/client/out/config.json';
configContent = fs.readFileSync(path.join(__dirname, remainingPath)); configContent = fs.readFileSync(path.join(__dirname, remainingPath));
} }
else { else {