Skip to content

Commit 97bef4b

Browse files
bpaserobpasero
authored
Update to electron 1.4.x (microsoft#15298)
* electron 1.4.6 * fix broken DND image feedback * OSS input * remove cat.exe as it is no longer needed * update electron.d.ts * set new ELECTRON_NO_ASAR environment for forked processes * Automatically enable high contrast theme when enabled in Windows (fixes microsoft#15360)
1 parent 2c9bafc commit 97bef4b

17 files changed

Lines changed: 315 additions & 59 deletions

File tree

‎OSSREADME.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
},
6969
{
7070
"name": "chromium",
71-
"version": "52.0.2743.82",
71+
"version": "53.0.2785.143",
7272
"repositoryURL": "http://www.chromium.org/Home",
7373
"licenseDetail": [
7474
"BSD License",
@@ -104,7 +104,7 @@
104104
},
105105
{
106106
"name": "libchromiumcontent",
107-
"version": "52.0.2743.82",
107+
"version": "53.0.2785.143",
108108
"license": "MIT",
109109
"repositoryURL": "https://github.com/electron/libchromiumcontent",
110110
"isProd": true
@@ -117,7 +117,7 @@
117117
},
118118
{
119119
"name": "electron",
120-
"version": "1.3.8",
120+
"version": "1.4.6",
121121
"license": "MIT",
122122
"repositoryURL": "https://github.com/electron/electron",
123123
"isProd": true

‎build/gulpfile.vscode.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,6 @@ function packageTask(platform, arch, opts) {
289289

290290
if (platform === 'win32') {
291291
result = es.merge(result, gulp.src('resources/win32/bin/code.js', { base: 'resources/win32' }));
292-
result = es.merge(result, gulp.src('resources/win32/bin/cat.exe', { base: 'resources/win32' }));
293292

294293
result = es.merge(result, gulp.src('resources/win32/bin/code.cmd', { base: 'resources/win32' })
295294
.pipe(replace('@@NAME@@', product.nameShort))

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.8.0",
4-
"electronVersion": "1.3.8",
4+
"electronVersion": "1.4.6",
55
"distro": "cc6a2710b81e898b8cde2b51ba29e178980009e8",
66
"author": {
77
"name": "Microsoft Corporation"

‎resources/win32/bin/cat.exe‎

-207 KB
Binary file not shown.

‎resources/win32/bin/code.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
setlocal
33
set VSCODE_DEV=
44
set ELECTRON_RUN_AS_NODE=1
5-
call "%~dp0..\@@NAME@@.exe" "%~dp0..\resources\app\out\cli.js" %* | "%~dp0\cat.exe"
5+
call "%~dp0..\@@NAME@@.exe" "%~dp0..\resources\app\out\cli.js" %*
66
endlocal

‎resources/win32/bin/code.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ if [ "$(expr substr $(uname -s) 1 9)" == "CYGWIN_NT" ]; then
1111
else
1212
CLI="$VSCODE_PATH/resources/app/out/cli.js"
1313
fi
14-
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@" | cat
14+
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
1515
exit $?

‎scripts/test.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if not "%BUILD_BUILDID%" == "" (
1717

1818
rem Otherwise
1919
if "%BUILD_BUILDID%" == "" (
20-
%CODE% .\node_modules\mocha\bin\_mocha --reporter dot %* | .\resources\win32\bin\cat
20+
%CODE% .\node_modules\mocha\bin\_mocha --reporter dot %*
2121
)
2222
popd
2323

0 commit comments

Comments
 (0)