diff --git a/.yarnrc b/.yarnrc index c7befdb5fa178..1614ee06ded12 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1,5 +1,5 @@ disturl "https://electronjs.org/headers" -target "27.1.3" -ms_build_id "25612240" +target "27.2.1" +ms_build_id "26149897" runtime "electron" build_from_source "true" diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt index 4726faa51f4fc..d5d99bdf9241f 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ -fb6f9b62f3f031106dbaba2538bd850c6c18206353a85552f66e41bea36cb4c0 *chromedriver-v27.1.3-darwin-arm64.zip -ad6fb1824df1ae040aaa0ea280b37b175458517f6023414ce11418a0787e7bc8 *chromedriver-v27.1.3-darwin-x64.zip -559c07c4392640478702818076414a53e32845ea10647b354f9d5cbd45eabea2 *chromedriver-v27.1.3-linux-arm64.zip -82a17100d8443b10763e66194960830236a1d6a8a931db7b75beac8d5fa929c4 *chromedriver-v27.1.3-linux-armv7l.zip -fea8713f19cafb4eb0591074d42a52ca6d1394a9da05d8c73ed2590f1bbd6056 *chromedriver-v27.1.3-linux-x64.zip -6202162efb2d4479a826dc0d6090c1ffa3c90efa245f6c66cfd6d71169f52cd8 *chromedriver-v27.1.3-mas-arm64.zip -dd966c0dd992b63616e0ec811f27367232c40b1ae12aca80467c7c3b3bf52da5 *chromedriver-v27.1.3-mas-x64.zip -a7c800241316318e74cdefd8c311c0aa80c84263471bc6f20738d6be1ede9f76 *chromedriver-v27.1.3-win32-arm64.zip -95722b9b0915e8e883de762ceea7e3e859d4b0c8ea05e1ec78273707bbae95be *chromedriver-v27.1.3-win32-ia32.zip -73d0d834812c51b408dd863588686e21013b076eb5af43a19a9b5bdb11b035cf *chromedriver-v27.1.3-win32-x64.zip -977a4b72c9f4bc83256b46bc477d8f99957e9db2d543a99e10bc72667431823c *electron-api.json -dee2d7db6aeaf9a0a4c67c6ad4242d162f5573f96198c8af7d3c4888090e7c3e *electron-v27.1.3-darwin-arm64-dsym-snapshot.zip -cf8bf2d3d907e0860b28fbe13d41889161fab11578d991251344820e2d9a0370 *electron-v27.1.3-darwin-arm64-dsym.zip -a98e58cc6b840dd079b42224ebb612e4286ee2dabc0fb0b3338d71da65b388c9 *electron-v27.1.3-darwin-arm64-symbols.zip -ae44b0d094c53e233f5f69db13fe83b1db5e6434a7688fe72550f30f00bde40c *electron-v27.1.3-darwin-arm64.zip -a262a0c9baa3c4296f0e82498714c84189ee4474a099bf3ed3f7ab532c42d8f7 *electron-v27.1.3-darwin-x64-dsym-snapshot.zip -ca6fced7f9c356bf85ca512721a929df6b8c72fffdd18de49e475140038aae99 *electron-v27.1.3-darwin-x64-dsym.zip -1f29c88e7a170ec4c0d28feff70b117d7dd9c32758f12e99e38cf7178d710c7d *electron-v27.1.3-darwin-x64-symbols.zip -1f390ed58536a6ca35a65f2d89dabfbec7710a63c0037e7b6b5b93ddec830e4a *electron-v27.1.3-darwin-x64.zip -20ec3f863b6af6dbf16e71a73f813dce72aa3ebe24e45a9aafeec95d0e50e0b1 *electron-v27.1.3-linux-arm64-debug.zip -9c61c8eccad95493e5b26d390d76054cc193ef6969ea09f9487d5fe7dddc74ed *electron-v27.1.3-linux-arm64-symbols.zip -dc40729e50501923fb6c05f96179404fb7cb66abffd4c541ba48a98dd99eb1ed *electron-v27.1.3-linux-arm64.zip -20ec3f863b6af6dbf16e71a73f813dce72aa3ebe24e45a9aafeec95d0e50e0b1 *electron-v27.1.3-linux-armv7l-debug.zip -070f1eb4f748ed7f2fcd7251eb1cc6a60dd673b875b5ccdde725a6d81d63aa93 *electron-v27.1.3-linux-armv7l-symbols.zip -b7722854c6cdc32748341a42a8031c6fb39a9c7bb4b14a5df2bede8b6c34a51d *electron-v27.1.3-linux-armv7l.zip -6a5b0a98a784761ad526b4d3c3f6ee9bb1b080fec033a6707f31562e21f78e21 *electron-v27.1.3-linux-x64-debug.zip -47cd6f88991657387ede77513fda4bee4af8774cda70370aee10efe20daf1e3d *electron-v27.1.3-linux-x64-symbols.zip -5c567315071b2c69e5b3834c8098270bc8be2625242709a82404ca16e66fae14 *electron-v27.1.3-linux-x64.zip -0e86b47e647bfa05638341f36405cd313827c35be4dc39e007150c5fed559d43 *electron-v27.1.3-mas-arm64-dsym-snapshot.zip -f353c28728ad2c18c8f394adca6cf579c7a6031d87192e4ac21c131aa15d73d1 *electron-v27.1.3-mas-arm64-dsym.zip -8a69b87569291270e647aeb45c4ba0c16b5282c6c23c60aafb067b9485908b2a *electron-v27.1.3-mas-arm64-symbols.zip -78f5a61e5d828fd85a25cad0f8bd97144fcb59e79f6be8ab9a6f5b92410bf8d0 *electron-v27.1.3-mas-arm64.zip -71d2a5843fab0b1e6fbbf31788f5ce262d26bead43974e4559b502e608c5caa0 *electron-v27.1.3-mas-x64-dsym-snapshot.zip -31ba66bc89ff0ca11d82971e5a1846ef3426bdd1aa22675fc5e5a9ecd545a419 *electron-v27.1.3-mas-x64-dsym.zip -3eb43d0058e88a0b45845f2e78d270325c52ae32b552e94b5da38d3a0187d3c8 *electron-v27.1.3-mas-x64-symbols.zip -bc7ff5f8938d24390a1305f13ed29760fb7c841b533fad090682024bdf93b304 *electron-v27.1.3-mas-x64.zip -e98c36b90984f7307463f815a7d593b41d373e24e6949e8dad28ea84b581c615 *electron-v27.1.3-win32-arm64-pdb.zip -c71180638cc29d888f6bdbbf92476dd4aa443c934ee3e9c588a898fbe0aaa70b *electron-v27.1.3-win32-arm64-symbols.zip -c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v27.1.3-win32-arm64-toolchain-profile.zip -4b8cbea485aff9325f3e41b842d4714900299667255179b2c7ac653b56d4b0c8 *electron-v27.1.3-win32-arm64.zip -d5be66a6f7416d4bf506c950e31c907604bbfc3c4c417c9545df81070cb669dd *electron-v27.1.3-win32-ia32-pdb.zip -e5ab5957302d1d839e620e803de810de9c476147383a05af41e08ba9add74445 *electron-v27.1.3-win32-ia32-symbols.zip -c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v27.1.3-win32-ia32-toolchain-profile.zip -c06c9ee185276e56dfb62ca7ea742f8442b8d573b430bb9d6ce03024fe4be670 *electron-v27.1.3-win32-ia32.zip -82a8dfb06126e25672f793a87fa6183c62badeefc4d6372043f038f3347c3880 *electron-v27.1.3-win32-x64-pdb.zip -441c05b66b2584421683771cd428be78d59e37359cee88d01e8a1201e8c95206 *electron-v27.1.3-win32-x64-symbols.zip -c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v27.1.3-win32-x64-toolchain-profile.zip -ed04476baf0d1c363f91c6cc457e448eaee2efd2464449f5bd1b3ec94f5a6b81 *electron-v27.1.3-win32-x64.zip -f58626c26c10446993521695da1fbe22162285dc4a49691de455153a6eb7ad4f *electron.d.ts -178f0822f1ac3c3dd936a05e7691eccbce7dc091fb23399eeb6c8c2d19d35309 *ffmpeg-v27.1.3-darwin-arm64.zip -8756fbaeffb0f076e9c03b03fbc0828c1d2af1fa5fafd892dbb35dbcab39606a *ffmpeg-v27.1.3-darwin-x64.zip -be517ba93c5b5f36d2e55af148213f4c2fc43177563825601bee6f88dd4f7b05 *ffmpeg-v27.1.3-linux-arm64.zip -926d0da25ffcea3d05a6cbcae15e5d7729d93bc43394ae4439747669d2210e1d *ffmpeg-v27.1.3-linux-armv7l.zip -6f9c0ef52af14828ad547a80b17f8c63cac51a18b8d5769a2f33e4fa6cccfc7e *ffmpeg-v27.1.3-linux-x64.zip -a8820f2d8133ac554edac5aaf5926f7b4d46e793c2315a1729099836dbe0674f *ffmpeg-v27.1.3-mas-arm64.zip -28cd237b7a4d04020ce262ab3e7bab66cb7921a94bb75f49d95eee0953624021 *ffmpeg-v27.1.3-mas-x64.zip -9949f98c8c07d03892a2b4940a4620a1ab2bc9501a1ab46d1941b4c2a3966beb *ffmpeg-v27.1.3-win32-arm64.zip -5cfe4c2b731c3db36338d01a88e146dc8cf7b83ede3f2090396f803f5095e7c2 *ffmpeg-v27.1.3-win32-ia32.zip -c175b1ef006ff337754bb9d9dd5b86e11273b981602d01a83bbc5eff09d583cb *ffmpeg-v27.1.3-win32-x64.zip -a37cecf4b0b2ffef035ed1916cc747037d42bd8e083c5b901decff3bfeb55a4d *hunspell_dictionaries.zip -3433837c4fdeaec616527ae03d433ae6f515a75b3855dfe750dc22b1622d67f0 *libcxx-objects-v27.1.3-linux-arm64.zip -60141a1fac588aed7320a53b355262b98dd3e67a6ad94a93f44ff240b34e69e0 *libcxx-objects-v27.1.3-linux-armv7l.zip -14d048f8375c27adc28006c9cdf73b4f9dcebb18f089b21cd2e35a17c9c89c21 *libcxx-objects-v27.1.3-linux-x64.zip -9983ad6c098939d91bc67b5a8d9ebd2e72685000310c712876533ce31e71d129 *libcxx_headers.zip -8052c0a22a9ad673d32c1ae157df9638838fbd017a030263d4cce21aeed5c824 *libcxxabi_headers.zip -734eef5f5c8ca1d9feb107c786d85a9560a2f8009c32cc6f8cda04d24b825d21 *mksnapshot-v27.1.3-darwin-arm64.zip -ec489cbe9634d799c14ec9897973a7924126404570a049a16eb0a2a771d728ed *mksnapshot-v27.1.3-darwin-x64.zip -b4f952c96d369b566e85f7b1d67c6a1553158f041c944a53e9bbd324a4a8699b *mksnapshot-v27.1.3-linux-arm64-x64.zip -c705cd0f7301fd7b8b282ffe51efdce3c7305a828c21015640c5091e6f9b71ed *mksnapshot-v27.1.3-linux-armv7l-x64.zip -bf5e7c0aa8000e6da7f8d00acdf7bb93474af8c2eb684177fb6fd0b2d2ae72d8 *mksnapshot-v27.1.3-linux-x64.zip -dd9ff64c44563d5713ae516dd05db950a34e9b271bc3df5ffed20e7eda1ae50b *mksnapshot-v27.1.3-mas-arm64.zip -31558d25b4051cbce2e5f98f58cc860b14fbbe92d727e2696f3f36ed266aed9e *mksnapshot-v27.1.3-mas-x64.zip -0b8f3b6702aa81adff35ddaedf44623ab91eda203aecde5e15759ff8ae95558f *mksnapshot-v27.1.3-win32-arm64-x64.zip -ad95d9708c7a94b396714956b7407c9a7283ca54b26bcf0034f81764d9285037 *mksnapshot-v27.1.3-win32-ia32.zip -98e7e1fd5580e8c626f519eb619ff8bf16c3d909212cd5260cebb8a155d2ddce *mksnapshot-v27.1.3-win32-x64.zip +fa257474711c65fe0f929299fc21a7171a548ef655e393246a48319ee53f702e *chromedriver-v27.2.1-darwin-arm64.zip +d3f279d281221ca87510716afda22be95f8ad66641b3d46943885de0ae94b046 *chromedriver-v27.2.1-darwin-x64.zip +fc0c512cb87c82b1d5327bb04ef7dfb2046ea884d00896bab89652d607ce1c97 *chromedriver-v27.2.1-linux-arm64.zip +4c33d1a323bc59d776a14b2ebb40229dbf1b8de30d51e5643e6584bd63cd7593 *chromedriver-v27.2.1-linux-armv7l.zip +a60c7fc2f278b7a177eb1ec3dccff6fc9c1c8d120596deb595b544a2b8018a79 *chromedriver-v27.2.1-linux-x64.zip +80bc0e0ce66028436853bb5a625f8a1c6c8456c1a8435070a6e30d0e06b9312b *chromedriver-v27.2.1-mas-arm64.zip +67fcfafbc24902d1dff455527115f4453d49308d95010214dda7a1e46a96e6e7 *chromedriver-v27.2.1-mas-x64.zip +1c33c6cadb07c62e7a80ae64de520cb3122cc8496ee73533da67770d0ab1bf5c *chromedriver-v27.2.1-win32-arm64.zip +666042a40a30ab322a66bbcf8552f777c0564bb4a7647122eb7bd260269cd1c3 *chromedriver-v27.2.1-win32-ia32.zip +af92d72b04760be18ac748c5a0072751b497cff4ebabb4bfeecc23538ea9de8e *chromedriver-v27.2.1-win32-x64.zip +9f626747797f005cfe41076bc905a11ab17ac380a2d7865c3cfba05c63ea6514 *electron-api.json +a1ea4e720b5ce964bb4aa6f723f0305ec81a0024f8e9fe474fb1b05b79402e51 *electron-v27.2.1-darwin-arm64-dsym-snapshot.zip +60f69390ca803845992dae4aecb0d360c8c3da62c842523f307a8d495bec84e7 *electron-v27.2.1-darwin-arm64-dsym.zip +33ed9025a4ac39ec597c6cdcc5f7c425a34aca4e34713732de159685a7884d52 *electron-v27.2.1-darwin-arm64-symbols.zip +a8d12908b5aad53083e1b257ba8028ea55ac099cab859260c2a8b5ce512597ca *electron-v27.2.1-darwin-arm64.zip +68b5e5a021239fc7849986a24dddb54d21f4cc9ffbceb8777b7bfd696c940c50 *electron-v27.2.1-darwin-x64-dsym-snapshot.zip +ed33f31e69925642c3b09b2c318ec66be8877bdfb4984c91ee3b90052fb1bcac *electron-v27.2.1-darwin-x64-dsym.zip +88f7b0fec77ee4e0ae9659cfee4d9cbe3a26b378cc92878236b928254568fb07 *electron-v27.2.1-darwin-x64-symbols.zip +7ea6d061520afa77483b891bb8623574d87458deb54841f740c51a1adfa88fea *electron-v27.2.1-darwin-x64.zip +e4af2089beecdcdb7625918ce1dfd6b3401b10239c1c0435951a8642ff17568f *electron-v27.2.1-linux-arm64-debug.zip +c9b009ce848f02fc31c072b546758fbccb39a6ff2779dfea794920c1a83f8f8d *electron-v27.2.1-linux-arm64-symbols.zip +32c86c89a4fdc55aac107c8807bf3181fc31cf5c6dc4e0ca00319bb7837ed695 *electron-v27.2.1-linux-arm64.zip +e4af2089beecdcdb7625918ce1dfd6b3401b10239c1c0435951a8642ff17568f *electron-v27.2.1-linux-armv7l-debug.zip +ceb3f9e7b19f8e1ca0e94858492b1b5eb8bb3c7e91ebde230bdbe463838f2a0a *electron-v27.2.1-linux-armv7l-symbols.zip +b4496ae943fa8ee19d418f9f871ce05ad2ffab35b5dfc79052c842478464b5d6 *electron-v27.2.1-linux-armv7l.zip +35bdcb99f7f63a6892dde033046b4eb315ca71a459124461b43f9ffcf9cae579 *electron-v27.2.1-linux-x64-debug.zip +5271540e93fbdb1f69f21a37a3deb51886afaf7e1b9200ed0cbb6dc91f83854c *electron-v27.2.1-linux-x64-symbols.zip +b4be96cd85797d23afd422dc7cc6bf321234001810d08b52e32b055a7e8afbd7 *electron-v27.2.1-linux-x64.zip +dc7feb71d7a65bde3ddbcc43e514940a070af9fd8b385f819ac012b9d694ce64 *electron-v27.2.1-mas-arm64-dsym-snapshot.zip +98317e6af5ddb3db98511958a9ad46a54de00c897b67c6d1e3dc3baaf3e3878a *electron-v27.2.1-mas-arm64-dsym.zip +91a78763ac1959c3b4865902e378830c7304917dc20877db7c12283c1d34e510 *electron-v27.2.1-mas-arm64-symbols.zip +01414a8e5ef3c1f7efb888d32bdfc85ba0ea8b42d4e8093ca7cf0e7a8a728415 *electron-v27.2.1-mas-arm64.zip +e082d37c20b1af792307fa2db9ff576e4345256d26dd0e0f5f2d807a45673991 *electron-v27.2.1-mas-x64-dsym-snapshot.zip +3a93a95bf05ec4d01268a64db2d58a07bff90463f3059a3dd4a30968297aab36 *electron-v27.2.1-mas-x64-dsym.zip +138ac2d1fea73d0f677fa5218a0ba2d5422d22cb6090d865c7ddce99383aa415 *electron-v27.2.1-mas-x64-symbols.zip +87457c8938858570b20a122c1cdb23c0a41374b7010253626d49e9b6b127a50a *electron-v27.2.1-mas-x64.zip +ce3638d29dfb46fc5b375ead5c0bbb98b50eec2c9e42c5b4a0a948a60ef25439 *electron-v27.2.1-win32-arm64-pdb.zip +f24636b71937e9b4ca46d046e6131a3acb87edca93be0b26d500d93c6a78abeb *electron-v27.2.1-win32-arm64-symbols.zip +c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v27.2.1-win32-arm64-toolchain-profile.zip +5b4fd051b04de97ef14a711533ecd44c99d31ce6fc83f2593c4e041e9550eeb1 *electron-v27.2.1-win32-arm64.zip +c8cd49e0ba8a87666a50d358dc3a2810d0d5f2c13e345c48febf488aed513856 *electron-v27.2.1-win32-ia32-pdb.zip +7d28badd01d7f357f0cbbff12df55b1816f2dd08bcceea00fa03b027d7c8bb9b *electron-v27.2.1-win32-ia32-symbols.zip +c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v27.2.1-win32-ia32-toolchain-profile.zip +508f29dd2d07c19b1ae6d7546772103230d601d44f33443a79a3b42a5fa9d293 *electron-v27.2.1-win32-ia32.zip +1b40186cd080f9d45bb03b1d7f6e4f3c4fc6332bbbe36453f99bd8643545f384 *electron-v27.2.1-win32-x64-pdb.zip +e2bc044c06a463d29699b5a0bedecb68714cacfdb5661a70db4047cb211a8246 *electron-v27.2.1-win32-x64-symbols.zip +c9f31ae6408aa6936b5d683eda601773789185890375cd097e61e924d4fed77a *electron-v27.2.1-win32-x64-toolchain-profile.zip +4d0810c1bc9985e7e471efb06380bd190b5d07f46ef1938c1d3ee496e0cdcccf *electron-v27.2.1-win32-x64.zip +f48477c175fe9bc34c1541cb75bd9d3eda2c540a799e2f3b715adcdd626c3dc1 *electron.d.ts +c951898cbf3c65013a21b5b4581d24e38f568183893f785f7d3bab0aedf49d6f *ffmpeg-v27.2.1-darwin-arm64.zip +5306f41915ced8307c44858a91250a228819304c82dfdd80c9f584fe092436ad *ffmpeg-v27.2.1-darwin-x64.zip +be517ba93c5b5f36d2e55af148213f4c2fc43177563825601bee6f88dd4f7b05 *ffmpeg-v27.2.1-linux-arm64.zip +926d0da25ffcea3d05a6cbcae15e5d7729d93bc43394ae4439747669d2210e1d *ffmpeg-v27.2.1-linux-armv7l.zip +6f9c0ef52af14828ad547a80b17f8c63cac51a18b8d5769a2f33e4fa6cccfc7e *ffmpeg-v27.2.1-linux-x64.zip +bb0036c363cdc2558d9feec90cb896c66133400b499b14fa099421e1d0117bc6 *ffmpeg-v27.2.1-mas-arm64.zip +33203048fa78450cac7ae1988b708ad51d1a49933d212b505fcf272da201e6d6 *ffmpeg-v27.2.1-mas-x64.zip +954870aaa5ffa56bbe06b04308bd6a4fc937b82cc11d8780542e4a9f25790b37 *ffmpeg-v27.2.1-win32-arm64.zip +a46eab4db71ff41a0a1056b8777ec2d01f83f4b7a85687514562045f1f2b4820 *ffmpeg-v27.2.1-win32-ia32.zip +74841b03157199f2439d2182cf4da66dfdc4014d4e2d76a043055b4dc5d33a9b *ffmpeg-v27.2.1-win32-x64.zip +7f15f0f64083f093a98f9dc002d6256a3a56cc7d720cd861d820a7223d46be83 *hunspell_dictionaries.zip +6cc8cbde27c4e0ed7689f87a4c444aa50a1bee9bfec35289e26e9854864c1d69 *libcxx-objects-v27.2.1-linux-arm64.zip +ce935631fa896af9d34e8ed01a431c7f4b289d9cc872cede5bfd9e4663ac4d6e *libcxx-objects-v27.2.1-linux-armv7l.zip +979a65ea5cd9c8c44e6d9760c2cb79bec0914396b68be9270b52d09c1b1a72ee *libcxx-objects-v27.2.1-linux-x64.zip +86f961adc7015bbf8762453bc5148d381ff7c7c4580ceed9189c93fd01139fcf *libcxx_headers.zip +acb2c0d967dc14fe63784c79c58648193348252efb25a691b61d3c19142d67e9 *libcxxabi_headers.zip +07bc91f769fb7320bfb331d7e40d963e787960dec0f404b165c7df9ef49f531b *mksnapshot-v27.2.1-darwin-arm64.zip +c9127c412b6f10a706c406865a72119abf34692efd19e58231dec631af91f3c5 *mksnapshot-v27.2.1-darwin-x64.zip +d52e6deec09571b4618dab3ee1c615f2996d3d52e97f0df4c8a7ecddc443d847 *mksnapshot-v27.2.1-linux-arm64-x64.zip +23aa985b9d4431d9a92eefe8f635bcd54a50a1b02d008d9883dce1ca90670d9b *mksnapshot-v27.2.1-linux-armv7l-x64.zip +9aac8616fcfaeda69945742f4fe99309cabfcc355f5a6edae5ac6bdb5de78552 *mksnapshot-v27.2.1-linux-x64.zip +f53004a849ea0d5e19569f48561fc79b95015c3395405ef28800fa34e5a6b37c *mksnapshot-v27.2.1-mas-arm64.zip +8b7458854d6e3339220623a53927eeaac2d97e02133172f2615ee976e32a1337 *mksnapshot-v27.2.1-mas-x64.zip +5314c938447f1f24aee9007719d8d65ef4f68a3fac0e103897bc53f26685ed6a *mksnapshot-v27.2.1-win32-arm64-x64.zip +fbae6d4323d20af0a7c5d5c044e9927b6f8396e0d9c8a45c1f6945ce32250715 *mksnapshot-v27.2.1-win32-ia32.zip +08556f224fcb5dee0928dce8beda23f058258cc85e85da3fe651bf0e84469f5d *mksnapshot-v27.2.1-win32-x64.zip diff --git a/cgmanifest.json b/cgmanifest.json index 505453b1a6d65..139424f261334 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -528,12 +528,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "d449c890159beae4d5176138dc65ab22d37e0fee" + "commitHash": "8471e4750734ea33a85720ce20bca0d8d9d56985" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "27.1.3" + "version": "27.2.1" }, { "component": { diff --git a/extensions/git/src/askpass.ts b/extensions/git/src/askpass.ts index 6b27d87618535..5d99534d55afb 100644 --- a/extensions/git/src/askpass.ts +++ b/extensions/git/src/askpass.ts @@ -30,7 +30,7 @@ export class Askpass implements IIPCHandler, ITerminalEnvironmentProvider { GIT_ASKPASS: path.join(__dirname, this.ipc ? 'askpass.sh' : 'askpass-empty.sh'), // VSCODE_GIT_ASKPASS VSCODE_GIT_ASKPASS_NODE: process.execPath, - VSCODE_GIT_ASKPASS_EXTRA_ARGS: (process.versions['electron'] && process.versions['microsoft-build']) ? '--ms-enable-electron-run-as-node' : '', + VSCODE_GIT_ASKPASS_EXTRA_ARGS: '', VSCODE_GIT_ASKPASS_MAIN: path.join(__dirname, 'askpass-main.js'), }; diff --git a/extensions/git/src/gitEditor.ts b/extensions/git/src/gitEditor.ts index f43e6f682096a..f5701642084a3 100644 --- a/extensions/git/src/gitEditor.ts +++ b/extensions/git/src/gitEditor.ts @@ -27,7 +27,7 @@ export class GitEditor implements IIPCHandler, ITerminalEnvironmentProvider { this.env = { GIT_EDITOR: `"${path.join(__dirname, ipc ? 'git-editor.sh' : 'git-editor-empty.sh')}"`, VSCODE_GIT_EDITOR_NODE: process.execPath, - VSCODE_GIT_EDITOR_EXTRA_ARGS: (process.versions['electron'] && process.versions['microsoft-build']) ? '--ms-enable-electron-run-as-node' : '', + VSCODE_GIT_EDITOR_EXTRA_ARGS: '', VSCODE_GIT_EDITOR_MAIN: path.join(__dirname, 'git-editor-main.js') }; } diff --git a/package.json b/package.json index 6b19116b08484..59ecb4c4c678d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.86.0", - "distro": "9d1271fd1c2cf545a209fb8aaf409f75da726c4c", + "distro": "4665912689c3b96279fd50cc65117ab6969e7132", "author": { "name": "Microsoft Corporation" }, @@ -150,7 +150,7 @@ "cssnano": "^4.1.11", "debounce": "^1.0.0", "deemon": "^1.8.0", - "electron": "27.1.3", + "electron": "27.2.1", "eslint": "8.36.0", "eslint-plugin-header": "3.1.1", "eslint-plugin-jsdoc": "^46.5.0", diff --git a/resources/darwin/bin/code.sh b/resources/darwin/bin/code.sh index 8c05872707185..1d66515c2c73b 100755 --- a/resources/darwin/bin/code.sh +++ b/resources/darwin/bin/code.sh @@ -31,5 +31,5 @@ fi CONTENTS="$APP_PATH/Contents" ELECTRON="$CONTENTS/MacOS/Electron" CLI="$CONTENTS/Resources/app/out/cli.js" -ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --ms-enable-electron-run-as-node "$@" +ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@" exit $? diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh index eb48bf8fcfc3c..4f11f5b82e00b 100755 --- a/resources/linux/bin/code.sh +++ b/resources/linux/bin/code.sh @@ -59,5 +59,5 @@ fi ELECTRON="$VSCODE_PATH/@@APPNAME@@" CLI="$VSCODE_PATH/resources/app/out/cli.js" -ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --ms-enable-electron-run-as-node "$@" +ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@" exit $? diff --git a/resources/win32/bin/code.cmd b/resources/win32/bin/code.cmd index c72e9e2833346..9da8ab4f7b819 100644 --- a/resources/win32/bin/code.cmd +++ b/resources/win32/bin/code.cmd @@ -2,5 +2,5 @@ setlocal set VSCODE_DEV= set ELECTRON_RUN_AS_NODE=1 -"%~dp0..\@@NAME@@.exe" "%~dp0..\resources\app\out\cli.js" --ms-enable-electron-run-as-node %* +"%~dp0..\@@NAME@@.exe" "%~dp0..\resources\app\out\cli.js" %* endlocal diff --git a/resources/win32/bin/code.sh b/resources/win32/bin/code.sh index a56c068f4ac97..bcf31892c2345 100644 --- a/resources/win32/bin/code.sh +++ b/resources/win32/bin/code.sh @@ -43,7 +43,7 @@ if [ $IN_WSL = true ]; then # use the Remote WSL extension if installed WSL_EXT_ID="ms-vscode-remote.remote-wsl" - ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" --ms-enable-electron-run-as-node --locate-extension $WSL_EXT_ID >/tmp/remote-wsl-loc.txt 2>/dev/null /tmp/remote-wsl-loc.txt 2>/dev/null { function findName(cmd: string): string { const UTILITY_NETWORK_HINT = /--utility-sub-type=network/i; - const NODEJS_PROCESS_HINT = /--ms-enable-electron-run-as-node/i; const WINDOWS_CRASH_REPORTER = /--crashes-directory/i; const WINPTY = /\\pipe\\winpty-control/i; const CONPTY = /conhost\.exe.+--headless/i; @@ -103,11 +102,6 @@ export function listProcesses(rootPid: number): Promise { } } - // find Electron node.js processes - if (NODEJS_PROCESS_HINT.exec(cmd)) { - return `electron-nodejs (${cmd})`; - } - return cmd; } diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts index 0ec11b21b516a..7acd17b994aa6 100644 --- a/src/vs/platform/environment/common/argv.ts +++ b/src/vs/platform/environment/common/argv.ts @@ -139,7 +139,4 @@ export interface NativeParsedArgs { 'log-net-log'?: string; 'vmodule'?: string; 'disable-dev-shm-usage'?: boolean; - - // MS Build command line arg - 'ms-enable-electron-run-as-node'?: boolean; } diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts index 60016db3d2c80..3bb02bcc7f1de 100644 --- a/src/vs/platform/environment/node/argv.ts +++ b/src/vs/platform/environment/node/argv.ts @@ -123,7 +123,6 @@ export const OPTIONS: OptionDescriptions> = { 'disable-gpu': { type: 'boolean', cat: 't', description: localize('disableGPU', "Disable GPU hardware acceleration.") }, 'disable-chromium-sandbox': { type: 'boolean', cat: 't', description: localize('disableChromiumSandbox', "Use this option only when there is requirement to launch the application as sudo user on Linux or when running as an elevated user in an applocker environment on Windows.") }, 'sandbox': { type: 'boolean' }, - 'ms-enable-electron-run-as-node': { type: 'boolean', global: true }, 'telemetry': { type: 'boolean', cat: 't', description: localize('telemetry', "Shows all telemetry events which VS code collects.") }, 'remote': { type: 'string', allowEmptyValue: true }, diff --git a/src/vs/platform/shell/node/shellEnv.ts b/src/vs/platform/shell/node/shellEnv.ts index 7c033e073bf6c..b956c37aa2a0e 100644 --- a/src/vs/platform/shell/node/shellEnv.ts +++ b/src/vs/platform/shell/node/shellEnv.ts @@ -128,7 +128,7 @@ async function doResolveUnixShellEnv(logService: ILogService, token: Cancellatio // handle popular non-POSIX shells const name = basename(systemShellUnix); let command: string, shellArgs: Array; - const extraArgs = (process.versions['electron'] && process.versions['microsoft-build']) ? '--ms-enable-electron-run-as-node' : ''; + const extraArgs = ''; if (/^pwsh(-preview)?$/.test(name)) { // Older versions of PowerShell removes double quotes sometimes so we use "double single quotes" which is how // you escape single quotes inside of a single quoted string. diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts index 22e77753062d9..6695c4b5a84cc 100644 --- a/src/vs/server/node/server.cli.ts +++ b/src/vs/server/node/server.cli.ts @@ -269,7 +269,6 @@ export async function main(desc: ProductDescription, args: string[]): Promise