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

Merge from vscode b12f623603e2fc1c5b3037115fa37c1a6acc4165 (#6760)

Browse Source
This commit is contained in:
Anthony Dresser
2019-08-15 02:19:31 -07:00
committed by GitHub
parent 4966ed8b42
commit 58bfba4b47
161 changed files with 2072 additions and 1317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/workbench/services/extensions/node/extensionPoints.ts
View File

@@ -313,11 +313,6 @@ class ExtensionManifestValidator extends ExtensionManifestHandler {
extensionDescription.id = `${extensionDescription.publisher}.${extensionDescription.name}`;
extensionDescription.identifier = new ExtensionIdentifier(extensionDescription.id);
// main := absolutePath(`main`)
if (extensionDescription.main) {
extensionDescription.main = path.join(this._absoluteFolderPath, extensionDescription.main);
}
extensionDescription.extensionLocation = URI.file(this._absoluteFolderPath);
return extensionDescription;

36
src/vs/workbench/services/extensions/node/proxyResolver.ts
View File

@@ -469,26 +469,24 @@ async function readCaCertificates() {
}
async function readWindowsCaCertificates() {
// Not using await to work around minifier bug (https://github.com/microsoft/vscode/issues/79044).
return import('vscode-windows-ca-certs')
.then(winCA => {
let ders: any[] = [];
const store = winCA();
try {
let der: any;
while (der = store.next()) {
ders.push(der);
}
} finally {
store.done();
}
const winCA = await import('vscode-windows-ca-certs');
const certs = new Set(ders.map(derToPem));
return {
certs: Array.from(certs),
append: true
};
});
let ders: any[] = [];
const store = winCA();
try {
let der: any;
while (der = store.next()) {
ders.push(der);
}
} finally {
store.done();
}
const certs = new Set(ders.map(derToPem));
return {
certs: Array.from(certs),
append: true
};
}
async function readMacCaCertificates() {