diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index 850d83a..1fa7d91 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -104,7 +104,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.18.2' + node-version: '20.19.0' if: env.SHOULD_BUILD == 'yes' - name: Setup Python 3 @@ -330,7 +330,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.18.2' + node-version: '20.19.0' if: env.DISABLED != 'yes' - name: Setup Python 3 diff --git a/.github/workflows/insider-macos.yml b/.github/workflows/insider-macos.yml index 9d40f14..40bdc4a 100644 --- a/.github/workflows/insider-macos.yml +++ b/.github/workflows/insider-macos.yml @@ -62,7 +62,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.18.2' + node-version: '20.19.0' - name: Setup Python 3 uses: actions/setup-python@v5 diff --git a/.github/workflows/insider-spearhead.yml b/.github/workflows/insider-spearhead.yml index 4432666..60247e7 100644 --- a/.github/workflows/insider-spearhead.yml +++ b/.github/workflows/insider-spearhead.yml @@ -41,7 +41,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.18.2' + node-version: '20.19.0' - name: Clone VSCode repo run: . get_repo.sh diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index 83c0308..6d4c919 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -102,7 +102,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.18.2' + node-version: '20.19.0' if: env.SHOULD_BUILD == 'yes' - name: Setup Python 3 @@ -183,7 +183,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.18.2' + node-version: '20.19.0' if: env.SHOULD_BUILD == 'yes' - name: Setup Python 3 diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml index 5220d58..a858201 100644 --- a/.github/workflows/stable-linux.yml +++ b/.github/workflows/stable-linux.yml @@ -105,7 +105,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.18.2' + node-version: '20.19.0' if: env.SHOULD_BUILD == 'yes' - name: Setup Python 3 @@ -331,7 +331,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.18.2' + node-version: '20.19.0' if: env.DISABLED != 'yes' - name: Setup Python 3 diff --git a/.github/workflows/stable-macos.yml b/.github/workflows/stable-macos.yml index 64ac130..9a5bec5 100644 --- a/.github/workflows/stable-macos.yml +++ b/.github/workflows/stable-macos.yml @@ -61,7 +61,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.18.2' + node-version: '20.19.0' - name: Setup Python 3 uses: actions/setup-python@v5 diff --git a/.github/workflows/stable-spearhead.yml b/.github/workflows/stable-spearhead.yml index 59f354b..15a2e48 100644 --- a/.github/workflows/stable-spearhead.yml +++ b/.github/workflows/stable-spearhead.yml @@ -36,7 +36,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.18.2' + node-version: '20.19.0' - name: Clone VSCode repo run: . get_repo.sh diff --git a/.github/workflows/stable-windows.yml b/.github/workflows/stable-windows.yml index d6ab4b5..ba7f4b1 100644 --- a/.github/workflows/stable-windows.yml +++ b/.github/workflows/stable-windows.yml @@ -101,7 +101,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.18.2' + node-version: '20.19.0' if: env.SHOULD_BUILD == 'yes' - name: Setup Python 3 @@ -182,7 +182,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: '20.18.2' + node-version: '20.19.0' if: env.SHOULD_BUILD == 'yes' - name: Setup Python 3 diff --git a/.nvmrc b/.nvmrc index d4b7699..5bd6811 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.18.1 +20.19.0 diff --git a/build/linux/appimage/build.sh b/build/linux/appimage/build.sh index a2b4366..8acea98 100755 --- a/build/linux/appimage/build.sh +++ b/build/linux/appimage/build.sh @@ -27,14 +27,16 @@ if [[ "${VSCODE_ARCH}" == "x64" ]]; then # remove check so build in docker can succeed sed -i 's/grep docker/# grep docker/' pkg2appimage.AppDir/usr/share/pkg2appimage/functions.sh + APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )" + if [[ "${VSCODE_QUALITY}" == "insider" ]]; then - sed -i 's|@@NAME@@|VSCodium-Insiders|g' recipe.yml - sed -i 's|@@APPNAME@@|codium-insiders|g' recipe.yml - sed -i 's|@@ICON@@|vscodium-insiders|g' recipe.yml + sed -i "s|@@NAME@@|${APP_NAME}-Insiders|g" recipe.yml + sed -i "s|@@APPNAME@@|${BINARY_NAME}|g" recipe.yml + sed -i "s|@@ICON@@|${APP_NAME_LC}-insiders|g" recipe.yml else - sed -i 's|@@NAME@@|VSCodium|g' recipe.yml - sed -i 's|@@APPNAME@@|codium|g' recipe.yml - sed -i 's|@@ICON@@|vscodium|g' recipe.yml + sed -i "s|@@NAME@@|${APP_NAME}|g" recipe.yml + sed -i "s|@@APPNAME@@|${BINARY_NAME}|g" recipe.yml + sed -i "s|@@ICON@@|${APP_NAME_LC}|g" recipe.yml fi # workaround that enforces x86 ARCH for pkg2appimage having /__w/vscodium/vscodium/build/linux/appimage/VSCodium/VSCodium.AppDir/usr/share/codium/resources/app/node_modules/rc/index.js is of architecture armhf diff --git a/build/linux/loong64/electron.sh b/build/linux/loong64/electron.sh index f84643a..d4ce4cd 100644 --- a/build/linux/loong64/electron.sh +++ b/build/linux/loong64/electron.sh @@ -2,5 +2,5 @@ set -ex -export ELECTRON_VERSION="34.2.0" +export ELECTRON_VERSION="34.5.4" export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}" diff --git a/build/linux/loong64/electron.sha256sums b/build/linux/loong64/electron.sha256sums index 9dbdc4e..814167e 100644 --- a/build/linux/loong64/electron.sha256sums +++ b/build/linux/loong64/electron.sha256sums @@ -1,11 +1,10 @@ -e47103e4191b781c9a166ec07f310b1d615866022fc896adf959f81a91615d33 *chromedriver-v34.2.0-linux-loong64.zip -24ac8b4c6dae1e3bc31de1cda733176ac03b0a124788fe2000a07723c17aa3ad *electron-v34.2.0-linux-loong64-debug.zip -0a2330d8aa615aa2faac3fc6d3d1924784cab9a1b9a498e00210cf90adc3e98a *electron-v34.2.0-linux-loong64-symbols.zip -97687006d23a57ee35fc3d3ce8803dfb7e48538ccaf98a73fc8eef09afc35672 *electron-v34.2.0-linux-loong64.zip -88f1d2e434c111203f06e17a5a23fe8ba5ea572473559055064784e37b804bb9 *hunspell-dictionaries.zip -b085b7ae8b77b07a210026901816f440c841666222809af3ae9aaf16d95ee6a2 *libcxx-headers.zip -1f8b7234dd1a8c219909aae8c8c4b5c064c7eb60b9b30efb2207b16a0991acfc *libcxx-objects-v34.2.0-linux-loong64.zip -a34caad87f177ae6b6098fef84a832fb0887bd5819be9cdc1272d317f4036b96 *libcxxabi-headers.zip -b7ea74bf6d6aac7eb96841c0c7539f5c8b853e715c4b4396c6cd097a872303b3 *mksnapshot-v34.2.0-linux-loong64.zip -2e574c7bf182ae8dfdb302be68da8c5d783cd952391e61e166bd8069dc8752fc *node-v34.2.0-headers.tar.gz - +cf8098d286cfb8d64ca430740084b2bd6f0152ee047e244897d94cc9a2df4d3f *chromedriver-v34.5.4-linux-loong64.zip +7e7ea3a5bd29615bfc56ef2ccdd90228c39c6967de31c7181242e82ad50a1828 *electron-v34.5.4-linux-loong64-debug.zip +78d894c1fa02fabae37cf61b8961b7c0d79e9c27078a68c68e299f09b1635ac1 *electron-v34.5.4-linux-loong64-symbols.zip +28fe7821944b42de2065bda356a49d058d190ee02355ac3369f591a1af066252 *electron-v34.5.4-linux-loong64.zip +ae61a77fc547493e8c30f1f52b0e1e9932a163cda261cac3c32fc453d9da8cde *hunspell-dictionaries.zip +0bd2ce3eaa8f79ebf162babeb38fc1c3352bc5398ef442151e9d0f04f29e7416 *libcxx-headers.zip +962b369d4166f43f8130ff16d632c25c5512975015ad74675b62cfdb6189199b *libcxx-objects-v34.5.4-linux-loong64.zip +e468dba6a76ff95d3573ac5a57d4fd97e736663dab44d3c842de1974b9fc7b25 *libcxxabi-headers.zip +4d1e508970b79d782e10e23e261211659dcf6edd6b01029011baf47becb95344 *mksnapshot-v34.5.4-linux-loong64.zip +0d0e7f1de51994c95241b3b6c0ce822a44d6eca45e1981f2e61c1ca6386d5d29 *node-v34.5.4-headers.tar.gz diff --git a/build/linux/package_bin.sh b/build/linux/package_bin.sh index 0224fa1..793eb9f 100755 --- a/build/linux/package_bin.sh +++ b/build/linux/package_bin.sh @@ -18,7 +18,7 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; } export VSCODE_PLATFORM='linux' export VSCODE_SKIP_NODE_VERSION_CHECK=1 -export VSCODE_SYSROOT_PREFIX='-glibc-2.28' +export VSCODE_SYSROOT_PREFIX='-glibc-2.28-gcc-10.5.0' if [[ "${VSCODE_ARCH}" == "arm64" || "${VSCODE_ARCH}" == "armhf" ]]; then export VSCODE_SKIP_SYSROOT=1 diff --git a/build/linux/package_reh.sh b/build/linux/package_reh.sh index 7b3ecdc..f7a9541 100755 --- a/build/linux/package_reh.sh +++ b/build/linux/package_reh.sh @@ -18,7 +18,7 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; } GLIBC_VERSION="2.28" GLIBCXX_VERSION="3.4.26" -NODE_VERSION="20.18.2" +NODE_VERSION="20.19.0" export VSCODE_NODEJS_URLROOT='/download/release' export VSCODE_NODEJS_URLSUFFIX='' @@ -49,6 +49,7 @@ elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then export USE_GNUPP2A=1 elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-ppc64le" + VSCODE_SYSROOT_PREFIX="-glibc-${GLIBC_VERSION}" export VSCODE_SYSROOT_REPOSITORY='VSCodium/vscode-linux-build-agent' export VSCODE_SYSROOT_VERSION='20240129-253798' @@ -67,6 +68,7 @@ elif [[ "${VSCODE_ARCH}" == "loong64" ]]; then export VSCODE_NODEJS_SITE='https://unofficial-builds.nodejs.org' elif [[ "${VSCODE_ARCH}" == "s390x" ]]; then VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-s390x" + VSCODE_SYSROOT_PREFIX="-glibc-${GLIBC_VERSION}" export VSCODE_SYSROOT_REPOSITORY='VSCodium/vscode-linux-build-agent' export VSCODE_SYSROOT_VERSION='20241108' @@ -76,7 +78,12 @@ export ELECTRON_SKIP_BINARY_DOWNLOAD=1 export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 export VSCODE_PLATFORM='linux' export VSCODE_SKIP_NODE_VERSION_CHECK=1 -export VSCODE_SYSROOT_PREFIX="-glibc-${GLIBC_VERSION}" + +if [[ -z "${VSCODE_SYSROOT_PREFIX}" ]]; then + export VSCODE_SYSROOT_PREFIX="-glibc-${GLIBC_VERSION}-gcc-10.5.0" +else + export VSCODE_SYSROOT_PREFIX +fi EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION:=GLIBC_VERSION}" VSCODE_HOST_MOUNT="$( pwd )" diff --git a/build/linux/ppc64le/electron.sh b/build/linux/ppc64le/electron.sh index f84643a..d4ce4cd 100644 --- a/build/linux/ppc64le/electron.sh +++ b/build/linux/ppc64le/electron.sh @@ -2,5 +2,5 @@ set -ex -export ELECTRON_VERSION="34.2.0" +export ELECTRON_VERSION="34.5.4" export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}" diff --git a/build/linux/ppc64le/electron.sha256sums b/build/linux/ppc64le/electron.sha256sums index 9f4b8c4..30fc895 100644 --- a/build/linux/ppc64le/electron.sha256sums +++ b/build/linux/ppc64le/electron.sha256sums @@ -1,11 +1,11 @@ -e28d3ffb1a4cdcef80b93cf2a73214c4a85b2fc2a414aefc14a03b212ce07a28 *chromedriver-v34.2.0-linux-ppc64le.zip -4cfaa3e888b9d4acb9149ca521188dc2e945fa569230b026d5a74d8a85a6f8ce *electron-v34.2.0-linux-ppc64le-debug.zip -3a82c9ef68f60234ea6d506205d3f37fc7821f7f2a9217c1f9027078da1b3a44 *electron-v34.2.0-linux-ppc64le-symbols.zip -85d2ddaee9d5aa93ab341e3a6f9ac2b7fce3825efee7b885cdda7ad91244a158 *electron-v34.2.0-linux-ppc64le.zip -5ca44a4ee9cc74a56c9556ce3f3774986dbb8b4f4953088c7f4577bfba4356a8 *electron.d.ts -a5db064d9f82e2ad8be677d5c5bcf4e9bca68b38ca1e096c54029879098bf7ba *ffmpeg-v34.2.0-linux-ppc64le.zip -d19ee157a394a258c0d2820ca0b3d6f3403065c54bdb4b35d8227c844ebc18d9 *hunspell_dictionaries.zip -3ba2b632a70b16315c0f975a87ebaf47b24878396d4e5b7ba1d9db49eb1bfee9 *libcxx-objects-v34.2.0-linux-ppc64le.zip -552fe6a9afe66b9efa054856553bb88c35ccafa31bc3bb398b483d77291be12c *libcxx_headers.zip -71d695f56d7fbee44d18d503790951c17ba22f2f75c5b96131d4c65e865860f0 *libcxxabi_headers.zip -6e25a04c8e19e475edbc8b7145df84372b0e8abdcde3c9ea42b5aaa6fb69ccda *mksnapshot-v34.2.0-linux-ppc64le.zip +2d72c038fc9480f4cb4cbda7bd777bede1a17ef5630dbbc249454e241ce49816 *chromedriver-v34.5.4-linux-ppc64le.zip +bd9e1e1fd6c0d1064fe7d430818bf792e86cd9eb938c099e3d026d88173c0523 *electron-v34.5.4-linux-ppc64le-debug.zip +50ad3382f101aab711e7b25d5a5fa1fec87634c25693c58b583ff745e7ed7631 *electron-v34.5.4-linux-ppc64le-symbols.zip +56fd4eee79448501b00490d6db85656ca76cf7a9878e5d10a77d9835ab5df8d3 *electron-v34.5.4-linux-ppc64le.zip +9a321b11432efca3d64439b1a398911de27c33fab0d6c3458924f5c71088b046 *electron.d.ts +c1bac0958d0a55ed72799a69908006c4982c963d911d095b2da7f8d15500c079 *ffmpeg-v34.5.4-linux-ppc64le.zip +9a5a43f33d8f39eb7f20ceca639cf2051aada59d25784dbc352359588ba2406e *hunspell_dictionaries.zip +43eadf79799f57a6c05c0cdac341ac8a4b2cbe09e3f35fca68130cd4c56f12a4 *libcxx-objects-v34.5.4-linux-ppc64le.zip +2d079f1fffbc87e0c6c75509f45793964fa4b7dab6b083c3b2f7e60efc11f9bd *libcxx_headers.zip +6d36957614559705c882105fbeeb5cd8073d88f450696f993216c71f6f0b694b *libcxxabi_headers.zip +e400bcdf220d028b2e0398da9af0fe2e2635e2c932733295458a4f5cb836bc90 *mksnapshot-v34.5.4-linux-ppc64le.zip diff --git a/build/linux/riscv64/electron.sh b/build/linux/riscv64/electron.sh index 52a0007..401643e 100755 --- a/build/linux/riscv64/electron.sh +++ b/build/linux/riscv64/electron.sh @@ -2,5 +2,5 @@ set -ex -export ELECTRON_VERSION="34.2.0" +export ELECTRON_VERSION="34.5.4" export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}.riscv1" diff --git a/build/linux/riscv64/electron.sha256sums b/build/linux/riscv64/electron.sha256sums index b1a1379..5d5f2be 100644 --- a/build/linux/riscv64/electron.sha256sums +++ b/build/linux/riscv64/electron.sha256sums @@ -1,11 +1,11 @@ -1cbe2e0aa7ce41832781b867ab1899bd83bbebf37ea89036e2d1f2e4e8c231dd *chromedriver-v34.2.0-linux-riscv64.zip -2a6dc0241a8f62e442833e8a6438b150206d824874b3c42d41220052ce2558d2 *electron-v34.2.0-linux-riscv64-debug.tar.zst -54c6f5a7775ca09b7c61c89ce668d68bcbd3bf9d0f88bcebbfc93d68fcf53ca9 *electron-v34.2.0-linux-riscv64-symbols.tar.zst -edc0e2b28a05eb4c812c09c072b091df1d90a74283ad58ac7b61c6c538048882 *electron-v34.2.0-linux-riscv64.zip -e9a934eb94580f5ff18537a9afab8eac59f21784e07952c0511fe8db3e0b63a1 *ffmpeg-v34.2.0-linux-riscv64.zip -0e162c2636b9583d39b40a383ee4ea41f177c82b20d168ec869a625a6f7a6f6b *hunspell-dictionaries.zip -d12dfd2413e0151c8ba800b0fa8881d2910b49793e62576798c3358eef724eec *libcxx-headers.zip -b2befbd4a5149b6f63925f833fcb40c247b5205e90a80426d6ba87e48e259575 *libcxx-objects-v34.2.0-linux-riscv64.zip -f70f8fdea628beac7c90453f4f4c01a587c5e0c5f6cd12bcbba6019fe6c172f9 *libcxxabi-headers.zip -ea85918270250a56ec1217d7c79ae8f0d8f1b8bd3e21c3f80e68e3b3fca20fbb *mksnapshot-v34.2.0-linux-riscv64.zip -25ca4f68090ac1474d7306ca74fb64a57501216fd25aeeca7795c058f8124f57 *node-v34.2.0-headers.tar.gz +b4df0c94e2c9472e78b58610882b356c2d44621d6b9de208317f14641337ff7f *chromedriver-v34.5.4-linux-riscv64.zip +aca8846305cb2a89d308b6529feb169d17e2a8a22a7f5cbbb42a884752ef3a83 *electron-v34.5.4-linux-riscv64-debug.tar.zst +69df7d143196fbac6d111648d827a92172f059e268309de7202c0d2122975396 *electron-v34.5.4-linux-riscv64-symbols.tar.zst +792dfffa0985b478d79264a48a855ba9bbe00d1406d82b0e74013186cbb6b84b *electron-v34.5.4-linux-riscv64.zip +898df4e8bc7d96f2e9baf2935f4cc8ecc00acb75aa5efcfac3113ed61bd0415e *ffmpeg-v34.5.4-linux-riscv64.zip +20c9f293ce544af2c0a30f8cecf5428a8001a0b54a874dee37dddcecc4c7c607 *hunspell-dictionaries.zip +2005156efe24662203f83a9e99459bb9f85b9215678b90cdc275b1d47ce72b50 *libcxx-headers.zip +c2b7941916618b9538a72417a2231ec3f4c315e07208e9958f51f7518a786be0 *libcxx-objects-v34.5.4-linux-riscv64.zip +2078a7264654ddf4675a5bade34dee26ad0971480b17899d610e784411968424 *libcxxabi-headers.zip +4255e0bf4b63857f8be2beb4e226240a20e38810190e0c6be6afb2e293f2bd27 *mksnapshot-v34.5.4-linux-riscv64.zip +66e001fec2e77ed97099bcd76d1af40e14b3cbadafea7cb1ef52530610061f96 *node-v34.5.4-headers.tar.gz diff --git a/check_tags.sh b/check_tags.sh index fee07ac..e761b5a 100755 --- a/check_tags.sh +++ b/check_tags.sh @@ -105,6 +105,13 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH_WEB="no" fi + if [[ -z $( contains "${APP_NAME_LC}-cli-darwin-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on MacOS because we have no CLI archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_CLI="no" + fi + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the MacOS builds" fi @@ -136,67 +143,15 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH="no" export SHOULD_BUILD_REH_WEB="no" - if [[ "${SHOULD_BUILD}" != "yes" ]]; then - echo "Already have all the Windows arm64 builds" - fi - - # windows-ia32 - elif [[ "${VSCODE_ARCH}" == "ia32" ]]; then - if [[ -z $( contains "${APP_NAME}Setup-${VSCODE_ARCH}-${RELEASE_VERSION}.exe" ) ]]; then - echo "Building on Windows ia32 because we have no system setup" + if [[ -z $( contains "${APP_NAME_LC}-cli-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Windows arm64 because we have no CLI archive" export SHOULD_BUILD="yes" else - export SHOULD_BUILD_EXE_SYS="no" - fi - - if [[ -z $( contains "UserSetup-${VSCODE_ARCH}-${RELEASE_VERSION}.exe" ) ]]; then - echo "Building on Windows ia32 because we have no user setup" - export SHOULD_BUILD="yes" - else - export SHOULD_BUILD_EXE_USR="no" - fi - - if [[ -z $( contains "${APP_NAME}-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.zip" ) ]]; then - echo "Building on Windows ia32 because we have no zip" - export SHOULD_BUILD="yes" - else - export SHOULD_BUILD_ZIP="no" - fi - - if [[ "${DISABLE_MSI}" == "yes" ]]; then - export SHOULD_BUILD_MSI="no" - elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then - echo "Building on Windows ia32 because we have no msi" - export SHOULD_BUILD="yes" - else - export SHOULD_BUILD_MSI="no" - fi - - if [[ "${DISABLE_MSI}" == "yes" ]]; then - export SHOULD_BUILD_MSI_NOUP="no" - elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then - echo "Building on Windows ia32 because we have no updates-disabled msi" - export SHOULD_BUILD="yes" - else - export SHOULD_BUILD_MSI_NOUP="no" - fi - - if [[ -z $( contains "${APP_NAME_LC}-reh-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then - echo "Building on Windows ia32 because we have no REH archive" - export SHOULD_BUILD="yes" - else - export SHOULD_BUILD_REH="no" - fi - - if [[ -z $( contains "${APP_NAME_LC}-reh-web-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then - echo "Building on Windows ia32 because we have no REH-web archive" - export SHOULD_BUILD="yes" - else - export SHOULD_BUILD_REH_WEB="no" + export SHOULD_BUILD_CLI="no" fi if [[ "${SHOULD_BUILD}" != "yes" ]]; then - echo "Already have all the Windows ia32 builds" + echo "Already have all the Windows arm64 builds" fi # windows-x64 @@ -254,6 +209,13 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH_WEB="no" fi + if [[ -z $( contains "${APP_NAME_LC}-cli-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Windows x64 because we have no CLI archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_CLI="no" + fi + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the Windows x64 builds" fi @@ -326,6 +288,14 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_APPIMAGE="no" + if [[ -z $( contains "${APP_NAME_LC}-cli-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Linux arm64 because we have no CLI archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_CLI="no" + fi + + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the Linux arm64 builds" fi @@ -370,6 +340,14 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_APPIMAGE="no" + if [[ -z $( contains "${APP_NAME_LC}-cli-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Linux arm because we have no CLI archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_CLI="no" + fi + + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the Linux arm builds" fi @@ -377,9 +355,9 @@ elif [[ "${ASSETS}" != "null" ]]; then # linux-ppc64le if [[ "${VSCODE_ARCH}" == "ppc64le" || "${CHECK_ALL}" == "yes" ]]; then - SHOULD_BUILD_APPIMAGE="no" - SHOULD_BUILD_DEB="no" - SHOULD_BUILD_RPM="no" + export SHOULD_BUILD_APPIMAGE="no" + export SHOULD_BUILD_DEB="no" + export SHOULD_BUILD_RPM="no" if [[ -z $( contains "${APP_NAME}-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then echo "Building on Linux PowerPC64LE because we have no TAR" @@ -403,6 +381,8 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH_WEB="no" fi + export SHOULD_BUILD_CLI="no" + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the Linux PowerPC64LE builds" fi @@ -435,6 +415,8 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH_WEB="no" fi + export SHOULD_BUILD_CLI="no" + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the Linux riscv64 builds" fi @@ -467,6 +449,8 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH_WEB="no" fi + export SHOULD_BUILD_CLI="no" + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the Linux Loong64 builds" fi @@ -493,6 +477,8 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH_WEB="no" fi + export SHOULD_BUILD_CLI="no" + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the Linux s390x builds" fi @@ -551,6 +537,13 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_REH_WEB="no" fi + if [[ -z $( contains "${APP_NAME_LC}-cli-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then + echo "Building on Linux x64 because we have no CLI archive" + export SHOULD_BUILD="yes" + else + export SHOULD_BUILD_CLI="no" + fi + if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Already have all the Linux x64 builds" fi @@ -622,12 +615,19 @@ else SHOULD_BUILD_DEB="no" SHOULD_BUILD_RPM="no" SHOULD_BUILD_TAR="no" + SHOULD_BUILD_CLI="no" elif [[ "${VSCODE_ARCH}" == "riscv64" ]]; then SHOULD_BUILD_DEB="no" SHOULD_BUILD_RPM="no" + SHOULD_BUILD_CLI="no" elif [[ "${VSCODE_ARCH}" == "loong64" ]]; then SHOULD_BUILD_DEB="no" SHOULD_BUILD_RPM="no" + SHOULD_BUILD_CLI="no" + elif [[ "${VSCODE_ARCH}" == "s390x" ]]; then + SHOULD_BUILD_DEB="no" + SHOULD_BUILD_RPM="no" + SHOULD_BUILD_CLI="no" fi if [[ "${VSCODE_ARCH}" != "x64" || "${DISABLE_APPIMAGE}" == "yes" ]]; then export SHOULD_BUILD_APPIMAGE="no" @@ -658,6 +658,7 @@ echo "SHOULD_BUILD_MSI=${SHOULD_BUILD_MSI}" >> "${GITHUB_ENV}" echo "SHOULD_BUILD_MSI_NOUP=${SHOULD_BUILD_MSI_NOUP}" >> "${GITHUB_ENV}" echo "SHOULD_BUILD_REH=${SHOULD_BUILD_REH}" >> "${GITHUB_ENV}" echo "SHOULD_BUILD_REH_WEB=${SHOULD_BUILD_REH_WEB}" >> "${GITHUB_ENV}" +echo "SHOULD_BUILD_CLI=${SHOULD_BUILD_CLI}" >> "${GITHUB_ENV}" echo "SHOULD_BUILD_RPM=${SHOULD_BUILD_RPM}" >> "${GITHUB_ENV}" echo "SHOULD_BUILD_SNAP=${SHOULD_BUILD_SNAP}" >> "${GITHUB_ENV}" echo "SHOULD_BUILD_TAR=${SHOULD_BUILD_TAR}" >> "${GITHUB_ENV}" diff --git a/dev/build.sh b/dev/build.sh index c1bbaa9..c57741d 100755 --- a/dev/build.sh +++ b/dev/build.sh @@ -6,6 +6,7 @@ ### export APP_NAME="VSCodium" +export ASSETS_REPOSITORY="VSCodium/vscodium" export BINARY_NAME="codium" export CI_BUILD="no" export GH_REPO_PATH="VSCodium/vscodium" @@ -21,6 +22,7 @@ export VSCODE_SKIP_NODE_VERSION_CHECK="yes" while getopts ":ilops" opt; do case "$opt" in i) + export ASSETS_REPOSITORY="VSCodium/vscodium-insiders" export BINARY_NAME="codium-insiders" export VSCODE_QUALITY="insider" ;; diff --git a/dev/patch.sh b/dev/patch.sh index 89e2f0c..9ea19cd 100755 --- a/dev/patch.sh +++ b/dev/patch.sh @@ -38,6 +38,10 @@ else fi if [[ -f "${FILE}" ]]; then + if [[ -f "${FILE}.bak" ]]; then + mv -f $FILE{.bak,} + fi + git apply --reject "${FILE}" || true fi diff --git a/dev/update_patches.sh b/dev/update_patches.sh index 71fdfac..145c924 100755 --- a/dev/update_patches.sh +++ b/dev/update_patches.sh @@ -19,6 +19,10 @@ check_file() { shift done + if [[ -f "${1}.bak" ]]; then + mv -f $1{.bak,} + fi + if [[ -f "${1}" ]]; then echo applying patch: "${1}" if ! git apply --ignore-whitespace "${1}"; then @@ -55,17 +59,21 @@ fi for ARCH in alpine linux osx windows; do for FILE in "../patches/${ARCH}/"*.patch; do - if [[ "${FILE}" != *"/arch-"* ]]; then + if [[ "${ARCH}" == "linux" && "${FILE}" == *"/arch-"* ]] || [[ "${ARCH}" == "windows" && "${FILE}" == *"/cli"* ]]; then + echo "skip ${FILE}" + else check_file "${FILE}" fi done if [[ "${ARCH}" == "linux" ]]; then - check_file "../patches/linux/arch-0-support.patch" - check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" - check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" - check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch" - check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch" "../patches/linux/arch-4-s390x.patch" + check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" + check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" + check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" + check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch" + check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch" "../patches/linux/arch-4-s390x.patch" + elif [[ "${ARCH}" == "windows" ]]; then + check_file "../patches/cli.patch" "../patches/windows/cli.patch" fi for TARGET in client reh; do diff --git a/patches/add-remote-url.patch b/patches/add-remote-url.patch index d5d33d6..9bf5306 100644 --- a/patches/add-remote-url.patch +++ b/patches/add-remote-url.patch @@ -5,7 +5,7 @@ index c1d64c0..3e60e80 100644 @@ -321,3 +321,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa const productJsonStream = gulp.src(['product.json'], { base: '.' }) - .pipe(json({ commit, date: readISODate('out-build'), version })) -+ .pipe(json({ commit, date: readISODate('out-build'), version, serverDownloadUrlTemplate: 'https://github.com/!!GH_REPO_PATH!!/releases/download/!!RELEASE_VERSION!!/!!APP_NAME_LC!!-reh-${os}-${arch}-!!RELEASE_VERSION!!.tar.gz' })) ++ .pipe(json({ commit, date: readISODate('out-build'), version, serverDownloadUrlTemplate: 'https://github.com/!!ASSETS_REPOSITORY!!/releases/download/!!RELEASE_VERSION!!/!!APP_NAME_LC!!-reh-${os}-${arch}-!!RELEASE_VERSION!!.tar.gz' })) .pipe(es.through(function (file) { diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index 7046ee0..9aa7bb0 100644 @@ -14,5 +14,5 @@ index 7046ee0..9aa7bb0 100644 @@ -288,3 +288,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op const productJsonStream = gulp.src(['product.json'], { base: '.' }) - .pipe(json({ commit, date: readISODate('out-build'), checksums, version })) -+ .pipe(json({ commit, date: readISODate('out-build'), checksums, version, serverDownloadUrlTemplate: 'https://github.com/!!GH_REPO_PATH!!/releases/download/!!RELEASE_VERSION!!/!!APP_NAME_LC!!-reh-${os}-${arch}-!!RELEASE_VERSION!!.tar.gz' })) ++ .pipe(json({ commit, date: readISODate('out-build'), checksums, version, serverDownloadUrlTemplate: 'https://github.com/!!ASSETS_REPOSITORY!!/releases/download/!!RELEASE_VERSION!!/!!APP_NAME_LC!!-reh-${os}-${arch}-!!RELEASE_VERSION!!.tar.gz' })) .pipe(es.through(function (file) { diff --git a/patches/brand.patch b/patches/brand.patch index 7637f44..1bb0c24 100644 --- a/patches/brand.patch +++ b/patches/brand.patch @@ -1,5 +1,5 @@ diff --git a/extensions/configuration-editing/src/configurationEditingMain.ts b/extensions/configuration-editing/src/configurationEditingMain.ts -index f791557..04f138d 100644 +index 2578270..99c8ca5 100644 --- a/extensions/configuration-editing/src/configurationEditingMain.ts +++ b/extensions/configuration-editing/src/configurationEditingMain.ts @@ -54,4 +54,4 @@ function registerVariableCompletions(pattern: string): vscode.Disposable { @@ -10,7 +10,7 @@ index f791557..04f138d 100644 + { label: 'workspaceFolderBasename', detail: vscode.l10n.t("The name of the folder opened in !!APP_NAME!! without any slashes (/)") }, { label: 'fileWorkspaceFolderBasename', detail: vscode.l10n.t("The current opened file workspace folder name without any slashes (/)") }, diff --git a/extensions/configuration-editing/src/settingsDocumentHelper.ts b/extensions/configuration-editing/src/settingsDocumentHelper.ts -index 12b50f3..be792c2 100644 +index 12b50f3..7cb0d1b 100644 --- a/extensions/configuration-editing/src/settingsDocumentHelper.ts +++ b/extensions/configuration-editing/src/settingsDocumentHelper.ts @@ -123,3 +123,3 @@ export class SettingsDocument { @@ -19,7 +19,7 @@ index 12b50f3..be792c2 100644 + completions.push(this.newSimpleCompletionItem(getText('appName'), range, vscode.l10n.t("e.g. !!APP_NAME!!"))); completions.push(this.newSimpleCompletionItem(getText('remoteName'), range, vscode.l10n.t("e.g. SSH"))); diff --git a/extensions/css-language-features/package.nls.json b/extensions/css-language-features/package.nls.json -index 057ec21..45cd969 100644 +index 057ec21..53c32b4 100644 --- a/extensions/css-language-features/package.nls.json +++ b/extensions/css-language-features/package.nls.json @@ -4,4 +4,4 @@ @@ -45,7 +45,7 @@ index 057ec21..45cd969 100644 + "scss.completion.triggerPropertyValueCompletion.desc": "By default, !!APP_NAME!! triggers property value completion after selecting a CSS property. Use this setting to disable this behavior.", "scss.completion.completePropertyWithSemicolon.desc": "Insert semicolon at end of line when completing CSS properties.", diff --git a/extensions/emmet/package.nls.json b/extensions/emmet/package.nls.json -index 2a58c39..af508f3 100644 +index 2a58c39..8224615 100644 --- a/extensions/emmet/package.nls.json +++ b/extensions/emmet/package.nls.json @@ -1,3 +1,3 @@ @@ -54,7 +54,7 @@ index 2a58c39..af508f3 100644 + "description": "Emmet support for !!APP_NAME!!", "command.wrapWithAbbreviation": "Wrap with Abbreviation", diff --git a/extensions/extension-editing/src/constants.ts b/extensions/extension-editing/src/constants.ts -index 1be4d0e..73a8f3e 100644 +index 1be4d0e..647b147 100644 --- a/extensions/extension-editing/src/constants.ts +++ b/extensions/extension-editing/src/constants.ts @@ -8,2 +8,2 @@ import { l10n } from 'vscode'; @@ -62,7 +62,7 @@ index 1be4d0e..73a8f3e 100644 -export const redundantImplicitActivationEvent = l10n.t("This activation event can be removed as VS Code generates these automatically from your package.json contribution declarations."); +export const redundantImplicitActivationEvent = l10n.t("This activation event can be removed as !!APP_NAME!! generates these automatically from your package.json contribution declarations."); diff --git a/extensions/extension-editing/src/extensionLinter.ts b/extensions/extension-editing/src/extensionLinter.ts -index be7eea1..389e89e 100644 +index be7eea1..0737bab 100644 --- a/extensions/extension-editing/src/extensionLinter.ts +++ b/extensions/extension-editing/src/extensionLinter.ts @@ -34,4 +34,4 @@ const relativeUrlRequiresHttpsRepository = l10n.t("Relative image URLs require a @@ -73,37 +73,37 @@ index be7eea1..389e89e 100644 +const bumpEngineForImplicitActivationEvents = l10n.t("This activation event can be removed for extensions targeting engine version ^1.75 as !!APP_NAME!! will generate these automatically from your package.json contribution declarations."); const starActivation = l10n.t("Using '*' activation is usually a bad idea as it impacts performance."); diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json -index 52ba381..8a42701 100644 +index 403f704..2f838cd 100644 --- a/extensions/git/package.nls.json +++ b/extensions/git/package.nls.json -@@ -227,3 +227,3 @@ +@@ -228,3 +228,3 @@ "{Locked='](command:git.showOutput'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -255,4 +255,4 @@ +@@ -256,4 +256,4 @@ "config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.", - "config.terminalAuthentication": "Controls whether to enable VS Code to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.", - "config.terminalGitEditor": "Controls whether to enable VS Code to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.", + "config.terminalAuthentication": "Controls whether to enable !!APP_NAME!! to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.", + "config.terminalGitEditor": "Controls whether to enable !!APP_NAME!! to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.", "config.timeline.showAuthor": "Controls whether to show the commit author in the Timeline view.", -@@ -323,3 +323,3 @@ +@@ -324,3 +324,3 @@ "{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -333,3 +333,3 @@ +@@ -334,3 +334,3 @@ "{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -343,3 +343,3 @@ +@@ -344,3 +344,3 @@ "{Locked='](command:workbench.extensions.search?%22%40category%3A%5C%22scm%20providers%5C%22%22'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -355,6 +355,6 @@ +@@ -356,6 +356,6 @@ "view.workbench.scm.disabled": { - "message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).", @@ -112,7 +112,7 @@ index 52ba381..8a42701 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -363,6 +363,6 @@ +@@ -364,6 +364,6 @@ "view.workbench.scm.empty": { - "message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.cloneRecursive)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.cloneRecursive)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).", @@ -121,7 +121,7 @@ index 52ba381..8a42701 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -371,6 +371,6 @@ +@@ -372,6 +372,6 @@ "view.workbench.scm.folder": { - "message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).", @@ -130,7 +130,7 @@ index 52ba381..8a42701 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -379,6 +379,6 @@ +@@ -380,6 +380,6 @@ "view.workbench.scm.workspace": { - "message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).", @@ -139,7 +139,7 @@ index 52ba381..8a42701 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -387,6 +387,6 @@ +@@ -388,6 +388,6 @@ "view.workbench.scm.emptyWorkspace": { - "message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).", @@ -148,27 +148,27 @@ index 52ba381..8a42701 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -405,3 +405,3 @@ +@@ -406,3 +406,3 @@ "{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -414,3 +414,3 @@ +@@ -415,3 +415,3 @@ "{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -422,3 +422,3 @@ +@@ -423,3 +423,3 @@ "{Locked='](command:git.manageUnsafeRepositories'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -430,3 +430,3 @@ +@@ -431,3 +431,3 @@ "{Locked='](command:git.manageUnsafeRepositories'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -435,6 +435,6 @@ +@@ -436,6 +436,6 @@ "view.workbench.scm.closedRepository": { - "message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).", @@ -177,7 +177,7 @@ index 52ba381..8a42701 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -443,6 +443,6 @@ +@@ -444,6 +444,6 @@ "view.workbench.scm.closedRepositories": { - "message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).", + "message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm).", @@ -186,18 +186,18 @@ index 52ba381..8a42701 100644 - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -454,3 +454,3 @@ +@@ -455,3 +455,3 @@ "{Locked='](command:git.clone'}", - "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code", + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" -@@ -458,3 +458,3 @@ +@@ -459,3 +459,3 @@ }, - "view.workbench.learnMore": "To learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm)." + "view.workbench.learnMore": "To learn more about how to use Git and source control in !!APP_NAME!! [read our docs](https://aka.ms/vscode-scm)." } diff --git a/extensions/github/package.nls.json b/extensions/github/package.nls.json -index 40271be..b52ff0f 100644 +index 40271be..00dae16 100644 --- a/extensions/github/package.nls.json +++ b/extensions/github/package.nls.json @@ -2,3 +2,3 @@ @@ -221,7 +221,7 @@ index 40271be..b52ff0f 100644 + "Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for !!APP_NAME!!", "Please make sure there is no space between the right bracket and left parenthesis: ]( this is an internal syntax for links" diff --git a/extensions/grunt/package.nls.json b/extensions/grunt/package.nls.json -index 789a579..fcf39ff 100644 +index 789a579..12e230e 100644 --- a/extensions/grunt/package.nls.json +++ b/extensions/grunt/package.nls.json @@ -1,4 +1,4 @@ @@ -232,7 +232,7 @@ index 789a579..fcf39ff 100644 + "displayName": "Grunt support for !!APP_NAME!!", "config.grunt.autoDetect": "Controls enablement of Grunt task detection. Grunt task detection can cause files in any open workspace to be executed.", diff --git a/extensions/html-language-features/client/src/htmlClient.ts b/extensions/html-language-features/client/src/htmlClient.ts -index 7b69c79..6441167 100644 +index 6e66f8d..7c86a69 100644 --- a/extensions/html-language-features/client/src/htmlClient.ts +++ b/extensions/html-language-features/client/src/htmlClient.ts @@ -108,3 +108,3 @@ export async function startClient(context: ExtensionContext, newLanguageClient: @@ -241,7 +241,7 @@ index 7b69c79..6441167 100644 + const res = await window.showInformationMessage(l10n.t('!!APP_NAME!! now has built-in support for auto-renaming tags. Do you want to enable it?'), configure); if (res === configure) { diff --git a/extensions/html-language-features/package.nls.json b/extensions/html-language-features/package.nls.json -index f36ecf3..9545ba2 100644 +index f36ecf3..0d795cb 100644 --- a/extensions/html-language-features/package.nls.json +++ b/extensions/html-language-features/package.nls.json @@ -3,3 +3,3 @@ @@ -255,7 +255,7 @@ index f36ecf3..9545ba2 100644 + "html.trace.server.desc": "Traces the communication between !!APP_NAME!! and the HTML language server.", "html.validate.scripts": "Controls whether the built-in HTML language support validates embedded scripts.", diff --git a/extensions/html-language-features/schemas/package.schema.json b/extensions/html-language-features/schemas/package.schema.json -index 205143c..5a069c6 100644 +index 205143c..cc9f918 100644 --- a/extensions/html-language-features/schemas/package.schema.json +++ b/extensions/html-language-features/schemas/package.schema.json @@ -9,3 +9,3 @@ @@ -264,7 +264,7 @@ index 205143c..5a069c6 100644 + "markdownDescription": "A list of relative file paths pointing to JSON files following the [custom data format](https://github.com/microsoft/vscode-html-languageservice/blob/master/docs/customData.md).\n\n!!APP_NAME!! loads custom data on startup to enhance its HTML support for the custom HTML tags, attributes and attribute values you specify in the JSON files.\n\nThe file paths are relative to workspace and only workspace folder settings are considered.", "items": { diff --git a/extensions/jake/package.nls.json b/extensions/jake/package.nls.json -index e82030e..1a634bd 100644 +index e82030e..ac999f6 100644 --- a/extensions/jake/package.nls.json +++ b/extensions/jake/package.nls.json @@ -1,4 +1,4 @@ @@ -275,7 +275,7 @@ index e82030e..1a634bd 100644 + "displayName": "Jake support for !!APP_NAME!!", "jake.taskDefinition.type.description": "The Jake task to customize.", diff --git a/extensions/json-language-features/package.nls.json b/extensions/json-language-features/package.nls.json -index af6c9d8..7057b54 100644 +index af6c9d8..36e64cf 100644 --- a/extensions/json-language-features/package.nls.json +++ b/extensions/json-language-features/package.nls.json @@ -11,3 +11,3 @@ @@ -284,7 +284,7 @@ index af6c9d8..7057b54 100644 + "json.tracing.desc": "Traces the communication between !!APP_NAME!! and the JSON language server.", "json.colorDecorators.enable.desc": "Enables or disables color decorators", diff --git a/extensions/markdown-language-features/package.nls.json b/extensions/markdown-language-features/package.nls.json -index fe98103..05afb90 100644 +index fe98103..ca36e86 100644 --- a/extensions/markdown-language-features/package.nls.json +++ b/extensions/markdown-language-features/package.nls.json @@ -22,3 +22,3 @@ @@ -298,7 +298,7 @@ index fe98103..05afb90 100644 + "This setting is use the user drops or pastes image data into the editor. In this case, !!APP_NAME!! automatically creates a new image file in the workspace containing the dropped/pasted image.", "It's easier to explain this setting with an example. For example, let's say the setting value was:", diff --git a/extensions/media-preview/package.nls.json b/extensions/media-preview/package.nls.json -index c45e1e2..d8408d8 100644 +index 920ced7..755a166 100644 --- a/extensions/media-preview/package.nls.json +++ b/extensions/media-preview/package.nls.json @@ -2,3 +2,3 @@ @@ -307,7 +307,7 @@ index c45e1e2..d8408d8 100644 + "description": "Provides !!APP_NAME!!'s built-in previews for images, audio, and video", "customEditor.audioPreview.displayName": "Audio Preview", diff --git a/extensions/media-preview/src/audioPreview.ts b/extensions/media-preview/src/audioPreview.ts -index e21a418..dc0698b 100644 +index 5058f7e..ee1283a 100644 --- a/extensions/media-preview/src/audioPreview.ts +++ b/extensions/media-preview/src/audioPreview.ts @@ -82,3 +82,3 @@ class AudioPreview extends MediaPreview { @@ -316,16 +316,16 @@ index e21a418..dc0698b 100644 + ${vscode.l10n.t("Open file using !!APP_NAME!!'s standard text/binary editor?")} diff --git a/extensions/media-preview/src/imagePreview/index.ts b/extensions/media-preview/src/imagePreview/index.ts -index e0c605c..079b9e8 100644 +index b405cd6..8eafea3 100644 --- a/extensions/media-preview/src/imagePreview/index.ts +++ b/extensions/media-preview/src/imagePreview/index.ts -@@ -191,3 +191,3 @@ class ImagePreview extends MediaPreview { +@@ -209,3 +209,3 @@ class ImagePreview extends MediaPreview {

