mirror of
https://github.com/Microsoft/vscode
synced 2024-09-13 21:55:38 +00:00
Update to Electron 4.0.x (#73119)
* Bump electron@4.0.0-beta.9 * electron 4 - temporarily warn about exploration change * update to Electron 4.0.0 stable * remove electron 4 notification * bump to electron@4.0.1 * electron 4: adopt format change of "version" file * build - set to use exploration image * Revert "build - set to use exploration image" This reverts commit1bb280fc5e
. * electron@4.0.2 * fix electron.d.ts * update distro * bump electron@4.0.4 * debt - adopt new process.getProcessMemoryInfo() * update electron@4.0.5 * electron@4.0.6 * electron 4.0.x - remove Linux 32bit build * electron@4.0.7 * electron - update to 4.1.2 * bump electron@4.1.4 * update build (remove Linux32) * electron@4.1.5 * electron 4 - remove linux 32bit warning * Remove more 32-bit Linux build stuff Fixes #66271 * electron@4.2.0 * electron@4.2.1 * electron@4.2.2 * electron@4.2.3 * Revert "electron@4.2.3" This reverts commitae375ef764
. * Revert "Revert "electron@4.2.3"" This reverts commit513581ebc5
.
This commit is contained in:
parent
f27ce91079
commit
73643c60a6
2
.yarnrc
2
.yarnrc
|
@ -1,3 +1,3 @@
|
||||||
disturl "https://atom.io/download/electron"
|
disturl "https://atom.io/download/electron"
|
||||||
target "3.1.8"
|
target "4.2.3"
|
||||||
runtime "electron"
|
runtime "electron"
|
||||||
|
|
|
@ -36,7 +36,6 @@ export interface IVersionAccessor extends IApplicationAccessor {
|
||||||
enum Platform {
|
enum Platform {
|
||||||
WIN_32 = 'win32-ia32',
|
WIN_32 = 'win32-ia32',
|
||||||
WIN_64 = 'win32-x64',
|
WIN_64 = 'win32-x64',
|
||||||
LINUX_32 = 'linux-ia32',
|
|
||||||
LINUX_64 = 'linux-x64',
|
LINUX_64 = 'linux-x64',
|
||||||
MAC_OS = 'darwin-x64'
|
MAC_OS = 'darwin-x64'
|
||||||
}
|
}
|
||||||
|
@ -191,7 +190,7 @@ if (process.platform === 'darwin') {
|
||||||
} else if (process.platform === 'win32') {
|
} else if (process.platform === 'win32') {
|
||||||
platform = is64 ? Platform.WIN_64 : Platform.WIN_32;
|
platform = is64 ? Platform.WIN_64 : Platform.WIN_32;
|
||||||
} else {
|
} else {
|
||||||
platform = is64 ? Platform.LINUX_64 : Platform.LINUX_32;
|
platform = Platform.LINUX_64;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create version and upload symbols in HockeyApp
|
// Create version and upload symbols in HockeyApp
|
||||||
|
|
|
@ -16,9 +16,6 @@ steps:
|
||||||
- script: |
|
- script: |
|
||||||
set -e
|
set -e
|
||||||
export npm_config_arch="$(VSCODE_ARCH)"
|
export npm_config_arch="$(VSCODE_ARCH)"
|
||||||
if [[ "$(VSCODE_ARCH)" == "ia32" ]]; then
|
|
||||||
export PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
|
|
||||||
fi
|
|
||||||
|
|
||||||
cat << EOF > ~/.netrc
|
cat << EOF > ~/.netrc
|
||||||
machine monacotools.visualstudio.com
|
machine monacotools.visualstudio.com
|
||||||
|
|
|
@ -5,8 +5,6 @@ ROOT="$REPO/.."
|
||||||
|
|
||||||
# Publish tarball
|
# Publish tarball
|
||||||
PLATFORM_LINUX="linux-$VSCODE_ARCH"
|
PLATFORM_LINUX="linux-$VSCODE_ARCH"
|
||||||
[[ "$VSCODE_ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
|
|
||||||
[[ "$VSCODE_ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
|
|
||||||
BUILDNAME="VSCode-$PLATFORM_LINUX"
|
BUILDNAME="VSCode-$PLATFORM_LINUX"
|
||||||
BUILD="$ROOT/$BUILDNAME"
|
BUILD="$ROOT/$BUILDNAME"
|
||||||
BUILD_VERSION="$(date +%s)"
|
BUILD_VERSION="$(date +%s)"
|
||||||
|
@ -39,7 +37,7 @@ node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_H
|
||||||
# Publish DEB
|
# Publish DEB
|
||||||
yarn gulp "vscode-linux-$VSCODE_ARCH-build-deb"
|
yarn gulp "vscode-linux-$VSCODE_ARCH-build-deb"
|
||||||
PLATFORM_DEB="linux-deb-$VSCODE_ARCH"
|
PLATFORM_DEB="linux-deb-$VSCODE_ARCH"
|
||||||
[[ "$VSCODE_ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
|
DEB_ARCH="amd64"
|
||||||
DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
|
DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
|
||||||
DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
|
DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
|
||||||
|
|
||||||
|
@ -48,7 +46,7 @@ node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_DEB" p
|
||||||
# Publish RPM
|
# Publish RPM
|
||||||
yarn gulp "vscode-linux-$VSCODE_ARCH-build-rpm"
|
yarn gulp "vscode-linux-$VSCODE_ARCH-build-rpm"
|
||||||
PLATFORM_RPM="linux-rpm-$VSCODE_ARCH"
|
PLATFORM_RPM="linux-rpm-$VSCODE_ARCH"
|
||||||
[[ "$VSCODE_ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
|
RPM_ARCH="x86_64"
|
||||||
RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
|
RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
|
||||||
RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
|
RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
|
||||||
|
|
||||||
|
|
|
@ -3,9 +3,6 @@ resources:
|
||||||
- container: vscode-x64
|
- container: vscode-x64
|
||||||
image: vscodehub.azurecr.io/vscode-linux-build-agent:x64
|
image: vscodehub.azurecr.io/vscode-linux-build-agent:x64
|
||||||
endpoint: VSCodeHub
|
endpoint: VSCodeHub
|
||||||
- container: vscode-ia32
|
|
||||||
image: vscodehub.azurecr.io/vscode-linux-build-agent:ia32
|
|
||||||
endpoint: VSCodeHub
|
|
||||||
- container: snapcraft
|
- container: snapcraft
|
||||||
image: snapcore/snapcraft
|
image: snapcore/snapcraft
|
||||||
|
|
||||||
|
@ -49,16 +46,6 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- template: linux/snap-build-linux.yml
|
- template: linux/snap-build-linux.yml
|
||||||
|
|
||||||
- job: Linux32
|
|
||||||
condition: eq(variables['VSCODE_BUILD_LINUX_32BIT'], 'true')
|
|
||||||
pool:
|
|
||||||
vmImage: 'Ubuntu-16.04'
|
|
||||||
variables:
|
|
||||||
VSCODE_ARCH: ia32
|
|
||||||
container: vscode-ia32
|
|
||||||
steps:
|
|
||||||
- template: linux/product-build-linux.yml
|
|
||||||
|
|
||||||
- job: LinuxArmhf
|
- job: LinuxArmhf
|
||||||
condition: eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true')
|
condition: eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true')
|
||||||
pool:
|
pool:
|
||||||
|
@ -84,7 +71,6 @@ jobs:
|
||||||
- Windows32
|
- Windows32
|
||||||
- Linux
|
- Linux
|
||||||
- LinuxSnap
|
- LinuxSnap
|
||||||
- Linux32
|
|
||||||
- LinuxArmhf
|
- LinuxArmhf
|
||||||
- macOS
|
- macOS
|
||||||
steps:
|
steps:
|
||||||
|
|
|
@ -23,7 +23,7 @@ const commit = util.getVersion(root);
|
||||||
const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
|
const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
|
||||||
|
|
||||||
function getDebPackageArch(arch) {
|
function getDebPackageArch(arch) {
|
||||||
return { x64: 'amd64', ia32: 'i386', arm: 'armhf', arm64: "arm64" }[arch];
|
return { x64: 'amd64', arm: 'armhf', arm64: "arm64" }[arch];
|
||||||
}
|
}
|
||||||
|
|
||||||
function prepareDebPackage(arch) {
|
function prepareDebPackage(arch) {
|
||||||
|
@ -114,7 +114,7 @@ function getRpmBuildPath(rpmArch) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getRpmPackageArch(arch) {
|
function getRpmPackageArch(arch) {
|
||||||
return { x64: 'x86_64', ia32: 'i386', arm: 'armhf', arm64: "arm64" }[arch];
|
return { x64: 'x86_64', arm: 'armhf', arm64: "arm64" }[arch];
|
||||||
}
|
}
|
||||||
|
|
||||||
function prepareRpmPackage(arch) {
|
function prepareRpmPackage(arch) {
|
||||||
|
@ -238,7 +238,6 @@ function buildSnapPackage(arch) {
|
||||||
}
|
}
|
||||||
|
|
||||||
const BUILD_TARGETS = [
|
const BUILD_TARGETS = [
|
||||||
{ arch: 'ia32' },
|
|
||||||
{ arch: 'x64' },
|
{ arch: 'x64' },
|
||||||
{ arch: 'arm' },
|
{ arch: 'arm' },
|
||||||
{ arch: 'arm64' },
|
{ arch: 'arm64' },
|
||||||
|
|
|
@ -24,7 +24,7 @@ module.exports.getElectronVersion = getElectronVersion;
|
||||||
if (require.main === module) {
|
if (require.main === module) {
|
||||||
const version = getElectronVersion();
|
const version = getElectronVersion();
|
||||||
const versionFile = path.join(root, '.build', 'electron', 'version');
|
const versionFile = path.join(root, '.build', 'electron', 'version');
|
||||||
const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `v${version}`;
|
const isUpToDate = fs.existsSync(versionFile) && fs.readFileSync(versionFile, 'utf8') === `${version}`;
|
||||||
|
|
||||||
process.exit(isUpToDate ? 0 : 1);
|
process.exit(isUpToDate ? 0 : 1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"git": {
|
"git": {
|
||||||
"name": "chromium",
|
"name": "chromium",
|
||||||
"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
|
"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
|
||||||
"commitHash": "164c37e3f235134c88e80fac2a182cfba3f07f00"
|
"commitHash": "c6a08e5368de4352903e702cde750b33239a50ab"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"licenseDetail": [
|
"licenseDetail": [
|
||||||
|
@ -40,20 +40,7 @@
|
||||||
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
||||||
],
|
],
|
||||||
"isOnlyProductionDependency": true,
|
"isOnlyProductionDependency": true,
|
||||||
"version": "66.0.3359.181"
|
"version": "69.0.3497.128"
|
||||||
},
|
|
||||||
{
|
|
||||||
"component": {
|
|
||||||
"type": "git",
|
|
||||||
"git": {
|
|
||||||
"name": "libchromiumcontent",
|
|
||||||
"repositoryUrl": "https://github.com/electron/libchromiumcontent",
|
|
||||||
"commitHash": "7ea271f92018b1eeb8e70ec6de8c29f9758a0c05"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"isOnlyProductionDependency": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"version": "66.0.3359.181"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"component": {
|
"component": {
|
||||||
|
@ -61,11 +48,11 @@
|
||||||
"git": {
|
"git": {
|
||||||
"name": "nodejs",
|
"name": "nodejs",
|
||||||
"repositoryUrl": "https://github.com/nodejs/node",
|
"repositoryUrl": "https://github.com/nodejs/node",
|
||||||
"commitHash": "5cbb905c1af7cea2d709932d59827d7c6d03ef4a"
|
"commitHash": "8c70b2084ce5f76ea1e3b3c4ccdeee4483fe338b"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"isOnlyProductionDependency": true,
|
"isOnlyProductionDependency": true,
|
||||||
"version": "10.2.0"
|
"version": "10.11.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"component": {
|
"component": {
|
||||||
|
@ -73,12 +60,12 @@
|
||||||
"git": {
|
"git": {
|
||||||
"name": "electron",
|
"name": "electron",
|
||||||
"repositoryUrl": "https://github.com/electron/electron",
|
"repositoryUrl": "https://github.com/electron/electron",
|
||||||
"commitHash": "e84a6860e35e14b4031b88bb9b49841cdb89a305"
|
"commitHash": "c1b5a1cfc8a14a337540193daecfa5d0f50dd7bb"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"isOnlyProductionDependency": true,
|
"isOnlyProductionDependency": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"version": "3.1.8"
|
"version": "4.2.3"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"component": {
|
"component": {
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
"v8-inspect-profiler": "^0.0.20",
|
"v8-inspect-profiler": "^0.0.20",
|
||||||
"vscode-chokidar": "1.6.5",
|
"vscode-chokidar": "1.6.5",
|
||||||
"vscode-debugprotocol": "1.35.0",
|
"vscode-debugprotocol": "1.35.0",
|
||||||
"vscode-nsfw": "1.1.1",
|
"vscode-nsfw": "1.1.2",
|
||||||
"vscode-proxy-agent": "0.4.0",
|
"vscode-proxy-agent": "0.4.0",
|
||||||
"vscode-ripgrep": "^1.2.5",
|
"vscode-ripgrep": "^1.2.5",
|
||||||
"vscode-sqlite3": "4.0.7",
|
"vscode-sqlite3": "4.0.7",
|
||||||
|
|
|
@ -63,83 +63,5 @@
|
||||||
"libxcb.so.1()(64bit)",
|
"libxcb.so.1()(64bit)",
|
||||||
"libxkbfile.so.1()(64bit)",
|
"libxkbfile.so.1()(64bit)",
|
||||||
"libsecret-1.so.0()(64bit)"
|
"libsecret-1.so.0()(64bit)"
|
||||||
],
|
|
||||||
"i386": [
|
|
||||||
"ld-linux.so.2",
|
|
||||||
"ld-linux.so.2(GLIBC_2.1)",
|
|
||||||
"libX11-xcb.so.1",
|
|
||||||
"libX11.so.6",
|
|
||||||
"libXcomposite.so.1",
|
|
||||||
"libXcursor.so.1",
|
|
||||||
"libXdamage.so.1",
|
|
||||||
"libXext.so.6",
|
|
||||||
"libXfixes.so.3",
|
|
||||||
"libXi.so.6",
|
|
||||||
"libXrandr.so.2",
|
|
||||||
"libXrender.so.1",
|
|
||||||
"libXss.so.1",
|
|
||||||
"libXtst.so.6",
|
|
||||||
"libasound.so.2",
|
|
||||||
"libatk-1.0.so.0",
|
|
||||||
"libc.so.6",
|
|
||||||
"libc.so.6(GLIBC_2.0)",
|
|
||||||
"libc.so.6(GLIBC_2.1)",
|
|
||||||
"libc.so.6(GLIBC_2.1.3)",
|
|
||||||
"libc.so.6(GLIBC_2.11)",
|
|
||||||
"libc.so.6(GLIBC_2.2)",
|
|
||||||
"libc.so.6(GLIBC_2.2.3)",
|
|
||||||
"libc.so.6(GLIBC_2.3)",
|
|
||||||
"libc.so.6(GLIBC_2.3.2)",
|
|
||||||
"libc.so.6(GLIBC_2.3.4)",
|
|
||||||
"libc.so.6(GLIBC_2.4)",
|
|
||||||
"libc.so.6(GLIBC_2.6)",
|
|
||||||
"libc.so.6(GLIBC_2.7)",
|
|
||||||
"libcairo.so.2",
|
|
||||||
"libcups.so.2",
|
|
||||||
"libdbus-1.so.3",
|
|
||||||
"libdl.so.2",
|
|
||||||
"libdl.so.2(GLIBC_2.0)",
|
|
||||||
"libdl.so.2(GLIBC_2.1)",
|
|
||||||
"libexpat.so.1",
|
|
||||||
"libfontconfig.so.1",
|
|
||||||
"libfreetype.so.6",
|
|
||||||
"libgcc_s.so.1",
|
|
||||||
"libgcc_s.so.1(GCC_4.0.0)",
|
|
||||||
"libgcc_s.so.1(GLIBC_2.0)",
|
|
||||||
"libgdk-x11-2.0.so.0",
|
|
||||||
"libgdk_pixbuf-2.0.so.0",
|
|
||||||
"libgio-2.0.so.0",
|
|
||||||
"libglib-2.0.so.0",
|
|
||||||
"libgmodule-2.0.so.0",
|
|
||||||
"libgobject-2.0.so.0",
|
|
||||||
"libgtk-3.so.0",
|
|
||||||
"libm.so.6",
|
|
||||||
"libm.so.6(GLIBC_2.0)",
|
|
||||||
"libm.so.6(GLIBC_2.1)",
|
|
||||||
"libnspr4.so",
|
|
||||||
"libnss3.so",
|
|
||||||
"libnssutil3.so",
|
|
||||||
"libpango-1.0.so.0",
|
|
||||||
"libpangocairo-1.0.so.0",
|
|
||||||
"libpthread.so.0",
|
|
||||||
"libpthread.so.0(GLIBC_2.0)",
|
|
||||||
"libpthread.so.0(GLIBC_2.1)",
|
|
||||||
"libpthread.so.0(GLIBC_2.2)",
|
|
||||||
"libpthread.so.0(GLIBC_2.2.3)",
|
|
||||||
"libpthread.so.0(GLIBC_2.3.2)",
|
|
||||||
"libpthread.so.0(GLIBC_2.3.3)",
|
|
||||||
"librt.so.1",
|
|
||||||
"librt.so.1(GLIBC_2.2)",
|
|
||||||
"libsmime3.so",
|
|
||||||
"libstdc++.so.6",
|
|
||||||
"libstdc++.so.6(GLIBCXX_3.4)",
|
|
||||||
"libstdc++.so.6(GLIBCXX_3.4.10)",
|
|
||||||
"libstdc++.so.6(GLIBCXX_3.4.11)",
|
|
||||||
"libstdc++.so.6(GLIBCXX_3.4.14)",
|
|
||||||
"libstdc++.so.6(GLIBCXX_3.4.15)",
|
|
||||||
"libstdc++.so.6(GLIBCXX_3.4.9)",
|
|
||||||
"libxcb.so.1",
|
|
||||||
"libxkbfile.so.1",
|
|
||||||
"libsecret-1.so.0"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
1047
src/typings/electron.d.ts
vendored
1047
src/typings/electron.d.ts
vendored
File diff suppressed because it is too large
Load diff
|
@ -75,7 +75,6 @@ export interface IProductConfiguration {
|
||||||
hockeyApp: {
|
hockeyApp: {
|
||||||
'win32-ia32': string;
|
'win32-ia32': string;
|
||||||
'win32-x64': string;
|
'win32-x64': string;
|
||||||
'linux-ia32': string;
|
|
||||||
'linux-x64': string;
|
'linux-x64': string;
|
||||||
'darwin': string;
|
'darwin': string;
|
||||||
};
|
};
|
||||||
|
|
|
@ -136,7 +136,7 @@ class PerfModelContentProvider implements ITextModelContentProvider {
|
||||||
md.li(`Memory(System): ${(metrics.totalmem / (1024 * 1024 * 1024)).toFixed(2)} GB(${(metrics.freemem / (1024 * 1024 * 1024)).toFixed(2)}GB free)`);
|
md.li(`Memory(System): ${(metrics.totalmem / (1024 * 1024 * 1024)).toFixed(2)} GB(${(metrics.freemem / (1024 * 1024 * 1024)).toFixed(2)}GB free)`);
|
||||||
}
|
}
|
||||||
if (metrics.meminfo) {
|
if (metrics.meminfo) {
|
||||||
md.li(`Memory(Process): ${(metrics.meminfo.workingSetSize / 1024).toFixed(2)} MB working set(${(metrics.meminfo.peakWorkingSetSize / 1024).toFixed(2)}MB peak, ${(metrics.meminfo.privateBytes / 1024).toFixed(2)}MB private, ${(metrics.meminfo.sharedBytes / 1024).toFixed(2)}MB shared)`);
|
md.li(`Memory(Process): ${(metrics.meminfo.workingSetSize / 1024).toFixed(2)} MB working set(${(metrics.meminfo.privateBytes / 1024).toFixed(2)}MB private, ${(metrics.meminfo.sharedBytes / 1024).toFixed(2)}MB shared)`);
|
||||||
}
|
}
|
||||||
md.li(`VM(likelyhood): ${metrics.isVMLikelyhood}%`);
|
md.li(`VM(likelyhood): ${metrics.isVMLikelyhood}%`);
|
||||||
md.li(`Initial Startup: ${metrics.initialStartup}`);
|
md.li(`Initial Startup: ${metrics.initialStartup}`);
|
||||||
|
|
|
@ -11,7 +11,7 @@ import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } fr
|
||||||
import { IGlobalActivityRegistry, GlobalActivityExtensions } from 'vs/workbench/common/activity';
|
import { IGlobalActivityRegistry, GlobalActivityExtensions } from 'vs/workbench/common/activity';
|
||||||
import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
|
import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
|
||||||
import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
|
import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
|
||||||
import { ShowCurrentReleaseNotesAction, ProductContribution, UpdateContribution, Win3264BitContribution, Linux32BitContribution } from './update';
|
import { ShowCurrentReleaseNotesAction, ProductContribution, UpdateContribution, Win3264BitContribution } from './update';
|
||||||
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
|
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
|
||||||
|
|
||||||
const workbench = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
|
const workbench = Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench);
|
||||||
|
@ -24,13 +24,6 @@ if (platform.isWindows) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO@ben remove me after a while
|
|
||||||
if (platform.isLinux) {
|
|
||||||
if (process.arch === 'ia32') {
|
|
||||||
workbench.registerWorkbenchContribution(Linux32BitContribution, LifecyclePhase.Restored);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Registry.as<IGlobalActivityRegistry>(GlobalActivityExtensions)
|
Registry.as<IGlobalActivityRegistry>(GlobalActivityExtensions)
|
||||||
.registerActivity(UpdateContribution);
|
.registerActivity(UpdateContribution);
|
||||||
|
|
||||||
|
|
|
@ -212,53 +212,6 @@ export class Win3264BitContribution implements IWorkbenchContribution {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class Linux32BitContribution implements IWorkbenchContribution {
|
|
||||||
|
|
||||||
private static readonly KEY = 'update/linux32-64bits';
|
|
||||||
private static readonly URL = 'https://code.visualstudio.com/updates/v1_32#_linux-32-bit-support-ends-soon';
|
|
||||||
private static readonly INSIDER_URL = 'https://github.com/Microsoft/vscode-docs/blob/vnext/release-notes/v1_32.md#linux-32-bit-support-ends-soon';
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
@IStorageService storageService: IStorageService,
|
|
||||||
@INotificationService notificationService: INotificationService,
|
|
||||||
@IEnvironmentService environmentService: IEnvironmentService
|
|
||||||
) {
|
|
||||||
if (environmentService.disableUpdates) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const neverShowAgain = new NeverShowAgain(Linux32BitContribution.KEY, storageService);
|
|
||||||
|
|
||||||
if (!neverShowAgain.shouldShow()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const url = product.quality === 'insider'
|
|
||||||
? Linux32BitContribution.INSIDER_URL
|
|
||||||
: Linux32BitContribution.URL;
|
|
||||||
|
|
||||||
const handle = notificationService.prompt(
|
|
||||||
severity.Info,
|
|
||||||
nls.localize('linux64bits', "{0} for 32-bit Linux will soon be discontinued. Please update to the 64-bit version.", product.nameShort, url),
|
|
||||||
[{
|
|
||||||
label: nls.localize('learnmore', "Learn More"),
|
|
||||||
run: () => {
|
|
||||||
window.open(url);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: nls.localize('neveragain', "Don't Show Again"),
|
|
||||||
isSecondary: true,
|
|
||||||
run: () => {
|
|
||||||
neverShowAgain.action.run(handle);
|
|
||||||
neverShowAgain.action.dispose();
|
|
||||||
}
|
|
||||||
}],
|
|
||||||
{ sticky: true }
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class CommandAction extends Action {
|
class CommandAction extends Action {
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
|
|
@ -23,14 +23,12 @@ import { IAccessibilityService, AccessibilitySupport } from 'vs/platform/accessi
|
||||||
/* __GDPR__FRAGMENT__
|
/* __GDPR__FRAGMENT__
|
||||||
"IMemoryInfo" : {
|
"IMemoryInfo" : {
|
||||||
"workingSetSize" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
|
"workingSetSize" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
|
||||||
"peakWorkingSetSize": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
|
|
||||||
"privateBytes": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
|
"privateBytes": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true },
|
||||||
"sharedBytes": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
|
"sharedBytes": { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth", "isMeasurement": true }
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
export interface IMemoryInfo {
|
export interface IMemoryInfo {
|
||||||
readonly workingSetSize: number;
|
readonly workingSetSize: number;
|
||||||
readonly peakWorkingSetSize: number;
|
|
||||||
readonly privateBytes: number;
|
readonly privateBytes: number;
|
||||||
readonly sharedBytes: number;
|
readonly sharedBytes: number;
|
||||||
}
|
}
|
||||||
|
@ -355,7 +353,13 @@ class TimerService implements ITimerService {
|
||||||
release = os.release();
|
release = os.release();
|
||||||
arch = os.arch();
|
arch = os.arch();
|
||||||
loadavg = os.loadavg();
|
loadavg = os.loadavg();
|
||||||
meminfo = process.getProcessMemoryInfo();
|
|
||||||
|
const processMemoryInfo = await process.getProcessMemoryInfo();
|
||||||
|
meminfo = {
|
||||||
|
workingSetSize: processMemoryInfo.residentSet,
|
||||||
|
privateBytes: processMemoryInfo.private,
|
||||||
|
sharedBytes: processMemoryInfo.shared
|
||||||
|
};
|
||||||
|
|
||||||
isVMLikelyhood = Math.round((virtualMachineHint.value() * 100));
|
isVMLikelyhood = Math.round((virtualMachineHint.value() * 100));
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
"@types/webdriverio": "4.6.1",
|
"@types/webdriverio": "4.6.1",
|
||||||
"concurrently": "^3.5.1",
|
"concurrently": "^3.5.1",
|
||||||
"cpx": "^1.5.0",
|
"cpx": "^1.5.0",
|
||||||
"electron": "3.1.8",
|
"electron": "4.2.3",
|
||||||
"htmlparser2": "^3.9.2",
|
"htmlparser2": "^3.9.2",
|
||||||
"mkdirp": "^0.5.1",
|
"mkdirp": "^0.5.1",
|
||||||
"mocha": "^5.2.0",
|
"mocha": "^5.2.0",
|
||||||
|
|
|
@ -49,10 +49,10 @@
|
||||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
|
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.33.tgz#1126e94374014e54478092830704f6ea89df04cd"
|
||||||
integrity sha512-vmCdO8Bm1ExT+FWfC9sd9r4jwqM7o97gGy2WBshkkXbf/2nLAJQUrZfIhw27yVOtLUev6kSZc4cav/46KbDd8A==
|
integrity sha512-vmCdO8Bm1ExT+FWfC9sd9r4jwqM7o97gGy2WBshkkXbf/2nLAJQUrZfIhw27yVOtLUev6kSZc4cav/46KbDd8A==
|
||||||
|
|
||||||
"@types/node@^8.0.24":
|
"@types/node@^10.12.18":
|
||||||
version "8.10.23"
|
version "10.12.18"
|
||||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.23.tgz#e5ccfdafff42af5397c29669b6d7d65f7d629a00"
|
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67"
|
||||||
integrity sha512-aEp5ZTLr4mYhR9S85cJ+sEYkcsgFY10N1Si5m49iTAVzanZXOwp/pgw6ibFLKXxpflqm71aSWZCRtnTXXO56gA==
|
integrity sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==
|
||||||
|
|
||||||
"@types/rimraf@2.0.2":
|
"@types/rimraf@2.0.2":
|
||||||
version "2.0.2"
|
version "2.0.2"
|
||||||
|
@ -596,12 +596,12 @@ electron-download@^4.1.0:
|
||||||
semver "^5.4.1"
|
semver "^5.4.1"
|
||||||
sumchecker "^2.0.2"
|
sumchecker "^2.0.2"
|
||||||
|
|
||||||
electron@3.1.8:
|
electron@4.2.3:
|
||||||
version "3.1.8"
|
version "4.2.3"
|
||||||
resolved "https://registry.yarnpkg.com/electron/-/electron-3.1.8.tgz#01b0b147dfcca47967ff07dbf72bf5e96125a2ac"
|
resolved "https://registry.yarnpkg.com/electron/-/electron-4.2.3.tgz#5d45da9dd5ae97269dbee2623840da808c72d29d"
|
||||||
integrity sha512-1MiFoMzxGaR0wDfwFE5Ydnuk6ry/4lKgF0c+NFyEItxM/WyEHNZPNjJAeKJ+M/0sevmZ+6W4syNZnQL5M3GgsQ==
|
integrity sha512-nx+jHxj2eNhaYHXFGdzr7zgSphpVHEU9WAu6qqEUsQ936X3c6bQ5Bdg08KbHZj+cyRRQ06JMu6/ILh5pWrDZaA==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@types/node" "^8.0.24"
|
"@types/node" "^10.12.18"
|
||||||
electron-download "^4.1.0"
|
electron-download "^4.1.0"
|
||||||
extract-zip "^1.0.3"
|
extract-zip "^1.0.3"
|
||||||
|
|
||||||
|
|
|
@ -9590,10 +9590,10 @@ vscode-nls-dev@3.2.5:
|
||||||
xml2js "^0.4.19"
|
xml2js "^0.4.19"
|
||||||
yargs "^10.1.1"
|
yargs "^10.1.1"
|
||||||
|
|
||||||
vscode-nsfw@1.1.1:
|
vscode-nsfw@1.1.2:
|
||||||
version "1.1.1"
|
version "1.1.2"
|
||||||
resolved "https://registry.yarnpkg.com/vscode-nsfw/-/vscode-nsfw-1.1.1.tgz#7c3febe153677c5850b197a0b64a197cd11e95c7"
|
resolved "https://registry.yarnpkg.com/vscode-nsfw/-/vscode-nsfw-1.1.2.tgz#9cb9073b5854386801afe41f7152f721b4ea9e80"
|
||||||
integrity sha512-Wg3vzN1U3T6P1uE13LdVVRIhdy7XWnWkwmAXhkLsIkH2QY0E/pvNDRLrwAMMW6GC1Fvvbxm3hzdIrCmr7Hq3FA==
|
integrity sha512-J0So+JNK/5kQboTO1hKNk4ie/wwUegrJilYSY5sVxU9JJlo3aQdP0zi2NtU8CEK3kkN6qRp0MbXCzbT0LKGorg==
|
||||||
dependencies:
|
dependencies:
|
||||||
fs-extra "^7.0.0"
|
fs-extra "^7.0.0"
|
||||||
lodash.isinteger "^4.0.4"
|
lodash.isinteger "^4.0.4"
|
||||||
|
|
Loading…
Reference in a new issue