diff --git a/.yarnrc b/.yarnrc index 31ceae81a485d..b40fb7e7f58ab 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1,5 +1,5 @@ disturl "https://electronjs.org/headers" -target "29.3.1" -ms_build_id "9464424" +target "29.4.0" +ms_build_id "9593362" runtime "electron" build_from_source "true" diff --git a/build/azure-pipelines/linux/product-build-linux-test.yml b/build/azure-pipelines/linux/product-build-linux-test.yml index 4e225757a81e8..4968b9ff04f34 100644 --- a/build/azure-pipelines/linux/product-build-linux-test.yml +++ b/build/azure-pipelines/linux/product-build-linux-test.yml @@ -92,9 +92,6 @@ steps: - script: ./scripts/test-integration.sh --tfs "Integration Tests" env: DISPLAY: ":10" - # TODO(deepak1556): Remove this once runtime is updated for - # https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724 - UV_USE_IO_URING: 0 displayName: Run integration tests (Electron) timeoutInMinutes: 20 @@ -104,8 +101,7 @@ steps: - script: ./scripts/test-remote-integration.sh env: - # TODO(deepak1556): Remove this once runtime is updated for - # https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724 + # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x UV_USE_IO_URING: 0 displayName: Run integration tests (Remote) timeoutInMinutes: 20 @@ -123,9 +119,6 @@ steps: ./scripts/test-integration.sh --build --tfs "Integration Tests" env: VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH) - # TODO(deepak1556): Remove this once runtime is updated for - # https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724 - UV_USE_IO_URING: 0 displayName: Run integration tests (Electron) timeoutInMinutes: 20 @@ -144,8 +137,7 @@ steps: ./scripts/test-remote-integration.sh env: VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH) - # TODO(deepak1556): Remove this once runtime is updated for - # https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724 + # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x UV_USE_IO_URING: 0 displayName: Run integration tests (Remote) timeoutInMinutes: 20 @@ -173,42 +165,31 @@ steps: - script: yarn smoketest-no-compile --tracing timeoutInMinutes: 20 - env: - # TODO(deepak1556): Remove this once runtime is updated for - # https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724 - UV_USE_IO_URING: 0 displayName: Run smoke tests (Electron) - script: yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage" timeoutInMinutes: 20 env: - # TODO(deepak1556): Remove this once runtime is updated for - # https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724 + # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x UV_USE_IO_URING: 0 displayName: Run smoke tests (Browser, Chromium) - script: yarn smoketest-no-compile --remote --tracing timeoutInMinutes: 20 env: - # TODO(deepak1556): Remove this once runtime is updated for - # https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724 + # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x UV_USE_IO_URING: 0 displayName: Run smoke tests (Remote) - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - script: yarn smoketest-no-compile --tracing --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)" timeoutInMinutes: 20 - env: - # TODO(deepak1556): Remove this once runtime is updated for - # https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724 - UV_USE_IO_URING: 0 displayName: Run smoke tests (Electron) - script: yarn smoketest-no-compile --web --tracing --headless --electronArgs="--disable-dev-shm-usage" env: VSCODE_REMOTE_SERVER_PATH: $(agent.builddirectory)/vscode-server-linux-$(VSCODE_ARCH)-web - # TODO(deepak1556): Remove this once runtime is updated for - # https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724 + # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x UV_USE_IO_URING: 0 timeoutInMinutes: 20 displayName: Run smoke tests (Browser, Chromium) @@ -221,8 +202,7 @@ steps: yarn smoketest-no-compile --tracing --remote --build "$APP_PATH" timeoutInMinutes: 20 env: - # TODO(deepak1556): Remove this once runtime is updated for - # https://github.com/microsoft/vscode/issues/210467#issuecomment-2104566724 + # TODO(deepak1556): Remove this once we update to Node.js >= 20.11.x UV_USE_IO_URING: 0 displayName: Run smoke tests (Remote) diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index 88fc9eceff0b1..a80aa1531f168 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -e59378f63e935a6a561e272cdf44a8c5c3f4c56a8ff5ed0b33d45f18dd7d0d6c *chromedriver-v29.3.1-darwin-arm64.zip -4c4b2f11e9a396ff0e4c2282f4afe898f548af5e530a26c4c52fc7dbe307eb31 *chromedriver-v29.3.1-darwin-x64.zip -10b0d4a01636ae1f064cb950d5cff2a591dff2d2573fa9169335a492815169d3 *chromedriver-v29.3.1-linux-arm64.zip -45aff39d150dd423536d221bcdf2dab12cef4d0e8df50dddcda0387f60c70843 *chromedriver-v29.3.1-linux-armv7l.zip -569022d7a6fc4634ee4f496bb0414b7a8b34e505e22c2d423e915776e23d576a *chromedriver-v29.3.1-linux-x64.zip -d2090eb226eb0fef894837277d08a313af62da5807ab14d4aae7e6ba0a6a8466 *chromedriver-v29.3.1-mas-arm64.zip -3d425b6713d2a6e3149c4559cff76940e0443e236e61c7ba9b35ce2438f7de15 *chromedriver-v29.3.1-mas-x64.zip -5a95303fffbab24b07e842441e677ba98966dd800c90a7e842a97e43f7681cd6 *chromedriver-v29.3.1-win32-arm64.zip -553f8a81b0974c23eb473d5129450413f206e67128f89b7f7723ae76f9e8ec5d *chromedriver-v29.3.1-win32-ia32.zip -67f2f561703c6008c1c51dfd50be991752dfa3959bf5bb5a3a324143894fdcc5 *chromedriver-v29.3.1-win32-x64.zip -1e8366964ae298ec1e5e67b3f192c1d7a7cffc1b932b2f32fac3d075962c8f7e *electron-api.json -80596ef89f4638495bb24a92b75191bb0b61151e3cbc608090c1e406d14cafd5 *electron-v29.3.1-darwin-arm64-dsym-snapshot.zip -a2804d07dded66a5735aa1d1e5c547ea97bff09e2f1443c019ba564a33a5660b *electron-v29.3.1-darwin-arm64-dsym.zip -4dd9f6c00f2021dba34532452eecc15ce7e5eb914978319fd03246d19ff66baa *electron-v29.3.1-darwin-arm64-symbols.zip -aaada7a9f7ee72cd2a9a465ed0b8ec703aeedda9084f67cf72c1dce8e2aff7ca *electron-v29.3.1-darwin-arm64.zip -cab2c8a7a72c6e6b59e04e3292f27799b4a25592764960d9df4894fab405abc5 *electron-v29.3.1-darwin-x64-dsym-snapshot.zip -f7706f674d092f314fb30e85985d3172c1a125804e8132b206b65196b8dc81c5 *electron-v29.3.1-darwin-x64-dsym.zip -f00ec2929503e067b4ee59f8c38d1d2419db5c2af3c2b078d30d17faae8dbd5d *electron-v29.3.1-darwin-x64-symbols.zip -be6b70648d35959d346924e89aff5419af321c80f929d0e252fba131d9c93f50 *electron-v29.3.1-darwin-x64.zip -19f8b15ff1eb3a572adab73444c8b12f9815fa8ddaadbd8383ef5bb7370f98cc *electron-v29.3.1-linux-arm64-debug.zip -db0861e5d285428cc98de1f055fd7ef2fb2b331ebfd3e0a069bdf136b5bdc5c7 *electron-v29.3.1-linux-arm64-symbols.zip -d900a5597e296cb925dc2e6266b1d839b0254ab12e424d405785d6e351f1c4d7 *electron-v29.3.1-linux-arm64.zip -19f8b15ff1eb3a572adab73444c8b12f9815fa8ddaadbd8383ef5bb7370f98cc *electron-v29.3.1-linux-armv7l-debug.zip -8936bb96a59c1ac129555050ae00b478bbc6c16a0e759ed07231624b3ac52749 *electron-v29.3.1-linux-armv7l-symbols.zip -2a66d5603cf59a28699e4465488032f1dfac6118140ed129cf7403617329f983 *electron-v29.3.1-linux-armv7l.zip -a1f7984c302b2f7a03e836a7a6026d8ba64ca7806f47cd7b9dcc2e744680fd7c *electron-v29.3.1-linux-x64-debug.zip -fe2f5a78e7c485423fae7d204f6ba7bea95f9427703e97831a5555ab42ca93f3 *electron-v29.3.1-linux-x64-symbols.zip -d907e1c8074d2b7933d8b7525da3987f88d5b5ecf88131efec3eb5bd710a15b4 *electron-v29.3.1-linux-x64.zip -7cd32474a7c024d40ae9f17fe83678ae34b6f631889e895cabed87d0ee1781bf *electron-v29.3.1-mas-arm64-dsym-snapshot.zip -0058c71c614e252b4ad689de8a492563ebf938ba90cdb124e5454a9ec9d4c75c *electron-v29.3.1-mas-arm64-dsym.zip -aafedfab99d059079011139cf534bbfca44d50cd0a668b0ca547aeb8eed99c14 *electron-v29.3.1-mas-arm64-symbols.zip -f45417c845be012f0a9d3b8c92d5d3d5b4b9650e06809a9d783baa1ff8ce75a7 *electron-v29.3.1-mas-arm64.zip -8a91e7cced48162ec60368a992e8c53ef7e0ba574ce0c6edd8462167ba23b053 *electron-v29.3.1-mas-x64-dsym-snapshot.zip -4bfdd08bdb98afd3966e6a9c506dbb6e8bbbed7b0b22c7ae019b3cf8564e8354 *electron-v29.3.1-mas-x64-dsym.zip -dada1302a225509de9e031c8b139096a28398f883c8bdcae4b8fc3a92dc4c99d *electron-v29.3.1-mas-x64-symbols.zip -555d83c9eea2c1dc40c6996092ef2eb812d9d4937062d53d8909bf2a9432ca88 *electron-v29.3.1-mas-x64.zip -857bcb8f8866b2183355f71e968a690ec7d9ecc386b507988fe0ab560fe25a57 *electron-v29.3.1-win32-arm64-pdb.zip -a38ee738e44c3a9470ff765422410c59bd3c0a94a955e3b1ce661b68d094de18 *electron-v29.3.1-win32-arm64-symbols.zip -c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v29.3.1-win32-arm64-toolchain-profile.zip -74bcf7b7bb09c6311a5ef01eef41e20eccb84cd169651138234a332ad33aa087 *electron-v29.3.1-win32-arm64.zip -4650398c9c49b63050b4c2d28ae664c1d14912464a2744170338c131291aa290 *electron-v29.3.1-win32-ia32-pdb.zip -79a7a2db4c26c231d0963a924b129391cf920cd6b97d28ef095a2a1da4e14577 *electron-v29.3.1-win32-ia32-symbols.zip -c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v29.3.1-win32-ia32-toolchain-profile.zip -5527aa7d73b49d1c3298d9f2fc930be775e7d093a70bb613bec73e2ddd316afa *electron-v29.3.1-win32-ia32.zip -d85bc6393bd5890cf0bc616c41c2a5c0596ea4c3967d51bbf146a12cae727fad *electron-v29.3.1-win32-x64-pdb.zip -870bc19b8f38a84eb65fa6269fe2026b8dd8b76f9bbeded15c7313923f3e2c66 *electron-v29.3.1-win32-x64-symbols.zip -c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v29.3.1-win32-x64-toolchain-profile.zip -ccd465a085578168b6bf88ac76a5946f649e977efa7ef130c460b04df1becffa *electron-v29.3.1-win32-x64.zip -eab0311367f1e6b264ac788ac7291449d50bddf0049015391370a2eac462c320 *electron.d.ts -1718c59d8a963ef09325d300e10684d1a2419c186f0c70ac200d03b4142cdbfd *ffmpeg-v29.3.1-darwin-arm64.zip -a58339efba05ff93ca39e3000ec5aa5c81fb059c8786401324285defad11eb4b *ffmpeg-v29.3.1-darwin-x64.zip -4e2ba537d7c131abbd34168bce2c28cc9ef6262b217d5f4085afccfdf9635da6 *ffmpeg-v29.3.1-linux-arm64.zip -4aa56ad5d849f4e61af22678a179346b68aec9100282e1b8a43df25d95721677 *ffmpeg-v29.3.1-linux-armv7l.zip -0558e6e1f78229d303e16d4d8c290794baa9adc619fdd2ddccadb3ea241a1df4 *ffmpeg-v29.3.1-linux-x64.zip -a580fce86cd20aaee06ad4136b2dfbbf7a7449be8fc4d1a528535b2a83b067d4 *ffmpeg-v29.3.1-mas-arm64.zip -41d8a8d20429ea22bbfdd482f1ea2c265cabdca3cacb35737be01f427455204e *ffmpeg-v29.3.1-mas-x64.zip -ce3bf67555cf614c837d1bc80aaa071627750e3ffcde03a25b750796de23fd43 *ffmpeg-v29.3.1-win32-arm64.zip -f305313a1c3d15c6308c6158edc2d9cadc7465536adefa57fa31d879e6fe5e55 *ffmpeg-v29.3.1-win32-ia32.zip -8c6b7febbd80e53ea0cf0e89104006b4211b96d0d05933f517d69d0d578e8726 *ffmpeg-v29.3.1-win32-x64.zip -59827658661e330bc4ef876419c927a647a9c393aac2e7767887ae0ac600dd65 *hunspell_dictionaries.zip -1a5ec4216f0f938be6ae45853ffa032cfeb04409f757e9b66228362fe14da74f *libcxx-objects-v29.3.1-linux-arm64.zip -febbdade1c2958dc24498d62e6402bc1a9add49c3837487cc8ecb0ecb0f28459 *libcxx-objects-v29.3.1-linux-armv7l.zip -d6c5c7e67f8e50cad64493215b418a303cb5a30e39800c85d28401f66e1addb3 *libcxx-objects-v29.3.1-linux-x64.zip -57f87572e20185f329334ca9c6971bb7974424fb5ff4aa2e11f3a8668f8060f9 *libcxx_headers.zip -c7bcb0555dd10aed27ec7041338783df430e58da79ccba6863cbfb8cd89ef062 *libcxxabi_headers.zip -6962a9872def625e43d87ea4f50e90bc571d5b522abe7b9b33ce17714c43a05e *mksnapshot-v29.3.1-darwin-arm64.zip -b801394b60eb4cefe52fddd35616be9e79058b53d2860badb1daa0c61242b730 *mksnapshot-v29.3.1-darwin-x64.zip -906058eaeadb81f918962529185b2cf4b5fc6b13adbbf04fea7fd4ace9c1f20e *mksnapshot-v29.3.1-linux-arm64-x64.zip -74c9834b9d8237b001cbe5822b2426bebe910a72c1173377c1cd446f726bc2e7 *mksnapshot-v29.3.1-linux-armv7l-x64.zip -6eafdfcbdc44d48df267ddb09e09e0acda1abbe472211e947ce4b68852f99d52 *mksnapshot-v29.3.1-linux-x64.zip -04164d534fae6f12ad37e2f2268ec864b3c4417c08134edeeb555dd1bf73c073 *mksnapshot-v29.3.1-mas-arm64.zip -3a870add5f6c3287f9f958d0327f67d59ef0a9c30bfb94fb7155b6ee6e905e46 *mksnapshot-v29.3.1-mas-x64.zip -174ac9f2d8b4664587a983067c2b870b6e74fe8079715a502c11d55d774d6317 *mksnapshot-v29.3.1-win32-arm64-x64.zip -50efe4e272a54d04392ccd8a205164f4c1400c8197648d1a1fa71e667e37d7ff *mksnapshot-v29.3.1-win32-ia32.zip -e80d3e57ed67f05573a12a65b0be30cdb3e0b147cf817a80eb89b9886e7743ae *mksnapshot-v29.3.1-win32-x64.zip +3d3d8bb185d7b63b0db910661fdd69d6381afb8c97742bbd2526a9c932e1f8ca *chromedriver-v29.4.0-darwin-arm64.zip +c3d075943d87604ffa50382cc8d5798485349544ca391cab88c892f889d3b14c *chromedriver-v29.4.0-darwin-x64.zip +6d62d2dba55e4419fa003d45f93dad1324ec29a4d3eb84fd9fd5fd7a64339389 *chromedriver-v29.4.0-linux-arm64.zip +81bb3d362331c7296f700b1b0e8f07c4c7739b1151f698cd56af927bedda59e7 *chromedriver-v29.4.0-linux-armv7l.zip +ab593cc39aefac8c5abd259e31f6add4b2b70c52231724a6c08ac1872b4a0edf *chromedriver-v29.4.0-linux-x64.zip +705d42ccc05b2c48b0673b9dcf63eb78772bb79dba078a523d384ed2481bc9c0 *chromedriver-v29.4.0-mas-arm64.zip +956a7caa28eeeb0c02eb7638a53215ffd89b4f12880f0893ff10f497ca1a8117 *chromedriver-v29.4.0-mas-x64.zip +1f070176aa33e0139d61a3d758fd2f015f09bb275577293fe93564749b6310ba *chromedriver-v29.4.0-win32-arm64.zip +38a71526d243bcb73c28cb648bd4816d70b5e643df52f9f86a83416014589744 *chromedriver-v29.4.0-win32-ia32.zip +f90750d3589cb3c9f6f0ebc70d5e025cf81c382e8c23fa47a54570696a478ef0 *chromedriver-v29.4.0-win32-x64.zip +05dffc90dd1341cc7a6b50127985e4e217fef7f50a173c7d0ff34039dd2d81b6 *electron-api.json +7f63f7cf675ba6dec3a5e4173d729bd53c75f81e612f809641d9d0c4d9791649 *electron-v29.4.0-darwin-arm64-dsym-snapshot.zip +aa29530fcafa4db364978d4f414a6ec2005ea695f7fee70ffbe5e114e9e453f0 *electron-v29.4.0-darwin-arm64-dsym.zip +8d12fb6d9bcdf5bbfc93dbcd1cac348735dc6f98aa450ee03ec7837a01a8a938 *electron-v29.4.0-darwin-arm64-symbols.zip +c16d05f1231bb3c77da05ab236b454b3a2b6a642403be51e7c9b16cd2c421a19 *electron-v29.4.0-darwin-arm64.zip +2dfc1017831ab2f6e9ddb575d3b9cff5a0d56f16a335a3c0df508e964e2db963 *electron-v29.4.0-darwin-x64-dsym-snapshot.zip +025de6aa39d98762928e1b700f46177e74be20101b27457659b938e2c69db326 *electron-v29.4.0-darwin-x64-dsym.zip +ec4eb0a618207233985ceaab297be34b3d4f0813d88801d5637295b238dd661a *electron-v29.4.0-darwin-x64-symbols.zip +8ed7924f77a5c43c137a57097c5c47c2e8e9a78197e18af11a767c98035c123e *electron-v29.4.0-darwin-x64.zip +bde1772fa8ac4850e108012a9edd3bd93472bad8f68ddd55fca355dad81dde4f *electron-v29.4.0-linux-arm64-debug.zip +dfe7852a7423196efb2205c788d942db3ffc9de6ce52577e173bcf7ca6973d48 *electron-v29.4.0-linux-arm64-symbols.zip +c3764d6c3799950e3418e8e5a5a5b2c41abe421dd8bcdebf054c7c85798d9860 *electron-v29.4.0-linux-arm64.zip +bde1772fa8ac4850e108012a9edd3bd93472bad8f68ddd55fca355dad81dde4f *electron-v29.4.0-linux-armv7l-debug.zip +360668ba669cb2c01c2f960cdee76c29670e6ce907ccc0718e971a04af594ce9 *electron-v29.4.0-linux-armv7l-symbols.zip +c5e92943ad78b4e41a32ae53c679e148ea2ae09f95f914b1834dbdbae578ba91 *electron-v29.4.0-linux-armv7l.zip +375be885426bcbd272bd068bfcef41a83296c2f8e61e633233d2a9e9a69242fc *electron-v29.4.0-linux-x64-debug.zip +847e0f75624616c2918b33de2eefeec63419bd250685610d3f52fa115527d2b9 *electron-v29.4.0-linux-x64-symbols.zip +91e5eb374c2c85a07c2d4e99a89eb18515ff0169a49c3fa75289800e1225729e *electron-v29.4.0-linux-x64.zip +098f973537c3d9679a69409d0b84bcc1a6113bb2002ee60068e2c22f335a3855 *electron-v29.4.0-mas-arm64-dsym-snapshot.zip +2724aa32eb441eea21680d95fc1efdd75ac473fa19623c7acf3d546419e96154 *electron-v29.4.0-mas-arm64-dsym.zip +98dd81914752a57da4cbaad1f0aa94b16335f9b8f997be9aa049be90b96b2886 *electron-v29.4.0-mas-arm64-symbols.zip +fd2663f65c1f995304e3eb65870b7146adfefef07cf82bf44de75855fd4f36e8 *electron-v29.4.0-mas-arm64.zip +237983b2169e69bb73aa0987e871e3e486755904b71ebe36c3e902377f92754a *electron-v29.4.0-mas-x64-dsym-snapshot.zip +a5d59599827d32ef322b99eee8416e39235f4c7a0ada78342a885665e0b732dd *electron-v29.4.0-mas-x64-dsym.zip +5182e7697ac0591e0b95c33f70316af24093c9100f442be2cee0039660e959ac *electron-v29.4.0-mas-x64-symbols.zip +e0ee7057aff0240a70b9ed75ff44d55aeae9af67fbc8915f741711a8bb6fe744 *electron-v29.4.0-mas-x64.zip +2802872dfc6de0f0e2e8cef9d2f4f384e3d82b20ad36fc981c4e725dd2f2abcd *electron-v29.4.0-win32-arm64-pdb.zip +d49c954dc25ae9e4c75e61af80b9718014c52f016f43a29071913f0e7100c7bd *electron-v29.4.0-win32-arm64-symbols.zip +c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v29.4.0-win32-arm64-toolchain-profile.zip +483d692efbe4fb1231ff63afb8a236b2e22b486fbe5ac6abbc8b208abf94a4d3 *electron-v29.4.0-win32-arm64.zip +98458f49ba67a08e473d475a68a2818d9df076a5246fbc9b45403e8796f9d35b *electron-v29.4.0-win32-ia32-pdb.zip +69d505d4ae59d9dddf83c4e530e45dd7c5bc64d6da90cf4f851e523be9e51014 *electron-v29.4.0-win32-ia32-symbols.zip +c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v29.4.0-win32-ia32-toolchain-profile.zip +d5a21a17a64e9638f49f057356af23b51f56bd6a7fea3c2e0a28ff3186a7bc41 *electron-v29.4.0-win32-ia32.zip +521ee7b3398c4dc395b43dac86cd099e86a6123de2b43636ee805b7da014ed3f *electron-v29.4.0-win32-x64-pdb.zip +e33848ebd6c6e4ce431aa367bef887050947a136e883677cfc524ca5cabc1e98 *electron-v29.4.0-win32-x64-symbols.zip +c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v29.4.0-win32-x64-toolchain-profile.zip +e4ef85aa3608221f8a3e011c1b1c2d2d36093ad19bda12d16b3816929fb6c99b *electron-v29.4.0-win32-x64.zip +707ee08593289ee83514b4fc55123611309f995788f38a5ec03e285741aac1c8 *electron.d.ts +281b5f4a49de55fdb86b1662530f07f2ced1252c878eb7a941c88ede545339e0 *ffmpeg-v29.4.0-darwin-arm64.zip +0b735912df9b2ff3d03eb23942e03bc0116d82f1291d0a45cbde14177c2f3066 *ffmpeg-v29.4.0-darwin-x64.zip +4e2ba537d7c131abbd34168bce2c28cc9ef6262b217d5f4085afccfdf9635da6 *ffmpeg-v29.4.0-linux-arm64.zip +4aa56ad5d849f4e61af22678a179346b68aec9100282e1b8a43df25d95721677 *ffmpeg-v29.4.0-linux-armv7l.zip +0558e6e1f78229d303e16d4d8c290794baa9adc619fdd2ddccadb3ea241a1df4 *ffmpeg-v29.4.0-linux-x64.zip +224f15d8f96c75348cd7f1b85c4eab63468fae1e50ff4b1381e08011cf76e4f7 *ffmpeg-v29.4.0-mas-arm64.zip +175ec79f0dc4c5966d9a0ca6ec1674106340ecc64503585c12c2f854249af06f *ffmpeg-v29.4.0-mas-x64.zip +5fa13744b87fef1bfd24a37513677f446143e085504541f8ce97466803bd1893 *ffmpeg-v29.4.0-win32-arm64.zip +d7ba316bb7e13025c9db29e0acafebb540b7716c9f111e469733615d8521186a *ffmpeg-v29.4.0-win32-ia32.zip +35c70a28bcfd4f0b1f8c985d3d1348936bd60767d231ce28ba38f3daeeef64bb *ffmpeg-v29.4.0-win32-x64.zip +8c7228ea0ecab25a1f7fcd1ba9680684d19f9671a497113d71a851a53867b048 *hunspell_dictionaries.zip +7552547c8d585b9bc43518d239d7ce3ad7c5cad0346b07cdcfc1eab638b2b794 *libcxx-objects-v29.4.0-linux-arm64.zip +76054a779d4845ad752b625213ce8990f08dcc5b89aa20660dd4f2e817ba30a8 *libcxx-objects-v29.4.0-linux-armv7l.zip +761c317a9c874bd3d1118d0ecad33c4be23727f538cfbb42a08dd87c68da6039 *libcxx-objects-v29.4.0-linux-x64.zip +f98f9972cc30200b8e05815f5a9cd5cec04bdeee0e48ae2143cdaeff5db9d71d *libcxx_headers.zip +f0b0dd2be579baaf97901322ef489d03fae69a0b8524ea77b24fb3c896f73dd9 *libcxxabi_headers.zip +5da864ea23d70538298a40e0d037a5a461a6b74984e72fd4f0cd20904bccaed1 *mksnapshot-v29.4.0-darwin-arm64.zip +bde97bd7c69209ed6bf4cf1cdf7de622e3a9f50fe6b4dc4b5618eee868f47c62 *mksnapshot-v29.4.0-darwin-x64.zip +a3df9b9e6ef14efe5827d0256d8ecaebe6d8be130cfc3faac0dea76eb53b9b11 *mksnapshot-v29.4.0-linux-arm64-x64.zip +648b9dbca21194d663ddb706e6086a166e691263c764c80f836ae02c27e3657a *mksnapshot-v29.4.0-linux-armv7l-x64.zip +e7a4201cda3956380facc2b5b9d0b1020cc5e654fba44129fc7429a982411cc1 *mksnapshot-v29.4.0-linux-x64.zip +ffb44c45733675e0378f45fce25dafa95697d0c86179f8e46742ada16bc11aa1 *mksnapshot-v29.4.0-mas-arm64.zip +0242da3ca193206e56b88eb108502244bae35dcc587210bd0a32d9fa4cb71041 *mksnapshot-v29.4.0-mas-x64.zip +1445806dca6effbc60072bbde7997cefb62bdb7a9e295a090d26f27c3882685f *mksnapshot-v29.4.0-win32-arm64-x64.zip +09599adc3afb0a13ae87fc4b8ab97c729fe3689faa6a4f5f7a4a3cf0d9cc49d3 *mksnapshot-v29.4.0-win32-ia32.zip +84f80683d95665d29284386509bb104e840ff0b797bfbbd19da86b84d370aa49 *mksnapshot-v29.4.0-win32-x64.zip diff --git a/cgmanifest.json b/cgmanifest.json index a85c770cff260..f1e4192dc2803 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "384642792eb521b978a008ee1dbc30885edb7dcb" + "commitHash": "f9ed0eaee4b172733872c2f84e5061882dd08e5c" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "29.3.1" + "version": "29.4.0" }, { "component": { diff --git a/package.json b/package.json index 6b0467b4a1470..b74ee912c95c2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.90.0", - "distro": "b885c5b015796a5b6373decb919a391522135903", + "distro": "95d725e64e7e797849db840c27108f9f2e85a678", "author": { "name": "Microsoft Corporation" }, @@ -148,7 +148,7 @@ "cssnano": "^6.0.3", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "29.3.1", + "electron": "29.4.0", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", diff --git a/remote/.yarnrc b/remote/.yarnrc index 60d35d0919238..3a01071e2badb 100644 --- a/remote/.yarnrc +++ b/remote/.yarnrc @@ -1,5 +1,5 @@ disturl "https://nodejs.org/dist" target "20.9.0" -ms_build_id "267516" +ms_build_id "274207" runtime "node" build_from_source "true" diff --git a/resources/server/bin/code-server-linux.sh b/resources/server/bin/code-server-linux.sh index 3d8881ee60182..9229ec89a0ed0 100644 --- a/resources/server/bin/code-server-linux.sh +++ b/resources/server/bin/code-server-linux.sh @@ -9,6 +9,8 @@ esac ROOT="$(dirname "$(dirname "$(readlink -f "$0")")")" -export UV_USE_IO_URING=0 # workaround for https://github.com/microsoft/vscode/issues/212678 +# workaround for https://github.com/microsoft/vscode/issues/212678 +# Remove this once we update to Node.js >= 20.11.x +export UV_USE_IO_URING=0 "$ROOT/node" ${INSPECT:-} "$ROOT/out/server-main.js" "$@" diff --git a/src/vs/platform/dialogs/electron-main/dialogMainService.ts b/src/vs/platform/dialogs/electron-main/dialogMainService.ts index 666829d56be4e..bc1230a48ea61 100644 --- a/src/vs/platform/dialogs/electron-main/dialogMainService.ts +++ b/src/vs/platform/dialogs/electron-main/dialogMainService.ts @@ -155,7 +155,7 @@ export class DialogMainService implements IDialogMainService { if (!fileDialogLock) { this.logService.error('[DialogMainService]: file save dialog is already or will be showing for the window with the same configuration'); - return { canceled: true }; + return { canceled: true, filePath: '' }; } try { diff --git a/yarn.lock b/yarn.lock index ac573d403b452..1d866e83a1fb5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3845,10 +3845,10 @@ electron-to-chromium@^1.4.668: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.717.tgz#99db370cae8cd090d5b01f8748e9ad369924d0f8" integrity sha512-6Fmg8QkkumNOwuZ/5mIbMU9WI3H2fmn5ajcVya64I5Yr5CcNmO7vcLt0Y7c96DCiMO5/9G+4sI2r6eEvdg1F7A== -electron@29.3.1: - version "29.3.1" - resolved "https://registry.yarnpkg.com/electron/-/electron-29.3.1.tgz#87c82b2cd2c326f78f036499377a5448bea5d4bb" - integrity sha512-auge1/6RVqgUd6TgIq88wKdUCJi2cjESi3jy7d+6X4JzvBGprKBqMJ8JSSFpu/Px1YJrFUKAxfy6SC+TQf1uLw== +electron@29.4.0: + version "29.4.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-29.4.0.tgz#5dcd5a977414337a2518619e9166c0e86a5a3bae" + integrity sha512-4DTO8U66oiI8rShrDSu2zDPW6GWRiCebyb1MHSfQkLWCNI/PnLyGKeqYPUoVgc0FWaNN2sCBn8NKJHb++hE2LQ== dependencies: "@electron/get" "^2.0.0" "@types/node" "^20.9.0"