${vscode.l10n.t("An error occurred while loading the image.")}

- ${vscode.l10n.t("Open file using VS Code's standard text/binary editor?")} + ${vscode.l10n.t("Open file using !!APP_NAME!!'s standard text/binary editor?")} diff --git a/extensions/media-preview/src/videoPreview.ts b/extensions/media-preview/src/videoPreview.ts -index efc6be7..e2a186d 100644 +index 6701212..c9f9fb2 100644 --- a/extensions/media-preview/src/videoPreview.ts +++ b/extensions/media-preview/src/videoPreview.ts @@ -86,3 +86,3 @@ class VideoPreview extends MediaPreview { @@ -334,7 +334,7 @@ index efc6be7..e2a186d 100644 + ${vscode.l10n.t("Open file using !!APP_NAME!!'s standard text/binary editor?")} diff --git a/extensions/notebook-renderers/package.json b/extensions/notebook-renderers/package.json -index d6ece35..9e878df 100644 +index d6ece35..547202f 100644 --- a/extensions/notebook-renderers/package.json +++ b/extensions/notebook-renderers/package.json @@ -22,3 +22,3 @@ @@ -343,7 +343,7 @@ index d6ece35..9e878df 100644 + "displayName": "!!APP_NAME!! Builtin Notebook Output Renderer", "requiresMessaging": "never", diff --git a/extensions/npm/package.nls.json b/extensions/npm/package.nls.json -index 56a77ff..b1e3722 100644 +index 56a77ff..e9f32d1 100644 --- a/extensions/npm/package.nls.json +++ b/extensions/npm/package.nls.json @@ -2,3 +2,3 @@ @@ -352,7 +352,7 @@ index 56a77ff..b1e3722 100644 + "displayName": "NPM support for !!APP_NAME!!", "workspaceTrust": "This extension executes tasks, which require trust to run.", diff --git a/extensions/swift/syntaxes/swift.tmLanguage.json b/extensions/swift/syntaxes/swift.tmLanguage.json -index 7d6694c..0e1d484 100644 +index 7d6694c..83b2599 100644 --- a/extensions/swift/syntaxes/swift.tmLanguage.json +++ b/extensions/swift/syntaxes/swift.tmLanguage.json @@ -260,3 +260,3 @@ @@ -361,22 +361,22 @@ index 7d6694c..0e1d484 100644 + "comment": "The simpler (?<=\\bProcess\\.|\\bCommandLine\\.) breaks !!APP_NAME!! / Atom, see https://github.com/textmate/swift.tmbundle/issues/29", "name": "support.variable.swift", diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json -index 447359e..e40077c 100644 +index 44fa54e..e349c6e 100644 --- a/extensions/typescript-language-features/package.nls.json +++ b/extensions/typescript-language-features/package.nls.json -@@ -75,4 +75,4 @@ +@@ -81,4 +81,4 @@ "configuration.tsserver.experimental.enableProjectDiagnostics": "Enables project wide error reporting.", - "typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use VS Code's locale.", - "typescript.locale.auto": "Use VS Code's configured display language.", + "typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use !!APP_NAME!!'s locale.", + "typescript.locale.auto": "Use !!APP_NAME!!'s configured display language.", "configuration.implicitProjectConfig.module": "Sets the module system for the program. See more: https://www.typescriptlang.org/tsconfig#module.", -@@ -160,3 +160,3 @@ +@@ -166,3 +166,3 @@ "typescript.workspaceSymbols.excludeLibrarySymbols": "Exclude symbols that come from library files in `Go to Symbol in Workspace` results. Requires using TypeScript 5.3+ in the workspace.", - "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code.", + "typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in !!APP_NAME!!.", "typescript.updateImportsOnFileMove.enabled.prompt": "Prompt on each rename.", -@@ -167,6 +167,6 @@ +@@ -173,6 +173,6 @@ "configuration.suggest.completeJSDocs": "Enable/disable suggestion to complete JSDoc comments.", - "configuration.tsserver.useVsCodeWatcher": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", + "configuration.tsserver.useVsCodeWatcher": "Use !!APP_NAME!!'s file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", @@ -385,7 +385,7 @@ index 447359e..e40077c 100644 - "configuration.tsserver.watchOptions.vscode": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", + "configuration.tsserver.watchOptions.vscode": "Use !!APP_NAME!!'s file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.", "configuration.tsserver.watchOptions.watchFile": "Strategy for how individual files are watched.", -@@ -221,9 +221,9 @@ +@@ -227,6 +227,6 @@ "configuration.suggest.objectLiteralMethodSnippets.enabled": "Enable/disable snippet completions for methods in object literals.", - "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VS Code is running in a trusted context.", + "configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that !!APP_NAME!! is running in a trusted context.", @@ -394,11 +394,7 @@ index 447359e..e40077c 100644 - "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.", + "configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want !!APP_NAME!! to detect a Node installation.", "configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.6+.", - "walkthroughs.nodejsWelcome.title": "Get started with JavaScript and Node.js", -- "walkthroughs.nodejsWelcome.description": "Make the most of Visual Studio Code's first-class JavaScript experience.", -+ "walkthroughs.nodejsWelcome.description": "Make the most of !!APP_NAME!!'s first-class JavaScript experience.", - "walkthroughs.nodejsWelcome.downloadNode.forMacOrWindows.title": "Install Node.js", -@@ -235,7 +235,7 @@ +@@ -242,7 +242,7 @@ "walkthroughs.nodejsWelcome.debugJsFile.title": "Run and Debug your JavaScript", - "walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VS Code's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)", - "walkthroughs.nodejsWelcome.debugJsFile.altText": "Debug and run your JavaScript code in Node.js with Visual Studio Code.", @@ -411,7 +407,7 @@ index 447359e..e40077c 100644 + "walkthroughs.nodejsWelcome.learnMoreAboutJs.altText": "Learn more about JavaScript and Node.js in !!APP_NAME!!." } diff --git a/extensions/typescript-language-features/src/tsServer/versionManager.ts b/extensions/typescript-language-features/src/tsServer/versionManager.ts -index 43a2413..277a089 100644 +index 43a2413..ba7934f 100644 --- a/extensions/typescript-language-features/src/tsServer/versionManager.ts +++ b/extensions/typescript-language-features/src/tsServer/versionManager.ts @@ -100,3 +100,3 @@ export class TypeScriptVersionManager extends Disposable { @@ -420,7 +416,7 @@ index 43a2413..277a089 100644 + : '') + vscode.l10n.t("Use !!APP_NAME!!'s Version"), description: bundledVersion.displayName, diff --git a/extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts b/extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts -index 239519e..a308077 100644 +index 239519e..5e58d4d 100644 --- a/extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts +++ b/extensions/typescript-language-features/src/tsServer/versionProvider.electron.ts @@ -70,3 +70,3 @@ export class DiskTypeScriptVersionProvider implements ITypeScriptVersionProvider @@ -429,7 +425,7 @@ index 239519e..a308077 100644 + vscode.window.showErrorMessage(vscode.l10n.t("!!APP_NAME!!\'s tsserver was deleted by another application such as a misbehaving virus detection tool. Please reinstall !!APP_NAME!!.")); throw new Error('Could not find bundled tsserver.js'); diff --git a/extensions/typescript-language-features/src/tsconfig.ts b/extensions/typescript-language-features/src/tsconfig.ts -index e85c715..9059335 100644 +index 01a88a4..1fdc86e 100644 --- a/extensions/typescript-language-features/src/tsconfig.ts +++ b/extensions/typescript-language-features/src/tsconfig.ts @@ -155,3 +155,3 @@ export async function openProjectConfigForFile( @@ -438,7 +434,7 @@ index e85c715..9059335 100644 + vscode.l10n.t("Please open a folder in !!APP_NAME!! to use a TypeScript or JavaScript project")); return; diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts -index 4201d6d..ec88aa1 100644 +index 4201d6d..ded6803 100644 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts @@ -653,3 +653,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType @@ -457,7 +453,7 @@ index 4201d6d..ec88aa1 100644 + vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against !!APP_NAME!!.", pluginExtensionList)); } else { diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json -index 66a80b8..bd2d284 100644 +index 0d7f87a..6b72fec 100644 --- a/extensions/vscode-api-tests/package.json +++ b/extensions/vscode-api-tests/package.json @@ -2,3 +2,3 @@ @@ -466,7 +462,7 @@ index 66a80b8..bd2d284 100644 + "description": "API tests for !!APP_NAME!!", "version": "0.0.1", diff --git a/extensions/vscode-colorize-tests/package.json b/extensions/vscode-colorize-tests/package.json -index b416aee..9e6396d 100644 +index b416aee..3f60c26 100644 --- a/extensions/vscode-colorize-tests/package.json +++ b/extensions/vscode-colorize-tests/package.json @@ -2,3 +2,3 @@ @@ -475,7 +471,7 @@ index b416aee..9e6396d 100644 + "description": "Colorize tests for !!APP_NAME!!", "version": "0.0.1", diff --git a/extensions/vscode-colorize-tests/test/colorize-fixtures/14119.less b/extensions/vscode-colorize-tests/test/colorize-fixtures/14119.less -index a0006d8..5ab2754 100644 +index a0006d8..132b67e 100644 --- a/extensions/vscode-colorize-tests/test/colorize-fixtures/14119.less +++ b/extensions/vscode-colorize-tests/test/colorize-fixtures/14119.less @@ -1,2 +1,2 @@ @@ -483,7 +479,7 @@ index a0006d8..5ab2754 100644 +#f(@hm: "broken highlighting in !!APP_NAME!!") { content: ""; diff --git a/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json b/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json -index 6680753..48f66bb 100644 +index 6680753..da1795a 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/14119_less.json @@ -114,3 +114,3 @@ @@ -492,7 +488,7 @@ index 6680753..48f66bb 100644 + "c": "broken highlighting in !!APP_NAME!!", "t": "source.css.less meta.selector.less meta.group.less meta.property-value.less string.quoted.double.less", diff --git a/extensions/vscode-test-resolver/package.json b/extensions/vscode-test-resolver/package.json -index 8ab2171..33fb9e0 100644 +index 8ab2171..0cd1cfb 100644 --- a/extensions/vscode-test-resolver/package.json +++ b/extensions/vscode-test-resolver/package.json @@ -2,3 +2,3 @@ @@ -501,7 +497,7 @@ index 8ab2171..33fb9e0 100644 + "description": "Test resolver for !!APP_NAME!!", "version": "0.0.1", diff --git a/extensions/vscode-test-resolver/src/download.ts b/extensions/vscode-test-resolver/src/download.ts -index a351aa7..32bfdb6 100644 +index a351aa7..c32e3ef 100644 --- a/extensions/vscode-test-resolver/src/download.ts +++ b/extensions/vscode-test-resolver/src/download.ts @@ -32,3 +32,3 @@ async function downloadVSCodeServerArchive(updateUrl: string, commit: string, qu @@ -535,7 +531,7 @@ index a351aa7..32bfdb6 100644 + throw Error(`Failed to download and unzip !!APP_NAME!! ${quality} - ${commit}`); } diff --git a/extensions/vscode-test-resolver/src/extension.ts b/extensions/vscode-test-resolver/src/extension.ts -index 2fab3ec..35d3325 100644 +index 2fab3ec..1195e3d 100644 --- a/extensions/vscode-test-resolver/src/extension.ts +++ b/extensions/vscode-test-resolver/src/extension.ts @@ -178,3 +178,3 @@ export function activate(context: vscode.ExtensionContext) { @@ -543,17 +539,35 @@ index 2fab3ec..35d3325 100644 - progress.report({ message: 'Installing VSCode Server' }); + progress.report({ message: 'Installing !!APP_NAME!! Server' }); serverLocation = await downloadAndUnzipVSCodeServer(updateUrl, commit, quality, serverBin, m => outputChannel.appendLine(m)); +diff --git a/src/main.ts b/src/main.ts +index 1af3c94..d1a8ea6 100644 +--- a/src/main.ts ++++ b/src/main.ts +@@ -397,3 +397,3 @@ function createDefaultArgvConfigSync(argvConfigPath: string): void { + const defaultArgvConfigContent = [ +- '// This configuration file allows you to pass permanent command line arguments to VS Code.', ++ '// This configuration file allows you to pass permanent command line arguments to !!APP_NAME!!.', + '// Only a subset of arguments is currently supported to reduce the likelihood of breaking', +@@ -403,6 +403,6 @@ function createDefaultArgvConfigSync(argvConfigPath: string): void { + '//', +- '// NOTE: Changing this file requires a restart of VS Code.', ++ '// NOTE: Changing this file requires a restart of !!APP_NAME!!.', + '{', + ' // Use software rendering instead of hardware accelerated rendering.', +- ' // This can help in cases where you see rendering issues in VS Code.', ++ ' // This can help in cases where you see rendering issues in !!APP_NAME!!.', + ' // "disable-hardware-acceleration": true', diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts -index 3fb0f3a..f1e158e 100644 +index 588e1cb..a18f74f 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts -@@ -522,3 +522,3 @@ export class CodeApplication extends Disposable { +@@ -526,3 +526,3 @@ export class CodeApplication extends Disposable { async startup(): Promise { - this.logService.debug('Starting VS Code'); + this.logService.debug('Starting !!APP_NAME!!'); this.logService.debug(`from: ${this.environmentMainService.appRoot}`); diff --git a/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts b/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts -index a200bf8..05826cf 100644 +index a200bf8..425936a 100644 --- a/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts +++ b/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.ts @@ -19,3 +19,3 @@ export class ToggleTabFocusModeAction extends Action2 { @@ -562,7 +576,7 @@ index a200bf8..05826cf 100644 + title: nls.localize2({ key: 'toggle.tabMovesFocus', comment: ['Turn on/off use of tab key for moving focus around !!APP_NAME!!'] }, 'Toggle Tab Key Moves Focus'), precondition: undefined, diff --git a/src/vs/platform/contextkey/common/contextkeys.ts b/src/vs/platform/contextkey/common/contextkeys.ts -index c256dba..0ae2e47 100644 +index c256dba..10a79c8 100644 --- a/src/vs/platform/contextkey/common/contextkeys.ts +++ b/src/vs/platform/contextkey/common/contextkeys.ts @@ -19,3 +19,3 @@ export const IsMobileContext = new RawContextKey('isMobile', isMobile, @@ -571,10 +585,10 @@ index c256dba..0ae2e47 100644 +export const ProductQualityContext = new RawContextKey('productQualityType', '', localize('productQualityType', "Quality type of !!APP_NAME!!")); diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts -index 696ef6f..801aba0 100644 +index 0a50a2e..0dacd44 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts -@@ -152,3 +152,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi +@@ -153,3 +153,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi if (manifest.engines && manifest.engines.vscode && !isEngineValid(manifest.engines.vscode, this.productService.version, this.productService.date)) { - throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with VS Code '{1}'.", extensionId, this.productService.version)); + throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with !!APP_NAME!! '{1}'.", extensionId, this.productService.version)); @@ -590,7 +604,7 @@ index 696ef6f..801aba0 100644 + throw new Error(nls.localize('restartCode', "Please restart !!APP_NAME!! before reinstalling {0}.", this.manifest.displayName || this.manifest.name)); } diff --git a/src/vs/platform/extensions/common/extensionValidator.ts b/src/vs/platform/extensions/common/extensionValidator.ts -index 87a9288..d2b5f3f 100644 +index 87a9288..dcbbf0a 100644 --- a/src/vs/platform/extensions/common/extensionValidator.ts +++ b/src/vs/platform/extensions/common/extensionValidator.ts @@ -374,5 +374,5 @@ export function areApiProposalsCompatible(apiProposals: string[], arg1?: any): b @@ -602,7 +616,7 @@ index 87a9288..d2b5f3f 100644 + notices.push(nls.localize('apiProposalMismatch2', "This extension is using the API proposals {0} and '{1}' that are not compatible with the current version of !!APP_NAME!!.", incompatibleProposals.slice(0, incompatibleProposals.length - 1).map(p => `'${p}'`).join(', '), diff --git a/src/vs/platform/externalTerminal/node/externalTerminalService.ts b/src/vs/platform/externalTerminal/node/externalTerminalService.ts -index ca6c82b..346647c 100644 +index ca6c82b..56fab2c 100644 --- a/src/vs/platform/externalTerminal/node/externalTerminalService.ts +++ b/src/vs/platform/externalTerminal/node/externalTerminalService.ts @@ -17,3 +17,3 @@ import { ITerminalEnvironment } from '../../terminal/common/terminal.js'; @@ -611,7 +625,7 @@ index ca6c82b..346647c 100644 +const TERMINAL_TITLE = nls.localize('console.title', "!!APP_NAME!! Console"); diff --git a/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts b/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts -index 7d8d78b..390d3da 100644 +index 7d8d78b..d39dad4 100644 --- a/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts +++ b/src/vs/platform/terminal/common/terminalPlatformConfiguration.ts @@ -338,3 +338,3 @@ const terminalPlatformConfiguration: IConfigurationNode = { @@ -620,7 +634,7 @@ index 7d8d78b..390d3da 100644 + description: localize('terminal.integrated.inheritEnv', "Whether new shells should inherit their environment from !!APP_NAME!!, which may source a login shell to ensure $PATH and other development variables are initialized. This has no effect on Windows."), type: 'boolean', diff --git a/src/vs/platform/update/common/update.config.contribution.ts b/src/vs/platform/update/common/update.config.contribution.ts -index d96926b..c4bbc4a 100644 +index d96926b..a787b34 100644 --- a/src/vs/platform/update/common/update.config.contribution.ts +++ b/src/vs/platform/update/common/update.config.contribution.ts @@ -47,3 +47,3 @@ configurationRegistry.registerConfiguration({ @@ -629,7 +643,7 @@ index d96926b..c4bbc4a 100644 + description: localize('enableWindowsBackgroundUpdates', "Enable to download and install new !!APP_NAME!! versions in the background on Windows."), included: isWindows && !isWeb diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts -index a1ec3fe..c974cf7 100644 +index 48d0d86..cbd5a33 100644 --- a/src/vs/platform/update/electron-main/abstractUpdateService.ts +++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts @@ -23,3 +23,3 @@ export type UpdateErrorClassification = { @@ -638,10 +652,10 @@ index a1ec3fe..c974cf7 100644 + comment: 'This is used to know how often !!APP_NAME!! updates have failed.'; }; diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts -index 57398fb..9129f54 100644 +index b78ebc5..9b0eb56 100644 --- a/src/vs/platform/update/electron-main/updateService.darwin.ts +++ b/src/vs/platform/update/electron-main/updateService.darwin.ts -@@ -115,4 +115,4 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau +@@ -122,4 +122,4 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau owner: 'joaomoreno'; - newVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The version number of the new VS Code that has been downloaded.' }; - comment: 'This is used to know how often VS Code has successfully downloaded the update.'; @@ -649,7 +663,7 @@ index 57398fb..9129f54 100644 + comment: 'This is used to know how often !!APP_NAME!! has successfully downloaded the update.'; }; diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts -index 0535ddd..79f12dc 100644 +index 0535ddd..2478997 100644 --- a/src/vs/server/node/server.cli.ts +++ b/src/vs/server/node/server.cli.ts @@ -469,3 +469,3 @@ function asExtensionIdOrVSIX(inputs: string[] | undefined) { @@ -658,7 +672,7 @@ index 0535ddd..79f12dc 100644 + console.error('Unable to connect to !!APP_NAME!! server: ' + message); console.error(err); diff --git a/src/vs/workbench/api/browser/mainThreadAuthentication.ts b/src/vs/workbench/api/browser/mainThreadAuthentication.ts -index 6441394..1984fd1 100644 +index 6441394..69955cd 100644 --- a/src/vs/workbench/api/browser/mainThreadAuthentication.ts +++ b/src/vs/workbench/api/browser/mainThreadAuthentication.ts @@ -334,3 +334,3 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu @@ -667,7 +681,7 @@ index 6441394..1984fd1 100644 + comment: 'Used to see which extensions are using the !!APP_NAME!! client id override'; extensionId: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'The extension id.' }; diff --git a/src/vs/workbench/api/browser/viewsExtensionPoint.ts b/src/vs/workbench/api/browser/viewsExtensionPoint.ts -index fdf354d..502f06e 100644 +index fdf354d..b196297 100644 --- a/src/vs/workbench/api/browser/viewsExtensionPoint.ts +++ b/src/vs/workbench/api/browser/viewsExtensionPoint.ts @@ -43,3 +43,3 @@ const viewsContainerSchema: IJSONSchema = { @@ -676,7 +690,7 @@ index fdf354d..502f06e 100644 + description: localize({ key: 'vscode.extension.contributes.views.containers.id', comment: ['Contribution refers to those that an extension contributes to !!APP_NAME!! through an extension/contribution point. '] }, "Unique id used to identify the container in which views can be contributed using 'views' contribution point"), type: 'string', diff --git a/src/vs/workbench/api/common/extHostApiCommands.ts b/src/vs/workbench/api/common/extHostApiCommands.ts -index 1d08ef2..aeef203 100644 +index 0dc4986..efbe644 100644 --- a/src/vs/workbench/api/common/extHostApiCommands.ts +++ b/src/vs/workbench/api/common/extHostApiCommands.ts @@ -443,3 +443,3 @@ const newCommands: ApiCommand[] = [ @@ -685,10 +699,10 @@ index 1d08ef2..aeef203 100644 + ApiCommandArgument.String.with('viewId', 'Custom editor view id. This should be the viewType string for custom editors or the notebookType string for notebooks. Use \'default\' to use !!APP_NAME!!\'s default text editor'), new ApiCommandArgument('columnOrOptions', 'Either the column in which to open or editor options, see vscode.TextDocumentShowOptions', diff --git a/src/vs/workbench/api/common/extHostCommands.ts b/src/vs/workbench/api/common/extHostCommands.ts -index 0c170ec..7683cb4 100644 +index 0bda2e8..5179ac6 100644 --- a/src/vs/workbench/api/common/extHostCommands.ts +++ b/src/vs/workbench/api/common/extHostCommands.ts -@@ -460,4 +460,4 @@ export class ApiCommandArgument { +@@ -462,4 +462,4 @@ export class ApiCommandArgument { static readonly TypeHierarchyItem = new ApiCommandArgument('item', 'A type hierarchy item', v => v instanceof extHostTypes.TypeHierarchyItem, extHostTypeConverter.TypeHierarchyItem.from); - static readonly TestItem = new ApiCommandArgument('testItem', 'A VS Code TestItem', v => v instanceof TestItemImpl, extHostTypeConverter.TestItem.from); - static readonly TestProfile = new ApiCommandArgument('testProfile', 'A VS Code test profile', v => v instanceof extHostTypes.TestRunProfileBase, extHostTypeConverter.TestRunProfile.from); @@ -696,7 +710,7 @@ index 0c170ec..7683cb4 100644 + static readonly TestProfile = new ApiCommandArgument('testProfile', 'A !!APP_NAME!! test profile', v => v instanceof extHostTypes.TestRunProfileBase, extHostTypeConverter.TestRunProfile.from); diff --git a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts -index 0d71384..45f7923 100644 +index 0d71384..ae8d169 100644 --- a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts +++ b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts @@ -364,3 +364,3 @@ suite('NotebookCell#Document', function () { @@ -704,8 +718,17 @@ index 0d71384..45f7923 100644 - test('Opening a notebook results in VS Code firing the event onDidChangeActiveNotebookEditor twice #118470', function () { + test('Opening a notebook results in !!APP_NAME!! firing the event onDidChangeActiveNotebookEditor twice #118470', function () { let count = 0; +diff --git a/src/vs/workbench/browser/actions/helpActions.ts b/src/vs/workbench/browser/actions/helpActions.ts +index 2487213..a22b4d1 100644 +--- a/src/vs/workbench/browser/actions/helpActions.ts ++++ b/src/vs/workbench/browser/actions/helpActions.ts +@@ -163,3 +163,3 @@ class OpenNewsletterSignupUrlAction extends Action2 { + id: OpenNewsletterSignupUrlAction.ID, +- title: localize2('newsletterSignup', 'Signup for the VS Code Newsletter'), ++ title: localize2('newsletterSignup', 'Signup for the !!APP_NAME!! Newsletter'), + category: Categories.Help, diff --git a/src/vs/workbench/browser/web.factory.ts b/src/vs/workbench/browser/web.factory.ts -index 422fbba..9dc9699 100644 +index 0ebe271..20974b2 100644 --- a/src/vs/workbench/browser/web.factory.ts +++ b/src/vs/workbench/browser/web.factory.ts @@ -35,3 +35,3 @@ export function create(domElement: HTMLElement, options: IWorkbenchConstructionO @@ -714,16 +737,32 @@ index 422fbba..9dc9699 100644 + throw new Error('Unable to create the !!APP_NAME!! workbench more than once.'); } else { diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts -index 5e785e8..a8aa1b7 100644 +index 735e721..0356d59 100644 --- a/src/vs/workbench/browser/workbench.contribution.ts +++ b/src/vs/workbench/browser/workbench.contribution.ts -@@ -678,3 +678,3 @@ const registry = Registry.as(ConfigurationExtensions.Con +@@ -696,3 +696,3 @@ const registry = Registry.as(ConfigurationExtensions.Con localize('profileName', "`${profileName}`: name of the profile in which the workspace is opened (e.g. Data Science (Profile)). Ignored if default profile is used."), - localize('appName', "`${appName}`: e.g. VS Code."), + localize('appName', "`${appName}`: e.g. !!APP_NAME!!."), localize('remoteName', "`${remoteName}`: e.g. SSH"), +diff --git a/src/vs/workbench/contrib/chat/browser/chatSetup.ts b/src/vs/workbench/contrib/chat/browser/chatSetup.ts +index 043193f..9311afb 100644 +--- a/src/vs/workbench/contrib/chat/browser/chatSetup.ts ++++ b/src/vs/workbench/contrib/chat/browser/chatSetup.ts +@@ -143,3 +143,3 @@ class SetupAgent extends Disposable implements IChatAgentImplementation { + +- const { agent, disposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, localize2('vscodeAgentDescription', "Ask questions about VS Code").value, ChatAgentLocation.Panel, undefined, context, controller); ++ const { agent, disposable } = SetupAgent.doRegisterAgent(instantiationService, chatAgentService, 'setup.vscode', 'vscode', false, localize2('vscodeAgentDescription', "Ask questions about !!APP_NAME!!").value, ChatAgentLocation.Panel, undefined, context, controller); + disposables.add(disposable); +@@ -153,4 +153,4 @@ class SetupAgent extends Disposable implements IChatAgentImplementation { + displayName: localize('setupToolDisplayName', "New Workspace"), +- modelDescription: localize('setupToolsDescription', "Scaffold a new workspace in VS Code"), +- userDescription: localize('setupToolsDescription', "Scaffold a new workspace in VS Code"), ++ modelDescription: localize('setupToolsDescription', "Scaffold a new workspace in !!APP_NAME!!"), ++ userDescription: localize('setupToolsDescription', "Scaffold a new workspace in !!APP_NAME!!"), + canBeReferencedInPrompt: true, diff --git a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts -index 0a13063..c62db65 100644 +index 0a13063..5a342c0 100644 --- a/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts +++ b/src/vs/workbench/contrib/debug/browser/debugAdapterManager.ts @@ -177,3 +177,3 @@ export class AdapterManager extends Disposable implements IAdapterManager { @@ -732,30 +771,30 @@ index 0a13063..c62db65 100644 + description: nls.localize('debugServer', "For debug extension development only: if a port is specified !!APP_NAME!! tries to connect to a debug adapter running in server mode"), default: 4711 diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts -index 34a5326..663d6de 100644 +index 39859b4..5e03ec2 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts -@@ -400,3 +400,3 @@ CommandsRegistry.registerCommand({ +@@ -338,3 +338,3 @@ CommandsRegistry.registerCommand({ description: '(optional) Options for installing the extension. Object with the following properties: ' + - '`installOnlyNewlyAddedFromExtensionPackVSIX`: When enabled, VS Code installs only newly added extensions from the extension pack VSIX. This option is considered only when installing VSIX. ', + '`installOnlyNewlyAddedFromExtensionPackVSIX`: When enabled, !!APP_NAME!! installs only newly added extensions from the extension pack VSIX. This option is considered only when installing VSIX. ', isOptional: true, -@@ -407,3 +407,3 @@ CommandsRegistry.registerCommand({ +@@ -345,3 +345,3 @@ CommandsRegistry.registerCommand({ 'type': 'boolean', - 'description': localize('workbench.extensions.installExtension.option.installOnlyNewlyAddedFromExtensionPackVSIX', "When enabled, VS Code installs only newly added extensions from the extension pack VSIX. This option is considered only while installing a VSIX."), + 'description': localize('workbench.extensions.installExtension.option.installOnlyNewlyAddedFromExtensionPackVSIX', "When enabled, !!APP_NAME!! installs only newly added extensions from the extension pack VSIX. This option is considered only while installing a VSIX."), default: false -@@ -412,3 +412,3 @@ CommandsRegistry.registerCommand({ +@@ -350,3 +350,3 @@ CommandsRegistry.registerCommand({ 'type': 'boolean', - 'description': localize('workbench.extensions.installExtension.option.installPreReleaseVersion', "When enabled, VS Code installs the pre-release version of the extension if available."), + 'description': localize('workbench.extensions.installExtension.option.installPreReleaseVersion', "When enabled, !!APP_NAME!! installs the pre-release version of the extension if available."), default: false -@@ -417,3 +417,3 @@ CommandsRegistry.registerCommand({ +@@ -355,3 +355,3 @@ CommandsRegistry.registerCommand({ 'type': 'boolean', - 'description': localize('workbench.extensions.installExtension.option.donotSync', "When enabled, VS Code do not sync this extension when Settings Sync is on."), + 'description': localize('workbench.extensions.installExtension.option.donotSync', "When enabled, !!APP_NAME!! do not sync this extension when Settings Sync is on."), default: false -@@ -938,4 +938,4 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi +@@ -879,4 +879,4 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi Severity.Info, - vsixs.length > 1 ? localize('InstallVSIXs.successReload', "Completed installing extensions. Please reload Visual Studio Code to enable them.") - : localize('InstallVSIXAction.successReload', "Completed installing extension. Please reload Visual Studio Code to enable it."), @@ -763,45 +802,45 @@ index 34a5326..663d6de 100644 + : localize('InstallVSIXAction.successReload', "Completed installing extension. Please reload VSCodium to enable it."), [{ diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts -index 572bb26..53f5740 100644 +index 862d00b..714f0fa 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts -@@ -106,3 +106,3 @@ export class PromptExtensionInstallFailureAction extends Action { +@@ -108,3 +108,3 @@ export class PromptExtensionInstallFailureAction extends Action { if (this.error.name === ExtensionManagementErrorCode.Unsupported) { - const productName = isWeb ? localize('VS Code for Web', "{0} for the Web", this.productService.nameLong) : this.productService.nameLong; + const productName = isWeb ? localize('!!APP_NAME!! for Web', "{0} for the Web", this.productService.nameLong) : this.productService.nameLong; const message = localize('cannot be installed', "The '{0}' extension is not available in {1}. Click 'More Information' to learn more.", this.extension.displayName || this.extension.identifier.id, productName); -@@ -524,3 +524,3 @@ export class InstallAction extends ExtensionAction { +@@ -553,3 +553,3 @@ export class InstallAction extends ExtensionAction { } else if (this.extension.deprecationInfo.settings) { - detail = localize('deprecated with alternate settings message', "This extension is deprecated as this functionality is now built-in to VS Code."); + detail = localize('deprecated with alternate settings message', "This extension is deprecated as this functionality is now built-in to !!APP_NAME!!."); -@@ -912,3 +912,3 @@ export class UninstallAction extends ExtensionAction { +@@ -941,3 +941,3 @@ export class UninstallAction extends ExtensionAction { await this.extensionsWorkbenchService.uninstall(this.extension); - alert(localize('uninstallExtensionComplete', "Please reload Visual Studio Code to complete the uninstallation of the extension {0}.", this.extension.displayName)); + alert(localize('uninstallExtensionComplete', "Please reload !!APP_NAME!! to complete the uninstallation of the extension {0}.", this.extension.displayName)); } catch (error) { -@@ -2565,3 +2565,3 @@ export class ExtensionStatusAction extends ExtensionAction { +@@ -2597,3 +2597,3 @@ export class ExtensionStatusAction extends ExtensionAction { const link = `[${localize('settings', "settings")}](${URI.parse(`command:workbench.action.openSettings?${encodeURIComponent(JSON.stringify([this.extension.deprecationInfo.settings.map(setting => `@id:${setting}`).join(' ')]))}`)})`; - this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to VS Code. Configure these {0} to use this functionality.", link)) }, true); + this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to !!APP_NAME!!. Configure these {0} to use this functionality.", link)) }, true); } else { diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -index bcf99d6..d473bf9 100644 +index 8ee497e..41de54a 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts -@@ -463,3 +463,3 @@ export class Extension implements IExtension { +@@ -468,3 +468,3 @@ export class Extension implements IExtension { return Promise.resolve(`# ${this.displayName || this.name} -**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled. +**Notice:** This extension is bundled with !!APP_NAME!!. It can be disabled but not uninstalled. ## Features -@@ -501,3 +501,3 @@ ${this.description} +@@ -506,3 +506,3 @@ ${this.description} if (this.type === ExtensionType.System) { - return Promise.resolve(`Please check the [VS Code Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`); + return Promise.resolve(`Please check the [!!APP_NAME!! Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`); } diff --git a/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.ts b/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.ts -index 818e662..2450efc 100644 +index 818e662..2d2ead7 100644 --- a/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.ts +++ b/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.ts @@ -29,3 +29,3 @@ export const ExtensionsConfigurationSchema: IJSONSchema = { @@ -815,7 +854,7 @@ index 818e662..2450efc 100644 + '\t// List of extensions recommended by !!APP_NAME!! that should not be recommended for users of this workspace.', '\t"unwantedRecommendations": [', diff --git a/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts b/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts -index f54ddfe..81ec478 100644 +index f54ddfe..946de6b 100644 --- a/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts +++ b/src/vs/workbench/contrib/externalUriOpener/common/configuration.ts @@ -57,3 +57,3 @@ export const externalUriOpenersConfigurationNode: IConfigurationNode = { @@ -824,7 +863,7 @@ index f54ddfe..81ec478 100644 + enumDescriptions: [nls.localize('externalUriOpeners.defaultId', "Open using !!APP_NAME!!'s standard opener.")], }, diff --git a/src/vs/workbench/contrib/localization/common/localization.contribution.ts b/src/vs/workbench/contrib/localization/common/localization.contribution.ts -index b89d74b..4f47a63 100644 +index b89d74b..2a06ffb 100644 --- a/src/vs/workbench/contrib/localization/common/localization.contribution.ts +++ b/src/vs/workbench/contrib/localization/common/localization.contribution.ts @@ -58,5 +58,5 @@ export class BaseLocalizationWorkbenchContribution extends Disposable implements @@ -836,7 +875,7 @@ index b89d74b..4f47a63 100644 + patternErrorMessage: localize('vscode.extension.contributes.localizations.translations.id.pattern', "Id should be `vscode` or in format `publisherId.extensionName` for translating !!APP_NAME!! or an extension respectively.") }, diff --git a/src/vs/workbench/contrib/localization/common/localizationsActions.ts b/src/vs/workbench/contrib/localization/common/localizationsActions.ts -index 8619144..a6ab349 100644 +index 8619144..5815a70 100644 --- a/src/vs/workbench/contrib/localization/common/localizationsActions.ts +++ b/src/vs/workbench/contrib/localization/common/localizationsActions.ts @@ -26,3 +26,3 @@ export class ConfigureDisplayLanguageAction extends Action2 { @@ -845,7 +884,7 @@ index 8619144..a6ab349 100644 + description: localize2('configureLocaleDescription', "Changes the locale of !!APP_NAME!! based on installed language packs. Common languages include French, Chinese, Spanish, Japanese, German, Korean, and more.") } diff --git a/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts b/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts -index b533feb..7a11449 100644 +index b533feb..112d695 100644 --- a/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts +++ b/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.ts @@ -95,4 +95,4 @@ interface IUnknownLayout { @@ -856,25 +895,25 @@ index b533feb..7a11449 100644 + `// ${nls.localize('doc', 'Open !!APP_NAME!! and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.')}`, ``, diff --git a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts -index b716bcd..07b107b 100644 +index 5de0485..177e215 100644 --- a/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts +++ b/src/vs/workbench/contrib/remoteTunnel/electron-sandbox/remoteTunnel.contribution.ts -@@ -560,3 +560,3 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo +@@ -561,3 +561,3 @@ export class RemoteTunnelWorkbenchContribution extends Disposable implements IWo }, - "You can now access this machine anywhere via the secure tunnel [{0}](command:{4}). To connect via a different machine, use the generated [{1}]({2}) link or use the [{6}]({7}) extension in the desktop or web. You can [configure](command:{3}) or [turn off](command:{5}) this access via the VS Code Accounts menu.", + "You can now access this machine anywhere via the secure tunnel [{0}](command:{4}). To connect via a different machine, use the generated [{1}]({2}) link or use the [{6}]({7}) extension in the desktop or web. You can [configure](command:{3}) or [turn off](command:{5}) this access via the !!APP_NAME!! Accounts menu.", connectionInfo.tunnelName, connectionInfo.domain, linkToOpenForMarkdown, RemoteTunnelCommandIds.manage, RemoteTunnelCommandIds.configure, RemoteTunnelCommandIds.turnOff, remoteExtension.friendlyName, 'https://code.visualstudio.com/docs/remote/tunnels' diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts -index 2538528..acd9714 100644 +index 78c67ee..b78fbdc 100644 --- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts +++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts -@@ -3200,3 +3200,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer +@@ -3199,3 +3199,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer if (response.code && response.code === TerminateResponseCode.ProcessNotFound) { - this._notificationService.error(nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting VS Code might result in orphaned processes.')); + this._notificationService.error(nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting !!APP_NAME!! might result in orphaned processes.')); } else { diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.ts b/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.ts -index 9db6b8a..b68a042 100644 +index 9db6b8a..cecac9f 100644 --- a/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.ts +++ b/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.ts @@ -193,3 +193,3 @@ const schema: IJSONSchema = { @@ -888,7 +927,7 @@ index 9db6b8a..b68a042 100644 + description: nls.localize('JsonSchema.promptOnClose', 'Whether the user is prompted when !!APP_NAME!! closes with a running background task.'), default: false diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts -index 42df6db..4eea384 100644 +index 42df6db..99e0383 100644 --- a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts +++ b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts @@ -411,3 +411,3 @@ const taskConfiguration: IJSONSchema = { @@ -897,7 +936,7 @@ index 42df6db..4eea384 100644 + description: nls.localize('JsonSchema.tasks.promptOnClose', 'Whether the user is prompted when !!APP_NAME!! closes with a running task.'), default: false diff --git a/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts b/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts -index 6a5728c..2c561bd 100644 +index 6a5728c..df166de 100644 --- a/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts +++ b/src/vs/workbench/contrib/tasks/electron-sandbox/taskService.ts @@ -213,3 +213,3 @@ export class TaskService extends AbstractTaskService { @@ -906,7 +945,7 @@ index 6a5728c..2c561bd 100644 + message: nls.localize('TaskSystem.noProcess', 'The launched task doesn\'t exist anymore. If the task spawned background processes exiting !!APP_NAME!! might result in orphaned processes. To avoid this start the last background process with a wait flag.'), primaryButton: nls.localize({ key: 'TaskSystem.exitAnyways', comment: ['&& denotes a mnemonic'] }, "&&Exit Anyways"), diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts -index 42ff0ac..7276ab8 100644 +index 42ff0ac..8f2f57c 100644 --- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts +++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts @@ -213,3 +213,3 @@ export class TerminalViewPane extends ViewPane { @@ -915,7 +954,7 @@ index 42ff0ac..7276ab8 100644 + this._notificationService.prompt(Severity.Warning, nls.localize('terminal.monospaceOnly', "The terminal only supports monospace fonts. Be sure to restart !!APP_NAME!! if this is a newly installed font."), choices); } diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts -index 28aa98c..b0da694 100644 +index 28aa98c..a3331fc 100644 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts @@ -314,3 +314,3 @@ const terminalConfiguration: IConfigurationNode = { @@ -964,7 +1003,7 @@ index 28aa98c..b0da694 100644 + markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives !!APP_NAME!! insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegration.decorationsEnabled#`', '`#editor.accessibilitySupport#`'), type: 'boolean', diff --git a/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts b/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts -index 4979520..49d0cbd 100644 +index 4979520..30ae11b 100644 --- a/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts +++ b/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.ts @@ -19,3 +19,3 @@ export const terminalAutoRepliesConfiguration: IStringDictionary `[${title}](${href})`; +@@ -201,13 +200,2 @@ export const startEntries: GettingStartedStartEntryContent = [ + }, +- { +- id: 'topLevelNewWorkspaceChat', +- title: localize('gettingStarted.newWorkspaceChat.title', "New Workspace with Copilot..."), +- description: localize('gettingStarted.newWorkspaceChat.description', "Create a new workspace with Copilot"), +- icon: Codicon.copilot, +- when: '!isWeb && !chatSetupHidden', +- content: { +- type: 'startEntry', +- command: 'command:welcome.newWorkspaceChat', +- } +- }, + ]; +@@ -216,24 +204,2 @@ const Button = (title: string, href: string) => `[${title}](${href})`; -const CopilotStepTitle = localize('gettingStarted.copilotSetup.title', "Use AI features with Copilot for free"); -const CopilotDescription = localize({ key: 'gettingStarted.copilotSetup.description', comment: ['{Locked="["}', '{Locked="]({0})"}'] }, "You can use [Copilot]({0}) to generate code across multiple files, fix errors, ask questions about your code and much more using natural language.", product.defaultChatAgent?.documentationUrl ?? ''); @@ -1050,7 +1103,7 @@ index c7074a5..4fd9ae7 100644 - id, - title: CopilotStepTitle, - description, -- when, +- when: `${when} && !chatSetupHidden`, - media: { - type: 'svg', altText: 'VS Code Copilot multi file edits', path: 'multi-file-edits.svg' - }, @@ -1058,23 +1111,23 @@ index c7074a5..4fd9ae7 100644 -} - export const walkthroughs: GettingStartedWalkthroughContent = [ -@@ -238,3 +215,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -241,3 +207,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ id: 'Setup', -- title: localize('gettingStarted.setup.title', "Get Started with VS Code"), -+ title: localize('gettingStarted.setup.title', "Get Started with !!APP_NAME!!"), +- title: localize('gettingStarted.setup.title', "Get started with VS Code"), ++ title: localize('gettingStarted.setup.title', "Get started with !!APP_NAME!!"), description: localize('gettingStarted.setup.description', "Customize your editor, learn the basics, and start coding"), -@@ -243,3 +220,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -246,3 +212,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ when: '!isWeb', - walkthroughPageTitle: localize('gettingStarted.setup.walkthroughPageTitle', 'Setup VS Code'), + walkthroughPageTitle: localize('gettingStarted.setup.walkthroughPageTitle', 'Setup !!APP_NAME!!'), next: 'Beginner', -@@ -248,5 +225,2 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -251,5 +217,2 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ steps: [ - createCopilotSetupStep('CopilotSetupSignedOut', CopilotSignedOutButton, 'chatSetupSignedOut', true), -- createCopilotSetupStep('CopilotSetupComplete', CopilotCompleteButton, 'chatSetupInstalled && (chatPlanPro || chatPlanLimited)', false), +- createCopilotSetupStep('CopilotSetupComplete', CopilotCompleteButton, 'chatSetupInstalled && (chatPlanPro || chatPlanProPlus || chatPlanBusiness || chatPlanEnterprise || chatPlanLimited)', false), - createCopilotSetupStep('CopilotSetupSignedIn', CopilotSignedInButton, '!chatSetupSignedOut && (!chatSetupInstalled || chatPlanCanSignUp)', true), { -@@ -264,6 +238,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -267,6 +230,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.extensions.title', "Code with extensions"), - description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VS Code's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), + description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are !!APP_NAME!!'s power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), @@ -1083,57 +1136,82 @@ index c7074a5..4fd9ae7 100644 - type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions-web.svg' + type: 'svg', altText: '!!APP_NAME!! extension marketplace with featured language extensions', path: 'extensions-web.svg' }, -@@ -283,5 +257,5 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ - // title: localize('gettingStarted.settings.title', "Tune your settings"), +@@ -282,21 +245,2 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ + }, +- // Hidden in favor of copilot entry (to be revisited when copilot entry moves, if at all) +- // { +- // id: 'settings', +- // title: localize('gettingStarted.settings.title', "Tune your settings"), - // description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), -+ // description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of !!APP_NAME!! and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), - // media: { +- // media: { - // type: 'svg', altText: 'VS Code Settings', path: 'settings.svg' -+ // type: 'svg', altText: '!!APP_NAME!! Settings', path: 'settings.svg' - // }, -@@ -301,3 +275,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +- // }, +- // }, +- // { +- // id: 'settingsSync', +- // title: localize('gettingStarted.settingsSync.title', "Sync settings across devices"), +- // description: localize('gettingStarted.settingsSync.description.interpolated', "Keep your essential customizations backed up and updated across all your devices.\n{0}", Button(localize('enableSync', "Backup and Sync Settings"), 'command:workbench.userDataSync.actions.turnOn')), +- // when: 'syncStatus != uninitialized', +- // completionEvents: ['onEvent:sync-enabled'], +- // media: { +- // type: 'svg', altText: 'The "Turn on Sync" entry in the settings gear menu.', path: 'settingsSync.svg' +- // }, +- // }, + { +@@ -304,3 +248,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.settings.title', "Tune your settings"), - description: localize('gettingStarted.settingsAndSync.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. [Back up and sync](command:workbench.userDataSync.actions.turnOn) your essential customizations across all your devices.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), + description: localize('gettingStarted.settingsAndSync.description.interpolated', "Customize every aspect of !!APP_NAME!! and your extensions to your liking. [Back up and sync](command:workbench.userDataSync.actions.turnOn) your essential customizations across all your devices.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), when: 'syncStatus != uninitialized', -@@ -305,3 +279,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -308,3 +252,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ media: { - type: 'svg', altText: 'VS Code Settings', path: 'settings.svg' + type: 'svg', altText: '!!APP_NAME!! Settings', path: 'settings.svg' }, -@@ -311,3 +285,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -314,24 +258,5 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.commandPalette.title', "Unlock productivity with the Command Palette "), - description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), + description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in !!APP_NAME!!.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' }, -@@ -318,3 +292,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ - // title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), + }, +- // Hidden in favor of copilot entry (to be revisited when copilot entry moves, if at all) +- // { +- // id: 'pickAFolderTask-Mac', +- // title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), - // description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')), -+ // description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into !!APP_NAME!!.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')), - // when: 'isMac && workspaceFolderCount == 0', -@@ -327,3 +301,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ - // title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), +- // when: 'isMac && workspaceFolderCount == 0', +- // media: { +- // type: 'svg', altText: 'Explorer view showing buttons for opening folder and cloning repository.', path: 'openFolder.svg' +- // } +- // }, +- // { +- // id: 'pickAFolderTask-Other', +- // title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), - // description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')), -+ // description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into !!APP_NAME!!.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')), - // when: '!isMac && workspaceFolderCount == 0', -@@ -345,4 +319,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +- // when: '!isMac && workspaceFolderCount == 0', +- // media: { +- // type: 'svg', altText: 'Explorer view showing buttons for opening folder and cloning repository.', path: 'openFolder.svg' +- // } +- // }, + { +@@ -348,4 +273,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.videoTutorial.title', "Watch video tutorials"), - description: localize('gettingStarted.videoTutorial.description.interpolated', "Watch the first in a series of short & practical video tutorials for VS Code's key features.\n{0}", Button(localize('watch', "Watch Tutorial"), 'https://aka.ms/vscode-getting-started-video')), - media: { type: 'svg', altText: 'VS Code Settings', path: 'learn.svg' }, + description: localize('gettingStarted.videoTutorial.description.interpolated', "Watch the first in a series of short & practical video tutorials for !!APP_NAME!!'s key features.\n{0}", Button(localize('watch', "Watch Tutorial"), 'https://aka.ms/vscode-getting-started-video')), + media: { type: 'svg', altText: '!!APP_NAME!! Settings', path: 'learn.svg' }, } -@@ -354,3 +328,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -357,3 +282,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ id: 'SetupWeb', - title: localize('gettingStarted.setupWeb.title', "Get Started with VS Code for the Web"), + title: localize('gettingStarted.setupWeb.title', "Get Started with !!APP_NAME!! for the Web"), description: localize('gettingStarted.setupWeb.description', "Customize your editor, learn the basics, and start coding"), -@@ -360,3 +334,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -363,3 +288,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ next: 'Beginner', - walkthroughPageTitle: localize('gettingStarted.setupWeb.walkthroughPageTitle', 'Setup VS Code Web'), + walkthroughPageTitle: localize('gettingStarted.setupWeb.walkthroughPageTitle', 'Setup !!APP_NAME!! Web'), content: { -@@ -386,6 +360,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -389,6 +314,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.extensions.title', "Code with extensions"), - description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VS Code's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), + description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are !!APP_NAME!!'s power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), @@ -1142,32 +1220,45 @@ index c7074a5..4fd9ae7 100644 - type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions-web.svg' + type: 'svg', altText: '!!APP_NAME!! extension marketplace with featured language extensions', path: 'extensions-web.svg' }, -@@ -414,3 +388,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -404,12 +329,2 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ + }, +- { +- id: 'settingsSyncWeb', +- title: localize('gettingStarted.settingsSync.title', "Sync settings across devices"), +- description: localize('gettingStarted.settingsSync.description.interpolated', "Keep your essential customizations backed up and updated across all your devices.\n{0}", Button(localize('enableSync', "Backup and Sync Settings"), 'command:workbench.userDataSync.actions.turnOn')), +- when: 'syncStatus != uninitialized', +- completionEvents: ['onEvent:sync-enabled'], +- media: { +- type: 'svg', altText: 'The "Turn on Sync" entry in the settings gear menu.', path: 'settingsSync.svg' +- }, +- }, + { +@@ -417,3 +332,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.commandPalette.title', "Unlock productivity with the Command Palette "), - description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), + description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in !!APP_NAME!!.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' }, -@@ -420,3 +394,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -423,3 +338,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"), - description: localize('gettingStarted.setup.OpenFolderWeb.description.interpolated', "You're all set to start coding. You can open a local project or a remote repository to get your files into VS Code.\n{0}\n{1}", Button(localize('openFolder', "Open Folder"), 'command:workbench.action.addRootFolder'), Button(localize('openRepository', "Open Repository"), 'command:remoteHub.openRepository')), + description: localize('gettingStarted.setup.OpenFolderWeb.description.interpolated', "You're all set to start coding. You can open a local project or a remote repository to get your files into !!APP_NAME!!.\n{0}\n{1}", Button(localize('openFolder', "Open Folder"), 'command:workbench.action.addRootFolder'), Button(localize('openRepository', "Open Repository"), 'command:remoteHub.openRepository')), when: 'workspaceFolderCount == 0', -@@ -441,3 +415,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -444,3 +359,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.setupAccessibility.title', "Get Started with Accessibility Features"), - description: localize('gettingStarted.setupAccessibility.description', "Learn the tools and shortcuts that make VS Code accessible. Note that some actions are not actionable from within the context of the walkthrough."), + description: localize('gettingStarted.setupAccessibility.description', "Learn the tools and shortcuts that make !!APP_NAME!! accessible. Note that some actions are not actionable from within the context of the walkthrough."), isFeatured: true, -@@ -446,3 +420,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -449,3 +364,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ next: 'Setup', - walkthroughPageTitle: localize('gettingStarted.setupAccessibility.walkthroughPageTitle', 'Setup VS Code Accessibility'), + walkthroughPageTitle: localize('gettingStarted.setupAccessibility.walkthroughPageTitle', 'Setup !!APP_NAME!! Accessibility'), content: { -@@ -477,3 +451,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -480,3 +395,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.commandPaletteAccessibility.title', "Unlock productivity with the Command Palette "), - description: localize('gettingStarted.commandPaletteAccessibility.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), + description: localize('gettingStarted.commandPaletteAccessibility.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in !!APP_NAME!!.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), media: { type: 'markdown', path: 'empty' }, -@@ -550,6 +524,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ +@@ -553,6 +468,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ title: localize('gettingStarted.extensions.title', "Code with extensions"), - description: localize('gettingStarted.extensions.description.interpolated', "Extensions are VS Code's power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}", Button(localize('browsePopular', "Browse Popular Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), + description: localize('gettingStarted.extensions.description.interpolated', "Extensions are !!APP_NAME!!'s power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}", Button(localize('browsePopular', "Browse Popular Extensions"), 'command:workbench.extensions.action.showPopularExtensions')), @@ -1176,8 +1267,84 @@ index c7074a5..4fd9ae7 100644 - type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions.svg' + type: 'svg', altText: '!!APP_NAME!! extension marketplace with featured language extensions', path: 'extensions.svg' }, +@@ -670,75 +585,2 @@ export const walkthroughs: GettingStartedWalkthroughContent = [ + }, +- { +- id: `${NEW_WELCOME_EXPERIENCE}`, +- title: localize('gettingStarted.new.title', "Get started with VS Code"), +- description: localize('gettingStarted.new.description', "Supercharge coding with AI"), +- isFeatured: false, +- icon: setupIcon, +- when: '!isWeb', +- walkthroughPageTitle: localize('gettingStarted.new.walkthroughPageTitle', 'Set up VS Code'), +- content: { +- type: 'steps', +- steps: [ +- { +- id: 'copilotSetup.chat', +- title: localize('gettingStarted.agentMode.title', "Agent mode"), +- description: localize('gettingStarted.agentMode.description', "Analyzes the problem, plans next steps, and makes changes for you."), +- media: { +- type: 'svg', altText: 'VS Code Copilot multi file edits', path: 'multi-file-edits.svg' +- }, +- }, +- { +- id: 'copilotSetup.inline', +- title: localize('gettingStarted.nes.title', "Next Edit Suggestions"), +- description: localize('gettingStarted.nes.description', "Get code suggestions that predict your next edit."), +- media: { +- type: 'svg', altText: 'Next Edit Suggestions', path: 'ai-powered-suggestions.svg' +- }, +- }, +- { +- id: 'copilotSetup.customize', +- title: localize('gettingStarted.customize.title', "Personalized to how you work"), +- description: localize('gettingStarted.customize.description', "Swap models, add agent mode tools, and create personalized instructions.\n{0}", Button(localize('signUp', "Set up AI"), 'command:workbench.action.chat.triggerSetup')), +- media: { +- type: 'svg', altText: 'Personalize', path: 'multi-file-edits.svg' +- }, +- }, +- { +- id: 'newCommandPaletteTask', +- title: localize('newgettingStarted.commandPalette.title', "All commands within reach"), +- description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')), +- media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' }, +- }, +- { +- id: 'newPickColorTheme', +- title: localize('gettingStarted.pickColor.title', "Choose your theme"), +- description: localize('gettingStarted.pickColor.description.interpolated', "The right theme helps you focus on your code, is easy on your eyes, and is simply more fun to use.\n{0}", Button(localize('titleID', "Browse Color Themes"), 'command:workbench.action.selectTheme')), +- completionEvents: [ +- 'onSettingChanged:workbench.colorTheme', +- 'onCommand:workbench.action.selectTheme' +- ], +- media: { type: 'markdown', path: 'theme_picker_small', } +- }, +- { +- id: 'newFindLanguageExtensions', +- title: localize('newgettingStarted.findLanguageExts.title', "Support for all languages"), +- description: localize('newgettingStarted.findLanguageExts.description.interpolated', "Install the language extensions you need in your toolkit.\n{0}", Button(localize('browseLangExts', "Browse Language Extensions"), 'command:workbench.extensions.action.showLanguageExtensions')), +- when: 'workspacePlatform != \'webworker\'', +- media: { +- type: 'svg', altText: 'Language extensions', path: 'languages.svg' +- }, +- }, +- { +- id: 'newSettingsAndSync', +- title: localize('newgettingStarted.settings.title', "Customize every aspect of VS Code"), +- description: localize('newgettingStarted.settingsAndSync.description.interpolated', "[Back up and sync](command:workbench.userDataSync.actions.turnOn) settings across all your devices.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')), +- when: 'syncStatus != uninitialized', +- completionEvents: ['onEvent:sync-enabled'], +- media: { +- type: 'svg', altText: 'VS Code Settings', path: 'settings.svg' +- }, +- }, +- ] +- } +- } + ]; diff --git a/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough.ts b/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough.ts -index bdd30bf..5023e82 100644 +index bdd30bf..317d11c 100644 --- a/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough.ts +++ b/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough.ts @@ -13,3 +13,3 @@ export default function content(accessor: ServicesAccessor) { @@ -1201,7 +1368,7 @@ index bdd30bf..5023e82 100644 +Well if you have got this far then you will have touched on some of the editing features in !!APP_NAME!!. But don't stop now :) We have lots of additional [documentation](https://code.visualstudio.com/docs), [introductory videos](https://code.visualstudio.com/docs/getstarted/introvideos) and [tips and tricks](https://go.microsoft.com/fwlink/?linkid=852118) for the product that will help you learn how to use it. And while you are here, here are a few additional things you can try: - Open the Integrated Terminal by pressing kb(workbench.action.terminal.toggleTerminal), then see what's possible by [reviewing the terminal documentation](https://code.visualstudio.com/docs/editor/integrated-terminal) diff --git a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts -index c512b64..8034183 100644 +index c512b64..dfa2150 100644 --- a/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts +++ b/src/vs/workbench/contrib/workspace/browser/workspace.contribution.ts @@ -733,3 +733,3 @@ Registry.as(ConfigurationExtensions.Configuration) @@ -1215,35 +1382,35 @@ index c512b64..8034183 100644 + markdownDescription: localize('workspace.trust.emptyWindow.description', "Controls whether or not the empty window is trusted by default within !!APP_NAME!!. When used with `#{0}#`, you can enable the full functionality of !!APP_NAME!! without prompting in an empty window.", WORKSPACE_TRUST_UNTRUSTED_FILES), tags: [WORKSPACE_TRUST_SETTING_TAG], diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts -index d57c6d6..6d846f7 100644 +index 88e0091..ec657a1 100644 --- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts +++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts -@@ -361,3 +361,3 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contri +@@ -364,3 +364,3 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contri allowTrailingCommas: true, - description: 'VSCode static command line definition file', + description: '!!APP_NAME!! static command line definition file', type: 'object', -@@ -406,3 +406,3 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contri +@@ -409,3 +409,3 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contri type: 'boolean', - description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running VS Code as elevated on Linux and running under Applocker on Windows.") + description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running !!APP_NAME!! as elevated on Linux and running under Applocker on Windows.") }, -@@ -410,3 +410,3 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contri +@@ -413,3 +413,3 @@ import { registerWorkbenchContribution2, WorkbenchPhase } from '../common/contri type: 'boolean', - description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running VS Code extension tests or when you're experiencing difficulties with the credential store.") + description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running !!APP_NAME!! extension tests or when you're experiencing difficulties with the credential store.") } diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts -index 798de91..3727e24 100644 +index edfe3a2..71a206f 100644 --- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts +++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts -@@ -1044,3 +1044,3 @@ export class ExtensionManagementService extends Disposable implements IWorkbench +@@ -1045,3 +1045,3 @@ export class ExtensionManagementService extends CommontExtensionManagementServic - const productName = localize('VS Code for Web', "{0} for the Web", this.productService.nameLong); + const productName = localize('!!APP_NAME!! for Web', "{0} for the Web", this.productService.nameLong); const virtualWorkspaceSupport = this.extensionManifestPropertiesService.getExtensionVirtualWorkspaceSupportType(manifest); diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts -index 859b976..dc0a455 100644 +index 859b976..06386e0 100644 --- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts +++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts @@ -181,3 +181,3 @@ export const schema: IJSONSchema = { @@ -1301,7 +1468,7 @@ index 859b976..dc0a455 100644 + description: nls.localize('vscode.extension.scripts.uninstall', 'Uninstall hook for !!APP_NAME!! extension. Script that gets executed when the extension is completely uninstalled from !!APP_NAME!! which is when !!APP_NAME!! is restarted (shutdown and start) after the extension is uninstalled. Only Node scripts are supported.'), type: 'string' diff --git a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts -index d38ab6b..8f704b1 100644 +index d38ab6b..2469194 100644 --- a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts +++ b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts @@ -167,3 +167,3 @@ export class NativeExtensionService extends AbstractExtensionService implements @@ -1310,7 +1477,7 @@ index d38ab6b..8f704b1 100644 + label: nls.localize('relaunch', "Relaunch !!APP_NAME!!"), run: () => { diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts -index cc56d9a..f985bec 100644 +index cc56d9a..f446b8e 100644 --- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts +++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts @@ -199,3 +199,3 @@ export class UserDataProfileManagementService extends Disposable implements IUse diff --git a/patches/disable-signature-verification.patch b/patches/disable-signature-verification.patch index 9540764..0f34807 100644 --- a/patches/disable-signature-verification.patch +++ b/patches/disable-signature-verification.patch @@ -1,14 +1,18 @@ diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts -index 680e0dd..0b04279 100644 +index 0a50a2e..5ee6782 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts -@@ -86,2 +86,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi +@@ -36,3 +36,2 @@ import { + IAllowedExtensionsService, +- VerifyExtensionSignatureConfigKey, + shouldRequireRepositorySignatureFor, +@@ -89,2 +88,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi @IFileService private readonly fileService: IFileService, + // @ts-expect-error no-unused-variable @IConfigurationService private readonly configurationService: IConfigurationService, -@@ -347,4 +348,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi +@@ -333,4 +333,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi if (verifySignature) { -- const value = this.configurationService.getValue('extensions.verifySignature'); +- const value = this.configurationService.getValue(VerifyExtensionSignatureConfigKey); - verifySignature = isBoolean(value) ? value : true; + verifySignature = false; } diff --git a/patches/feat-ext-unsafe.patch b/patches/feat-ext-unsafe.patch index fbc8bf7..cee3557 100644 --- a/patches/feat-ext-unsafe.patch +++ b/patches/feat-ext-unsafe.patch @@ -1,8 +1,8 @@ diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts -index a0afbe7..7a4aaa5 100644 +index 5974768..876f779 100644 --- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts +++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts -@@ -1764,2 +1764,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle +@@ -1788,2 +1788,8 @@ export abstract class AbstractExtensionGalleryService implements IExtensionGalle + const excludeUnsafes = this.configurationService.getValue('extensions.excludeUnsafes') ?? true; + @@ -12,13 +12,11 @@ index a0afbe7..7a4aaa5 100644 + const context = await this.requestService.request({ diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts -index 34a5326..ee0dd6c 100644 +index 4c44d3b..fe989e0 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts -@@ -357,3 +357,10 @@ Registry.as(ConfigurationExtensions.Configuration) - } -- } -+ }, +@@ -294,2 +294,9 @@ Registry.as(ConfigurationExtensions.Configuration) + }, + 'extensions.excludeUnsafes': { + scope: ConfigurationScope.MACHINE, + type: 'boolean', diff --git a/patches/insider/add-remote-url.patch b/patches/insider/add-remote-url.patch deleted file mode 100644 index 8706443..0000000 --- a/patches/insider/add-remote-url.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js -index 2606eed..3e60e80 100644 ---- a/build/gulpfile.reh.js -+++ b/build/gulpfile.reh.js -@@ -321,3 +321,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa - const productJsonStream = gulp.src(['product.json'], { base: '.' }) -- .pipe(json({ commit, date: readISODate('out-build'), version, serverDownloadUrlTemplate: 'https://github.com/!!GH_REPO_PATH!!/releases/download/!!RELEASE_VERSION!!/!!APP_NAME_LC!!-reh-${os}-${arch}-!!RELEASE_VERSION!!.tar.gz' })) -+ .pipe(json({ commit, date: readISODate('out-build'), version, serverDownloadUrlTemplate: 'https://github.com/!!GH_REPO_PATH!!-insiders/releases/download/!!RELEASE_VERSION!!-insider/!!APP_NAME_LC!!-reh-${os}-${arch}-!!RELEASE_VERSION!!-insider.tar.gz' })) - .pipe(es.through(function (file) { -diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js -index b975c64..9aa7bb0 100644 ---- a/build/gulpfile.vscode.js -+++ b/build/gulpfile.vscode.js -@@ -288,3 +288,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op - const productJsonStream = gulp.src(['product.json'], { base: '.' }) -- .pipe(json({ commit, date: readISODate('out-build'), checksums, version, serverDownloadUrlTemplate: 'https://github.com/!!GH_REPO_PATH!!/releases/download/!!RELEASE_VERSION!!/!!APP_NAME_LC!!-reh-${os}-${arch}-!!RELEASE_VERSION!!.tar.gz' })) -+ .pipe(json({ commit, date: readISODate('out-build'), checksums, version, serverDownloadUrlTemplate: 'https://github.com/!!GH_REPO_PATH!!-insiders/releases/download/!!RELEASE_VERSION!!-insider/!!APP_NAME_LC!!-reh-${os}-${arch}-!!RELEASE_VERSION!!-insider.tar.gz' })) - .pipe(es.through(function (file) { diff --git a/patches/linux/arch-1-ppc64le.patch b/patches/linux/arch-1-ppc64le.patch index 34396e4..3a2363d 100644 --- a/patches/linux/arch-1-ppc64le.patch +++ b/patches/linux/arch-1-ppc64le.patch @@ -27,11 +27,11 @@ index c655ce7..c7150f2 100755 + TRIPLE="powerpc64le-linux-gnu" fi diff --git a/build/checksums/vscode-sysroot.txt b/build/checksums/vscode-sysroot.txt -index 67182b0..db63d02 100644 +index 5744a5f..3fedbe9 100644 --- a/build/checksums/vscode-sysroot.txt +++ b/build/checksums/vscode-sysroot.txt -@@ -3 +3,2 @@ - dbb927408393041664a020661f2641c9785741be3d29b050b9dac58980967784 x86_64-linux-gnu-glibc-2.28.tar.gz +@@ -7 +7,2 @@ f82c8dacbb9dd85819e4801909eb4e842ac12c899632aa75b4839383a18c7501 arm-rpi-linux- + 84acc5a15566c98ddf80631731d672e0ce9febcf3f2e969101e0dfd7ef2405e3 x86_64-linux-gnu-glibc-2.28-gcc-8.5.0.tar.gz +fa8176d27be18bb0eeb7f55b0fa22255050b430ef68c29136599f02976eb0b1b powerpc64le-linux-gnu-glibc-2.28.tar.gz diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js index 5ac9f95..cd04bdf 100644 @@ -191,10 +191,10 @@ index 91b0ebc..0d0f11b 100644 + ], }; diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js -index 532e3d5..ab6b826 100644 +index 783db5c..2b63de5 100644 --- a/build/linux/debian/install-sysroot.js +++ b/build/linux/debian/install-sysroot.js -@@ -140,2 +140,6 @@ async function getVSCodeSysroot(arch) { +@@ -146,2 +146,6 @@ async function getVSCodeSysroot(arch, isMusl = false) { break; + case 'ppc64le': + expectedName = `powerpc64le-linux-gnu${prefix}.tar.gz`; @@ -202,10 +202,10 @@ index 532e3d5..ab6b826 100644 + break; } diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts -index 6543b49..c23db0f 100644 +index 57cf015..8cfa7f4 100644 --- a/build/linux/debian/install-sysroot.ts +++ b/build/linux/debian/install-sysroot.ts -@@ -154,2 +154,6 @@ export async function getVSCodeSysroot(arch: DebianArchString): Promise +@@ -159,2 +159,6 @@ export async function getVSCodeSysroot(arch: DebianArchString, isMusl: boolean = break; + case 'ppc64le': + expectedName = `powerpc64le-linux-gnu${prefix}.tar.gz`; @@ -513,18 +513,18 @@ index 8ea4c0b..b9d3b47 100644 + ppc64el) LDCONFIG_ARCH="64bit";; esac diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts -index b7f8325..5400065 100644 +index f270903..8b028eb 100644 --- a/src/vs/platform/extensionManagement/common/extensionManagement.ts +++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts -@@ -44,2 +44,3 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) { +@@ -46,2 +46,3 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) { case TargetPlatform.LINUX_ARMHF: return 'Linux ARM'; + case TargetPlatform.LINUX_PPC64LE: return 'Linux PowerPC64'; -@@ -67,2 +68,3 @@ export function toTargetPlatform(targetPlatform: string): TargetPlatform { +@@ -69,2 +70,3 @@ export function toTargetPlatform(targetPlatform: string): TargetPlatform { case TargetPlatform.LINUX_ARMHF: return TargetPlatform.LINUX_ARMHF; + case TargetPlatform.LINUX_PPC64LE: return TargetPlatform.LINUX_PPC64LE; -@@ -102,2 +104,5 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string | +@@ -104,2 +106,5 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string | } + if (arch === 'ppc64le') { + return TargetPlatform.LINUX_PPC64LE; diff --git a/patches/policies.patch b/patches/policies.patch index aedabfb..bb05eeb 100644 --- a/patches/policies.patch +++ b/patches/policies.patch @@ -50,32 +50,32 @@ index 34d20e9..8404cdf 100644 + diff --git a/eslint.config.js b/eslint.config.js -index 822da54..6236bf0 100644 +index f1b01d0..7dca1f1 100644 --- a/eslint.config.js +++ b/eslint.config.js -@@ -796,3 +796,3 @@ export default tseslint.config( +@@ -797,3 +797,3 @@ export default tseslint.config( '@vscode/iconv-lite-umd', - '@vscode/policy-watcher', + '@vscodium/policy-watcher', '@vscode/proxy-agent', diff --git a/package-lock.json b/package-lock.json -index 8112caf..682b56a 100644 +index beb023f..623c8ab 100644 --- a/package-lock.json +++ b/package-lock.json -@@ -19,3 +19,2 @@ +@@ -18,3 +18,2 @@ "@vscode/iconv-lite-umd": "0.7.0", -- "@vscode/policy-watcher": "^1.3.0", +- "@vscode/policy-watcher": "^1.3.2", "@vscode/proxy-agent": "^0.32.0", -@@ -30,2 +29,3 @@ +@@ -29,2 +28,3 @@ "@vscode/windows-registry": "^1.1.0", -+ "@vscodium/policy-watcher": "^1.3.0-2503300035", - "@xterm/addon-clipboard": "^0.2.0-beta.82", -@@ -2844,22 +2844,2 @@ ++ "@vscodium/policy-watcher": "^1.3.2-252465", + "@xterm/addon-clipboard": "^0.2.0-beta.84", +@@ -2701,22 +2701,2 @@ }, - "node_modules/@vscode/policy-watcher": { -- "version": "1.3.0", -- "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.3.0.tgz", -- "integrity": "sha512-a8pPxlZlMJWOOj2NZ/2ceXgHdDU/NXo+8Pn/InV/sPBfbvTnf/MpMc4pscm9pdU4UIrTGR5+OduQW7mTK8DK7Q==", +- "version": "1.3.2", +- "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.3.2.tgz", +- "integrity": "sha512-fmNPYysU2ioH99uCaBPiRblEZSnir5cTmc7w91hAxAoYoGpHt2PZPxT5eIOn7FGmPOsjLdQcd6fduFJGYVD4Mw==", - "hasInstallScript": true, - "license": "MIT", - "dependencies": { @@ -93,12 +93,12 @@ index 8112caf..682b56a 100644 - } - }, "node_modules/@vscode/proxy-agent": { -@@ -3260,2 +3240,22 @@ +@@ -3117,2 +3097,22 @@ }, + "node_modules/@vscodium/policy-watcher": { -+ "version": "1.3.0-2503300035", -+ "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.3.0-2503300035.tgz", -+ "integrity": "sha512-Vf83Z2uKkq+SL2Kr+DHlE7Ezb+HBnspn5iMazUele1Mj/7WQv0Zq/fTQ3LFKKVC6hV5+G95BXwOc7oSAU0gWUw==", ++ "version": "1.3.2-252465", ++ "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.3.2-252465.tgz", ++ "integrity": "sha512-kpnb656HMteBIm8d9LhBpQ5gL2A/4rJrsaLCF0D8IWyrZAQ0UR9EzXM6tZ6p5H+KWot3QUjm0Gry6vMV1yye5Q==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { @@ -117,13 +117,13 @@ index 8112caf..682b56a 100644 + }, "node_modules/@webassemblyjs/ast": { diff --git a/package.json b/package.json -index add0c27..2e5b5f1 100644 +index 8d3443f..e95927c 100644 --- a/package.json +++ b/package.json -@@ -78,3 +78,3 @@ +@@ -77,3 +77,3 @@ "@vscode/iconv-lite-umd": "0.7.0", -- "@vscode/policy-watcher": "^1.3.0", -+ "@vscodium/policy-watcher": "^1.3.0-2503300035", +- "@vscode/policy-watcher": "^1.3.2", ++ "@vscodium/policy-watcher": "^1.3.2-252465", "@vscode/proxy-agent": "^0.32.0", diff --git a/src/vs/base/test/node/uri.perf.data.txt b/src/vs/base/test/node/uri.perf.data.txt index ee0a24b..881ce36 100644 diff --git a/patches/report-issue.patch b/patches/report-issue.patch index 544a90d..7cd00ba 100644 --- a/patches/report-issue.patch +++ b/patches/report-issue.patch @@ -8,15 +8,15 @@ index 447f4c9..1118f18 100644 +- !!APP_NAME!! version: \`${this._productService.version}\`\n\n${message}`); diff --git a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts -index c5074ca..5fb3fa4 100644 +index 3d7653e..7dbd60b 100644 --- a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts +++ b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts -@@ -663,3 +663,3 @@ export class BaseIssueReporterService extends Disposable { +@@ -665,3 +665,3 @@ export class BaseIssueReporterService extends Disposable { if (title) { - this.searchDuplicates(title, issueDescription); + this.searchGitHub('!!GH_REPO_PATH!!', title); } else { -@@ -755,33 +755,2 @@ export class BaseIssueReporterService extends Disposable { +@@ -757,33 +757,2 @@ export class BaseIssueReporterService extends Disposable { - @debounce(300) - private searchDuplicates(title: string, body?: string): void { @@ -50,14 +50,14 @@ index c5074ca..5fb3fa4 100644 - } - private displaySearchResults(results: SearchResult[]) { -@@ -877,4 +846,4 @@ export class BaseIssueReporterService extends Disposable { +@@ -879,4 +848,4 @@ export class BaseIssueReporterService extends Disposable { sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true)); - sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "Visual Studio Code"), false)); - sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VS Code extension"), false)); + sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "!!APP_NAME!!"), false)); + sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A !!APP_NAME!! extension"), false)); if (this.product.reportMarketplaceIssueUrl) { -@@ -965,3 +934,3 @@ export class BaseIssueReporterService extends Disposable { +@@ -967,3 +936,3 @@ export class BaseIssueReporterService extends Disposable { hide(descriptionTextArea); - reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VS Code")); + reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of !!APP_NAME!!")); @@ -72,9 +72,14 @@ index 0bbd8ac..3f35022 100644 +!!APP_NAME!! version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion} OS version: ${this._data.versionInfo && this._data.versionInfo.os} diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts -index e739f44..573fa7c 100644 +index e739f44..0024f74 100644 --- a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts +++ b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts +@@ -14,3 +14,3 @@ const sendExperimentsLabel = escape(localize('sendExperiments', "Include A/B exp + const sendExtensionData = escape(localize('sendExtensionData', "Include additional extension info")); +-const acknowledgementsLabel = escape(localize('acknowledgements', "I acknowledge that my VS Code version is not updated and this issue may be closed.")); ++const acknowledgementsLabel = escape(localize('acknowledgements', "I acknowledge that my !!APP_NAME!! version is not updated and this issue may be closed.")); + const reviewGuidanceLabel = localize( // intentionally not escaped because of its embedded tags @@ -19,3 +19,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it comment: [ - '{Locked=""}', diff --git a/patches/update-electron.patch b/patches/update-electron.patch index a37ae2c..b9bf50e 100644 --- a/patches/update-electron.patch +++ b/patches/update-electron.patch @@ -1,205 +1,206 @@ diff --git a/.npmrc b/.npmrc -index 71d98e6..b568b8e 100644 +index 05f84f8..62dbfd8 100644 --- a/.npmrc +++ b/.npmrc @@ -1,3 +1,3 @@ disturl="https://electronjs.org/headers" --target="34.3.2" -+target="34.3.3" - ms_build_id="11161073" +-target="34.5.1" ++target="34.5.4" + ms_build_id="11369351" diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt -index d390d7a..fd80964 100644 +index 9bfbc95..086fa93 100644 --- a/build/checksums/electron.txt +++ b/build/checksums/electron.txt @@ -1,75 +1,75 @@ --c9b82c9f381742e839fea00aeb14f24519bcaf38a0f4eed25532191701f9535b *chromedriver-v34.3.2-darwin-arm64.zip --d556c1e2b06f1bf131e83c2fb981de755c28e1083a884d257eb964815be16b0c *chromedriver-v34.3.2-darwin-x64.zip --1cabad4f3303ac2ff172a9f22185f64944dbaa6fc68271609077158eaefdee35 *chromedriver-v34.3.2-linux-arm64.zip --4213ce52c72ef414179b5c5c22ae8423847ff030d438296bd6c2aac763930a7b *chromedriver-v34.3.2-linux-armv7l.zip --3c64c08221fdfc0f4be60ea8b1b126f2ecca45f60001b63778522f711022c6ea *chromedriver-v34.3.2-linux-x64.zip --e8388734d88e011cb6cd79795431de9206820749219d80565ee49d90501d2bf3 *chromedriver-v34.3.2-mas-arm64.zip --3ad1dd37bd6e0bb37e8503898db7aedd56bd5213e6d6760b05c3d11f4625062b *chromedriver-v34.3.2-mas-x64.zip --d567b481a0f5d88e84bba7718f89fb08f56363bfc4cb5914e1c2086358a5c252 *chromedriver-v34.3.2-win32-arm64.zip --df6732e9dc61cb20a3c0b2a2de453aac7e2bd54e7cbff43512afa614852c15fa *chromedriver-v34.3.2-win32-ia32.zip --dda0765c8d064924632e18cd152014ecd767f3808fc51c8249a053bfb7ca70a2 *chromedriver-v34.3.2-win32-x64.zip --1945f15caff98f2e0f1ee539c483d352fb8d4d0c13f342caa7abe247676d828c *electron-api.json --c078bbf727b3c3026f60e07a0f4643b85c06c581b54be017d0a6c284ba6772d3 *electron-v34.3.2-darwin-arm64-dsym-snapshot.zip --35f587754d6a3272606258386bf73688d63dd53c7e572d3a7cbaae6f3f60bdae *electron-v34.3.2-darwin-arm64-dsym.zip --08b14ee02c98353de3c738120dfd017322666e82b914a7f6de9b9888dcc5c0f0 *electron-v34.3.2-darwin-arm64-symbols.zip --2a4aa7e8fa30f229e465ebd18d3e4722e2b41529dc51a68a954d333a7e556ffe *electron-v34.3.2-darwin-arm64.zip --1509ccdeb80024f5e3edd5ecf804b4cef4e47ea2bd74e33ef0b39044b0ccf892 *electron-v34.3.2-darwin-x64-dsym-snapshot.zip --3bbe5d587c3f582ed8c126b0fb635cc02ad9a14d077b04892fe6f862092445b0 *electron-v34.3.2-darwin-x64-dsym.zip --fa7ece82e6ecaf1c94ed341e8ebff98e64687c68fe113f52cd9a21400302e22f *electron-v34.3.2-darwin-x64-symbols.zip --23938c62257a65a863ed7aa7c7966ba5f257a7d3dc16c78293e826962cc39c5c *electron-v34.3.2-darwin-x64.zip --0547eecf8ab538d74fa854f591ce8b888a3dbb339256d2db3038e7bb2c6dd929 *electron-v34.3.2-linux-arm64-debug.zip --676d0dc2b1c1c85c8b2abbb8cd5376ee22ecdb910493b910d9ae5a998532136a *electron-v34.3.2-linux-arm64-symbols.zip --774e4ccb39d553e5487994a9f8c60774a90f08cdb049ff65f3963fc27c969ff2 *electron-v34.3.2-linux-arm64.zip --0547eecf8ab538d74fa854f591ce8b888a3dbb339256d2db3038e7bb2c6dd929 *electron-v34.3.2-linux-armv7l-debug.zip --ba33bf53fcb35dea568a2795f5b23ecf46c218abe8258946611c72a1f42f716c *electron-v34.3.2-linux-armv7l-symbols.zip --73ae92c8fffb351d3a455569cf57ce9a3f676f42bf61939c613c607fe0fc3bfb *electron-v34.3.2-linux-armv7l.zip --e61a9a69dd7ea6f2687708a8e83516670cdea53c728226e598e2f6f1fad5b77b *electron-v34.3.2-linux-x64-debug.zip --f1a04df7fe67dd1cd29e7b87871525458d2eb24c0cf3b5835a1c56974707562a *electron-v34.3.2-linux-x64-symbols.zip --7b74c0c4fae82e27c7e9cbca13e9763e046113dba8737d3e27de9a0b300ac87e *electron-v34.3.2-linux-x64.zip --8571a6aa83e00925ceb39fdc5a45a9f6b9aa3d92fd84951c6f252ed723aea4ae *electron-v34.3.2-mas-arm64-dsym-snapshot.zip --477410c6f9a6c5eeaedf376058a02c2996fc0a334aa40eeec7d3734c09347f4d *electron-v34.3.2-mas-arm64-dsym.zip --c2e62dcd6630cb51b2d8e2869e74e47d29bda785521cea6e82e546d0fc58aabb *electron-v34.3.2-mas-arm64-symbols.zip --a1698e8546a062fd59b7f8e5507a7f3220fb00b347f2377de83fc9a07f7f3507 *electron-v34.3.2-mas-arm64.zip --741a24ac230a3651dca81d211f9f00b835c428a5ed0c5f67d370d4e88b62f8d6 *electron-v34.3.2-mas-x64-dsym-snapshot.zip --aeff97ec9e5c9e173ac89e38acd94476025c5640d5f27be1e8c2abd54398bab3 *electron-v34.3.2-mas-x64-dsym.zip --9f14b66b1d612ac66697288e8763171c388f7f200854871a5f0ab464a6a921c2 *electron-v34.3.2-mas-x64-symbols.zip --c979d7e7175f1e8e03ca187997d4c156b878189fc3611b347fadebcb16f3e027 *electron-v34.3.2-mas-x64.zip --f43c700641e8220205dd356952e32718d113cf530520c4ed7209b59851eac266 *electron-v34.3.2-win32-arm64-pdb.zip --3ba6e01c99bffac6b5dd3fd6f122ecdb571cf6f675dc5498c65050bd7a382ef8 *electron-v34.3.2-win32-arm64-symbols.zip --c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.3.2-win32-arm64-toolchain-profile.zip --9b9cb65d75a16782088b492f9ef3bb4d27525012b819c12bf29bd27e159d749b *electron-v34.3.2-win32-arm64.zip --1006e7af4c149114b5ebc3497617aaa6cd1bb0b131e0a225fd73709ff308f9c5 *electron-v34.3.2-win32-ia32-pdb.zip --1ecb6430cd04454f08f557c9579163f3552144bfcc0b67b768dad8868b5b891d *electron-v34.3.2-win32-ia32-symbols.zip --c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.3.2-win32-ia32-toolchain-profile.zip --d004fd5f853754001fafaec33e383d1950b30c935ee71b297ec1c9e084355e9b *electron-v34.3.2-win32-ia32.zip --4e0721552fd2f09e9466e88089af8b965f1bfbc4ae00a59aaf6245b1d1efabfd *electron-v34.3.2-win32-x64-pdb.zip --9dea812a7e7cd0fb18e5fed9a99db5531959a068c24d3c0ecedceb644cd3ffa0 *electron-v34.3.2-win32-x64-symbols.zip --c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.3.2-win32-x64-toolchain-profile.zip --1785e161420fb90d2331c26e50bba3413cae9625b7db3c8524ea02ade631efba *electron-v34.3.2-win32-x64.zip --722b304c31ddac58b0083d94a241c5276464f04bd8ea4fcbfd33051d197be103 *electron.d.ts --31ce159b2e47d1de5bc907d8e1c89726b0f2ba530ec2e9d7a8e5c723b1ccf6e0 *ffmpeg-v34.3.2-darwin-arm64.zip --565539bac64a6ee9cf6f188070f520210a1507341718f5dc388ac7c454b1e1d5 *ffmpeg-v34.3.2-darwin-x64.zip --6006ea0f46ab229feb2685be086b0fafd65981e2939dd2218a078459c75ab527 *ffmpeg-v34.3.2-linux-arm64.zip --9404ce2e85df7c40f809f2cf62c7af607de299839fe6b7ae978c3015500abcc8 *ffmpeg-v34.3.2-linux-armv7l.zip --79aec96898b7e2462826780ee0b52b9ab299dc662af333e128a34fd5ddae87f1 *ffmpeg-v34.3.2-linux-x64.zip --9190743c78210574faf5d5ecb82a00f8fa15e5f2253378cb925a99ca9d39961b *ffmpeg-v34.3.2-mas-arm64.zip --48915adcb1a6342efeda896035101300f0432c0304cfb38f2378e98c6309ebae *ffmpeg-v34.3.2-mas-x64.zip --745d5ef786de6d4a720475079836e2fda7b501cfcd255819485a47de5b24b74e *ffmpeg-v34.3.2-win32-arm64.zip --d0d86d60978439dc8ae4a723d4e4c1f853891d596bfd84033440a232fa762e2f *ffmpeg-v34.3.2-win32-ia32.zip --4441539fd8c9cbe79880ff1bade9bdc0c3744c33d7409130af6404e57ee401ff *ffmpeg-v34.3.2-win32-x64.zip --39edd1eeefe881aa75af0e438204e0b1c6e6724e34fa5819109276331c0c2c9a *hunspell_dictionaries.zip --20dd417536e5f4ebc01f480221284c0673729c27b082bc04e2922f16cd571719 *libcxx-objects-v34.3.2-linux-arm64.zip --7e53c5779c04f895f8282c0450ec4a63074d15a0e910e41006cfea133d0288af *libcxx-objects-v34.3.2-linux-armv7l.zip --92e2283c924ab523ffec3ea22513beaab6417f7fc3d570f57d51a1e1ceb7f510 *libcxx-objects-v34.3.2-linux-x64.zip --9bf3c6e8ad68f523fe086fada4148dd04e5bb0b9290d104873e66f2584a5cf50 *libcxx_headers.zip --34e4b44f9c5e08b557a2caed55456ce7690abab910196a783a2a47b58d2b9ac9 *libcxxabi_headers.zip --11f67635e6659f9188198e4086c51b89890b61a22f6c17c99eff35595ee8f51d *mksnapshot-v34.3.2-darwin-arm64.zip --c0add9ef4ac27c73fa043d04b4c9635fd3fd9f5c16d7a03e961864ba05252813 *mksnapshot-v34.3.2-darwin-x64.zip --6262adf86a340d8d28059937b01ef1117b93212e945fddbceea5c18d7e7c64f0 *mksnapshot-v34.3.2-linux-arm64-x64.zip --f7db8ebe91a1cc8d24ef6aad12949a18d8e4975ac296e3e5e9ecd88c9bccb143 *mksnapshot-v34.3.2-linux-armv7l-x64.zip --6642038e86bda362980ff1c8973a404e2b02efdd87de9e35b650fc1e743833da *mksnapshot-v34.3.2-linux-x64.zip --15883bf8e8cd737c3682d1e719d7cbac92f50b525681aac324dca876861dfc7d *mksnapshot-v34.3.2-mas-arm64.zip --4da23a950bfcc377ef21c37d496017ab4c36da03f3b41049ac114042c42608ce *mksnapshot-v34.3.2-mas-x64.zip --fab59573d3c2f9bdf31146a1896d24ac0c51f736aad86d2f3c7ecef13c05a7fd *mksnapshot-v34.3.2-win32-arm64-x64.zip --66f25e07c6f8d5d2009577a129440255a3baf63c929a5b60b2e77cd52e46105b *mksnapshot-v34.3.2-win32-ia32.zip --8168bfbf61882cfac80aed1e71e364e1c7f2fccd11eac298e6abade8b46894ea *mksnapshot-v34.3.2-win32-x64.zip -+aa80917205c7bf0c3fa01c4c9246415d1668836ba8244509e495d67fa197f383 *chromedriver-v34.3.3-darwin-arm64.zip -+7ba6b42a5fba86391c3f496db885fd240b22e8fa80790747a11697dab80ef099 *chromedriver-v34.3.3-darwin-x64.zip -+6c99a95b2c9fc98636678c44477f11c39e2603d93211f41e788442445a210020 *chromedriver-v34.3.3-linux-arm64.zip -+b1c0ebc724e8e833201b23348477f348086cfd102879d6c1cc8269f72e177d72 *chromedriver-v34.3.3-linux-armv7l.zip -+999fb44c5877b34da0ee6e24eb0ce74e521ed47e84db107b6037488ec51d45f1 *chromedriver-v34.3.3-linux-x64.zip -+43787d7e7282046b1634eeda18f558b21598fe008be00aff4ad2192b213bcad3 *chromedriver-v34.3.3-mas-arm64.zip -+e395e75c795717fcda6ae96d50edd4ae4d2aa174ab0f5d912ad4d74ca18e2db5 *chromedriver-v34.3.3-mas-x64.zip -+6ceed62f0f3422688f85a5cd8a57f599f0ddbf7aa4d8d856e6cbbf906d18cce9 *chromedriver-v34.3.3-win32-arm64.zip -+613c0c193b9dc91f29ec510d4abb14bccc40a09e68fa29c72988afff4c302a37 *chromedriver-v34.3.3-win32-ia32.zip -+1f5cc9370e28921119806a13f660ebefdcdcd7bbe9cb27b60b72b43af5ceaf10 *chromedriver-v34.3.3-win32-x64.zip -+437ee8f12e620f0bb3c0bc95aa4fd9c673644ccd348da8750d17c3a721e86dd0 *electron-api.json -+796351cfbc61bb7f65ded4f7743ad8454eb8030e047ec1c283b1a9cb684cbcb8 *electron-v34.3.3-darwin-arm64-dsym-snapshot.zip -+94a4735a9be1c1d24f9504bf89af4fb7673fab2537c32d917c69b1095cde116f *electron-v34.3.3-darwin-arm64-dsym.zip -+eccc0bc609b3019f2b1277c897f8c7178eab1261c77fd9bc42c6b4495818ad5e *electron-v34.3.3-darwin-arm64-symbols.zip -+dab1531dc858b2f8b888182bc62272b4d7d40dc53cee97454779f37e1803acb3 *electron-v34.3.3-darwin-arm64.zip -+da0b8faf5f952883438b711f222f9b155e9d44a9b1a086d49062adf27ffee891 *electron-v34.3.3-darwin-x64-dsym-snapshot.zip -+9cc48f7ad70ef2e34f0667e6aa6ab8c87e6ce252e40f8f43a371004bdccc5309 *electron-v34.3.3-darwin-x64-dsym.zip -+b85de265e1904b52eeb46f2f0fbbab6d8a38c7d567c3b8bade174a417a415eae *electron-v34.3.3-darwin-x64-symbols.zip -+c515f2b65af0f2c0fd08c478e26801061a14d17decdb5dd40ed7a36fd03e0ff4 *electron-v34.3.3-darwin-x64.zip -+2273b5f177fb4621c2ef51f4eb980f16c59ebfcb9194129c007e42cec0f424ec *electron-v34.3.3-linux-arm64-debug.zip -+4de2795f92de253497e23582a3edf5e05093d8c4731efe17f3a8f8555fd6e964 *electron-v34.3.3-linux-arm64-symbols.zip -+26c5509e785b4e3117f9430e6b52ad1cb8c7dc83a3b7c7ad4b593c724fc334f2 *electron-v34.3.3-linux-arm64.zip -+2273b5f177fb4621c2ef51f4eb980f16c59ebfcb9194129c007e42cec0f424ec *electron-v34.3.3-linux-armv7l-debug.zip -+f3c5140cd91c6409f6f03ddc46dcc2b2faae939eee7b1504b6375b12dc0cef50 *electron-v34.3.3-linux-armv7l-symbols.zip -+26f50b1ef9bfb572fea3af20cdebae01112aaff69cf0933602d2c33de1a5e71a *electron-v34.3.3-linux-armv7l.zip -+802ce23b5b51e8bac1e516cfdfe3271dd0c43b06d076163bfef280520b019426 *electron-v34.3.3-linux-x64-debug.zip -+e6788941da28a26592e6e6805d6317ffcb03fcdc290d5ff64684b6e26df51750 *electron-v34.3.3-linux-x64-symbols.zip -+7ddd7e64846d72f90f62c4af29ce7930859b7d2ffac256c156e5bfa36f9e9b39 *electron-v34.3.3-linux-x64.zip -+c7e9bb42a531c05ae67fa140fdcd693e6151cd67f79ae638eaeab3e0a902b455 *electron-v34.3.3-mas-arm64-dsym-snapshot.zip -+c050a4c452c21cc9f282a55dfe14b38445ab412a18b4c7e5bfe4acaa82a25561 *electron-v34.3.3-mas-arm64-dsym.zip -+321fc702cdadd62934adfd784571df47f33b61e9a0e7947202e987284088858b *electron-v34.3.3-mas-arm64-symbols.zip -+25639cf358579239f557b881596b29637ece5f8274e321172095ff8a380fcaa0 *electron-v34.3.3-mas-arm64.zip -+00bf6ac7b417d12a8cda5d7984ee17ac3ec142bed3ddae6721e7b4dd529c898f *electron-v34.3.3-mas-x64-dsym-snapshot.zip -+b887fa367726758353d63b9f3c14b3107bda7b340b36a62e2a9e154c38d91ea7 *electron-v34.3.3-mas-x64-dsym.zip -+93c0d7b8cd540398381217dee09a0b78c463c0ff1dedd22b77fbfb66f0e3fa7a *electron-v34.3.3-mas-x64-symbols.zip -+9426fd9f5dd50e1a946ffe388c87813ea6d18117881c5db12b0e91abd707a116 *electron-v34.3.3-mas-x64.zip -+5ebc2819b9a38713c77c26624204226739cbc9e79c3783700046ebf9d4beb885 *electron-v34.3.3-win32-arm64-pdb.zip -+10826d6f46ef2cc9141714697485431f4639689dea9b156fe33e5e4545de5e79 *electron-v34.3.3-win32-arm64-symbols.zip -+c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.3.3-win32-arm64-toolchain-profile.zip -+abd8f7ddfcd51cccfc5e57eca6863cfa5d431da92d38ad9f50be40e70d111ea7 *electron-v34.3.3-win32-arm64.zip -+e99bbaf33a9ee394175fa7788e82264ceaf6cbb3905835cba806ce8696b720aa *electron-v34.3.3-win32-ia32-pdb.zip -+aed5e8365ef671706674a1af39ca8721b92cc853675ea1b79a4cecff2213d43b *electron-v34.3.3-win32-ia32-symbols.zip -+c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.3.3-win32-ia32-toolchain-profile.zip -+9a3741604a2e4140bdab28639f508efb2f08a449b338e40b03beb6ae0e467663 *electron-v34.3.3-win32-ia32.zip -+9b1fe05d6391da8358a16c5ab53447d7884c7f6c7a19f61299d0db0cdd14486e *electron-v34.3.3-win32-x64-pdb.zip -+c6439b0f3c3d21d2b5cc9738e6d47f02749b8d9e6aab035f13e5ec7dcb98bd99 *electron-v34.3.3-win32-x64-symbols.zip -+c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.3.3-win32-x64-toolchain-profile.zip -+aefae0491c5e5307d15b91573d2f1d02613c65e342812cf595d14bd7a0a1a194 *electron-v34.3.3-win32-x64.zip -+ef32fc93b969732f26817d2ef985692ed51bd9ae9727cb9c66f8b3e26d1eb408 *electron.d.ts -+a4b3c26ed5e4a7bc70089eacf2f255e010e0222176fedc5d99854ce467bd348b *ffmpeg-v34.3.3-darwin-arm64.zip -+8e9367cede8dcd2be6912d82b5022c866cf9d9ced5a784a9081aedfb59c3d6ff *ffmpeg-v34.3.3-darwin-x64.zip -+346101611df565cabcfaa3515b1db3f70d0891ba8f1241074dd09b69e12630d2 *ffmpeg-v34.3.3-linux-arm64.zip -+5c77c712ee93bd26706daa78f0651d9b4ba8e4b46a115908f29d2742a2e1b9f0 *ffmpeg-v34.3.3-linux-armv7l.zip -+f5ab70d399d528450c9499966e88ce02a368bb8c7dd7ac0676a6628fa29b3f14 *ffmpeg-v34.3.3-linux-x64.zip -+663996797979660ca83880548a4cc02220deb806710192ce1b2481949d1ab5c2 *ffmpeg-v34.3.3-mas-arm64.zip -+4b5c1bbceca58ab7ea82d364493e7b714a8fe2da789925f637c5b2eb12abf0f4 *ffmpeg-v34.3.3-mas-x64.zip -+5aa8309552ac4782c6a3fc1e27e8575e3d4e2c6f1fd0c915dd2861885b3880df *ffmpeg-v34.3.3-win32-arm64.zip -+ad83515a248cd2be57565e7be98cae57faf89797e3522f7d0abf305243176954 *ffmpeg-v34.3.3-win32-ia32.zip -+1b74d1fd0121046c668f23eb6a47bb398ce7b1e1cb7a8d10ba69e95db9d061b9 *ffmpeg-v34.3.3-win32-x64.zip -+0dd294d40e50146122afaeb05cdd57021be404b084229bbb1fdac21ec94c62c7 *hunspell_dictionaries.zip -+869ce66958a2c099b173afc26b4ab6b0ef6d9a3082dd46883ee01a65a43bb19e *libcxx-objects-v34.3.3-linux-arm64.zip -+a5f4cf99a84c36824317cd625f48ab3587cc86f11bbebb7c5de31ca0b692aab7 *libcxx-objects-v34.3.3-linux-armv7l.zip -+9c3325a43c3271b8affa832520a5c3595c517608cd9707973e1da7015579230c *libcxx-objects-v34.3.3-linux-x64.zip -+0e1e781ee022e68dc876e0713e03ce0d8706001926275314f55a44bd73f9c1d7 *libcxx_headers.zip -+006ccb83761a3bf5791d165bc9795e4de3308c65df646b4cbcaa61025fe7a6c5 *libcxxabi_headers.zip -+5f586160ab7ef70682759e504c519b9b51d65dc38ac50bba475850a5b6068c36 *mksnapshot-v34.3.3-darwin-arm64.zip -+67abd54930cf425d09fe501c399e658076908e611683b95e16fed33022171b72 *mksnapshot-v34.3.3-darwin-x64.zip -+dbc9f3b60dea2c3112ba09e34d1c9de64a44c40372c5c8fc549d0fd3063c71f1 *mksnapshot-v34.3.3-linux-arm64-x64.zip -+82ca1f76bfd855112554737c93bc8004d3aa2e4832e1cd840304cfee01fc667d *mksnapshot-v34.3.3-linux-armv7l-x64.zip -+53dd3fc0219da0a0bbd02e459343b4cb5b6120d2beb200cf4e68b5a5da6e6511 *mksnapshot-v34.3.3-linux-x64.zip -+71a4739dbde61a1da48a1a9e9379e06aaf1784a2ca69e77cf2b02cf9ba812b5c *mksnapshot-v34.3.3-mas-arm64.zip -+ad72337792d08c37a812a6c64d669e908370e627b7bd00eedd7ea5fa224fbadc *mksnapshot-v34.3.3-mas-x64.zip -+ff58fe3b53681970e58acaca92c3e3f0a9586c3a262350bad973910792bd779c *mksnapshot-v34.3.3-win32-arm64-x64.zip -+df40ee34d993c7dc171c5b953cbdd88d9c1eadd258d2dba566c0ef315a2143ab *mksnapshot-v34.3.3-win32-ia32.zip -+cde7f12a9e271ee300c0f515b61d7cfb8a9ee62b4804a28f8f330f4d85047f68 *mksnapshot-v34.3.3-win32-x64.zip +-249f89d35cb6bd74edc07551b141bffc2045847c4cf9e57e21089d5082bdb4b4 *chromedriver-v34.5.1-darwin-arm64.zip +-7ff68fd26f225deaa8c6fbcd76dc80a00f9ef73f9118075f3e2ab54dfb0c810e *chromedriver-v34.5.1-darwin-x64.zip +-749f692603527e8743c81d05eb2de2e281e2b03b148ec00379f13e8da17ca7a4 *chromedriver-v34.5.1-linux-arm64.zip +-14bcc062457cf31d606451aa7fae1baae720a944dead06231fe2a55f17d39966 *chromedriver-v34.5.1-linux-armv7l.zip +-57cf85eb9dafe28ccdd8ba4a095cb1fd5b8c71f0743bf532b132bc45e56630ef *chromedriver-v34.5.1-linux-x64.zip +-e90e10cf45f4aaba1d8b763279b7c4b85e1132bdc9faef834ffda41ee1460df8 *chromedriver-v34.5.1-mas-arm64.zip +-1206e1c71ec0360be9531e48c0292ffac37e40d8d7a48dd38f1108d3d3ccc0c0 *chromedriver-v34.5.1-mas-x64.zip +-1b226994cfa02663f23edfb0c8a4d3e218b7c4d037a90bbb4800a7c396b67d9f *chromedriver-v34.5.1-win32-arm64.zip +-dc38291ccad6f715a82cc2ce0cfffe3bb37612fa86013d405e878ea74e4c5fb8 *chromedriver-v34.5.1-win32-ia32.zip +-3ccc7e4b65adde12e26b7affeea30b9597b8841fc2a4d3c50c042e80b85853ac *chromedriver-v34.5.1-win32-x64.zip +-71fe75d29208ca9e38754d903af4d5d6e80c62b04097605c36ebf722c2447842 *electron-api.json +-009c833bd014b6f873974c5d3189905e705ebcb188a90ae05b60ea252319a46e *electron-v34.5.1-darwin-arm64-dsym-snapshot.zip +-c5f5722c55e75e9860cb203e03626c04f30f272ef17b735946fd723600ee07ea *electron-v34.5.1-darwin-arm64-dsym.zip +-06de49512ac4b0b4e374bdcd296e8c70584fb47207bb6caed9122e3cef5da8f7 *electron-v34.5.1-darwin-arm64-symbols.zip +-78411442b5bd2252cf4605b6a44c35ad6a06807d03c63c61726ad7693c6d5893 *electron-v34.5.1-darwin-arm64.zip +-e90b292974251336ae8990a74977065ac4dd6388836ccd1cfee3a1599a37bd39 *electron-v34.5.1-darwin-x64-dsym-snapshot.zip +-35a0ac52f6036cd0a7d4bc9848477b653095b210497e36797427ff8fe3194c7f *electron-v34.5.1-darwin-x64-dsym.zip +-0457bb7413c770245912342a6dd07c3588f586e8d868e0dd534179e22b07898c *electron-v34.5.1-darwin-x64-symbols.zip +-8d4bc5f4495ef952589891b6c70a86d8a9d143a1d4d90d15dd81926639822031 *electron-v34.5.1-darwin-x64.zip +-73be60acd1f3773f87b283eef8c26e257f16efd46a179c143311b1b9fcb4a61a *electron-v34.5.1-linux-arm64-debug.zip +-53677a8f437b36b79481eb6c6f9f7557606af04ef94cce751620e8206dad36a8 *electron-v34.5.1-linux-arm64-symbols.zip +-4c0d5833faa01cc3a586087b82f719c2fe331515d26bb3fa098dc79bd3ea153f *electron-v34.5.1-linux-arm64.zip +-73be60acd1f3773f87b283eef8c26e257f16efd46a179c143311b1b9fcb4a61a *electron-v34.5.1-linux-armv7l-debug.zip +-6eb39e79bd52f566d18a1140242c7484b89d7cd77573b92fc2e2993b51d6fbf1 *electron-v34.5.1-linux-armv7l-symbols.zip +-7ed517eeaff56960a01fe53fc445e4118135eeb8267d61c37ef9df943dcc35fb *electron-v34.5.1-linux-armv7l.zip +-582a2206cf1e09baa8511ca21b697cc49fddd76ef7723406b449b130b3d21730 *electron-v34.5.1-linux-x64-debug.zip +-7b5d60f3d6c4ef84b0855148f14295624527cc27ab395bf54640a06eb3f7a5b0 *electron-v34.5.1-linux-x64-symbols.zip +-3ae6f75fa08f5c1bdb7bbcec4dc9cf7d7f53ffcf6a4292e4a482b2ce515505e7 *electron-v34.5.1-linux-x64.zip +-e6ff5c411167c0cf8c82cd737f8d0c863f4371e8e1fe213d04b502584411d239 *electron-v34.5.1-mas-arm64-dsym-snapshot.zip +-8d1cb700f23d8ac7ec078d4d5d07018dfae594346e7bc5652356a5fe242a2b44 *electron-v34.5.1-mas-arm64-dsym.zip +-3b74614ef81382e63f189aceb87f6c3830a23ffed046d06f672d0c1a1b361e96 *electron-v34.5.1-mas-arm64-symbols.zip +-eabc29959b914f623f5f2e4011cb4e35182ed9528dc30664e59ca37c806c1d7d *electron-v34.5.1-mas-arm64.zip +-ee3de3f5a96efb0197022557ec2de36d92d7423426636577864b1ae744053dea *electron-v34.5.1-mas-x64-dsym-snapshot.zip +-a3db9cc489720701e3f35d2f7425c97e24f74fdb78a38bc0950b68b3f82aebb2 *electron-v34.5.1-mas-x64-dsym.zip +-a9131003b1ac4a3c3327ff405e1cd8f3e61dc8a73cfae3e05cb5eb0f2d872bee *electron-v34.5.1-mas-x64-symbols.zip +-1b44d42dbe9cb6bc5c2fb77f708d639e01f8ec6f74b95710fc6c8dbd70181f3b *electron-v34.5.1-mas-x64.zip +-4495d8bf4d3dbb5ebc3ad135f4658e09d706368d002af9f24d236e1a0a28e994 *electron-v34.5.1-win32-arm64-pdb.zip +-2c31fa61d24e736f3e327eba4d354c09471fba5aa277e215f7e2ea275b323a80 *electron-v34.5.1-win32-arm64-symbols.zip +-c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.5.1-win32-arm64-toolchain-profile.zip +-c0cff1c83094a430f1b202bb5035b51ebcefa54cd53d798bb63de9cb96abf223 *electron-v34.5.1-win32-arm64.zip +-d662fb7afc288aa15d929fecbb391c7067448ea86b4bf01e941fa8da744a8167 *electron-v34.5.1-win32-ia32-pdb.zip +-2cd1f41a3297fc271e426bd0cc5f8c3474f73438a7a303186701cb7d8b26bdb6 *electron-v34.5.1-win32-ia32-symbols.zip +-c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.5.1-win32-ia32-toolchain-profile.zip +-cf86edf6cdb47d5cfb00c4eb68f7a18d70bf9e33f1f6a0481d51673cf6af7050 *electron-v34.5.1-win32-ia32.zip +-9dd0e6f6ef53f8bd4d7ecd97a3bfc7e8a98de8771986071692afc57d57d199d6 *electron-v34.5.1-win32-x64-pdb.zip +-f50ab96420bddd43bd5dbd56130cfcd69eea2dba18bfd3c8c3b4bb189bb033e6 *electron-v34.5.1-win32-x64-symbols.zip +-c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.5.1-win32-x64-toolchain-profile.zip +-da606d1a085a52ddf5592110b58284fc3bf49f273f6f2e7d6a8341c98af8498e *electron-v34.5.1-win32-x64.zip +-793ae7822cbdad6270c318f3c93c0e8b4f9276dea6dd87db2d1297cadc7381c6 *electron.d.ts +-1d1465b4f6a3919a6e8e2fb8612b29f61b09d80f386a8fa2b806859b9be0d0bf *ffmpeg-v34.5.1-darwin-arm64.zip +-e138b6422dd1648cbe817b99f59476c65ed9946d50e50094124eae660b416378 *ffmpeg-v34.5.1-darwin-x64.zip +-346101611df565cabcfaa3515b1db3f70d0891ba8f1241074dd09b69e12630d2 *ffmpeg-v34.5.1-linux-arm64.zip +-5c77c712ee93bd26706daa78f0651d9b4ba8e4b46a115908f29d2742a2e1b9f0 *ffmpeg-v34.5.1-linux-armv7l.zip +-f5ab70d399d528450c9499966e88ce02a368bb8c7dd7ac0676a6628fa29b3f14 *ffmpeg-v34.5.1-linux-x64.zip +-10e3424c01b946274fa8c651d4ea79032637feca4c8712ebb1c00f392711594f *ffmpeg-v34.5.1-mas-arm64.zip +-4db0373915c2c2a055bd04755acdbcd08e00456f1fb92fefc0e05cd7fb48e4fa *ffmpeg-v34.5.1-mas-x64.zip +-c8cca82fc9315f86ffb60b39e824ebec7f98361f8773ea0618d9feea92b88412 *ffmpeg-v34.5.1-win32-arm64.zip +-c8cca82fc9315f86ffb60b39e824ebec7f98361f8773ea0618d9feea92b88412 *ffmpeg-v34.5.1-win32-ia32.zip +-c8cca82fc9315f86ffb60b39e824ebec7f98361f8773ea0618d9feea92b88412 *ffmpeg-v34.5.1-win32-x64.zip +-9ae3a56bf29d9704cd8cf32924aad89414f28d439e61dd54bdd8b4259b8d0b1d *hunspell_dictionaries.zip +-691e23913b7dbde1f9c9b6e9f13f06353d5c7927cbab6d48b7de43e76e5eacd8 *libcxx-objects-v34.5.1-linux-arm64.zip +-eaaa18779a96873daeece21c7c823d1f5d4759f8eca79dbbbf2055635df6112f *libcxx-objects-v34.5.1-linux-armv7l.zip +-6a2e3dfcea9d0582ecbc2a6be124f0e830e2194111bd9aa6a9843cb956c946c4 *libcxx-objects-v34.5.1-linux-x64.zip +-d4b70d94523ebd770009dba04c842450539a9bdc856de660a7391620d3bcc1fb *libcxx_headers.zip +-0ed01bc1908fd8f7519ccdf636b5732c6fe2c095a6dc35a13eb6c79b9e87d7d1 *libcxxabi_headers.zip +-f633cd0df0b08a15938ccdc77480bc28eb96fd85936ef76c343cc3f47fe74f3c *mksnapshot-v34.5.1-darwin-arm64.zip +-a8643285a2386960ceb608ff34d6dac33942142e821e2e0c670b282389a87e53 *mksnapshot-v34.5.1-darwin-x64.zip +-70863b79d4b7ab75d013a9192f7b23165e3e523b243632c7b55418767527e022 *mksnapshot-v34.5.1-linux-arm64-x64.zip +-c30319434ea16416c38bbdf847432fd37fd8e1aa78c1c22b6345d02e3743c016 *mksnapshot-v34.5.1-linux-armv7l-x64.zip +-e882e32b67501d36710da396167274158c1940afe67459ffa1d9df534a8f6df1 *mksnapshot-v34.5.1-linux-x64.zip +-af1d08dbd3c572ae10db0d24203a28d83c87e92e966064134ec5d7770c74e3ac *mksnapshot-v34.5.1-mas-arm64.zip +-238058875abebcb9233e609fadad76e85b79530f1bdfb60498b144fec82ff8fc *mksnapshot-v34.5.1-mas-x64.zip +-779e494cf2088ee386bb3ffd68d5efc2de3d43e5a2e6a5a768638799c460fdab *mksnapshot-v34.5.1-win32-arm64-x64.zip +-9f9790fab86209ca76ecfae3e20dc028bc0e49574872f6ac17b8856093811357 *mksnapshot-v34.5.1-win32-ia32.zip +-5c39077fd59426108f15e4981c7be5ebe56aa706b9d166853225de882fee8d6e *mksnapshot-v34.5.1-win32-x64.zip ++f68064647df820d9f207d039850cb055fddb2539a8b01838a5af787d9413dde1 *chromedriver-v34.5.4-darwin-arm64.zip ++7bf6fe1aa4be3a9b8a6583667a8c81c1bb7e01ec62a886c2fecd1fac108fa8ab *chromedriver-v34.5.4-darwin-x64.zip ++d5eb1a8e1748b74341acab18eb928a5e139f9a530e153c1c59b6e8383ff284bd *chromedriver-v34.5.4-linux-arm64.zip ++5d8f205a4b326b65528bf24988457129d40f5c393b0af43410d28e252bc2170d *chromedriver-v34.5.4-linux-armv7l.zip ++08d86fb4cd0a2ae190ef43de117fa8a1b02079b302709fc0d3d7df5b60869429 *chromedriver-v34.5.4-linux-x64.zip ++8ef6b029dbb939162ef43bfceffd14f36f4674c6ac28daf2be9f29fd58eab343 *chromedriver-v34.5.4-mas-arm64.zip ++53318dcb6d29f9e23efe88fda1fc88bc9d22aaa588538bfde42ecbc9f8c61306 *chromedriver-v34.5.4-mas-x64.zip ++130d0fc9f96c83486ee8e37121dc1a412bfa71f65aa8ad67f6f4e4ed30cc4d1e *chromedriver-v34.5.4-win32-arm64.zip ++00ef5fc423142150758fdb1968f0b0db996ae035c211df164e7af9422743dfae *chromedriver-v34.5.4-win32-ia32.zip ++01f6371487d173f0b2d8b41d7aab5affa9ac7f0cc5154f1ee39ba2120e36026d *chromedriver-v34.5.4-win32-x64.zip ++7cfbc13990047fe5917ad9cf3269f83c4759551a5c300011bf8eda3af96efabb *electron-api.json ++194074a282320343e0997c9071f70f64cafcd6113f7741a628c45249105a0801 *electron-v34.5.4-darwin-arm64-dsym-snapshot.zip ++cb2deebc1596cfdea6889f37c7827bcd31af9645209288b3a92d0f25b78761e8 *electron-v34.5.4-darwin-arm64-dsym.zip ++f2402094acdc73d8123a8535f623934948662316a340ec767c3ddfd75c73dd9b *electron-v34.5.4-darwin-arm64-symbols.zip ++92dc77f80fde9267ce2db8e7094c6e49b1766a19c3da90c25e2b5024b7a4501b *electron-v34.5.4-darwin-arm64.zip ++8ef7c227cce20a4da7dbfc85f83f4d1af0a8d698cc9e8cea8487571e412b1591 *electron-v34.5.4-darwin-x64-dsym-snapshot.zip ++276dce4418ad0c630c82757a5242575eff67793a10151a65c0ed81965cbf2b1c *electron-v34.5.4-darwin-x64-dsym.zip ++a7a57b5e02f86e545dadf479e5c2652760c1cb2f9738e0f75f3d3db06e40ee1d *electron-v34.5.4-darwin-x64-symbols.zip ++c631318672a1b6ecc9835ccf1501562380728a044a78de2fa105608a6610fa01 *electron-v34.5.4-darwin-x64.zip ++fd49778abd8eb28b00241137db97c5c9eaf27a52aadcbff3b8832d1eedfec954 *electron-v34.5.4-linux-arm64-debug.zip ++cef68467ee2d5e4ed0f60c44168b0e1c885582e6ff2dc6773848b6983fee5c08 *electron-v34.5.4-linux-arm64-symbols.zip ++f4b4dcc92a0f4bf92c68571868dd13d49b33bca51f7b1352319f55f5abbf3505 *electron-v34.5.4-linux-arm64.zip ++fd49778abd8eb28b00241137db97c5c9eaf27a52aadcbff3b8832d1eedfec954 *electron-v34.5.4-linux-armv7l-debug.zip ++2a3a78b068ac2cbe223d9aec30012125586ea84e357ba05cab9def032ce649c5 *electron-v34.5.4-linux-armv7l-symbols.zip ++048256f513e036df0f056c32b249b0ca48f6c3c0481b1e6bdc686df409289f8d *electron-v34.5.4-linux-armv7l.zip ++6e108ee8b073619bf0760947f4a71c0846602aa18820593566362eaadc4f8ff5 *electron-v34.5.4-linux-x64-debug.zip ++cc962ac6ec063d6cb222892e0e0dc1d9efdb64ac2086790e35d61f035b6d31fd *electron-v34.5.4-linux-x64-symbols.zip ++c8c871ef0cf83e1e937afa620e9eb2fa7fc22f5a1302e9ec666923fc22bc0bd0 *electron-v34.5.4-linux-x64.zip ++4131d194d5e7be6e1c2b6e43fd115f679264df397a1bbf653c1bbbbb83109cc0 *electron-v34.5.4-mas-arm64-dsym-snapshot.zip ++c252bc1b97bcc50615ac3b1296152481b4deaa7f79f6b0e42a56614991695413 *electron-v34.5.4-mas-arm64-dsym.zip ++1a435e5c0db5a52b607b57e5627d2862d67826a732ce4c2db9ecc86ff843ffd0 *electron-v34.5.4-mas-arm64-symbols.zip ++a309cc5d77994e27c2bdd2d753642dd217e909ca0d1de336d2f72f4f89bdac6f *electron-v34.5.4-mas-arm64.zip ++4388832d22a4f10ced28ed15daa254cb3805dbb0e33f2816a74c7b82dca93926 *electron-v34.5.4-mas-x64-dsym-snapshot.zip ++c6d7c1b5c605db62b25bb5ee0bd6159b9e063019d970e418e3c5773c8074e6b6 *electron-v34.5.4-mas-x64-dsym.zip ++539cd04e89ad98afa71159ba6e7e001387a5fc22ca9a1421890d8be0e1cbf8bd *electron-v34.5.4-mas-x64-symbols.zip ++c8319f49a04c9de7792225847f0f52358c0cdeedbc83dd8edc1949d917d3d377 *electron-v34.5.4-mas-x64.zip ++e5331a5cf9d100982ae15dddad4abdaedf5d7976f325af4c39d5bdd094122880 *electron-v34.5.4-win32-arm64-pdb.zip ++3e87f89afc24ce72b8dd8b7df56561dd7a5474cfe8df3788a94bbc5cf446fd87 *electron-v34.5.4-win32-arm64-symbols.zip ++c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.5.4-win32-arm64-toolchain-profile.zip ++912346508a25c56a0f4a5eeda466bb145cabcbff9e68b0f8759bf8847e01dab3 *electron-v34.5.4-win32-arm64.zip ++f98be086997be9534e991a1374755cfcfbbf9f53a95ab17e9291ef224370da79 *electron-v34.5.4-win32-ia32-pdb.zip ++aaa12a153b0bb2746cf7acd8f994a2c714d27791393383e1e78403de16388131 *electron-v34.5.4-win32-ia32-symbols.zip ++c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.5.4-win32-ia32-toolchain-profile.zip ++19f272b112ad2b2468caa3a01ceaa0f4ab83e100a0decdda36b261c0b584e848 *electron-v34.5.4-win32-ia32.zip ++2bac4be5bed9eff8a7adb3732c112beaf06a643f8c8b91c02cf226101bee2ca3 *electron-v34.5.4-win32-x64-pdb.zip ++3eb34ea1553ccfbd33a95c65827dac1d07119ede1749b8010a113a1693b80394 *electron-v34.5.4-win32-x64-symbols.zip ++c23f84aabb09c24cd2ae759a547fdba4206af19a3bb0f4554a91cd9528648ad0 *electron-v34.5.4-win32-x64-toolchain-profile.zip ++42c05407af7584c9b8134647b7f217ae683c3a04991d3de7524094cceff95505 *electron-v34.5.4-win32-x64.zip ++9a321b11432efca3d64439b1a398911de27c33fab0d6c3458924f5c71088b046 *electron.d.ts ++9483ab113a02e4520c20ea9d1b4464f0f677a4f9a408b0df12632a9e3ef4bade *ffmpeg-v34.5.4-darwin-arm64.zip ++c2fb961e4219f41772c796db759703240bfea2251366e6a77580805a70a8ecfe *ffmpeg-v34.5.4-darwin-x64.zip ++346101611df565cabcfaa3515b1db3f70d0891ba8f1241074dd09b69e12630d2 *ffmpeg-v34.5.4-linux-arm64.zip ++5c77c712ee93bd26706daa78f0651d9b4ba8e4b46a115908f29d2742a2e1b9f0 *ffmpeg-v34.5.4-linux-armv7l.zip ++f5ab70d399d528450c9499966e88ce02a368bb8c7dd7ac0676a6628fa29b3f14 *ffmpeg-v34.5.4-linux-x64.zip ++c7d14c50640283759e21932d3c478b3bad01e15add490efb3fc18446c32a5fe1 *ffmpeg-v34.5.4-mas-arm64.zip ++944918f694a9c37a74faee19feb989c02b78aaf32bfaa945ccce688fa76126ce *ffmpeg-v34.5.4-mas-x64.zip ++39d841fb03d07e6831533c29bf55446f16a2116a5f02beb1022b68232bac6a55 *ffmpeg-v34.5.4-win32-arm64.zip ++39d841fb03d07e6831533c29bf55446f16a2116a5f02beb1022b68232bac6a55 *ffmpeg-v34.5.4-win32-ia32.zip ++39d841fb03d07e6831533c29bf55446f16a2116a5f02beb1022b68232bac6a55 *ffmpeg-v34.5.4-win32-x64.zip ++2caad55fb223f7aa9652f9b68ce29440c8c714e9be65ff657682dc4f9a05d67a *hunspell_dictionaries.zip ++f584b71abbbb021e1002fdc85d67773898219af2982209abfff4f92f8b255243 *libcxx-objects-v34.5.4-linux-arm64.zip ++51e2db3cb02ab656404d7a28beab866d07b59dc2cc3127e5984ec5397f0f43d8 *libcxx-objects-v34.5.4-linux-armv7l.zip ++6e6ca30cdedb38b9bfbcf79d8f14f466ab023145c464c1f75d581482e9fe601f *libcxx-objects-v34.5.4-linux-x64.zip ++3191ca448f1978a80181ab0e31ecd7c1fbfe9cd409018b82f3879c0b2b299fc7 *libcxx_headers.zip ++6afe922a6e3006d40a5342719af3d40de669bb4e03aa938816f3732901677407 *libcxxabi_headers.zip ++6d3bed9a1eb9e6692f9c936336d65d4cc1f43401b5570e75b8e2838605057f88 *mksnapshot-v34.5.4-darwin-arm64.zip ++8022267c02204f75495a23177a144af4bdce8a56aa89b918df127e4b98cb7e2d *mksnapshot-v34.5.4-darwin-x64.zip ++4901999d515c571a9882a50fb6b92e12423c6fe3775d1d7574bdaf8cc9fd32bd *mksnapshot-v34.5.4-linux-arm64-x64.zip ++723c47202c2553c930057328be3ddfcef53da9e71140e8ba581295e3000dde00 *mksnapshot-v34.5.4-linux-armv7l-x64.zip ++0e8b27412c7a223035d16599134f783e9d77b9372898e64b45401e9c3cace29a *mksnapshot-v34.5.4-linux-x64.zip ++2d194587b295c6119b690917c1508d7ed8ee6e2798778afd6de5114cae1bd9b9 *mksnapshot-v34.5.4-mas-arm64.zip ++8e3c743227136f327e928bca25d8fe16a8f003feb33bb936dda4fb1f20765a88 *mksnapshot-v34.5.4-mas-x64.zip ++669c3375bac1ee3b2c8737432d0d2a6e2dc4d44f0d9fa1aa6a1aaf10b6db8224 *mksnapshot-v34.5.4-win32-arm64-x64.zip ++3a54ef58fb4cfc3e2f4b006f96b260e2ac980203a653ad6c1d2bd24d004106dc *mksnapshot-v34.5.4-win32-ia32.zip ++20ec7d86c5f42061c544a2461b6a35a2d69a38cbf69418043ed73856c2ac2a95 *mksnapshot-v34.5.4-win32-x64.zip +\ No newline at end of file diff --git a/cgmanifest.json b/cgmanifest.json -index eb5b37d..23dc982 100644 +index 6ee72b3..9344b4e 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -530,3 +530,3 @@ "repositoryUrl": "https://github.com/electron/electron", -- "commitHash": "f98501308a973e0aee2414315b426e5de2c03a60" -+ "commitHash": "ac5b5995e85e6f0b9bf5e82ff6df20d52c7d56bc" +- "commitHash": "d0594707ded4d564c95badf5322d5893295da4ed" ++ "commitHash": "200a6ff5c6be89cb07221fff7025a2f9201bf25b" } @@ -535,3 +535,3 @@ "license": "MIT", -- "version": "34.3.2" -+ "version": "34.3.3" +- "version": "34.5.1" ++ "version": "34.5.4" }, diff --git a/package-lock.json b/package-lock.json -index 21f43a6..2108ce1 100644 +index beb023f..31df569 100644 --- a/package-lock.json +++ b/package-lock.json -@@ -99,3 +99,3 @@ - "deemon": "^1.8.0", -- "electron": "34.3.2", -+ "electron": "34.3.3", +@@ -98,3 +98,3 @@ + "deemon": "^1.13.4", +- "electron": "34.5.1", ++ "electron": "34.5.4", "eslint": "^9.11.1", -@@ -6114,5 +6114,5 @@ +@@ -6004,5 +6004,5 @@ "node_modules/electron": { -- "version": "34.3.2", -- "resolved": "https://registry.npmjs.org/electron/-/electron-34.3.2.tgz", -- "integrity": "sha512-n9tzmFexVLxipZXwMTY30H10f0X9k2OP0SkpSwL5VvnDZi0l/Hc+8CEArKkQPbbSf/IS7nxgc96gtTaR+XoSBg==", -+ "version": "34.3.3", -+ "resolved": "https://registry.npmjs.org/electron/-/electron-34.3.3.tgz", -+ "integrity": "sha512-7m1FiO1mwc1K/UqqnnkG7Ik/kAngDzmLfHwcl+xaWgCQ+Sts9rlEqzOh6g1GHhDqebrbs4bO/aU+NDi32fCciQ==", +- "version": "34.5.1", +- "resolved": "https://registry.npmjs.org/electron/-/electron-34.5.1.tgz", +- "integrity": "sha512-z2Wm7QjhnJ5592fLITynj8UwIk1mBiT402mOakxSYiADrERIci3IOPk7xWHAFOMvt/eoG5RW16PPhgJiedZcGA==", ++ "version": "34.5.4", ++ "resolved": "https://registry.npmjs.org/electron/-/electron-34.5.4.tgz", ++ "integrity": "sha512-WXc3ElYW/1LH50CnpigSeRsK1AfFB/J8hCySFnhXDmz6BBAKhXlJ6bgw1k9ZldR5i+8JqX323773Jn8X3/Wagw==", "dev": true, diff --git a/package.json b/package.json -index b83ddd9..2ff7586 100644 +index 4d41ab6..304a0b0 100644 --- a/package.json +++ b/package.json -@@ -158,3 +158,3 @@ - "deemon": "^1.8.0", -- "electron": "34.3.2", -+ "electron": "34.3.3", +@@ -157,3 +157,3 @@ + "deemon": "^1.13.4", +- "electron": "34.5.1", ++ "electron": "34.5.4", "eslint": "^9.11.1", diff --git a/patches/version-1-update.patch b/patches/version-1-update.patch index 627e0ea..24722ab 100644 --- a/patches/version-1-update.patch +++ b/patches/version-1-update.patch @@ -49,7 +49,7 @@ index 199f433..a6cbb10 100644 + | "user"; \ No newline at end of file diff --git a/src/vs/platform/update/electron-main/abstractUpdateService.ts b/src/vs/platform/update/electron-main/abstractUpdateService.ts -index a1ec3fe..f954720 100644 +index 48d0d86..840b9d3 100644 --- a/src/vs/platform/update/electron-main/abstractUpdateService.ts +++ b/src/vs/platform/update/electron-main/abstractUpdateService.ts @@ -14,6 +14,10 @@ import { IProductService } from '../../product/common/productService.js'; @@ -67,7 +67,7 @@ index a1ec3fe..f954720 100644 + } } diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts -index 57398fb..fddd521 100644 +index b78ebc5..a4a3b1d 100644 --- a/src/vs/platform/update/electron-main/updateService.darwin.ts +++ b/src/vs/platform/update/electron-main/updateService.darwin.ts @@ -15,3 +15,3 @@ import { ILogService } from '../../log/common/log.js'; @@ -99,15 +99,11 @@ index 57398fb..fddd521 100644 - return url; + return createUpdateURL(this.productService, quality, process.platform, process.arch); } -@@ -94,4 +82,36 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau - protected doCheckForUpdates(context: any): void { -+ if (!this.url) { -+ return; -+ } -+ - this.setState(State.CheckingForUpdates(context)); +@@ -100,5 +88,30 @@ export class DarwinUpdateService extends AbstractUpdateService implements IRelau + +- const url = explicit ? this.url : `${this.url}?bg=true`; +- electron.autoUpdater.setFeedURL({ url }); - electron.autoUpdater.checkForUpdates(); -+ + this.requestService.request({ url: this.url }, CancellationToken.None) + .then(asJson) + .then(update => { @@ -124,7 +120,7 @@ index 57398fb..fddd521 100644 + this.setState(State.Idle(UpdateType.Setup)); + } + else { -+ electron.autoUpdater.setFeedURL({ url: this.url as string }); ++ electron.autoUpdater.setFeedURL({ url: this.url! }); + electron.autoUpdater.checkForUpdates(); + } + @@ -133,12 +129,12 @@ index 57398fb..fddd521 100644 + .then(undefined, err => { + this.logService.error(err); + // only show message when explicitly checking for updates -+ const message: string | undefined = !!context ? (err.message || err) : undefined; ++ const message: string | undefined = explicit ? (err.message || err) : undefined; + this.setState(State.Idle(UpdateType.Setup, message)); + }); } diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts -index dd18900..33ef8e5 100644 +index 8550ace..c2fddcb 100644 --- a/src/vs/platform/update/electron-main/updateService.linux.ts +++ b/src/vs/platform/update/electron-main/updateService.linux.ts @@ -15,2 +15,3 @@ import { AvailableForDownload, IUpdate, State, UpdateType } from '../common/upda @@ -150,11 +146,15 @@ index dd18900..33ef8e5 100644 - return createUpdateURL(`linux-${process.arch}`, quality, this.productService); + return createUpdateURL(this.productService, quality, process.platform, process.arch); } -@@ -40,2 +41,3 @@ export class LinuxUpdateService extends AbstractUpdateService { - this.setState(State.CheckingForUpdates(context)); -+ - this.requestService.request({ url: this.url }, CancellationToken.None) -@@ -45,5 +47,17 @@ export class LinuxUpdateService extends AbstractUpdateService { +@@ -39,6 +40,5 @@ export class LinuxUpdateService extends AbstractUpdateService { + +- const url = explicit ? this.url : `${this.url}?bg=true`; + this.setState(State.CheckingForUpdates(explicit)); + +- this.requestService.request({ url }, CancellationToken.None) ++ this.requestService.request({ url: this.url }, CancellationToken.None) + .then(asJson) +@@ -47,5 +47,17 @@ export class LinuxUpdateService extends AbstractUpdateService { this.setState(State.Idle(UpdateType.Archive)); - } else { + @@ -174,7 +174,7 @@ index dd18900..33ef8e5 100644 + return Promise.resolve(null); }) diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts -index db92de2..2bbdad9 100644 +index 8f92a3e..020e690 100644 --- a/src/vs/platform/update/electron-main/updateService.win32.ts +++ b/src/vs/platform/update/electron-main/updateService.win32.ts @@ -11,3 +11,2 @@ import { CancellationToken } from '../../../base/common/cancellation.js'; @@ -235,7 +235,7 @@ index db92de2..2bbdad9 100644 - return createUpdateURL(platform, quality, this.productService); + return createUpdateURL(this.productService, quality, process.platform, process.arch, target); } -@@ -130,2 +145,10 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun +@@ -131,2 +146,10 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun + const fetchedVersion = /\d+\.\d+\.\d+\.\d+/.test(update.productVersion) ? update.productVersion.replace(/(\d+\.\d+\.\d+)\.\d+(\-\w+)?/, '$1$2') : update.productVersion.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3') + const currentVersion = this.productService.version.replace(/(\d+\.\d+\.)0+(\d+)(\-\w+)?/, '$1$2$3') @@ -246,16 +246,16 @@ index db92de2..2bbdad9 100644 + } + if (updateType === UpdateType.Archive) { -@@ -156,3 +179,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun +@@ -157,3 +180,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun - const fastUpdatesEnabled = this.configurationService.getValue('update.enableWindowsBackgroundUpdates'); + const fastUpdatesEnabled = getUpdateType() == UpdateType.Setup && this.configurationService.getValue('update.enableWindowsBackgroundUpdates'); if (fastUpdatesEnabled) { -@@ -168,3 +191,2 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun +@@ -169,3 +192,2 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun .then(undefined, err => { - this.telemetryService.publicLog2<{ messageHash: string }, UpdateErrorClassification>('update:error', { messageHash: String(hash(String(err))) }); this.logService.error(err); -@@ -252,6 +274,14 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun +@@ -253,6 +275,14 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun } else { - spawn(this.availableUpdate.packagePath, ['/silent', '/log', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], { - detached: true, diff --git a/prepare_assets.sh b/prepare_assets.sh index 5c1261e..29b2811 100755 --- a/prepare_assets.sh +++ b/prepare_assets.sh @@ -71,7 +71,7 @@ if [[ "${OS_NAME}" == "osx" ]]; then cd .. fi - if [[ "${SHOULD_BUILD_DMG}" != "no" ]]; then + if [[ -n "${CERTIFICATE_OSX_P12_DATA}" && "${SHOULD_BUILD_DMG}" != "no" ]]; then echo "Building and moving DMG" pushd "VSCode-darwin-${VSCODE_ARCH}" npx create-dmg ./*.app . @@ -216,6 +216,32 @@ if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then cd .. fi +set -ex + +if [[ "${SHOULD_BUILD_CLI}" != "no" ]]; then + echo "Building and moving CLI" + + APPLICATION_NAME="$( node -p "require(\"./vscode/product.json\").applicationName" )" + NAME_SHORT="$( node -p "require(\"./vscode/product.json\").nameShort" )" + TUNNEL_APPLICATION_NAME="$( node -p "require(\"./vscode/product.json\").tunnelApplicationName" )" + + mkdir -p "vscode-cli" + + cd "vscode-cli" + + if [[ "${OS_NAME}" == "osx" ]]; then + cp "../VSCode-${VSCODE_PLATFORM}-${VSCODE_ARCH}/${NAME_SHORT}.app/Contents/Resources/app/bin/${TUNNEL_APPLICATION_NAME}" "${APPLICATION_NAME}" + elif [[ "${OS_NAME}" == "windows" ]]; then + cp "../VSCode-${VSCODE_PLATFORM}-${VSCODE_ARCH}/bin/${TUNNEL_APPLICATION_NAME}.exe" "${APPLICATION_NAME}.exe" + else + cp "../VSCode-${VSCODE_PLATFORM}-${VSCODE_ARCH}/bin/${TUNNEL_APPLICATION_NAME}" "${APPLICATION_NAME}" + fi + + tar czf "../assets/${APP_NAME_LC}-cli-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" . + + cd .. +fi + if [[ "${OS_NAME}" != "windows" ]]; then ./prepare_checksums.sh fi diff --git a/product.json b/product.json index d84717b..fdc150e 100644 --- a/product.json +++ b/product.json @@ -91,12 +91,10 @@ "terminalExecuteCommandEvent", "notebookReplDocument", "notebookVariableProvider", - "terminalShellEnv", - "terminalShellType" + "terminalShellEnv" ], "ms-python.vscode-python-envs": [ - "terminalShellEnv", - "terminalShellType" + "terminalShellEnv" ], "ms-dotnettools.dotnet-interactive-vscode": [ "notebookMessaging" @@ -226,6 +224,7 @@ "chatProvider", "mappedEditsProvider", "aiRelatedInformation", + "aiSettingsSearch", "codeActionAI", "findTextInFiles", "findTextInFiles2", @@ -244,7 +243,6 @@ "authLearnMore", "testObserver", "aiTextSearchProvider", - "chatReadonlyPromptReference", "documentFiltersExclusive", "chatParticipantPrivate", "contribDebugCreateConfiguration", @@ -254,7 +252,8 @@ "languageModelSystem", "languageModelCapabilities", "languageModelDataPart", - "chatStatusItem" + "chatStatusItem", + "taskProblemMatcherStatus" ], "GitHub.remotehub": [ "contribRemoteHelp", @@ -274,7 +273,10 @@ "ms-python.gather": [ "notebookCellExecutionState" ], - "ms-python.vscode-pylance": [], + "ms-python.vscode-pylance": [ + "mcpConfigurationProvider", + "terminalShellEnv" + ], "ms-python.debugpy": [ "contribViewsWelcome", "debugVisualization", @@ -299,6 +301,9 @@ "notebookVariableProvider", "notebookReplDocument" ], + "donjayamanne.kusto": [ + "notebookVariableProvider" + ], "ms-toolsai.tensorboard": [ "portsAttributes" ], diff --git a/release.sh b/release.sh index 937af53..57fe296 100755 --- a/release.sh +++ b/release.sh @@ -16,23 +16,43 @@ npm install -g github-release-cli if [[ $( gh release view "${RELEASE_VERSION}" --repo "${ASSETS_REPOSITORY}" 2>&1 ) =~ "release not found" ]]; then echo "Creating release '${RELEASE_VERSION}'" + . ./utils.sh + + APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )" + VERSION="${RELEASE_VERSION%-insider}" + if [[ "${VSCODE_QUALITY}" == "insider" ]]; then NOTES="update vscode to [${MS_COMMIT}](https://github.com/microsoft/vscode/tree/${MS_COMMIT})" - gh release create "${RELEASE_VERSION}" --repo "${ASSETS_REPOSITORY}" --title "${RELEASE_VERSION}" --notes "${NOTES}" + replace "s|@@APP_NAME@@|${APP_NAME}|g" release_notes.md + replace "s|@@APP_NAME_LC@@|${APP_NAME_LC}|g" release_notes.md + replace "s|@@APP_NAME_QUALITY@@|${APP_NAME}-Insiders|g" release_notes.md + replace "s|@@ASSETS_REPOSITORY@@|${ASSETS_REPOSITORY}|g" release_notes.md + replace "s|@@BINARY_NAME@@|${BINARY_NAME}|g" release_notes.md + replace "s|@@MS_TAG@@|${MS_COMMIT}|g" release_notes.md + replace "s|@@MS_URL@@|https://github.com/microsoft/vscode/tree/${MS_COMMIT}|g" release_notes.md + replace "s|@@QUALITY@@|-insider|g" release_notes.md + replace "s|@@RELEASE_NOTES@@||g" release_notes.md + replace "s|@@VERSION@@|${VERSION}|g" release_notes.md + + gh release create "${RELEASE_VERSION}" --repo "${ASSETS_REPOSITORY}" --title "${RELEASE_VERSION}" --notes-file release_notes.md else gh release create "${RELEASE_VERSION}" --repo "${ASSETS_REPOSITORY}" --title "${RELEASE_VERSION}" --generate-notes - . ./utils.sh - RELEASE_NOTES=$( gh release view "${RELEASE_VERSION}" --repo "${ASSETS_REPOSITORY}" --json "body" --jq ".body" ) - replace "s|MS_TAG_SHORT|$( echo "${MS_TAG//./_}" | cut -d'_' -f 1,2 )|" release_notes.txt - replace "s|MS_TAG|${MS_TAG}|" release_notes.txt - replace "s|RELEASE_VERSION|${RELEASE_VERSION}|g" release_notes.txt - replace "s|RELEASE_NOTES|${RELEASE_NOTES//$'\n'/\\n}|" release_notes.txt + replace "s|@@APP_NAME@@|${APP_NAME}|g" release_notes.md + replace "s|@@APP_NAME_LC@@|${APP_NAME_LC}|g" release_notes.md + replace "s|@@APP_NAME_QUALITY@@|${APP_NAME}|g" release_notes.md + replace "s|@@ASSETS_REPOSITORY@@|${ASSETS_REPOSITORY}|g" release_notes.md + replace "s|@@BINARY_NAME@@|${BINARY_NAME}|g" release_notes.md + replace "s|@@MS_TAG@@|${MS_TAG}|g" release_notes.md + replace "s|@@MS_URL@@|https://code.visualstudio.com/updates/v$( echo "${MS_TAG//./_}" | cut -d'_' -f 1,2 )|g" release_notes.md + replace "s|@@QUALITY@@||g" release_notes.md + replace "s|@@RELEASE_NOTES@@|${RELEASE_NOTES//$'\n'/\\n}|g" release_notes.md + replace "s|@@VERSION@@|${VERSION}|g" release_notes.md - gh release edit "${RELEASE_VERSION}" --repo "${ASSETS_REPOSITORY}" --notes-file release_notes.txt + gh release edit "${RELEASE_VERSION}" --repo "${ASSETS_REPOSITORY}" --notes-file release_notes.md fi fi diff --git a/release_notes.md b/release_notes.md new file mode 100644 index 0000000..c3c3945 --- /dev/null +++ b/release_notes.md @@ -0,0 +1,286 @@ +update vscode to [@@MS_TAG@@](@@MS_URL@@) + +@@RELEASE_NOTES@@ + +## x86 64bits + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
WindowsUser Installer@@APP_NAME@@UserSetup-x64-@@VERSION@@@@QUALITY@@.exe
System Installer@@APP_NAME@@Setup-x64-@@VERSION@@@@QUALITY@@.exe
.zip@@APP_NAME@@-win32-x64-@@VERSION@@@@QUALITY@@.zip
.msi - updates enabled@@APP_NAME@@-x64-@@VERSION@@@@QUALITY@@.msi
.msi - updates disabled@@APP_NAME@@-x64-updates-disabled-@@VERSION@@@@QUALITY@@.msi
Remote Host@@APP_NAME_LC@@-reh-win32-x64-@@VERSION@@@@QUALITY@@.tar.gz
Web Host@@APP_NAME_LC@@-reh-web-win32-x64-@@VERSION@@@@QUALITY@@.tar.gz
CLI@@APP_NAME_LC@@-cli-win32-x64-@@VERSION@@@@QUALITY@@.tar.gz
macOS.dmg@@APP_NAME@@.x64.@@VERSION@@@@QUALITY@@.dmg
.zip@@APP_NAME@@-darwin-x64-@@VERSION@@@@QUALITY@@.zip
Remote Host@@APP_NAME_LC@@-reh-darwin-x64-@@VERSION@@.@@QUALITY@@.tar.gz
Web Host@@APP_NAME_LC@@-reh-web-darwin-x64-@@VERSION@@@@QUALITY@@.tar.gz
CLI@@APP_NAME_LC@@-cli-darwin-x64-@@VERSION@@@@QUALITY@@.tar.gz
Linux.deb@@BINARY_NAME@@_@@VERSION@@_amd64.deb
.rpm@@BINARY_NAME@@-@@VERSION@@-el8.x86_64.rpm
.tar.gz@@APP_NAME@@-linux-x64-@@VERSION@@@@QUALITY@@.tar.gz
AppImage + @@APP_NAME_QUALITY@@-@@VERSION@@.glibc2.29-x86_64.AppImage
+ @@APP_NAME_QUALITY@@-@@VERSION@@.glibc2.29-x86_64.AppImage.zsync +
Snap@@BINARY_NAME@@_@@VERSION@@_amd64.snap
Remote Host@@APP_NAME_LC@@-reh-linux-x64-@@VERSION@@@@QUALITY@@.tar.gz
Web Host@@APP_NAME_LC@@-reh-web-linux-x64-@@VERSION@@@@QUALITY@@.tar.gz
CLI@@APP_NAME_LC@@-cli-linux-x64-@@VERSION@@@@QUALITY@@.tar.gz
AlpineRemote Host@@APP_NAME_LC@@-reh-alpine-x64-@@VERSION@@@@QUALITY@@.tar.gz
Web Host@@APP_NAME_LC@@-reh-web-alpine-x64-@@VERSION@@@@QUALITY@@.tar.gz
+ +## ARM 64bits + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
WindowsUser Installer@@APP_NAME@@UserSetup-arm64-@@VERSION@@@@QUALITY@@.exe
System Installer@@APP_NAME@@Setup-arm64-@@VERSION@@@@QUALITY@@.exe
.zip@@APP_NAME@@-win32-arm64-@@VERSION@@@@QUALITY@@.zip
CLI@@APP_NAME_LC@@-cli-win32-arm64-@@VERSION@@@@QUALITY@@.tar.gz
macOS.dmg@@APP_NAME@@.arm64.@@VERSION@@@@QUALITY@@.dmg
.zip@@APP_NAME@@-darwin-arm64-@@VERSION@@@@QUALITY@@.zip
Remote Host@@APP_NAME_LC@@-reh-darwin-arm64-@@VERSION@@@@QUALITY@@.tar.gz
Web Host@@APP_NAME_LC@@-reh-web-darwin-arm64-@@VERSION@@@@QUALITY@@.tar.gz
CLI@@APP_NAME_LC@@-cli-darwin-arm64-@@VERSION@@@@QUALITY@@.tar.gz
Linux.deb@@BINARY_NAME@@_@@VERSION@@_arm64.deb
.rpm@@BINARY_NAME@@-@@VERSION@@-el8.aarch64.rpm
.tar.gz@@APP_NAME@@-linux-arm64-@@VERSION@@@@QUALITY@@.tar.gz
Snap@@BINARY_NAME@@_@@VERSION@@_arm64.snap
Remote Host@@APP_NAME_LC@@-reh-linux-arm64-@@VERSION@@@@QUALITY@@.tar.gz
Web Host@@APP_NAME_LC@@-reh-web-linux-arm64-@@VERSION@@@@QUALITY@@.tar.gz
CLI@@APP_NAME_LC@@-cli-linux-arm64-@@VERSION@@@@QUALITY@@.tar.gz
AlpineRemote Host@@APP_NAME_LC@@-reh-alpine-arm64-@@VERSION@@@@QUALITY@@.tar.gz
Web Host@@APP_NAME_LC@@-reh-web-alpine-arm64-@@VERSION@@@@QUALITY@@.tar.gz
+ +## ARM 32bits + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Linux.deb@@BINARY_NAME@@_@@VERSION@@_armhf.deb
.rpm@@BINARY_NAME@@-@@VERSION@@-el8.armv7hl.rpm
.tar.gz@@APP_NAME@@-linux-armhf-@@VERSION@@@@QUALITY@@.tar.gz
Remote Host@@APP_NAME_LC@@-reh-linux-armhf-@@VERSION@@@@QUALITY@@.tar.gz
Web Host@@APP_NAME_LC@@-reh-web-linux-armhf-@@VERSION@@@@QUALITY@@.tar.gz
CLI@@APP_NAME_LC@@-cli-linux-armhf-@@VERSION@@@@QUALITY@@.tar.gz
+ +## PPC 64bits + + + + + + + + + + + + + + + +
Linux.tar.gz@@APP_NAME@@-linux-ppc64le-@@VERSION@@@@QUALITY@@.tar.gz
Remote Host@@APP_NAME_LC@@-reh-linux-ppc64le-@@VERSION@@@@QUALITY@@.tar.gz
Web Host@@APP_NAME_LC@@-reh-web-linux-ppc64le-@@VERSION@@@@QUALITY@@.tar.gz
+ +## RISC-V 64bits + + + + + + + + + + + + + + + +
Linux.tar.gz@@APP_NAME@@-linux-riscv64-@@VERSION@@@@QUALITY@@.tar.gz
Remote Host@@APP_NAME_LC@@-reh-linux-riscv64-@@VERSION@@@@QUALITY@@.tar.gz
Web Host@@APP_NAME_LC@@-reh-web-linux-riscv64-@@VERSION@@@@QUALITY@@.tar.gz
+ +## Loong 64bits + + + + + + + + + + + + + + + +
Linux.tar.gz@@APP_NAME@@-linux-loong64-@@VERSION@@@@QUALITY@@.tar.gz
Remote Host@@APP_NAME_LC@@-reh-linux-loong64-@@VERSION@@@@QUALITY@@.tar.gz
Web Host@@APP_NAME_LC@@-reh-web-linux-loong64-@@VERSION@@@@QUALITY@@.tar.gz
+ +## s390x + + + + + + + + + + + +
LinuxRemote Host@@APP_NAME_LC@@-reh-linux-s390x-@@VERSION@@@@QUALITY@@.tar.gz
Web Host@@APP_NAME_LC@@-reh-web-linux-s390x-@@VERSION@@@@QUALITY@@.tar.gz
diff --git a/release_notes.txt b/release_notes.txt deleted file mode 100644 index f09a433..0000000 --- a/release_notes.txt +++ /dev/null @@ -1,258 +0,0 @@ -update vscode to [MS_TAG](https://code.visualstudio.com/updates/vMS_TAG_SHORT) - -RELEASE_NOTES - -## x86 64bits - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
WindowsUser InstallerVSCodiumUserSetup-x64-RELEASE_VERSION.exe
System InstallerVSCodiumSetup-x64-RELEASE_VERSION.exe
.zipVSCodium-win32-x64-RELEASE_VERSION.zip
.msi - updates enabledVSCodium-x64-RELEASE_VERSION.msi
.msi - updates disabledVSCodium-x64-updates-disabled-RELEASE_VERSION.msi
Remote Hostvscodium-reh-win32-x64-RELEASE_VERSION.tar.gz
Web Hostvscodium-reh-web-win32-x64-RELEASE_VERSION.tar.gz
macOS.dmgVSCodium.x64.RELEASE_VERSION.dmg
.zipVSCodium-darwin-x64-RELEASE_VERSION.zip
Remote Hostvscodium-reh-darwin-x64-RELEASE_VERSION.tar.gz
Web Hostvscodium-reh-web-darwin-x64-RELEASE_VERSION.tar.gz
Linux.debcodium_RELEASE_VERSION_amd64.deb
.rpmcodium-RELEASE_VERSION-el8.x86_64.rpm
.tar.gzVSCodium-linux-x64-RELEASE_VERSION.tar.gz
AppImage - VSCodium-RELEASE_VERSION.glibc2.29-x86_64.AppImage
- VSCodium-RELEASE_VERSION.glibc2.29-x86_64.AppImage.zsync -
Snapcodium_RELEASE_VERSION_amd64.snap
Remote Hostvscodium-reh-linux-x64-RELEASE_VERSION.tar.gz
Web Hostvscodium-reh-web-linux-x64-RELEASE_VERSION.tar.gz
AlpineRemote Hostvscodium-reh-alpine-x64-RELEASE_VERSION.tar.gz
Web Hostvscodium-reh-web-alpine-x64-RELEASE_VERSION.tar.gz
- -## ARM 64bits - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
WindowsUser InstallerVSCodiumUserSetup-arm64-RELEASE_VERSION.exe
System InstallerVSCodiumSetup-arm64-RELEASE_VERSION.exe
.zipVSCodium-win32-arm64-RELEASE_VERSION.zip
macOS.dmgVSCodium.arm64.RELEASE_VERSION.dmg
.zipVSCodium-darwin-arm64-RELEASE_VERSION.zip
Remote Hostvscodium-reh-darwin-arm64-RELEASE_VERSION.tar.gz
Web Hostvscodium-reh-web-darwin-arm64-RELEASE_VERSION.tar.gz
Linux.debcodium_RELEASE_VERSION_arm64.deb
.rpmcodium-RELEASE_VERSION-el8.aarch64.rpm
.tar.gzVSCodium-linux-arm64-RELEASE_VERSION.tar.gz
Snapcodium_RELEASE_VERSION_arm64.snap
Remote Hostvscodium-reh-linux-arm64-RELEASE_VERSION.tar.gz
Web Hostvscodium-reh-web-linux-arm64-RELEASE_VERSION.tar.gz
AlpineRemote Hostvscodium-reh-alpine-arm64-RELEASE_VERSION.tar.gz
Web Hostvscodium-reh-web-alpine-arm64-RELEASE_VERSION.tar.gz
- -## ARM 32bits - - - - - - - - - - - - - - - - - - - - - - - -
Linux.debcodium_RELEASE_VERSION_armhf.deb
.rpmcodium-RELEASE_VERSION-el8.armv7hl.rpm
.tar.gzVSCodium-linux-armhf-RELEASE_VERSION.tar.gz
Remote Hostvscodium-reh-linux-armhf-RELEASE_VERSION.tar.gz
Web Hostvscodium-reh-web-linux-armhf-RELEASE_VERSION.tar.gz
- -## PPC 64bits - - - - - - - - - - - - - - - -
Linux.tar.gzVSCodium-linux-ppc64le-RELEASE_VERSION.tar.gz
Remote Hostvscodium-reh-linux-ppc64le-RELEASE_VERSION.tar.gz
Web Hostvscodium-reh-web-linux-ppc64le-RELEASE_VERSION.tar.gz
- -## RISC-V 64bits - - - - - - - - - - - - - - - -
Linux.tar.gzVSCodium-linux-riscv64-RELEASE_VERSION.tar.gz
Remote Hostvscodium-reh-linux-riscv64-RELEASE_VERSION.tar.gz
Web Hostvscodium-reh-web-linux-riscv64-RELEASE_VERSION.tar.gz
- -## Loong 64bits - - - - - - - - - - - - - - - -
Linux.tar.gzVSCodium-linux-loong64-RELEASE_VERSION.tar.gz
Remote Hostvscodium-reh-linux-loong64-RELEASE_VERSION.tar.gz
Web Hostvscodium-reh-web-linux-loong64-RELEASE_VERSION.tar.gz
- -## s390x - - - - - - - - - - - -
LinuxRemote Hostvscodium-reh-linux-s390x-RELEASE_VERSION.tar.gz
Web Hostvscodium-reh-web-linux-s390x-RELEASE_VERSION.tar.gz
diff --git a/upstream/insider.json b/upstream/insider.json index 7ca91aa..7657094 100644 --- a/upstream/insider.json +++ b/upstream/insider.json @@ -1,4 +1,4 @@ { - "tag": "1.99.0", - "commit": "b34f7ee5b19a94b2aa6982c48a9495f691a8d9f6" + "tag": "1.100.0", + "commit": "19e0f9e681ecb8e5c09d8784acaa601316ca4571" } diff --git a/upstream/stable.json b/upstream/stable.json index c6f3bdb..7657094 100644 --- a/upstream/stable.json +++ b/upstream/stable.json @@ -1,4 +1,4 @@ { - "tag": "1.99.3", - "commit": "17baf841131aa23349f217ca7c570c76ee87b957" + "tag": "1.100.0", + "commit": "19e0f9e681ecb8e5c09d8784acaa601316ca4571" } diff --git a/utils.sh b/utils.sh index 3ee2bf9..18996a1 100755 --- a/utils.sh +++ b/utils.sh @@ -2,6 +2,7 @@ APP_NAME="${APP_NAME:-VSCodium}" APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )" +ASSETS_REPOSITORY="${ASSETS_REPOSITORY:-VSCodium/vscodium}" BINARY_NAME="${BINARY_NAME:-codium}" GH_REPO_PATH="${GH_REPO_PATH:-VSCodium/vscodium}" ORG_NAME="${ORG_NAME:-VSCodium}" @@ -18,6 +19,7 @@ apply_patch() { replace "s|!!APP_NAME!!|${APP_NAME}|g" "$1" replace "s|!!APP_NAME_LC!!|${APP_NAME_LC}|g" "$1" + replace "s|!!ASSETS_REPOSITORY!!|${ASSETS_REPOSITORY}|g" "$1" replace "s|!!BINARY_NAME!!|${BINARY_NAME}|g" "$1" replace "s|!!GH_REPO_PATH!!|${GH_REPO_PATH}|g" "$1" replace "s|!!ORG_NAME!!|${ORG_NAME}|g" "$1"