@@ -11,16 +11,59 @@ index e73dd4d9e8..e3192b3a0d 100644
1111 build/node_modules
1212 coverage/
1313diff --git a/.yarnrc b/.yarnrc
14- index d86b284e83..a7300dbfb9 100644
14+ deleted file mode 100644
15+ index d86b284e83..0000000000
1516--- a/.yarnrc
16- +++ b/.yarnrc
17- @@ -1,3 +1,3 @@
17+ +++ /dev/null
18+ @@ -1,3 +0,0 @@
1819- disturl "https://atom.io/download/electron"
1920- target "7.2.4"
2021- runtime "electron"
21- + disturl "http://nodejs.org/dist"
22- + target "12.16.3"
23- + runtime "node"
22+ diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
23+ index f2ea1bd370..2dc6da34fb 100644
24+ --- a/build/gulpfile.reh.js
25+ +++ b/build/gulpfile.reh.js
26+ @@ -52,6 +52,7 @@ gulp.task('vscode-reh-web-linux-x64-min', noop);
27+ gulp.task('vscode-reh-web-linux-alpine-min', noop);
28+
29+ function getNodeVersion() {
30+ + return process.versions.node
31+ const yarnrc = fs.readFileSync(path.join(REPO_ROOT, 'remote', '.yarnrc'), 'utf8');
32+ const target = /^target "(.*)"$/m.exec(yarnrc)[1];
33+ return target;
34+ diff --git a/build/lib/electron.ts b/build/lib/electron.ts
35+ index 86c7afcf31..0663b4c28d 100644
36+ --- a/build/lib/electron.ts
37+ +++ b/build/lib/electron.ts
38+ @@ -20,6 +20,7 @@ const product = JSON.parse(fs.readFileSync(path.join(root, 'product.json'), 'utf
39+ const commit = util.getVersion(root);
40+
41+ export function getElectronVersion(): string {
42+ + return process.versions.node
43+ const yarnrc = fs.readFileSync(path.join(root, '.yarnrc'), 'utf8');
44+ const target = /^target "(.*)"$/m.exec(yarnrc)![1];
45+ return target;
46+ diff --git a/build/lib/node.ts b/build/lib/node.ts
47+ index 6439703446..a3e9f7cee2 100644
48+ --- a/build/lib/node.ts
49+ +++ b/build/lib/node.ts
50+ @@ -7,10 +7,11 @@ import * as path from 'path';
51+ import * as fs from 'fs';
52+
53+ const root = path.dirname(path.dirname(__dirname));
54+ - const yarnrcPath = path.join(root, 'remote', '.yarnrc');
55+ - const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
56+ - const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)![1];
57+ + // const yarnrcPath = path.join(root, 'remote', '.yarnrc');
58+ + // const yarnrc = fs.readFileSync(yarnrcPath, 'utf8');
59+ + // const version = /^target\s+"([^"]+)"$/m.exec(yarnrc)![1];
60+ + const version = process.versions.node;
61+ const node = process.platform === 'win32' ? 'node.exe' : 'node';
62+ const nodePath = path.join(root, '.build', 'node', `v${version}`, `${process.platform}-${process.arch}`, node);
63+
64+ - console.log(nodePath);
65+ \ No newline at end of file
66+ + console.log(nodePath);
2467diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
2568index 7a2320d828..5768890636 100644
2669--- a/build/npm/postinstall.js
@@ -166,6 +209,15 @@ index 91b3b92678..f76f2c1548 100644
166209 "urlProtocol": "code-oss",
167210 "extensionAllowedProposedApi": [
168211 "ms-vscode.vscode-js-profile-table",
212+ diff --git a/remote/.yarnrc b/remote/.yarnrc
213+ deleted file mode 100644
214+ index 1e16cde724..0000000000
215+ --- a/remote/.yarnrc
216+ +++ /dev/null
217+ @@ -1,3 +0,0 @@
218+ - disturl "http://nodejs.org/dist"
219+ - target "12.4.0"
220+ - runtime "node"
169221diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
170222index e4546b2cf6..9df12239fb 100644
171223--- a/src/vs/base/common/network.ts
0 commit comments