Merge branch 'master' into roblou/inspectEH

build/tfs/darwin/build.sh

@@ -25,8 +25,8 @@ step "Install distro dependencies" \
 step "Build minified & upload source maps" \
 	npm run gulp -- --max_old_space_size=4096 vscode-darwin-min upload-vscode-sourcemaps
 
-step "Create loader snapshot"
-	node build/lib/snapshotLoader.js
+# step "Create loader snapshot"
+#	node build/lib/snapshotLoader.js
 
 step "Run unit tests" \
 	./scripts/test.sh --build --reporter dot

build/tfs/linux/build.sh

@@ -30,8 +30,8 @@ step "Install distro dependencies" \
 step "Build minified" \
 	npm run gulp -- --max_old_space_size=4096 "vscode-linux-$ARCH-min"
 
-step "Create loader snapshot"
-	node build/lib/snapshotLoader.js --arch=$ARCH
+# step "Create loader snapshot"
+# 	node build/lib/snapshotLoader.js --arch=$ARCH
 
 step "Run unit tests" \
 	./scripts/test.sh --build --reporter dot

build/tfs/win32/1_build.ps1

@@ -36,9 +36,9 @@ step "Build minified" {
   exec { & npm run gulp -- --max_old_space_size=4096 "vscode-win32-$global:arch-min" }
 }
 
-step "Create loader snapshot" {
-  exec { & 	node build\lib\snapshotLoader.js --arch=$global:arch }
-}
+# step "Create loader snapshot" {
+#   exec { & 	node build\lib\snapshotLoader.js --arch=$global:arch }
+# }
 
 step "Run unit tests" {
   exec { & .\scripts\test.bat --build --reporter dot }

package.json

 {
   "name": "code-oss-dev",
   "version": "1.16.0",
-  "electronVersion": "1.6.6",
+  "electronVersion": "1.7.4",
   "distro": "724097db097bfde7796fcca70aaac83ba80a95f8",
   "author": {
     "name": "Microsoft Corporation"
@@ -60,7 +60,7 @@
     "cson-parser": "^1.3.3",
     "debounce": "^1.0.0",
     "documentdb": "^1.5.1",
-    "electron-mksnapshot": "1.6.0",
+    "electron-mksnapshot": "~1.7.0",
     "eslint": "^3.4.0",
     "event-stream": "^3.1.7",
     "express": "^4.13.1",
@@ -129,4 +129,4 @@
     "windows-mutex": "^0.2.0",
     "fsevents": "0.3.8"
   }
-}
\ No newline at end of file
+}

scripts/test.bat

@@ -26,4 +26,10 @@ if not "%INSTALLEDVERSION%" == "%DESIREDVERSION%" node .\node_modules\gulp\bin\g
 popd
 
 endlocal
+
+:: app.exit(0) is exiting with code 255 in Electron 1.7.4.
+:: See https://github.com/Microsoft/vscode/issues/28582
+echo errorlevel: %errorlevel%
+if %errorlevel% == 255 set errorlevel=0
+
 exit /b %errorlevel%