Skip to content

Commit

Permalink
Update to electron 1.4.x (microsoft#15298)
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
bpasero authored Nov 14, 2016
1 parent 2c9bafc commit 97bef4b
Show file tree
Hide file tree
Showing 17 changed files with 315 additions and 59 deletions.
6 changes: 3 additions & 3 deletions OSSREADME.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
},
{
"name": "chromium",
"version": "52.0.2743.82",
"version": "53.0.2785.143",
"repositoryURL": "http://www.chromium.org/Home",
"licenseDetail": [
"BSD License",
Expand Down Expand Up @@ -104,7 +104,7 @@
},
{
"name": "libchromiumcontent",
"version": "52.0.2743.82",
"version": "53.0.2785.143",
"license": "MIT",
"repositoryURL": "https://github.com/electron/libchromiumcontent",
"isProd": true
Expand All @@ -117,7 +117,7 @@
},
{
"name": "electron",
"version": "1.3.8",
"version": "1.4.6",
"license": "MIT",
"repositoryURL": "https://github.com/electron/electron",
"isProd": true
Expand Down
1 change: 0 additions & 1 deletion build/gulpfile.vscode.js
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,6 @@ function packageTask(platform, arch, opts) {

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

result = es.merge(result, gulp.src('resources/win32/bin/code.cmd', { base: 'resources/win32' })
.pipe(replace('@@NAME@@', product.nameShort))
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "code-oss-dev",
"version": "1.8.0",
"electronVersion": "1.3.8",
"electronVersion": "1.4.6",
"distro": "cc6a2710b81e898b8cde2b51ba29e178980009e8",
"author": {
"name": "Microsoft Corporation"
Expand Down
Binary file removed resources/win32/bin/cat.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion resources/win32/bin/code.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
setlocal
set VSCODE_DEV=
set ELECTRON_RUN_AS_NODE=1
call "%~dp0..\@@NAME@@.exe" "%~dp0..\resources\app\out\cli.js" %* | "%~dp0\cat.exe"
call "%~dp0..\@@NAME@@.exe" "%~dp0..\resources\app\out\cli.js" %*
endlocal
2 changes: 1 addition & 1 deletion resources/win32/bin/code.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ if [ "$(expr substr $(uname -s) 1 9)" == "CYGWIN_NT" ]; then
else
CLI="$VSCODE_PATH/resources/app/out/cli.js"
fi
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@" | cat
ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@"
exit $?
2 changes: 1 addition & 1 deletion scripts/test.bat
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if not "%BUILD_BUILDID%" == "" (

rem Otherwise
if "%BUILD_BUILDID%" == "" (
%CODE% .\node_modules\mocha\bin\_mocha --reporter dot %* | .\resources\win32\bin\cat
%CODE% .\node_modules\mocha\bin\_mocha --reporter dot %*
)
popd

Expand Down
Loading

0 comments on commit 97bef4b

Please sign in to comment.