ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove more instances of insiders builtinextensions (#8932)

Browse Source
This commit is contained in:
Anthony Dresser
2020-01-22 13:30:12 -08:00
committed by GitHub
parent 8b9aeb8679
commit 5ccde42213
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/platform/extensionManagement/node/extensionManagementService.ts
View File

@@ -964,9 +964,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
private _devSystemExtensionsFilePath: string | null = null; private _devSystemExtensionsFilePath: string | null = null;
private get devSystemExtensionsFilePath(): string { private get devSystemExtensionsFilePath(): string {
if (!this._devSystemExtensionsFilePath) { if (!this._devSystemExtensionsFilePath) {
// {{SQL CARBON EDIT} this._devSystemExtensionsFilePath = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'build', 'builtInExtensions.json'));
let builtInPath = product.quality === 'stable' ? 'builtInExtensions' : 'builtInExtensions-insiders';
this._devSystemExtensionsFilePath = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'build', `${builtInPath}.json`));
} }
return this._devSystemExtensionsFilePath; return this._devSystemExtensionsFilePath;
} }

5
src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts
View File

@@ -259,10 +259,7 @@ export class CachedExtensionScanner {
let finalBuiltinExtensions: Promise<IExtensionDescription[]> = builtinExtensions; let finalBuiltinExtensions: Promise<IExtensionDescription[]> = builtinExtensions;
if (devMode) { if (devMode) {
// {{SQL CARBON EDIT}} const builtInExtensionsFilePath = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'build', 'builtInExtensions.json'));
let builtInFilename = product.quality === 'stable' ? 'builtInExtensions.json' : 'builtInExtensions-insiders.json';
const builtInExtensionsFilePath = path.normalize(path.join(getPathFromAmdModule(require, ''), '..', 'build', builtInFilename));
// {{SQL CARBON EDIT}} - END
const builtInExtensions = pfs.readFile(builtInExtensionsFilePath, 'utf8') const builtInExtensions = pfs.readFile(builtInExtensionsFilePath, 'utf8')
.then<IBuiltInExtension[]>(raw => JSON.parse(raw)); .then<IBuiltInExtension[]>(raw => JSON.parse(raw));