fix: use electron v34.3.2 (#2273)

Signed-off-by: Thibaud CANALE <thican@thican.net>

.github/workflows/insider-linux.yml

@@ -18,6 +18,7 @@ on:
     branches: [ insider ]
     paths-ignore:
     - '**/*.md'
+    - 'upstream/*.json'
   pull_request:
     branches: [ insider ]
     paths-ignore:
@@ -29,7 +30,9 @@ env:
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
   BINARY_NAME: codium-insiders
   DISABLE_UPDATE: 'yes'
+  GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
   GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: linux
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -101,7 +104,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.18'
+          node-version: '20.18.2'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Install Yarn
@@ -173,7 +176,7 @@ jobs:
         - slug: LOONG64
           vscode_arch: loong64
           npm_arch: loong64
-          image: vscodium/vscodium-linux-build-agent:trixie-loong64
+          image: vscodium/vscodium-linux-build-agent:beige-loong64
         - slug: PPC64
           vscode_arch: ppc64le
           npm_arch: ppc64
@@ -204,7 +207,7 @@ jobs:
         env:
           PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
         run: ./get_pr.sh
-        if: env.DISABLED != 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Install GH
         run: ./install_gh.sh
@@ -232,7 +235,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.npm_arch }}
-        run: ./package_linux_bin.sh
+        run: ./build/linux/package_bin.sh
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Prepare assets
@@ -328,7 +331,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.18'
+          node-version: '20.18.2'
         if: env.DISABLED != 'yes'
 
       - name: Setup Python 3
@@ -362,7 +365,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.npm_arch }}
-        run: ./package_linux_reh.sh
+        run: ./build/linux/package_reh.sh
         if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
 
       - name: Release
@@ -389,12 +392,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - vscode_arch: x64
+        - slug: X64
+          vscode_arch: x64
           npm_arch: x64
-        - vscode_arch: arm64
+        - slug: ARM64
+          vscode_arch: arm64
           npm_arch: arm64
     env:
       BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
+      DISABLED: ${{ vars[format('DISABLE_INSIDER_ALPINE_REH_{0}', matrix.slug)] }}
       MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
       MS_TAG: ${{ needs.check.outputs.MS_TAG }}
       OS_NAME: alpine
@@ -438,21 +444,21 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: vscode
-        if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
 
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.npm_arch }}
-        run: ./package_alpine_reh.sh
-        if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
+        run: ./build/alpine/package_reh.sh
+        if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
 
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./release.sh
-        if: env.SHOULD_BUILD_REH != 'no' && env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no')
 
       - name: Upload assets
         uses: actions/upload-artifact@v4
@@ -460,7 +466,7 @@ jobs:
           name: reh-alpine-${{ matrix.vscode_arch }}
           path: assets/
           retention-days: 3
-        if: env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
 
   aur:
     needs:
@@ -504,7 +510,7 @@ jobs:
         platform:
         - amd64
         - arm64
-    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_INSIDER_SNAP != 'yes'
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && needs.check.outputs.SHOULD_BUILD_SNAP != 'no' && vars.DISABLE_INSIDER_SNAP != 'yes'
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/insider-macos.yml

@@ -18,6 +18,7 @@ on:
     branches: [ insider ]
     paths-ignore:
     - '**/*.md'
+    - 'upstream/*.json'
   pull_request:
     branches: [ insider ]
     paths-ignore:
@@ -26,7 +27,10 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
+  BINARY_NAME: codium-insiders
   GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
+  GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: osx
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -58,7 +62,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.18'
+          node-version: '20.18.2'
 
       - name: Setup Python 3
         uses: actions/setup-python@v5

.github/workflows/insider-spearhead.yml

@@ -24,8 +24,11 @@ jobs:
     env:
       APP_NAME: VSCodium
       ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
+      BINARY_NAME: codium-insiders
+      GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+      ORG_NAME: ${{ github.repository_owner }}
       OS_NAME: osx
+      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
       VSCODE_ARCH: arm64
       VSCODE_LATEST: ${{ github.event.inputs.dont_update == 'true' && 'no' || 'yes' }}
       VSCODE_QUALITY: insider
@@ -38,7 +41,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.18'
+          node-version: '20.18.2'
 
       - name: Clone VSCode repo
         run: . get_repo.sh
@@ -56,11 +59,17 @@ jobs:
         run: ./build.sh
         if: env.SHOULD_BUILD == 'yes'
 
-      - name: Update <quality>.json
-        run: ./update_qualityjson.sh
-        env:
-          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
-          GITHUB_USERNAME: ${{ github.repository_owner }}
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+        if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'
+
+      - name: Update upstream version
+        run: ./update_upstream.sh
         if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'
 
       - name: Prepare source

.github/workflows/insider-windows.yml

@@ -18,6 +18,7 @@ on:
     branches: [ insider ]
     paths-ignore:
     - '**/*.md'
+    - 'upstream/*.json'
   pull_request:
     branches: [ insider ]
     paths-ignore:
@@ -26,7 +27,10 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
+  BINARY_NAME: codium-insiders
   GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
+  GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: windows
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -98,7 +102,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.18'
+          node-version: '20.18.2'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Install Yarn
@@ -183,7 +187,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.18'
+          node-version: '20.18.2'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Install Yarn
@@ -214,7 +218,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.vscode_arch }}
           npm_config_target_arch: ${{ matrix.vscode_arch }}
-        run: ./package_windows.sh
+        run: ./build/windows/package.sh
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Prepare assets

.github/workflows/stable-linux.yml

@@ -18,6 +18,7 @@ on:
     branches: [ master ]
     paths-ignore:
     - '**/*.md'
+    - 'upstream/*.json'
   pull_request:
     branches: [ master ]
     paths-ignore:
@@ -29,6 +30,8 @@ env:
   ASSETS_REPOSITORY: ${{ github.repository }}
   BINARY_NAME: codium
   DISABLE_UPDATE: 'yes'
+  GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: linux
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: stable
@@ -90,17 +93,19 @@ jobs:
         env:
           PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
         run: ./get_pr.sh
+        if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup GCC
         uses: egor-tensin/setup-gcc@v1
         with:
           version: 10
           platform: x64
+        if: env.SHOULD_BUILD == 'yes'
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.18'
+          node-version: '20.18.2'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Install Yarn
@@ -172,7 +177,7 @@ jobs:
         - slug: LOONG64
           vscode_arch: loong64
           npm_arch: loong64
-          image: vscodium/vscodium-linux-build-agent:trixie-loong64
+          image: vscodium/vscodium-linux-build-agent:beige-loong64
         - slug: PPC64
           vscode_arch: ppc64le
           npm_arch: ppc64
@@ -231,7 +236,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.npm_arch }}
-        run: ./package_linux_bin.sh
+        run: ./build/linux/package_bin.sh
         if: env.DISABLED != 'yes' && env.SHOULD_BUILD == 'yes'
 
       - name: Prepare assets
@@ -327,7 +332,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.18'
+          node-version: '20.18.2'
         if: env.DISABLED != 'yes'
 
       - name: Setup Python 3
@@ -361,7 +366,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.npm_arch }}
-        run: ./package_linux_reh.sh
+        run: ./build/linux/package_reh.sh
         if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
 
       - name: Release
@@ -388,12 +393,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - vscode_arch: x64
+        - slug: X64
+          vscode_arch: x64
           npm_arch: x64
-        - vscode_arch: arm64
+        - slug: ARM64
+          vscode_arch: arm64
           npm_arch: arm64
     env:
       BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
+      DISABLED: ${{ vars[format('DISABLE_STABLE_ALPINE_REH_{0}', matrix.slug)] }}
       MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
       MS_TAG: ${{ needs.check.outputs.MS_TAG }}
       OS_NAME: alpine
@@ -437,21 +445,21 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: vscode
-        if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
 
       - name: Build
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.npm_arch }}
-        run: ./package_alpine_reh.sh
-        if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true'
+        run: ./build/alpine/package_reh.sh
+        if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true')
 
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./release.sh
-        if: env.SHOULD_BUILD_REH != 'no' && env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no')
 
       - name: Upload assets
         uses: actions/upload-artifact@v4
@@ -459,7 +467,7 @@ jobs:
           name: reh-alpine-${{ matrix.vscode_arch }}
           path: assets/
           retention-days: 3
-        if: env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'no' && github.event.inputs.generate_assets == 'true'
 
   aur:
     needs:
@@ -500,7 +508,7 @@ jobs:
         platform:
         - amd64
         - arm64
-    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_STABLE_SNAP != 'yes'
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && needs.check.outputs.SHOULD_BUILD_SNAP != 'no' && vars.DISABLE_STABLE_SNAP != 'yes'
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/stable-macos.yml

@@ -18,6 +18,7 @@ on:
     branches: [ master ]
     paths-ignore:
     - '**/*.md'
+    - 'upstream/*.json'
   pull_request:
     branches: [ master ]
     paths-ignore:
@@ -26,6 +27,9 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}
+  BINARY_NAME: codium
+  GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: osx
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: stable
@@ -57,7 +61,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.18'
+          node-version: '20.18.2'
 
       - name: Setup Python 3
         uses: actions/setup-python@v5

.github/workflows/stable-spearhead.yml

@@ -21,8 +21,11 @@ jobs:
     env:
       APP_NAME: VSCodium
       ASSETS_REPOSITORY: ${{ github.repository }}
-      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
+      BINARY_NAME: codium
+      GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+      ORG_NAME: ${{ github.repository_owner }}
       OS_NAME: osx
+      VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
       VSCODE_ARCH: arm64
       VSCODE_LATEST: ${{ github.event.inputs.dont_update == 'true' && 'no' || 'yes' }}
       VSCODE_QUALITY: stable
@@ -33,7 +36,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.18'
+          node-version: '20.18.2'
 
       - name: Clone VSCode repo
         run: . get_repo.sh
@@ -51,11 +54,17 @@ jobs:
         run: ./build.sh
         if: env.SHOULD_BUILD == 'yes'
 
-      - name: Update <quality>.json
-        run: ./update_qualityjson.sh
-        env:
-          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
-          GITHUB_USERNAME: ${{ github.repository_owner }}
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+        if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'
+
+      - name: Update upstream version
+        run: ./update_upstream.sh
         if: env.SHOULD_BUILD == 'yes' && github.event.inputs.dont_update != 'true'
 
       - name: Prepare source

.github/workflows/stable-windows.yml

@@ -18,6 +18,7 @@ on:
     branches: [ master ]
     paths-ignore:
     - '**/*.md'
+    - 'upstream/*.json'
   pull_request:
     branches: [ master ]
     paths-ignore:
@@ -26,6 +27,9 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}
+  BINARY_NAME: codium
+  GH_REPO_PATH: ${{ github.repository_owner }}/${{ github.repository }}
+  ORG_NAME: ${{ github.repository_owner }}
   OS_NAME: windows
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: stable
@@ -97,7 +101,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.18'
+          node-version: '20.18.2'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Install Yarn
@@ -182,7 +186,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v4
         with:
-          node-version: '20.18'
+          node-version: '20.18.2'
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Install Yarn
@@ -213,7 +217,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           npm_config_arch: ${{ matrix.vscode_arch }}
           npm_config_target_arch: ${{ matrix.vscode_arch }}
-        run: ./package_windows.sh
+        run: ./build/windows/package.sh
         if: env.SHOULD_BUILD == 'yes'
 
       - name: Prepare assets

.nvmrc

@@ -1 +1 @@
-20.18
+20.18.1

CONTRIBUTING.md

@@ -34,7 +34,7 @@ If you want to update the existing patches, please follow the section [`Patch Up
 ### Add a new patch
 
 - first, you need to build VSCodium
-- then use the command `patch.sh <your patch name>`, to initiate a new patch
+- then use the command `./dev/patch.sh <your patch name>`, to initiate a new patch
 - when the script pauses at `Press any key when the conflict have been resolved...`, open `vscode` directory in **VSCodium**
 - run `yarn watch`
 - run `./script/code.sh`

build.sh

@@ -29,6 +29,9 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
 
     VSCODE_PLATFORM="darwin"
   elif [[ "${OS_NAME}" == "windows" ]]; then
+    # generate Group Policy definitions
+    node build/lib/policies
+
     # in CI, packaging will be done by a different job
     if [[ "${CI_BUILD}" == "no" ]]; then
       . ../build/windows/rtf/make.sh

build/alpine/package_reh.sh

@@ -7,6 +7,11 @@ if [[ "${CI_BUILD}" == "no" ]]; then
   exit 1
 fi
 
+# include common functions
+. ./utils.sh
+
+mkdir -p assets
+
 tar -xzf ./vscode.tar.gz
 
 cd vscode || { echo "'vscode' dir not found"; exit 1; }
@@ -22,11 +27,7 @@ export VSCODE_HOST_MOUNT VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME
 if [[ -d "../patches/alpine/reh/" ]]; then
   for file in "../patches/alpine/reh/"*.patch; do
     if [[ -f "${file}" ]]; then
-      echo applying patch: "${file}";
-      if ! git apply --ignore-whitespace "${file}"; then
-        echo failed to apply patch "${file}" >&2
-        exit 1
-      fi
+      apply_patch "${file}"
     fi
   done
 fi
@@ -42,25 +43,38 @@ done
 
 node build/azure-pipelines/distro/mixin-npm
 
-yarn gulp minify-vscode-reh
-
 if [[ "${VSCODE_ARCH}" == "x64" ]]; then
   PA_NAME="linux-alpine"
 else
   PA_NAME="alpine-arm64"
 fi
 
-yarn gulp "vscode-reh-${PA_NAME}-min-ci"
+if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
+  echo "Building REH"
+  yarn gulp minify-vscode-reh
+  yarn gulp "vscode-reh-${PA_NAME}-min-ci"
 
-cd ..
+  pushd "../vscode-reh-${PA_NAME}"
 
-APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
+  echo "Archiving REH"
+  tar czf "../assets/${APP_NAME_LC}-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" .
 
-mkdir -p assets
+  popd
+fi
+
+if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
+  echo "Building REH-web"
+  yarn gulp minify-vscode-reh-web
+  yarn gulp "vscode-reh-web-${PA_NAME}-min-ci"
+
+  pushd "../vscode-reh-web-${PA_NAME}"
+
+  echo "Archiving REH-web"
+  tar czf "../assets/${APP_NAME_LC}-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" .
+
+  popd
+fi
 
-echo "Building and moving REH"
-cd "vscode-reh-${PA_NAME}"
-tar czf "../assets/${APP_NAME_LC}-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" .
 cd ..
 
 npm install -g checksum

build/linux/loong64/electron.sh

@@ -2,5 +2,5 @@
 
 set -ex
 
-export ELECTRON_VERSION="32.2.7"
+export ELECTRON_VERSION="34.2.0"
 export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}"

build/linux/loong64/electron.sha256sums

@@ -0,0 +1,11 @@
+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
+

build/linux/package_bin.sh

@@ -7,6 +7,9 @@ if [[ "${CI_BUILD}" == "no" ]]; then
   exit 1
 fi
 
+# include common functions
+. ./utils.sh
+
 tar -xzf ./vscode.tar.gz
 
 chown -R root:root vscode
@@ -41,33 +44,37 @@ elif [[ "${VSCODE_ARCH}" == "loong64" ]]; then
   export VSCODE_SKIP_SETUPENV=1
 fi
 
-if [[ -f "../electron_linux_${VSCODE_ARCH}.sh" ]]; then
+if [[ -f "../build/linux/${VSCODE_ARCH}/electron.sh" ]]; then
   # add newline at the end of the file
   echo "" >> build/checksums/electron.txt
 
-  if [[ -f "../electron_linux_${VSCODE_ARCH}.sha256sums" ]]; then
-    cat "../electron_linux_${VSCODE_ARCH}.sha256sums" >> build/checksums/electron.txt
+  if [[ -f "../build/linux/${VSCODE_ARCH}/electron.sha256sums" ]]; then
+    cat "../build/linux/${VSCODE_ARCH}/electron.sha256sums" >> build/checksums/electron.txt
   fi
 
   # shellcheck disable=SC1090
-  source "../electron_linux_${VSCODE_ARCH}.sh"
+  source "../build/linux/${VSCODE_ARCH}/electron.sh"
 
-  if [[ "${ELECTRON_VERSION}" != "$( yarn config get target )" ]]; then
+  TARGET=$( yarn config get target )
+
+  # Only fails at different major versions
+  if [[ "${ELECTRON_VERSION%%.*}" != "${TARGET%%.*}" ]]; then
     # Fail the pipeline if electron target doesn't match what is used.
     echo "Electron ${VSCODE_ARCH} binary version doesn't match target electron version!"
     echo "Releases available at: https://github.com/${VSCODE_ELECTRON_REPOSITORY}/releases"
     exit 1
   fi
+
+  if [[ "${ELECTRON_VERSION}" != "${TARGET}" ]]; then
+    # Force version
+    replace "s|target=\"${TARGET}\"|target=\"${ELECTRON_VERSION}\"|" .npmrc
+  fi
 fi
 
 if [[ -d "../patches/linux/client/" ]]; then
   for file in "../patches/linux/client/"*.patch; do
     if [[ -f "${file}" ]]; then
-      echo applying patch: "${file}";
-      if ! git apply --ignore-whitespace "${file}"; then
-        echo failed to apply patch "${file}" >&2
-        exit 1
-      fi
+      apply_patch "${file}"
     fi
   done
 fi
@@ -124,8 +131,8 @@ node build/azure-pipelines/distro/mixin-npm
 
 yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
 
-if [[ -f "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" ]]; then
-  bash "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" "../VSCode-linux-${VSCODE_ARCH}/resources/app/node_modules"
+if [[ -f "../build/linux/${VSCODE_ARCH}/ripgrep.sh" ]]; then
+  bash "../build/linux/${VSCODE_ARCH}/ripgrep.sh" "../VSCode-linux-${VSCODE_ARCH}/resources/app/node_modules"
 fi
 
 find "../VSCode-linux-${VSCODE_ARCH}" -print0 | xargs -0 touch -c

build/linux/package_reh.sh

@@ -7,7 +7,8 @@ if [[ "${CI_BUILD}" == "no" ]]; then
   exit 1
 fi
 
-APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
+# include common functions
+. ./utils.sh
 
 mkdir -p assets
 
@@ -17,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.1"
+NODE_VERSION="20.18.2"
 
 export VSCODE_NODEJS_URLROOT='/download/release'
 export VSCODE_NODEJS_URLSUFFIX=''
@@ -25,25 +26,30 @@ export VSCODE_NODEJS_URLSUFFIX=''
 if [[ "${VSCODE_ARCH}" == "x64" ]]; then
   GLIBC_VERSION="2.17"
   GLIBCXX_VERSION="3.4.22"
-  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:centos7-devtoolset8-${VSCODE_ARCH}"
+
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-x64"
 
   export VSCODE_NODEJS_SITE='https://unofficial-builds.nodejs.org'
   export VSCODE_NODEJS_URLSUFFIX='-glibc-217'
+
+  export VSCODE_SKIP_SETUPENV=1
 elif [[ "${VSCODE_ARCH}" == "arm64" ]]; then
-  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:centos7-devtoolset8-${VSCODE_ARCH}"
+  EXPECTED_GLIBC_VERSION="2.30"
+
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-arm64"
 
   export VSCODE_SKIP_SYSROOT=1
   export USE_GNUPP2A=1
 elif [[ "${VSCODE_ARCH}" == "armhf" ]]; then
-  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-arm32v7"
+  EXPECTED_GLIBC_VERSION="2.30"
+
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-armhf"
 
   export VSCODE_SKIP_SYSROOT=1
   export USE_GNUPP2A=1
 elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
-  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-ppc64le"
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-ppc64le"
 
-  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
   export VSCODE_SYSROOT_REPOSITORY='VSCodium/vscode-linux-build-agent'
   export VSCODE_SYSROOT_VERSION='20240129-253798'
   export USE_GNUPP2A=1
@@ -51,31 +57,28 @@ elif [[ "${VSCODE_ARCH}" == "riscv64" ]]; then
   NODE_VERSION="20.16.0"
   VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-riscv64"
 
-  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
   export VSCODE_SKIP_SETUPENV=1
   export VSCODE_NODEJS_SITE='https://unofficial-builds.nodejs.org'
 elif [[ "${VSCODE_ARCH}" == "loong64" ]]; then
   NODE_VERSION="20.16.0"
-  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:trixie-devtoolset-loong64"
+  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:beige-devtoolset-loong64"
 
-  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
   export VSCODE_SKIP_SETUPENV=1
   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"
 
-  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
   export VSCODE_SYSROOT_REPOSITORY='VSCodium/vscode-linux-build-agent'
   export VSCODE_SYSROOT_VERSION='20241108'
 fi
 
+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}"
 
+EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION:=GLIBC_VERSION}"
 VSCODE_HOST_MOUNT="$( pwd )"
 
 export VSCODE_HOST_MOUNT
@@ -86,11 +89,7 @@ sed -i "/target/s/\"20.*\"/\"${NODE_VERSION}\"/" remote/.npmrc
 if [[ -d "../patches/linux/reh/" ]]; then
   for file in "../patches/linux/reh/"*.patch; do
     if [[ -f "${file}" ]]; then
-      echo applying patch: "${file}";
-      if ! git apply --ignore-whitespace "${file}"; then
-        echo failed to apply patch "${file}" >&2
-        exit 1
-      fi
+      apply_patch "${file}"
     fi
   done
 fi
@@ -98,11 +97,7 @@ fi
 if [[ -d "../patches/linux/reh/${VSCODE_ARCH}/" ]]; then
   for file in "../patches/linux/reh/${VSCODE_ARCH}/"*.patch; do
     if [[ -f "${file}" ]]; then
-      echo applying patch: "${file}";
-      if ! git apply --ignore-whitespace "${file}"; then
-        echo failed to apply patch "${file}" >&2
-        exit 1
-      fi
+      apply_patch "${file}"
     fi
   done
 fi
@@ -129,6 +124,9 @@ EOF
   echo "${INCLUDES}" > "${HOME}/.gyp/include.gypi"
 fi
 
+mv .npmrc .npmrc.bak
+cp ../npmrc .npmrc
+
 for i in {1..5}; do # try 5 times
   npm ci --prefix build && break
   if [[ $i == 3 ]]; then
@@ -153,8 +151,13 @@ for i in {1..5}; do # try 5 times
     exit 1
   fi
   echo "Npm install failed $i, trying again..."
+
+  # remove dependencies that fail during cleanup
+  rm -rf node_modules/@vscode node_modules/node-pty
 done
 
+mv .npmrc.bak .npmrc
+
 node build/azure-pipelines/distro/mixin-npm
 
 export VSCODE_NODE_GLIBC="-glibc-${GLIBC_VERSION}"
@@ -164,7 +167,7 @@ if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
   yarn gulp minify-vscode-reh
   yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
 
-  EXPECTED_GLIBC_VERSION="${GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
+  EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
 
   pushd "../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}"
 
@@ -183,7 +186,7 @@ if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
   yarn gulp minify-vscode-reh-web
   yarn gulp "vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
 
-  EXPECTED_GLIBC_VERSION="${GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
+  EXPECTED_GLIBC_VERSION="${EXPECTED_GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
 
   pushd "../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}"
 

build/linux/ppc64le/electron.sh

@@ -2,5 +2,5 @@
 
 set -ex
 
-export ELECTRON_VERSION="32.2.7"
+export ELECTRON_VERSION="34.2.0"
 export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}"

build/linux/ppc64le/electron.sha256sums

@@ -0,0 +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

build/linux/riscv64/electron.sh

@@ -2,5 +2,5 @@
 
 set -ex
 
-export ELECTRON_VERSION="32.2.7"
+export ELECTRON_VERSION="34.2.0"
 export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}.riscv1"

build/linux/riscv64/electron.sha256sums

@@ -0,0 +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

check_tags.sh

@@ -258,342 +258,358 @@ elif [[ "${ASSETS}" != "null" ]]; then
         echo "Already have all the Windows x64 builds"
       fi
     fi
-  elif [[ "${OS_NAME}" == "linux" ]]; then
+  else
+    if [[ "${OS_NAME}" == "linux" ]]; then
+      if [[ "${CHECK_ONLY_REH}" == "yes" ]]; then
 
-    if [[ "${CHECK_ONLY_REH}" == "yes" ]]; then
+        if [[ -z $( contains "${APP_NAME_LC}-reh-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux ${VSCODE_ARCH} because we have no REH archive"
+          export SHOULD_BUILD="yes"
+        else
+          echo "Already have the Linux REH ${VSCODE_ARCH} archive"
+          export SHOULD_BUILD_REH="no"
+        fi
+
+        if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux ${VSCODE_ARCH} because we have no REH-web archive"
+          export SHOULD_BUILD="yes"
+        else
+          echo "Already have the Linux REH-web ${VSCODE_ARCH} archive"
+          export SHOULD_BUILD_REH_WEB="no"
+        fi
 
-      if [[ -z $( contains "${APP_NAME_LC}-reh-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Linux ${VSCODE_ARCH} because we have no REH archive"
-        export SHOULD_BUILD="yes"
       else
-        echo "Already have the Linux REH ${VSCODE_ARCH} archive"
-        export SHOULD_BUILD_REH="no"
-      fi
 
-      if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Linux ${VSCODE_ARCH} because we have no REH-web archive"
-        export SHOULD_BUILD="yes"
-      else
-        echo "Already have the Linux REH-web ${VSCODE_ARCH} archive"
-        export SHOULD_BUILD_REH_WEB="no"
-      fi
+        # linux-arm64
+        if [[ "${VSCODE_ARCH}" == "arm64" || "${CHECK_ALL}" == "yes" ]]; then
+          if [[ -z $( contains "arm64.deb" ) ]]; then
+            echo "Building on Linux arm64 because we have no DEB"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_DEB="no"
+          fi
 
-    else
+          if [[ -z $( contains "aarch64.rpm" ) ]]; then
+            echo "Building on Linux arm64 because we have no RPM"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_RPM="no"
+          fi
 
-      # linux-arm64
-      if [[ "${VSCODE_ARCH}" == "arm64" || "${CHECK_ALL}" == "yes" ]]; then
-        if [[ -z $( contains "arm64.deb" ) ]]; then
-          echo "Building on Linux arm64 because we have no DEB"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_DEB="no"
-        fi
+          if [[ -z $( contains "${APP_NAME}-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm64 because we have no TAR"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi
 
-        if [[ -z $( contains "aarch64.rpm" ) ]]; then
-          echo "Building on Linux arm64 because we have no RPM"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_RPM="no"
-        fi
+          if [[ -z $( contains "arm64.snap" ) ]]; then
+            echo "Building on Linux arm64 because we have no SNAP"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_SNAP="no"
+          fi
 
-        if [[ -z $( contains "${APP_NAME}-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux arm64 because we have no TAR"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_TAR="no"
-        fi
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm64 because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
 
-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux arm64 because we have no REH archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH="no"
-        fi
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm64 because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
 
-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux arm64 because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
-        fi
-
-        export SHOULD_BUILD_APPIMAGE="no"
-
-        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux arm64 builds"
-        fi
-      fi
-
-      # linux-armhf
-      if [[ "${VSCODE_ARCH}" == "armhf" || "${CHECK_ALL}" == "yes" ]]; then
-        if [[ -z $( contains "armhf.deb" ) ]]; then
-          echo "Building on Linux arm because we have no DEB"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_DEB="no"
-        fi
-
-        if [[ -z $( contains "armv7hl.rpm" ) ]]; then
-          echo "Building on Linux arm because we have no RPM"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_RPM="no"
-        fi
-
-        if [[ -z $( contains "${APP_NAME}-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux arm because we have no TAR"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_TAR="no"
-        fi
-
-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux arm because we have no REH archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH="no"
-        fi
-
-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux arm because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
-        fi
-
-        export SHOULD_BUILD_APPIMAGE="no"
-
-        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux arm builds"
-        fi
-      fi
-
-      # linux-ppc64le
-      if [[ "${VSCODE_ARCH}" == "ppc64le" || "${CHECK_ALL}" == "yes" ]]; then
-        SHOULD_BUILD_APPIMAGE="no"
-        SHOULD_BUILD_DEB="no"
-        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"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_TAR="no"
-        fi
-
-
-        if [[ -z $( contains "${APP_NAME_LC}-reh-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux PowerPC64LE 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-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux PowerPC64LE because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
-        fi
-
-        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux PowerPC64LE builds"
-        fi
-      fi
-
-      # linux-riscv64
-      if [[ "${VSCODE_ARCH}" == "riscv64" || "${CHECK_ALL}" == "yes" ]]; then
-        export SHOULD_BUILD_DEB="no"
-        export SHOULD_BUILD_RPM="no"
-        export SHOULD_BUILD_APPIMAGE="no"
-
-        if [[ -z $( contains "${APP_NAME}-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux RISC-V 64 because we have no TAR"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_TAR="no"
-        fi
-
-        if [[ -z $( contains "${APP_NAME_LC}-reh-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux RISC-V 64 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-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux RISC-V 64 because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
-        fi
-
-        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux riscv64 builds"
-        fi
-      fi
-
-      # linux-loong64
-      if [[ "${VSCODE_ARCH}" == "loong64" || "${CHECK_ALL}" == "yes" ]]; then
-        export SHOULD_BUILD_DEB="no"
-        export SHOULD_BUILD_RPM="no"
-        export SHOULD_BUILD_APPIMAGE="no"
-
-        if [[ -z $( contains "${APP_NAME}-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux Loong64 because we have no TAR"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_TAR="no"
-        fi
-
-        if [[ -z $( contains "${APP_NAME_LC}-reh-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux Loong64 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-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux Loong64 because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
-        fi
-
-        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux Loong64 builds"
-        fi
-      fi
-
-      # linux-s390x
-      if [[ "${VSCODE_ARCH}" == "s390x" || "${CHECK_ALL}" == "yes" ]]; then
-        SHOULD_BUILD_APPIMAGE="no"
-        SHOULD_BUILD_DEB="no"
-        SHOULD_BUILD_RPM="no"
-        SHOULD_BUILD_TAR="no"
-
-        if [[ -z $( contains "${APP_NAME_LC}-reh-linux-s390x-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux s390x 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-linux-s390x-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux s390x because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
-        fi
-
-        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux s390x builds"
-        fi
-      fi
-
-      # linux-x64
-      if [[ "${VSCODE_ARCH}" == "x64" || "${CHECK_ALL}" == "yes" ]]; then
-        if [[ -z $( contains "amd64.deb" ) ]]; then
-          echo "Building on Linux x64 because we have no DEB"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_DEB="no"
-        fi
-
-        if [[ -z $( contains "x86_64.rpm" ) ]]; then
-          echo "Building on Linux x64 because we have no RPM"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_RPM="no"
-        fi
-
-        if [[ -z $( contains "${APP_NAME}-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux x64 because we have no TAR"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_TAR="no"
-        fi
-
-        if [[ "${DISABLE_APPIMAGE}" == "yes" ]]; then
           export SHOULD_BUILD_APPIMAGE="no"
-        elif [[ -z $( contains "x86_64.AppImage" ) ]]; then
-          echo "Building on Linux x64 because we have no AppImage"
-          export SHOULD_BUILD="yes"
-        else
+
+          if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+            echo "Already have all the Linux arm64 builds"
+          fi
+        fi
+
+        # linux-armhf
+        if [[ "${VSCODE_ARCH}" == "armhf" || "${CHECK_ALL}" == "yes" ]]; then
+          if [[ -z $( contains "armhf.deb" ) ]]; then
+            echo "Building on Linux arm because we have no DEB"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_DEB="no"
+          fi
+
+          if [[ -z $( contains "armv7hl.rpm" ) ]]; then
+            echo "Building on Linux arm because we have no RPM"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_RPM="no"
+          fi
+
+          if [[ -z $( contains "${APP_NAME}-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm because we have no TAR"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-armhf-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux arm because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
+
           export SHOULD_BUILD_APPIMAGE="no"
+
+          if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+            echo "Already have all the Linux arm builds"
+          fi
         fi
 
-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux x64 because we have no REH archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH="no"
+        # linux-ppc64le
+        if [[ "${VSCODE_ARCH}" == "ppc64le" || "${CHECK_ALL}" == "yes" ]]; then
+          SHOULD_BUILD_APPIMAGE="no"
+          SHOULD_BUILD_DEB="no"
+          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"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi
+
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux PowerPC64LE because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux PowerPC64LE because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
+
+          if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+            echo "Already have all the Linux PowerPC64LE builds"
+          fi
         fi
 
-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Linux x64 because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
+        # linux-riscv64
+        if [[ "${VSCODE_ARCH}" == "riscv64" || "${CHECK_ALL}" == "yes" ]]; then
+          export SHOULD_BUILD_DEB="no"
+          export SHOULD_BUILD_RPM="no"
+          export SHOULD_BUILD_APPIMAGE="no"
+
+          if [[ -z $( contains "${APP_NAME}-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux RISC-V 64 because we have no TAR"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux RISC-V 64 because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux RISC-V 64 because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
+
+          if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+            echo "Already have all the Linux riscv64 builds"
+          fi
         fi
 
-        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux x64 builds"
+        # linux-loong64
+        if [[ "${VSCODE_ARCH}" == "loong64" || "${CHECK_ALL}" == "yes" ]]; then
+          export SHOULD_BUILD_DEB="no"
+          export SHOULD_BUILD_RPM="no"
+          export SHOULD_BUILD_APPIMAGE="no"
+
+          if [[ -z $( contains "${APP_NAME}-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux Loong64 because we have no TAR"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux Loong64 because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux Loong64 because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
+
+          if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+            echo "Already have all the Linux Loong64 builds"
+          fi
+        fi
+
+        # linux-s390x
+        if [[ "${VSCODE_ARCH}" == "s390x" || "${CHECK_ALL}" == "yes" ]]; then
+          SHOULD_BUILD_APPIMAGE="no"
+          SHOULD_BUILD_DEB="no"
+          SHOULD_BUILD_RPM="no"
+          SHOULD_BUILD_TAR="no"
+
+          if [[ -z $( contains "${APP_NAME_LC}-reh-linux-s390x-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux s390x 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-linux-s390x-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux s390x because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
+
+          if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+            echo "Already have all the Linux s390x builds"
+          fi
+        fi
+
+        # linux-x64
+        if [[ "${VSCODE_ARCH}" == "x64" || "${CHECK_ALL}" == "yes" ]]; then
+          if [[ -z $( contains "amd64.deb" ) ]]; then
+            echo "Building on Linux x64 because we have no DEB"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_DEB="no"
+          fi
+
+          if [[ -z $( contains "x86_64.rpm" ) ]]; then
+            echo "Building on Linux x64 because we have no RPM"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_RPM="no"
+          fi
+
+          if [[ -z $( contains "${APP_NAME}-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux x64 because we have no TAR"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_TAR="no"
+          fi
+
+          if [[ "${DISABLE_APPIMAGE}" == "yes" ]]; then
+            export SHOULD_BUILD_APPIMAGE="no"
+          elif [[ -z $( contains "x86_64.AppImage" ) ]]; then
+            echo "Building on Linux x64 because we have no AppImage"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_APPIMAGE="no"
+          fi
+
+          if [[ -z $( contains "amd64.snap" ) ]]; then
+            echo "Building on Linux x64 because we have no SNAP"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_SNAP="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux x64 because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Linux x64 because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
+
+          if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+            echo "Already have all the Linux x64 builds"
+          fi
         fi
       fi
     fi
 
-  elif [[ "${OS_NAME}" == "alpine" ]]; then
+    if [[ "${OS_NAME}" == "alpine" ]] || [[ "${OS_NAME}" == "linux" && "${CHECK_ALL}" == "yes" ]]; then
 
-    if [[ "${CHECK_ONLY_REH}" == "yes" ]]; then
-      if [[ -z $( contains "${APP_NAME_LC}-reh-alpine-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Alpine ${VSCODE_ARCH} because we have no REH archive"
-        export SHOULD_BUILD="yes"
-      else
-        echo "Already have the Alpine REH ${VSCODE_ARCH} archive"
-        export SHOULD_BUILD_REH="no"
-      fi
-
-      if [[ -z $( contains "${APP_NAME_LC}-reh-web-alpine-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
-        echo "Building on Alpine ${VSCODE_ARCH} because we have no REH-web archive"
-        export SHOULD_BUILD="yes"
-      else
-        echo "Already have the Alpine REH-web ${VSCODE_ARCH} archive"
-        export SHOULD_BUILD_REH_WEB="no"
-      fi
-    else
-
-      # alpine-arm64
-      if [[ "${VSCODE_ARCH}" == "arm64" || "${CHECK_ALL}" == "yes" ]]; then
-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-alpine-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Alpine arm64 because we have no REH archive"
+      if [[ "${CHECK_ONLY_REH}" == "yes" ]]; then
+        if [[ -z $( contains "${APP_NAME_LC}-reh-alpine-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Alpine ${VSCODE_ARCH} because we have no REH archive"
           export SHOULD_BUILD="yes"
         else
+          echo "Already have the Alpine REH ${VSCODE_ARCH} archive"
           export SHOULD_BUILD_REH="no"
         fi
 
-         if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-alpine-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Alpine arm64 because we have no REH-web archive"
+        if [[ -z $( contains "${APP_NAME_LC}-reh-web-alpine-${VSCODE_ARCH}-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Alpine ${VSCODE_ARCH} because we have no REH-web archive"
           export SHOULD_BUILD="yes"
         else
+          echo "Already have the Alpine REH-web ${VSCODE_ARCH} archive"
           export SHOULD_BUILD_REH_WEB="no"
         fi
-      fi
+      else
 
-      # alpine-x64
-      if [[ "${VSCODE_ARCH}" == "x64" || "${CHECK_ALL}" == "yes" ]]; then
-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-alpine-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Alpine x64 because we have no REH archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH="no"
+        # alpine-arm64
+        if [[ "${VSCODE_ARCH}" == "arm64" || "${CHECK_ALL}" == "yes" ]]; then
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-alpine-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Alpine arm64 because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-alpine-arm64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Alpine arm64 because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
         fi
 
-        if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-alpine-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
-          echo "Building on Alpine x64 because we have no REH-web archive"
-          export SHOULD_BUILD="yes"
-        else
-          export SHOULD_BUILD_REH_WEB="no"
+        # alpine-x64
+        if [[ "${VSCODE_ARCH}" == "x64" || "${CHECK_ALL}" == "yes" ]]; then
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-alpine-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Alpine x64 because we have no REH archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH="no"
+          fi
+
+          if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-alpine-x64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+            echo "Building on Alpine x64 because we have no REH-web archive"
+            export SHOULD_BUILD="yes"
+          else
+            export SHOULD_BUILD_REH_WEB="no"
+          fi
         fi
       fi
     fi
@@ -643,6 +659,7 @@ 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_RPM=${SHOULD_BUILD_RPM}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_SNAP=${SHOULD_BUILD_SNAP}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_TAR=${SHOULD_BUILD_TAR}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_ZIP=${SHOULD_BUILD_ZIP}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_SRC=${SHOULD_BUILD_SRC}" >> "${GITHUB_ENV}"

dev/build.ps1

@@ -3,4 +3,4 @@
 # first so `bash` is the one installed with `git`, avoid conflict with WSL
 $env:Path = "C:\Program Files\Git\bin;" + $env:Path
 
-bash ./build/build.sh
+bash ./dev/build.sh

dev/build.sh

@@ -2,12 +2,14 @@
 # shellcheck disable=SC1091,SC2129
 
 ### Windows
-# to run with Bash: "C:\Program Files\Git\bin\bash.exe" ./build/build.sh
+# to run with Bash: "C:\Program Files\Git\bin\bash.exe" ./dev/build.sh
 ###
 
 export APP_NAME="VSCodium"
 export BINARY_NAME="codium"
 export CI_BUILD="no"
+export GH_REPO_PATH="VSCodium/vscodium"
+export ORG_NAME="VSCodium"
 export SHOULD_BUILD="yes"
 export SKIP_ASSETS="yes"
 export SKIP_BUILD="no"
@@ -84,16 +86,16 @@ if [[ "${SKIP_SOURCE}" == "no" ]]; then
   . version.sh
 
   # save variables for later
-  echo "MS_TAG=\"${MS_TAG}\"" > build.env
-  echo "MS_COMMIT=\"${MS_COMMIT}\"" >> build.env
-  echo "RELEASE_VERSION=\"${RELEASE_VERSION}\"" >> build.env
-  echo "BUILD_SOURCEVERSION=\"${BUILD_SOURCEVERSION}\"" >> build.env
+  echo "MS_TAG=\"${MS_TAG}\"" > dev/build.env
+  echo "MS_COMMIT=\"${MS_COMMIT}\"" >> dev/build.env
+  echo "RELEASE_VERSION=\"${RELEASE_VERSION}\"" >> dev/build.env
+  echo "BUILD_SOURCEVERSION=\"${BUILD_SOURCEVERSION}\"" >> dev/build.env
 else
   if [[ "${SKIP_ASSETS}" != "no" ]]; then
     rm -rf vscode-* VSCode-*
   fi
 
-  . build.env
+  . dev/build.env
 
   echo "MS_TAG=\"${MS_TAG}\""
   echo "MS_COMMIT=\"${MS_COMMIT}\""
@@ -124,7 +126,7 @@ if [[ "${SKIP_BUILD}" == "no" ]]; then
       echo "{}" > ~/.gyp/include.gypi.pre-vscodium
     fi
 
-    cp ./include_osx.gypi ~/.gyp/include.gypi
+    cp ./build/osx/include.gypi ~/.gyp/include.gypi
   fi
 
   . build.sh
@@ -134,8 +136,8 @@ if [[ "${SKIP_BUILD}" == "no" ]]; then
   fi
 
   if [[ "${VSCODE_LATEST}" == "yes" ]]; then
-    jsonTmp=$( cat "${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )
-    echo "${jsonTmp}" > "${VSCODE_QUALITY}.json" && unset jsonTmp
+    jsonTmp=$( cat "./upstream/${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )
+    echo "${jsonTmp}" > "./upstream/${VSCODE_QUALITY}.json" && unset jsonTmp
   fi
 fi
 
@@ -144,8 +146,8 @@ if [[ "${SKIP_ASSETS}" == "no" ]]; then
     rm -rf build/windows/msi/releasedir
   fi
 
-  if [[ "${OS_NAME}" == "osx" && -f "./macos-codesign.env" ]]; then
-    . macos-codesign.env
+  if [[ "${OS_NAME}" == "osx" && -f "dev/osx/codesign.env" ]]; then
+    . dev/osx/macos-codesign.env
 
     echo "CERTIFICATE_OSX_ID: ${CERTIFICATE_OSX_ID}"
   fi

dev/patch.sh

@@ -29,7 +29,7 @@ while [ $# -gt 1 ]; do
 done
 
 git add .
-git commit -q -m "VSCODIUM HELPER" --no-verify
+git commit --no-verify -q -m "VSCODIUM HELPER"
 
 if [[ "${1}" == *patch ]]; then
   FILE="../patches/${1}"
@@ -38,7 +38,7 @@ else
 fi
 
 if [[ -f "${FILE}" ]]; then
-  git apply --reject "${FILE}"
+  git apply --reject "${FILE}" || true
 fi
 
 read -rp "Press any key when the conflict have been resolved..." -n1 -s
@@ -47,6 +47,4 @@ git add .
 git diff --staged -U1 > "${FILE}"
 git reset -q --hard HEAD~
 
-cd ..
-
 echo "The patch has been generated."

docs/howto-build.md

@@ -51,21 +51,21 @@ see [the common dependencies](#dependencies)
 
 ## <a id="build-scripts"></a>Build Scripts
 
-A build helper script can be found at `build/build.sh`.
+A build helper script can be found at `dev/build.sh`.
 
-- Linux: `./build/build.sh`
-- MacOS: `./build/build.sh`
-- Windows: `powershell -ExecutionPolicy ByPass -File .\build\build.ps1` or `"C:\Program Files\Git\bin\bash.exe" ./build/build.sh`
+- Linux: `./dev/build.sh`
+- MacOS: `./dev/build.sh`
+- Windows: `powershell -ExecutionPolicy ByPass -File .\dev\build.ps1` or `"C:\Program Files\Git\bin\bash.exe" ./dev/build.sh`
 
 ### Insider
 
-The `insider` version can be built with `./build/build.sh -i` on the `insider` branch.
+The `insider` version can be built with `./dev/build.sh -i` on the `insider` branch.
 
-You can try the latest version with the command `./build/build.sh -il` but the patches might not be up to date.
+You can try the latest version with the command `./dev/build.sh -il` but the patches might not be up to date.
 
 ### Flags
 
-The script `build/build.sh` provides several flags:
+The script `dev/build.sh` provides several flags:
 
 - `-i`: build the Insiders version
 - `-l`: build with latest version of Visual Studio Code
@@ -93,8 +93,8 @@ review-tools.snap-review --allow-classic codium*.snap
 
 ## <a id="patch-update-process-semiauto"></a>Semi-Automated
 
-- run `./build/build_<os>.sh`, if a patch is failing then,
-- run `./build/update_patches.sh`
+- run `./dev/build.sh`, if a patch is failing then,
+- run `./dev/update_patches.sh`
 - when the script pauses at `Press any key when the conflict have been resolved...`, open `vscode` directory in **VSCodium**
 - fix all the `*.rej` files
 - run `yarn watch`
@@ -103,7 +103,7 @@ review-tools.snap-review --allow-classic codium*.snap
 
 ## <a id="patch-update-process-manual"></a>Manual
 
-- run `./build/build_<os>.sh`, if a patch is failing then,
+- run `./dev/build.sh`, if a patch is failing then,
 - open `vscode` directory in **VSCodium**
 - revert all changes
 - run `git apply --reject ../patches/<name>.patch`

docs/index.md

@@ -69,10 +69,12 @@ See [this article](https://www.gitpod.io/blog/open-vsx/) for more information on
 You can switch from the pre-set Open VSX Registry by configuring the endpoints using the following solutions.
 
 You can either use the following environment variables:
-- `VSCODE_GALLERY_SERVICE_URL`
-- `VSCODE_GALLERY_ITEM_URL`
+- `VSCODE_GALLERY_SERVICE_URL` ***(required)***
+- `VSCODE_GALLERY_ITEM_URL` ***(required)***
 - `VSCODE_GALLERY_CACHE_URL`
 - `VSCODE_GALLERY_CONTROL_URL`
+- `VSCODE_GALLERY_EXTENSION_URL_TEMPLATE` ***(required)***
+- `VSCODE_GALLERY_RESOURCE_URL_TEMPLATE`
 
 Or by creating a custom `product.json` at the following location (replace `VSCodium` by `VSCodium - Insiders` if you use that):
 - Windows: `%APPDATA%\VSCodium` or `%USERPROFILE%\AppData\Roaming\VSCodium`
@@ -84,10 +86,12 @@ with the content like:
 ```jsonc
 {
   "extensionsGallery": {
-    "serviceUrl": "",
-    "itemUrl": "",
+    "serviceUrl": "", // required
+    "itemUrl": "", // required
     "cacheUrl": "",
-    "controlUrl": ""
+    "controlUrl": "",
+    "extensionUrlTemplate": "", // required
+    "resourceUrlTemplate": "",
   }
 }
 ```

electron_linux_loong64.sha256sums

@@ -1,11 +0,0 @@
-2324198f130de1f5ccff6f216277eafa76fa53883c8297533f0e0c09d96faf31 *chromedriver-v32.2.7-linux-loong64.zip
-724acd5cde9e747b3765f062b9a243af344faa039f9f0218beed1b0e9455e893 *electron-v32.2.7-linux-loong64-debug.zip
-dee3600a67cc7f40f0fb4a8938940cb20fba0a95886352145cacc0334baa955e *electron-v32.2.7-linux-loong64-symbols.zip
-2904bfaa386deddf968dec71c4b4235635daa318bdbb05ae3f3673983242cefe *electron-v32.2.7-linux-loong64.zip
-e8fb755c82a58d98c70c1d3ac4d9c9c77e42021322b188183a550793ba94afe0 *ffmpeg-v32.2.7-linux-loong64.zip
-69506c95a7ce4d5270164e0613aec9eb11fdc24f3dc21df3cd78963b764a6b75 *hunspell-dictionaries.zip
-e02189a00e5170306289ba2bc0c295a9698f76899d812e35fc69fd8e4e4841d2 *libcxx-headers.zip
-0cc5c76d848d9f572ef4050839876afd8533dc71fc90c319edfffcaa3dca0e01 *libcxx-objects-v32.2.7-linux-loong64.zip
-caada8fb0a210d660e2150a0fe9f7b84a9e969a5b1110ce2d6b58f5d21637387 *libcxxabi-headers.zip
-8736592799acdaafae2214156c7755f3249f4fd577fccc3df11bf42a5481aa12 *mksnapshot-v32.2.7-linux-loong64.zip
-3d80771ab908f55cc61416b8b11d572e777b6c613ad2a7ee7aa8fef8b4ede011 *node-v32.2.7-headers.tar.gz

electron_linux_ppc64le.sha256sums

@@ -1,11 +0,0 @@
-176cbd410925566ed2290d006b4a70de9d7953997d2189e67495fec5ec7648aa *chromedriver-v32.2.7-linux-ppc64le.zip
-64a683d339b87463cacef142730ac366fa39ee27e017390909a928b9afb81b12 *electron-v32.2.7-linux-ppc64le-debug.zip
-361b11b83589f64756def0a4982b611fb5220df287cd6c6fc3c9d4c5240a7b87 *electron-v32.2.7-linux-ppc64le-symbols.zip
-1cba399c82c5baccb0387971a5697920d771bc424bd65fe503289e4d8f72dfa2 *electron-v32.2.7-linux-ppc64le.zip
-ce41b10c28bd43249cd3b409e081b1c83a2b691381bdd2e3bf208ec40ca176b8 *electron.d.ts
-9b74c159cbc8e9f80d145117e828066b09a1703961adc4f31703271776132797 *ffmpeg-v32.2.7-linux-ppc64le.zip
-d8b47b51bb9474e39f9a0024a34a2378e4bdb3ff1ed4366db1752b3c6452afd1 *hunspell_dictionaries.zip
-0c125463ff1b1bc3e8f16e3fc09052f4061143743acddf478188d08049da4d55 *libcxx-objects-v32.2.7-linux-ppc64le.zip
-b1fc26b925ba6b896dea50bd471128cfa290c5b19673a62e8775537f6f94514d *libcxx_headers.zip
-6f00ab500f9418eb788578c67a84422ed5dc962ad9c3be0de1f2931f55066895 *libcxxabi_headers.zip
-2def4b7386e49bd658dd4f2f147710525423bb5cd3811394af0cf2b5047045ea *mksnapshot-v32.2.7-linux-ppc64le.zip

electron_linux_riscv64.sha256sums

@@ -1,11 +0,0 @@
-26a3b6958d4b88f8b436b429aa7702d5d3af58ce892fe985c8fd68156e0b33d6 *chromedriver-v32.2.7-linux-riscv64.zip
-3b1e9b38a722a32c7127a9646b37366ebe20470fbedf17c94e2dd7e388046c26 *electron-v32.2.7-linux-riscv64-debug.tar.zst
-e9b4738bfd9aa0a9a98ee626e760f230730655bb02185a90a246ba6398c52db3 *electron-v32.2.7-linux-riscv64-symbols.tar.zst
-e71a432a4e03458b71d2428c812d3119658b61941a59b60d346d281b5c29f827 *electron-v32.2.7-linux-riscv64.zip
-51982b096a16b6546941710225fd21855a3fe3b83ec0bf69a4b048d9995ddd19 *ffmpeg-v32.2.7-linux-riscv64.zip
-5455ce9b9a98b349ad95050ca643bfc5312cf4636dd5ec62d475d1a07b2a35a5 *hunspell-dictionaries.zip
-4f0abd2517c30de0fc3ddcaa881460924b87c6a48e28cffa41e1050e201b17e5 *libcxx-headers.zip
-3477a9c568c8c65e5a142a2b4408aec19edda2de9ba303e4aec77eef41aeea10 *libcxx-objects-v32.2.7-linux-riscv64.zip
-01ff628652bc485ce6bf41b975e15339b246771f5f9d1de79ba24d79a00e840a *libcxxabi-headers.zip
-8d47b32d2cd3d57fab542de097a10f5f632a958902172a8993fe390a6089f778 *mksnapshot-v32.2.7-linux-riscv64.zip
-29229408ca301a90be7f7862ac3efec932b198105c44e668f1b3eb6bf043198e *node-v32.2.7-headers.tar.gz

get_repo.sh

@@ -9,13 +9,13 @@ if [[ "${CI_BUILD}" != "no" ]]; then
 fi
 
 if [[ -z "${RELEASE_VERSION}" ]]; then
-  if [[ "${VSCODE_LATEST}" == "yes" ]] || [[ ! -f "${VSCODE_QUALITY}.json" ]]; then
+  if [[ "${VSCODE_LATEST}" == "yes" ]] || [[ ! -f "./upstream/${VSCODE_QUALITY}.json" ]]; then
     echo "Retrieve lastest version"
     UPDATE_INFO=$( curl --silent --fail "https://update.code.visualstudio.com/api/update/darwin/${VSCODE_QUALITY}/0000000000000000000000000000000000000000" )
   else
     echo "Get version from ${VSCODE_QUALITY}.json"
-    MS_COMMIT=$( jq -r '.commit' "${VSCODE_QUALITY}.json" )
-    MS_TAG=$( jq -r '.tag' "${VSCODE_QUALITY}.json" )
+    MS_COMMIT=$( jq -r '.commit' "./upstream/${VSCODE_QUALITY}.json" )
+    MS_TAG=$( jq -r '.tag' "./upstream/${VSCODE_QUALITY}.json" )
   fi
 
   if [[ -z "${MS_COMMIT}" ]]; then
@@ -53,8 +53,8 @@ else
     fi
   fi
 
-  if [[ "${MS_TAG}" == "$( jq -r '.tag' "${VSCODE_QUALITY}".json )" ]]; then
-    MS_COMMIT=$( jq -r '.commit' "${VSCODE_QUALITY}".json )
+  if [[ "${MS_TAG}" == "$( jq -r '.tag' "./upstream/${VSCODE_QUALITY}.json" )" ]]; then
+    MS_COMMIT=$( jq -r '.commit' "./upstream/${VSCODE_QUALITY}.json" )
   else
     echo "Error: No MS_COMMIT for ${RELEASE_VERSION}"
     exit 1

insider.json

@@ -1,4 +0,0 @@
-{
-  "tag": "1.96.0",
-  "commit": "475acb4b9bdd77d4204224990bf288ed5bfe6b0e"
-}

npmrc

@@ -0,0 +1,3 @@
+build_from_source="true"
+legacy-peer-deps="true"
+timeout=180000

patches/disable-cloud.patch

@@ -1,5 +1,5 @@
 diff --git a/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts b/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
-index 18b5815..51a5d50 100644
+index 1bb5eb3..70f1b37 100644
 --- a/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
 +++ b/src/vs/workbench/contrib/editSessions/browser/editSessionsStorageService.ts
 @@ -7,3 +7,3 @@ import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.j
@@ -16,9 +16,12 @@ index 18b5815..51a5d50 100644
  
 -		this.registerSignInAction();
  		this.registerResetAuthenticationAction();
-@@ -456,39 +455,2 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
+@@ -456,42 +455,2 @@ export class EditSessionsWorkbenchService extends Disposable implements IEditSes
  
 -	private registerSignInAction() {
+-		if (!this.serverConfiguration?.url) {
+-			return;
+-		}
 -		const that = this;
 -		const id = 'workbench.editSessions.actions.signIn';
 -		const when = ContextKeyExpr.and(ContextKeyExpr.equals(EDIT_SESSIONS_PENDING_KEY, false), ContextKeyExpr.equals(EDIT_SESSIONS_SIGNED_IN_KEY, false));

patches/ext-from-gh.patch

@@ -1,22 +1,19 @@
 diff --git a/build/lib/builtInExtensions.js b/build/lib/builtInExtensions.js
-index 1b0adc4..b595123 100644
+index 249777c..129af8a 100644
 --- a/build/lib/builtInExtensions.js
 +++ b/build/lib/builtInExtensions.js
-@@ -47,5 +47,3 @@ function isUpToDate(extension) {
- function getExtensionDownloadStream(extension) {
--    const galleryServiceUrl = productjson.extensionsGallery?.serviceUrl;
--    return (galleryServiceUrl ? ext.fromMarketplace(galleryServiceUrl, extension) : ext.fromGithub(extension))
--        .pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
-+    return ext.fromGithub(extension).pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
- }
+@@ -87,5 +87,2 @@ function getExtensionDownloadStream(extension) {
+     }
+-    else if (productjson.extensionsGallery?.serviceUrl) {
+-        input = ext.fromMarketplace(productjson.extensionsGallery.serviceUrl, extension);
+-    }
+     else {
 diff --git a/build/lib/builtInExtensions.ts b/build/lib/builtInExtensions.ts
-index fefed43..4ae553e 100644
+index e9a1180..b8348e3 100644
 --- a/build/lib/builtInExtensions.ts
 +++ b/build/lib/builtInExtensions.ts
-@@ -72,5 +72,3 @@ function isUpToDate(extension: IExtensionDefinition): boolean {
- function getExtensionDownloadStream(extension: IExtensionDefinition) {
--	const galleryServiceUrl = productjson.extensionsGallery?.serviceUrl;
--	return (galleryServiceUrl ? ext.fromMarketplace(galleryServiceUrl, extension) : ext.fromGithub(extension))
--		.pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
-+	return ext.fromGithub(extension).pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`));
- }
+@@ -75,4 +75,2 @@ function getExtensionDownloadStream(extension: IExtensionDefinition) {
+ 		input = ext.fromVsix(path.join(root, extension.vsix), extension);
+-	} else if (productjson.extensionsGallery?.serviceUrl) {
+-		input = ext.fromMarketplace(productjson.extensionsGallery.serviceUrl, extension);
+ 	} else {

patches/feat-announcements.patch

@@ -8,7 +8,7 @@ index c581ac0..f11c0f0 100644
 +			scope: ConfigurationScope.MACHINE,
 +			type: 'boolean',
 +			default: true,
-+			description: localize('workbench.welcomePage.extraAnnouncements', "When enabled, the get started page loads additional announcements from VSCodium's repository.")
++			description: localize('workbench.welcomePage.extraAnnouncements', "When enabled, the get started page loads additional announcements from !!APP_NAME!!'s repository.")
 +		},
  		'workbench.startupEditor': {
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
@@ -62,7 +62,7 @@ index 664c55b..43f9e2e 100644
 +		if (this.announcementList) { this.announcementList.dispose(); }
 +
 +		const announcementList = this.announcementList = new GettingStartedIndexList({
-+			title: localize('announcements', "VSCodium Announcements"),
++			title: localize('announcements', "!!APP_NAME!! Announcements"),
 +			klass: 'announcements',
 +			limit: 5,
 +			empty: $('.empty-recent', {}, localize('noAnnouncements', "There are no current announcements.")),
@@ -75,7 +75,7 @@ index 664c55b..43f9e2e 100644
 +
 +			if (showExtras) {
 +				const branch = this.productService.quality === 'insider' ? 'insider' : 'master';
-+				await fetch(`https://raw.githubusercontent.com/VSCodium/vscodium/${branch}/announcements-extra.json`)
++				await fetch(`https://raw.githubusercontent.com/!!GH_REPO_PATH!!/${branch}/announcements-extra.json`)
 +					.then(async res => {
 +						if (res.ok) {
 +							var extraAnnouncements = await res.json() as AnnouncementEntry[];

patches/fix-eol-banner.patch

@@ -9,7 +9,7 @@ index 1f329c4..3e36bff 100644
  import { IThemeService } from '../../../../platform/theme/common/themeService.js';
 @@ -30,2 +30,3 @@ import { widgetClose } from '../../../../platform/theme/common/iconRegistry.js';
  import { BannerFocused } from '../../../common/contextkeys.js';
-+import { INeverShowAgainOptions, NeverShowAgainScope } from '../../../../platform/notification/common/notification';
++import { INeverShowAgainOptions, NeverShowAgainScope } from '../../../../platform/notification/common/notification.js';
  
 @@ -67,3 +68,3 @@ export class BannerPart extends Part implements IBannerService {
  		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
@@ -53,7 +53,7 @@ index 2db0fa4..d179055 100644
 +++ b/src/vs/workbench/services/banner/browser/bannerService.ts
 @@ -10,2 +10,3 @@ import { ILinkDescriptor } from '../../../../platform/opener/browser/link.js';
  import { ThemeIcon } from '../../../../base/common/themables.js';
-+import { INeverShowAgainOptions } from '../../../../platform/notification/common/notification';
++import { INeverShowAgainOptions } from '../../../../platform/notification/common/notification.js';
  
 @@ -18,2 +19,3 @@ export interface IBannerItem {
  	readonly onClose?: () => void;

patches/insider/add-remote-url.patch

@@ -5,7 +5,7 @@ index 7d58861..cefb8ad 100644
 @@ -306,3 +306,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const productJsonStream = gulp.src(['product.json'], { base: '.' })
 -			.pipe(json({ commit, date: readISODate('out-build'), version, release }))
-+			.pipe(json({ commit, date: readISODate('out-build'), version, release, serverDownloadUrlTemplate: 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' }))
++			.pipe(json({ commit, date: readISODate('out-build'), version, release, serverDownloadUrlTemplate: 'https://github.com/!!GH_REPO_PATH!!-insiders/releases/download/${version}.${release}-insider/!!APP_NAME_LC!!-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' }))
  			.pipe(es.through(function (file) {
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
 index 4af4067..1bac2cc 100644
@@ -14,5 +14,5 @@ index 4af4067..1bac2cc 100644
 @@ -261,3 +261,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  		const productJsonStream = gulp.src(['product.json'], { base: '.' })
 -			.pipe(json({ commit, date: readISODate('out-build'), checksums, version, release }))
-+			.pipe(json({ commit, date: readISODate('out-build'), checksums, version, release, serverDownloadUrlTemplate: 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' }))
++			.pipe(json({ commit, date: readISODate('out-build'), checksums, version, release, serverDownloadUrlTemplate: 'https://github.com/!!GH_REPO_PATH!!-insiders/releases/download/${version}.${release}-insider/!!APP_NAME_LC!!-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' }))
  			.pipe(es.through(function (file) {

patches/linux/client/avoid-crash-16k-page-size.patch

@@ -0,0 +1,17 @@
+diff --git a/src/main.ts b/src/main.ts
+index c132c9b..51a7290 100644
+--- a/src/main.ts
++++ b/src/main.ts
+@@ -524,2 +524,12 @@ function getJSFlags(cliArgs: NativeParsedArgs): string | null {
+ 
++	// Fix cppgc crash on Linux with 16KB page size.
++	// Refs https://issues.chromium.org/issues/378017037
++	// The fix from https://github.com/electron/electron/commit/6c5b2ef55e08dc0bede02384747549c1eadac0eb
++	// only affects non-renderer process.
++	// The following will ensure that the flag will be
++	// applied to the renderer process as well.
++	// TODO: Remove this once we update to
++	// Chromium >= 134.
++	jsFlags.push('--nodecommit_pooled_pages');
++
+ 	return jsFlags.length > 0 ? jsFlags.join(' ') : null;

patches/linux/fix-build.patch

@@ -19,21 +19,21 @@ index fb0e5a4..412a6cc 100644
 +	const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch)));
  	gulp.task(buildRpmTask);
 diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
-index 80b11b3..0a0ca71 100644
+index 39e2b4e..aae72ae 100644
 --- a/build/linux/dependencies-generator.js
 +++ b/build/linux/dependencies-generator.js
-@@ -24,3 +24,3 @@ const product = require("../../product.json");
+@@ -27,3 +27,3 @@ const product = require("../../product.json");
  // are valid, are in dep-lists.ts
 -const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
 +const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
- // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/128.0.6613.186:chrome/installer/linux/BUILD.gn;l=64-80
-@@ -57,3 +57,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
+ // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/132.0.6834.196:chrome/installer/linux/BUILD.gn;l=64-80
+@@ -60,3 +60,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
      // Add the tunnel binary.
--    files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
-+    // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
+-    files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
++    // files.push(path_1.default.join(buildDir, 'bin', product.tunnelApplicationName));
      // Add the main executable.
 diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
-index 3163aee..dca1845 100644
+index 83d2ec7..6c14583 100644
 --- a/build/linux/dependencies-generator.ts
 +++ b/build/linux/dependencies-generator.ts
 @@ -25,3 +25,3 @@ import product = require('../../product.json');
@@ -46,4 +46,3 @@ index 3163aee..dca1845 100644
 -	files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
 +	// files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
  	// Add the main executable.
-  

patches/linux/reh/s390x/arch-4-s390x-package.json.patch

@@ -1,10 +1,8 @@
 diff --git a/package-lock.json b/package-lock.json
-index 7b02996..4642486 100644
+index fd395eb..f56bc78 100644
 --- a/package-lock.json
 +++ b/package-lock.json
-@@ -17875,10 +17875,11 @@
-       }
-     },
+@@ -18274,6 +18274,7 @@
      "node_modules/web-tree-sitter": {
 -      "version": "0.20.8",
 -      "resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.20.8.tgz",
@@ -16,20 +14,13 @@ index 7b02996..4642486 100644
 +      "dev": true,
 +      "license": "MIT"
      },
-     "node_modules/webidl-conversions": {
-       "version": "3.0.1",
 diff --git a/package.json b/package.json
-index 7e0de18..4ceaded 100644
+index eb0abcc..40b107a 100644
 --- a/package.json
 +++ b/package.json
-@@ -226,7 +226,10 @@
-     },
-     "@parcel/watcher@2.1.0": {
+@@ -226,2 +226,5 @@
        "node-addon-api": "7.1.0"
 +    },
 +    "@vscode/l10n-dev@0.0.35": {
 +      "web-tree-sitter": "0.23.0"
      }
-   },
-   "repository": {
-     "type": "git",

patches/linux/yarn-dependencies.patch

@@ -1,12 +1,17 @@
 diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index 88e3c9e..4cad4f1 100644
+index c1f22aa5002..a6fb2728b1f 100644
 --- a/build/npm/postinstall.js
 +++ b/build/npm/postinstall.js
-@@ -55,4 +55,6 @@ function npmInstall(dir, opts) {
+@@ -53,8 +53,10 @@ function npmInstall(dir, opts) {
+ 		log(dir, `Installing dependencies inside container ${process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME']}...`);
+ 
  		opts.cwd = root;
 -		if (process.env['npm_config_arch'] === 'arm64') {
-+		if (process.env['npm_config_arch'] === 'arm64' || process.env['npm_config_arch'] === 'arm' || process.env['npm_config_arch'] === 'ppc64' || process.env['npm_config_arch'] === 'riscv64' || process.env['npm_config_arch'] === 's390x') {
- 			run('sudo', ['docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static', '--reset', '-p', 'yes'], opts);
+-			run('sudo', ['docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static', '--reset', '-p', 'yes'], opts);
++		if ((process.env['npm_config_arch'] === 'arm64' || process.env['npm_config_arch'] === 'arm' || process.env['npm_config_arch'] === 'ppc64' || process.env['npm_config_arch'] === 'riscv64' || process.env['npm_config_arch'] === 's390x') && process.env['DISABLE_QEMU'] !== 'true') {
++			run('sudo', ['docker', 'run', '--rm', '--privileged', 'tonistiigi/binfmt:latest', '--install', 'all'], opts);
 +		} else if (process.env['npm_config_arch'] === 'loong64') {
 +			run('sudo', ['docker', 'run', '--rm', '--privileged', 'loongcr.lcpu.dev/multiarch/archlinux', '--reset', '-p', 'yes'], opts);
  		}
+ 		run('sudo', ['docker', 'run', '-e', 'GITHUB_TOKEN', '-v', `${process.env['VSCODE_HOST_MOUNT']}:/root/vscode`, '-v', `${process.env['VSCODE_HOST_MOUNT']}/.build/.netrc:/root/.netrc`, '-w', path.resolve('/root/vscode', dir), process.env['VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME'], 'sh', '-c', `\"chown -R root:root ${path.resolve('/root/vscode', dir)} && npm i -g node-gyp-build && npm ci\"`], opts);
+ 		run('sudo', ['chown', '-R', `${userinfo.uid}:${userinfo.gid}`, `${path.resolve(root, dir)}`], opts);

patches/merge-user-product.patch

@@ -1,5 +1,5 @@
 diff --git a/src/main.ts b/src/main.ts
-index ff9a5e8..2135d00 100644
+index c132c9b..9684685 100644
 --- a/src/main.ts
 +++ b/src/main.ts
 @@ -8,2 +8,3 @@ import * as fs from 'original-fs';
@@ -25,24 +25,26 @@ index ff9a5e8..2135d00 100644
 +}
 +
  /**
-@@ -183,2 +197,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu
+@@ -208,2 +222,3 @@ async function startup(codeCachePath: string | undefined, nlsConfig: INLSConfigu
  	process.env['VSCODE_CODE_CACHE_PATH'] = codeCachePath || '';
 +	resolveUserProduct();
  
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index 1a2a619..9bf5ac0 100644
+index 1a2a619..3837df0 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
-@@ -29,2 +29,36 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
+@@ -29,2 +29,38 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
  
-+	const { serviceUrl, searchUrl, itemUrl, controlUrl } = product.extensionsGallery || {};
++	const { serviceUrl, publisherUrl, itemUrl, controlUrl, extensionUrlTemplate, resourceUrlTemplate } = product.extensionsGallery || {};
 +
 +	Object.assign(product, {
 +		extensionsGallery: {
 +			serviceUrl: env['VSCODE_GALLERY_SERVICE_URL'] || serviceUrl,
-+			searchUrl: env['VSCODE_GALLERY_SEARCH_URL'] || searchUrl,
++			publisherUrl: env['VSCODE_GALLERY_PUBLISHER_URL'] || publisherUrl,
 +			itemUrl: env['VSCODE_GALLERY_ITEM_URL'] || itemUrl,
 +			controlUrl: env['VSCODE_GALLERY_CONTROL_URL'] || controlUrl,
++			extensionUrlTemplate: env['VSCODE_GALLERY_EXTENSION_URL_TEMPLATE'] || extensionUrlTemplate,
++			resourceUrlTemplate: env['VSCODE_GALLERY_RESOURCE_URL_TEMPLATE'] || resourceUrlTemplate,
 +		}
 +	});
 +

patches/osx/fix-codesign.patch

@@ -1,28 +1,30 @@
 diff --git a/build/darwin/sign.js b/build/darwin/sign.js
-index f5913b7..100b950 100644
+index dff30fd..df48bee 100644
 --- a/build/darwin/sign.js
 +++ b/build/darwin/sign.js
-@@ -53,5 +53,7 @@ async function main(buildDir) {
+@@ -56,5 +56,7 @@ async function main(buildDir) {
          ignore: (filePath) => {
-+						const ext = path.extname(filePath);
++            const ext = path_1.default.extname(filePath);
              return filePath.includes(gpuHelperAppName) ||
                  filePath.includes(rendererHelperAppName) ||
 -                filePath.includes(pluginHelperAppName);
 +                filePath.includes(pluginHelperAppName) ||
-+								ext == '.asar' || ext == '.dat' || ext == '.gif' || ext == '.icns' || ext == '.ico' || ext == '.json' || ext == '.mp3' || ext == '.nib' || ext == '.pak' || ext == '.png' || ext == '.scpt' || ext == '.ttf' || ext == '.wasm' || ext == '.woff' || ext == '.woff2';
++                ext == '.asar' || ext == '.dat' || ext == '.gif' || ext == '.icns' || ext == '.ico' || ext == '.json' || ext == '.mp3' || ext == '.nib' || ext == '.pak' || ext == '.png' || ext == '.scpt' || ext == '.ttf' || ext == '.wasm' || ext == '.woff' || ext == '.woff2';
          }
-@@ -83,3 +85,3 @@ async function main(buildDir) {
-             '-string',
--            'An application in Visual Studio Code wants to use AppleScript.',
-+            'An application in VSCodium wants to use AppleScript.',
-             `${infoPlistPath}`
-@@ -90,3 +92,3 @@ async function main(buildDir) {
-             '-string',
--            'An application in Visual Studio Code wants to use the Microphone.',
-+            'An application in VSCodium wants to use the Microphone.',
-             `${infoPlistPath}`
-@@ -97,3 +99,3 @@ async function main(buildDir) {
-             '-string',
--            'An application in Visual Studio Code wants to use the Camera.',
-+            'An application in VSCodium wants to use the Camera.',
-             `${infoPlistPath}`
+diff --git a/build/darwin/sign.ts b/build/darwin/sign.ts
+index ecf1627..a414032 100644
+--- a/build/darwin/sign.ts
++++ b/build/darwin/sign.ts
+@@ -60,6 +60,9 @@ async function main(buildDir?: string): Promise<void> {
+ 		ignore: (filePath: string) => {
+-			return filePath.includes(gpuHelperAppName) ||
+-				filePath.includes(rendererHelperAppName) ||
+-				filePath.includes(pluginHelperAppName);
++			const ext = path.extname(filePath);
++            return filePath.includes(gpuHelperAppName) ||
++                filePath.includes(rendererHelperAppName) ||
++                filePath.includes(pluginHelperAppName) ||
++				ext == '.asar' || ext == '.dat' || ext == '.gif' || ext == '.icns' || ext == '.ico' || ext == '.json' || ext == '.mp3' || ext == '.nib' || ext == '.pak' || ext == '.png' || ext == '.scpt' || ext == '.ttf' || ext == '.wasm' || ext == '.woff' || ext == '.woff2';
+ 		}
++
+ 	};

patches/osx/fix-emulated-urls.patch

@@ -6,6 +6,6 @@ index 90c9654..3ef5d32 100644
  						const quality = this.productService.quality;
 -						const stableURL = 'https://code.visualstudio.com/docs/?dv=osx';
 -						const insidersURL = 'https://code.visualstudio.com/docs/?dv=osx&build=insiders';
-+						const stableURL = 'https://github.com/VSCodium/vscodium/releases/latest';
-+						const insidersURL = 'https://github.com/VSCodium/vscodium-insiders/releases/latest';
++						const stableURL = 'https://github.com/!!GH_REPO_PATH!!/releases/latest';
++						const insidersURL = 'https://github.com/!!GH_REPO_PATH!!-insiders/releases/latest';
  						this.openerService.open(quality === 'stable' ? stableURL : insidersURL);

patches/remove-mangle.patch

@@ -1,15 +1,15 @@
 diff --git a/build/lib/compilation.js b/build/lib/compilation.js
-index 2270e05..1bd7b90 100644
+index 841dbe1..7cf692a 100644
 --- a/build/lib/compilation.js
 +++ b/build/lib/compilation.js
-@@ -104,24 +104,3 @@ function compileTask(src, out, build, options = {}) {
+@@ -148,24 +148,3 @@ function compileTask(src, out, build, options = {}) {
          }
 -        // mangle: TypeScript to TypeScript
--        let mangleStream = es.through();
+-        let mangleStream = event_stream_1.default.through();
 -        if (build && !options.disableMangle) {
--            let ts2tsMangler = new index_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true });
+-            let ts2tsMangler = new index_1.Mangler(compile.projectPath, (...data) => (0, fancy_log_1.default)(ansi_colors_1.default.blue('[mangler]'), ...data), { mangleExports: true, manglePrivateFields: true });
 -            const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
--            mangleStream = es.through(async function write(data) {
+-            mangleStream = event_stream_1.default.through(async function write(data) {
 -                const tsNormalPath = ts.normalizePath(data.path);
 -                const newContents = (await newContentsByFileName).get(tsNormalPath);
 -                if (newContents !== undefined) {
@@ -28,10 +28,15 @@ index 2270e05..1bd7b90 100644
 -            .pipe(mangleStream)
              .pipe(generator.stream)
 diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
-index d5da3f1..fa46962 100644
+index 6e1fcab..4e45106 100644
 --- a/build/lib/compilation.ts
 +++ b/build/lib/compilation.ts
-@@ -123,27 +123,3 @@ export function compileTask(src: string, out: string, build: boolean, options: {
+@@ -18,4 +18,2 @@ import File from 'vinyl';
+ import * as task from './task';
+-import { Mangler } from './mangle/index';
+-import { RawSourceMap } from 'source-map';
+ import { gulpPostcss } from './postcss';
+@@ -138,27 +136,3 @@ export function compileTask(src: string, out: string, build: boolean, options: {
  
 -		// mangle: TypeScript to TypeScript
 -		let mangleStream = es.through();

patches/report-issue.patch

@@ -5,7 +5,7 @@ index 447f4c9..4ad0e18 100644
 @@ -153,3 +153,3 @@ class ReportExtensionSlowAction extends Action {
  - OS Version: \`${osVersion}\`
 -- VS Code version: \`${this._productService.version}\`\n\n${message}`);
-+- VSCodium version: \`${this._productService.version}\`\n\n${message}`);
++- !!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 26d796b..1d1ff79 100644
@@ -14,7 +14,7 @@ index 26d796b..1d1ff79 100644
 @@ -630,3 +630,3 @@ export class BaseIssueReporterService extends Disposable {
  		if (title) {
 -			this.searchDuplicates(title, issueDescription);
-+			this.searchGitHub('VSCodium/vscodium', title);
++			this.searchGitHub('!!GH_REPO_PATH!!', title);
  		} else {
 @@ -722,33 +722,2 @@ export class BaseIssueReporterService extends Disposable {
  
@@ -54,13 +54,13 @@ index 26d796b..1d1ff79 100644
  		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', "VSCodium"), false));
-+		sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VSCodium 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) {
 @@ -905,3 +874,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 VSCodium"));
++			reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of !!APP_NAME!!"));
  			reset(descriptionSubtitle, localize('elsewhereDescription', "The '{0}' extension prefers to use an external issue reporter. To be taken to that issue reporting experience, click the button below.", selectedExtension.displayName));
 diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
 index 0bbd8ac..4cffa1a 100644
@@ -69,7 +69,7 @@ index 0bbd8ac..4cffa1a 100644
 @@ -92,3 +92,3 @@ ${this._data.issueDescription}
  ${this.getExtensionVersion()}
 -VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
-+VSCodium version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
++!!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 5cbc709..5d6b1e2 100644
@@ -78,10 +78,10 @@ index 5cbc709..5d6b1e2 100644
 @@ -18,3 +18,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
  		comment: [
 -			'{Locked="<a href=\"https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
-+			'{Locked="<a href=\"https://github.com/VSCodium/vscodium/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
++			'{Locked="<a href=\"https://github.com/!!GH_REPO_PATH!!/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
  			'{Locked="</a>"}'
 @@ -22,3 +22,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
  	},
 -	'Before you report an issue here please <a href="https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions" target="_blank">review the guidance we provide</a>.'
-+	'Before you report an issue here please <a href="https://github.com/VSCodium/vscodium/wiki/Submitting-Bugs-and-Suggestions" target="_blank">review the guidance we provide</a>.'
++	'Before you report an issue here please <a href="https://github.com/!!GH_REPO_PATH!!/wiki/Submitting-Bugs-and-Suggestions" target="_blank">review the guidance we provide</a>.'
  );

patches/terminal-suggest.patch

@@ -0,0 +1,44 @@
+diff --git a/extensions/terminal-suggest/src/completions/codium-insiders.ts b/extensions/terminal-suggest/src/completions/codium-insiders.ts
+new file mode 100644
+index 0000000..a5769b1
+--- /dev/null
++++ b/extensions/terminal-suggest/src/completions/codium-insiders.ts
+@@ -0,0 +1,9 @@
++import code from './code';
++
++const codiumInsidersCompletionSpec: Fig.Spec = {
++	...code,
++	name: '!!BINARY_NAME!!-insiders',
++	description: '!!APP_NAME!! Insiders',
++};
++
++export default codiumInsidersCompletionSpec;
+diff --git a/extensions/terminal-suggest/src/completions/codium.ts b/extensions/terminal-suggest/src/completions/codium.ts
+new file mode 100644
+index 0000000..b1fa812
+--- /dev/null
++++ b/extensions/terminal-suggest/src/completions/codium.ts
+@@ -0,0 +1,9 @@
++import code from './code';
++
++const codiumCompletionSpec: Fig.Spec = {
++	...code,
++	name: '!!BINARY_NAME!!',
++	description: '!!APP_NAME!!',
++};
++
++export default codiumCompletionSpec;
+diff --git a/extensions/terminal-suggest/src/terminalSuggestMain.ts b/extensions/terminal-suggest/src/terminalSuggestMain.ts
+index 3f181bc..34054ed 100644
+--- a/extensions/terminal-suggest/src/terminalSuggestMain.ts
++++ b/extensions/terminal-suggest/src/terminalSuggestMain.ts
+@@ -12,2 +12,4 @@ import codeCompletionSpec from './completions/code';
+ import codeInsidersCompletionSpec from './completions/code-insiders';
++import codiumCompletionSpec from './completions/codium';
++import codiumInsidersCompletionSpec from './completions/codium-insiders';
+ import setLocationSpec from './completions/set-location';
+@@ -52,2 +54,4 @@ export const availableSpecs: Fig.Spec[] = [
+ 	codeCompletionSpec,
++	codiumInsidersCompletionSpec,
++	codiumCompletionSpec,
+ 	setLocationSpec,

patches/update-electron.patch

@@ -1,192 +1,191 @@
 diff --git a/.npmrc b/.npmrc
-index 22256e5..a6dfc1d 100644
+index e10d4a0..4553a7b 100644
 --- a/.npmrc
 +++ b/.npmrc
 @@ -1,3 +1,3 @@
  disturl="https://electronjs.org/headers"
--target="32.2.6"
-+target="32.2.7"
- ms_build_id="10629634"
+-target="34.2.0"
++target="34.3.2"
+ ms_build_id="11161602"
 diff --git a/build/checksums/electron.txt b/build/checksums/electron.txt
-index 17ec96f..ce17d8d 100644
+index dcc7bf5..d390d7a 100644
 --- a/build/checksums/electron.txt
 +++ b/build/checksums/electron.txt
 @@ -1,75 +1,75 @@
--bb4164f7b554606b2c4daaf43e81bf2e2b5cf0d4441cfdd74f04653237fcf655 *chromedriver-v32.2.6-darwin-arm64.zip
--a0fc3df1c6cd17bfe62ffbb1eba3655ca625dea5046e5d2b3dbb0e9e349cd10e *chromedriver-v32.2.6-darwin-x64.zip
--671d6dab890747ea73ba5589327eef7612670950a20e5f88c7d8a301b5491e26 *chromedriver-v32.2.6-linux-arm64.zip
--55bfd4e33fef1506261d4cb3074988e1970c2a762ca76a8f1197512a1766723c *chromedriver-v32.2.6-linux-armv7l.zip
--d3c7a45c8c75152db927b3596f506995e72631df870b302b7dbcbd3399e54a3a *chromedriver-v32.2.6-linux-x64.zip
--567f77d09708942901c6cdce6708b995f6ac779faceebb4ed383ca5003e2de4e *chromedriver-v32.2.6-mas-arm64.zip
--b3a28181b1d077742f1be632a802e15b5a36a260b1cfe0e429735de9f52d074a *chromedriver-v32.2.6-mas-x64.zip
--a113f5bd747b6eeb033f4d6ea2f53cf332d9b45d6340af514dd938bac7f99419 *chromedriver-v32.2.6-win32-arm64.zip
--3b3237a788fad0a6be63a69b93c28b6052db23aeaa1a75d2589be15b4c2c0f2f *chromedriver-v32.2.6-win32-ia32.zip
--1096c131cf8e3f98a01525e93d573eaf4fd23492d8dd78a211e39c448e69e463 *chromedriver-v32.2.6-win32-x64.zip
--8e6fcf3171c3fcdcb117f641ec968bb53be3d38696e388636bf34f04c10b987d *electron-api.json
--b1b20784a97e64992c92480e69af828a110d834372479b26759f1559b3da80fc *electron-v32.2.6-darwin-arm64-dsym-snapshot.zip
--f11dd5a84229430ec59b4335415a4b308dc4330ff7b9febae20165fbdd862e92 *electron-v32.2.6-darwin-arm64-dsym.zip
--cc96cf91f6b108dc927d8f7daee2fe27ae8a492c932993051508aa779e816445 *electron-v32.2.6-darwin-arm64-symbols.zip
--fcb6bbb6aa3c1020b4045dbe9f2a5286173d5025248550f55631e70568e91775 *electron-v32.2.6-darwin-arm64.zip
--d2bfeea27fc91936b4f71d0f5c577e5ad0ea094edba541dfa348948fd65c3331 *electron-v32.2.6-darwin-x64-dsym-snapshot.zip
--5e7684cc12c0dee11fb933b68301d0fe68d3198d1daeadd5e1b4cf52743f79bf *electron-v32.2.6-darwin-x64-dsym.zip
--6d2a7d41ab14fc7d3c5e4b35d5d425edb2d13978dcc332e781ec8b7bcfe6a794 *electron-v32.2.6-darwin-x64-symbols.zip
--c0964ee5fdcefb1003ffd7ef574b07e5147856f3a94bb4335f78c409f8cf2eca *electron-v32.2.6-darwin-x64.zip
--604d88b9d434ea66ddf234dd129dcef3d468b95b0da47e2f1555a682c8d0de28 *electron-v32.2.6-linux-arm64-debug.zip
--f448e91df42fc84177bcd46378e49ee648f6114984fc57af4a84690a5197c23e *electron-v32.2.6-linux-arm64-symbols.zip
--9e4f9345cae06e8e5679b228e7b7ac21b8733e3fcda8903e3dcbc8171c53f8be *electron-v32.2.6-linux-arm64.zip
--604d88b9d434ea66ddf234dd129dcef3d468b95b0da47e2f1555a682c8d0de28 *electron-v32.2.6-linux-armv7l-debug.zip
--c85d5ca3f38dc4140040bcde6a37ac9c7510bb542f12e1ffce695a35f68e3c13 *electron-v32.2.6-linux-armv7l-symbols.zip
--df4b490a9c501d83c5305f20b2a9d1aa100d2e878e59ebafde477f21d35e3300 *electron-v32.2.6-linux-armv7l.zip
--a5aa67da85ee318ff0770d55a506f62e6e5a10e967dfab272a94bcd91922e075 *electron-v32.2.6-linux-x64-debug.zip
--671eb342a58e056f0dee5a6e9c69a6a96ee2141f81d306fa1a0e2635e22aa7c0 *electron-v32.2.6-linux-x64-symbols.zip
--a3231409db7f8ac2cc446708f17e2abac0f8549c166eaab2f427e8d0f864208d *electron-v32.2.6-linux-x64.zip
--8b8d0aeadcf21633216a9cce87d323ad6aa21e38ec82092cd5f65bf171be025f *electron-v32.2.6-mas-arm64-dsym-snapshot.zip
--298931236955b83d174738d3325931e9672a8333bf854fc5f471168b0f7e70be *electron-v32.2.6-mas-arm64-dsym.zip
--53e4c666a6f5f87aa150b1c2f34532e3711e00b0237fb103dcbef64d65979429 *electron-v32.2.6-mas-arm64-symbols.zip
--bedbc78acc3bc6cb30e5fe1f133562104152022273ec21a83cd32a0eece9003f *electron-v32.2.6-mas-arm64.zip
--9ba3def756c90460867d968af5417996991bf3b4b306dba4c9fbde43de2f771d *electron-v32.2.6-mas-x64-dsym-snapshot.zip
--e4a3f9392934bb4ef82a214fec2ce1f319ea409b89bf03b2a2a4ab7a55688d0c *electron-v32.2.6-mas-x64-dsym.zip
--55c54fd01faf5767493183001a440b837b63f8b8d64c36f7b42fa7217af36dcd *electron-v32.2.6-mas-x64-symbols.zip
--1efe974cd426a288d617750c864e6edbf28495c3b851a5bc806af19cda7a274d *electron-v32.2.6-mas-x64.zip
--88c50d34dc48a55a11014349d2d278f895f1615405614dbfcf27dff5f5030cf1 *electron-v32.2.6-win32-arm64-pdb.zip
--b0b2211bf0f11924bcd693b6783627c7f6c9a066117bcf05c10766064c79794c *electron-v32.2.6-win32-arm64-symbols.zip
--48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.6-win32-arm64-toolchain-profile.zip
--2b7962348f23410863cb6562d79654ce534666bab9f75965b5c8ebee61f49657 *electron-v32.2.6-win32-arm64.zip
--d248ab4ec8b4a5aec414c7a404e0efd9b9a73083f7c5cb6c657c2ed58c4cbe94 *electron-v32.2.6-win32-ia32-pdb.zip
--2ef98197d66d94aee4978047f22ba07538d259b25a8f5f301d9564a13649e72c *electron-v32.2.6-win32-ia32-symbols.zip
--48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.6-win32-ia32-toolchain-profile.zip
--e85dbf85d58cab5b06cdb8e76fde3a25306e7c1808f5bb30925ba7e29ff14d13 *electron-v32.2.6-win32-ia32.zip
--9d76b0c0d475cc062b2a951fbfb3b17837880102fb6cc042e2736dfebbfa0e5d *electron-v32.2.6-win32-x64-pdb.zip
--3d7b93bafc633429f5c9f820bcb4843d504b12e454b3ecebb1b69c15b5f4080f *electron-v32.2.6-win32-x64-symbols.zip
--48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.6-win32-x64-toolchain-profile.zip
--77d5e5b76b49767e6a3ad292dc315fbc7cdccd557ac38da9093b8ac6da9262d5 *electron-v32.2.6-win32-x64.zip
--a52935712eb4fc2c12ac4ae611a57e121da3b6165c2de1abd7392ed4261287e2 *electron.d.ts
--6345ea55fda07544434c90c276cdceb2662044b9e0355894db67ca95869af22a *ffmpeg-v32.2.6-darwin-arm64.zip
--4c1347e8653727513a22be013008c2760d19200977295b98506b3b9947e74090 *ffmpeg-v32.2.6-darwin-x64.zip
--3f1eafaf4cd90ab43ba0267429189be182435849a166a2cbe1faefc0d07217c4 *ffmpeg-v32.2.6-linux-arm64.zip
--3db919bc57e1a5bf7c1bae1d7aeacf4a331990ea82750391c0b24a046d9a2812 *ffmpeg-v32.2.6-linux-armv7l.zip
--fe7d779dddbfb5da5999a7607fc5e3c7a6ab7c65e8da9fee1384918865231612 *ffmpeg-v32.2.6-linux-x64.zip
--e09ae881113d1b3103aec918e7c95c36f82b2db63657320c380c94386f689138 *ffmpeg-v32.2.6-mas-arm64.zip
--ee316e435662201a81fcededc62582dc87a0bd5c9fd0f6a8a55235eca806652f *ffmpeg-v32.2.6-mas-x64.zip
--415395968d31e13056cefcb589ed550a0e80d7c3d0851ee3ba29e4dcdf174210 *ffmpeg-v32.2.6-win32-arm64.zip
--17f61a5293b707c984cee52b57a7e505cde994d22828e31c016434521638e419 *ffmpeg-v32.2.6-win32-ia32.zip
--f9b47951a553eec21636b3cc15eccf0a2ba272567146ec8a6e2eeb91a985fd62 *ffmpeg-v32.2.6-win32-x64.zip
--7d2b596bd94e4d5c7befba11662dc563a02f18c183da12ebd56f38bb6f4382e9 *hunspell_dictionaries.zip
--06bca9a33142b5834fbca6d10d7f3303b0b5c52e7222fe783db109cd4c5260ed *libcxx-objects-v32.2.6-linux-arm64.zip
--7ab8ff5a4e1d3a6639978ed718d2732df9c1a4dd4dcd3e18f6746a2168d353a9 *libcxx-objects-v32.2.6-linux-armv7l.zip
--ba96792896751e11fdba63e5e336e323979986176aa1848122ca3757c854352e *libcxx-objects-v32.2.6-linux-x64.zip
--1f858d484f4ce27f9f3c4a120b2881f88c17c81129ca10e495b50398fb2eed64 *libcxx_headers.zip
--4566afb06a6dd8bd895dba5350a5705868203321116a1ae0a216d5a4a6bfb289 *libcxxabi_headers.zip
--350f5419c14aede5802c4f0ef5204ddbbe0eb7d5263524da38d19f43620d8530 *mksnapshot-v32.2.6-darwin-arm64.zip
--9f4e4943df4502943994ffa17525b7b5b9a1d889dbc5aeb28bfc40f9146323ec *mksnapshot-v32.2.6-darwin-x64.zip
--6295ad1a4ab3b24ac99ec85d35ebfce3861e58185b94d20077e364e81ad935f8 *mksnapshot-v32.2.6-linux-arm64-x64.zip
--ed9e1931165a2ff85c1af9f10b3bf8ba05d2dae31331d1d4f5ff1512078e4411 *mksnapshot-v32.2.6-linux-armv7l-x64.zip
--6680c63b11e4638708d88c130474ceb2ee92fc58c62cfcd3bf33dda9fee771c2 *mksnapshot-v32.2.6-linux-x64.zip
--5a4c45b755b7bbdcad51345f5eb2935ba988987650f9b8540c7ef04015207a2f *mksnapshot-v32.2.6-mas-arm64.zip
--1e6243d6a1b68f327457b9dae244ffaeadc265b07a99d9c36f1abcff31e36856 *mksnapshot-v32.2.6-mas-x64.zip
--407099537b17860ce7dcea6ba582a854314c29dc152a6df0abcc77ebb0187b4c *mksnapshot-v32.2.6-win32-arm64-x64.zip
--f9107536378e19ae9305386dacf6fae924c7ddaad0cf0a6f49694e1e8af6ded5 *mksnapshot-v32.2.6-win32-ia32.zip
--82a142db76a2cc5dfb9a89e4cd721cfebc0f3077d2415d8f3d86bb7411f0fe27 *mksnapshot-v32.2.6-win32-x64.zip
-+0729d2cb830425c4591b40d7189c2f7da020f5adb887a49a4faa022d551b1e6f *chromedriver-v32.2.7-darwin-arm64.zip
-+a7d61c68d3b3522c0ec383915b6ab3d9f269d9ada0e09aa87a4e7d9fc24fe928 *chromedriver-v32.2.7-darwin-x64.zip
-+45314c8c7127f6083469c2c067aa78beb20055ba4d7a63eb2108b27e594a647a *chromedriver-v32.2.7-linux-arm64.zip
-+7e976a7131dcfd55f781c073ae59c8a24a1393119d831fbac13c6a335eb71467 *chromedriver-v32.2.7-linux-armv7l.zip
-+3437feb5d8e7157476d2e7a6558346061cd7e46506874bc7870eed8a3a43642a *chromedriver-v32.2.7-linux-x64.zip
-+3737301add80a936374acb17b84bb3a715fab9fbce049816ea7a51fa53d3b35e *chromedriver-v32.2.7-mas-arm64.zip
-+8b8b62f48a5e8b8a340b47348a2cc5dd4ba38789f76bc5567c039587538081a9 *chromedriver-v32.2.7-mas-x64.zip
-+24b666e3ab41eb1c66ab0f2361af0529b2b8e1e5ef153cfcef36adc700f9ed6d *chromedriver-v32.2.7-win32-arm64.zip
-+6d40251661afb1835adbef85e317fd520c0f1378156614c82befb348c3122c2d *chromedriver-v32.2.7-win32-ia32.zip
-+483012da9903d8d75e5e251a3262667c9a0a012a492b93dbe1237c7827eba778 *chromedriver-v32.2.7-win32-x64.zip
-+1e9b2b9011f56fa26f4d9fa57254ef1d0bdb34405a9bdf83a652f6258347e46d *electron-api.json
-+c0ea4a21f2e7e946300bf587a4e31f72ef996c497eaa94e6b8f788b917b896e5 *electron-v32.2.7-darwin-arm64-dsym-snapshot.zip
-+1e6e84e56cfb3a2473cab41577c160d3afcbda8337dda17c5295da90266433c9 *electron-v32.2.7-darwin-arm64-dsym.zip
-+9f460100fb71ef098bec26e9a09978ec1b1663165d6a358bfc398f5548a844c3 *electron-v32.2.7-darwin-arm64-symbols.zip
-+71e76a0a81a0c1c10e9e4862caf96437ba85a18c8fa7d8e15d59e3c057b893bd *electron-v32.2.7-darwin-arm64.zip
-+e406d690365f332826843c86c6a1b5c0320a84b0527ad8700a0e995b12a35f8c *electron-v32.2.7-darwin-x64-dsym-snapshot.zip
-+53d6fb64d717af80f024284161a432aaffb47631ef7548f18f33016c3376871a *electron-v32.2.7-darwin-x64-dsym.zip
-+3c9187db2cc0570d7b01651fa78294df7d451c87c361335cee80a61c1c561b67 *electron-v32.2.7-darwin-x64-symbols.zip
-+34310ed51d32b6c02ba3e3f447b0807ea85804d1f2b239e02a9de58b9080fbf8 *electron-v32.2.7-darwin-x64.zip
-+e884f2f9f3d001488888929b8affe053a60a7a780af7d0ec8d7023023f40ca52 *electron-v32.2.7-linux-arm64-debug.zip
-+fd88e47e7b564b006f68641b5c328721bbc8d87cfc9e569d9733354d263cddee *electron-v32.2.7-linux-arm64-symbols.zip
-+fb6e1f24385c3058844bd768320d5b332b4cbd011ab930e7252dc330c8ee17b3 *electron-v32.2.7-linux-arm64.zip
-+e884f2f9f3d001488888929b8affe053a60a7a780af7d0ec8d7023023f40ca52 *electron-v32.2.7-linux-armv7l-debug.zip
-+f338ea7ea592c3ccdad1bb788e9b936610f825ac69290e48d394790d5266dce3 *electron-v32.2.7-linux-armv7l-symbols.zip
-+4a95643e88cadfb011354d25cafe242cdb8c5327d65f86b4fbabe64717367ed2 *electron-v32.2.7-linux-armv7l.zip
-+e6e0fce9f6d95a84653b537b741967cae48c4c70c8026c02293c979074225b46 *electron-v32.2.7-linux-x64-debug.zip
-+122cc565d0ccd2774e298645473869752d27d2632aa97583d93b499e9b02f22b *electron-v32.2.7-linux-x64-symbols.zip
-+98007545e1d3700b32de5cb5eebcc10b9d105fb0dad6396155fdab1b40abb638 *electron-v32.2.7-linux-x64.zip
-+556d9ca239ee1206c9d67affa836ebb651db88eea6bee48cb7b43fa75851c72d *electron-v32.2.7-mas-arm64-dsym-snapshot.zip
-+662a3742b94fcbf7ab91a7c20e1430825ae7852e915fcb558d6357a310d631c6 *electron-v32.2.7-mas-arm64-dsym.zip
-+edd0763ead7ffd5bf5072539e5ca0be9252b9590e674e6e44e69b2057c329d79 *electron-v32.2.7-mas-arm64-symbols.zip
-+a4483f5246ecadfa48b1fc671d92b5dfbc09fbd88fe386f2ce48f10de79f2127 *electron-v32.2.7-mas-arm64.zip
-+a9aad4c413d4851fa3463eeef7015e3a3e77a501192965db1c5b870fa31a9660 *electron-v32.2.7-mas-x64-dsym-snapshot.zip
-+96c20e5c4b73febd3458679e9cc939f5f8255a327b06f49188ab2e3fe8311ea3 *electron-v32.2.7-mas-x64-dsym.zip
-+6ac844957373114e04411d3af1cb6507e35174d1dc279cce41cb92bbf2ea5d26 *electron-v32.2.7-mas-x64-symbols.zip
-+888b830b991dab6cf2c4351e112a48f24a4748efefcd763d693a79161199e65a *electron-v32.2.7-mas-x64.zip
-+27759db6bcdd16d4ff5548684361ba4372d885d3142bf02db59837c3634b1934 *electron-v32.2.7-win32-arm64-pdb.zip
-+6019e6ec58e9b6da335f20874efebc42d034a179163180b3b6faedf2963ae577 *electron-v32.2.7-win32-arm64-symbols.zip
-+48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.7-win32-arm64-toolchain-profile.zip
-+2c755fdd4f9fda618b2db6b8c7210c5f3106a88b1e87b83e8433b4ab4a628cc2 *electron-v32.2.7-win32-arm64.zip
-+4dce0b21d1c2093cc4f7c0eaf9453a38377e0076d811da3c7391f105fc1d6afb *electron-v32.2.7-win32-ia32-pdb.zip
-+9a0a9c3746cd40ddc9c926755633b16676714e2138d7a2d888f658a26f617039 *electron-v32.2.7-win32-ia32-symbols.zip
-+48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.7-win32-ia32-toolchain-profile.zip
-+6c338c5cd0b0587349ab0f119ca8f7d2728b1c3a43fe241741087f5fdf139c9c *electron-v32.2.7-win32-ia32.zip
-+fa240d324c5376aa12ed2aef26597764d9bfc2fdd0d16d7f76afc2c3e3c65a29 *electron-v32.2.7-win32-x64-pdb.zip
-+f645b53771cbcdfaa041d9cf9581348821d82c1b185ddb913759e2d62ee2410a *electron-v32.2.7-win32-x64-symbols.zip
-+48b81d28fdceb4ab3ca27650d79bab910a1a19dbda72271882bfdc877c71975f *electron-v32.2.7-win32-x64-toolchain-profile.zip
-+819ab19b7111dfd39dff506b3cb5cd2e1d8f4bb17f96ba74b987b2eac14b6c63 *electron-v32.2.7-win32-x64.zip
-+ce41b10c28bd43249cd3b409e081b1c83a2b691381bdd2e3bf208ec40ca176b8 *electron.d.ts
-+d2491071a641ce2e0f63c1f52e3a412856dd83ca17d021af1166d6e5b4de5638 *ffmpeg-v32.2.7-darwin-arm64.zip
-+5c5589b2c93f834e595eb692aa768b934245d2631df69bc4cad3a6602bba0e67 *ffmpeg-v32.2.7-darwin-x64.zip
-+3f1eafaf4cd90ab43ba0267429189be182435849a166a2cbe1faefc0d07217c4 *ffmpeg-v32.2.7-linux-arm64.zip
-+3db919bc57e1a5bf7c1bae1d7aeacf4a331990ea82750391c0b24a046d9a2812 *ffmpeg-v32.2.7-linux-armv7l.zip
-+fe7d779dddbfb5da5999a7607fc5e3c7a6ab7c65e8da9fee1384918865231612 *ffmpeg-v32.2.7-linux-x64.zip
-+feeef1ab10543c813f730cc7a482b43eda35d40f1285b950e1a6d7805db2332a *ffmpeg-v32.2.7-mas-arm64.zip
-+96ef45180589c854fedf2d0601a20e70a65220c0820c45d0dfd4ec64724c58e0 *ffmpeg-v32.2.7-mas-x64.zip
-+ab4ab9cd62e40c4d3064004caa9de680cb72d8180d4facc1be06bdc886c23410 *ffmpeg-v32.2.7-win32-arm64.zip
-+90b5e2ebd4ff683eda97cc43ebbdee9b133b27edd2a34ae7ef37e7969d1d68be *ffmpeg-v32.2.7-win32-ia32.zip
-+8452085c0a650035f30a4b76e2ce1791f9b392ea7262109d29f7fe383fc41ddb *ffmpeg-v32.2.7-win32-x64.zip
-+78b415ebb9040dacabb6eb776a8d4837dda9a9b1ec9d64ee15db28dbb8598862 *hunspell_dictionaries.zip
-+a30057c37e6be5732944084575a2278616297242ae51bd474c683263cbc0c3e4 *libcxx-objects-v32.2.7-linux-arm64.zip
-+f9e9d1ff1a03a3e609ab8e727b1f89e77934509a4afdb849698b70e701c2176f *libcxx-objects-v32.2.7-linux-armv7l.zip
-+bb66e3b48f8e0706126b2b8b08827a4adda6f56c509eae4d136fcffd5414c353 *libcxx-objects-v32.2.7-linux-x64.zip
-+5181518d7da83fea5d8b033ab4fb7ed300f73bd8d20b8c26b624128233bd6ab2 *libcxx_headers.zip
-+6030ad099859b62cbdd9021b2cdb453a744a2751cb1dab30519e3e8708ad72d6 *libcxxabi_headers.zip
-+d3dcc4925a6bd55bc305fd41805ffee77dc8821730ac75cf4ee9ed2ca4ebdccb *mksnapshot-v32.2.7-darwin-arm64.zip
-+e6dfad3c30f4f38509b2fc972dd05cef06142c4832d931edba19742e06161279 *mksnapshot-v32.2.7-darwin-x64.zip
-+25ba5be47a721700f16af10945e71408ed86ffd6800b5d5ef04d38c0d77aa446 *mksnapshot-v32.2.7-linux-arm64-x64.zip
-+f7e8b50691712206587d81844bd63271f2dd49253c946a5b66bd6f169ccf94d6 *mksnapshot-v32.2.7-linux-armv7l-x64.zip
-+a0b119abe93c0231601b6c699cce4b78e89def766c24f9a8a06cfab3feca8f6c *mksnapshot-v32.2.7-linux-x64.zip
-+e3e8a496a1eaf6c8ce623fa4b139e5458cf3ce3702ea3560cded839087b60792 *mksnapshot-v32.2.7-mas-arm64.zip
-+c03219273c82022c29e277d07ce1d0980d25c22d39269fa3eef9547f57ec410b *mksnapshot-v32.2.7-mas-x64.zip
-+7684cb9c6f621db05b6e68080fade81f46d0ff8eeac94080bd635f035069d13e *mksnapshot-v32.2.7-win32-arm64-x64.zip
-+f7ca1d557e3d0f878b13f57dc0e00932f7a97f3dd0f0cc3bbbd565a06718bd17 *mksnapshot-v32.2.7-win32-ia32.zip
-+d9d8dd33561eb648e5ebd00f99418122d9a915ec63fe967e7cb0ff64ef8ee199 *mksnapshot-v32.2.7-win32-x64.zip
-\ No newline at end of file
+-c0a187acca68906c4a6387e8fabd052cb031ace6132d60a71001d9a0e891958e *chromedriver-v34.2.0-darwin-arm64.zip
+-fa5a46d752267d8497d375e19079e8b6a8df70c234a79b2d6b48f5862e1a0abc *chromedriver-v34.2.0-darwin-x64.zip
+-61e03d4fa570976d80f740637f56192b6448a05a73d1fba9717900b29f2b1b4d *chromedriver-v34.2.0-linux-arm64.zip
+-ec774d9b1a1b828a0db1502a1017fcab1dfed99b1b6b2fd2308dd600a1efa98a *chromedriver-v34.2.0-linux-armv7l.zip
+-cc15a6e6206485a2d96649ceb60509b9da04fa2811c4824b2e0eb43d1f4b1417 *chromedriver-v34.2.0-linux-x64.zip
+-9777122f6684180ef375b9b21dcabbc731d8a8befa300d1d47ad954a5b64c1c8 *chromedriver-v34.2.0-mas-arm64.zip
+-69451fa148b105fec9644646b22ca758a206499574c5816591354835c8056679 *chromedriver-v34.2.0-mas-x64.zip
+-eb7adc7e720f5e0f1d2c12ecbe886bdc01f2c9aaa3954bd6ebd313750bb18819 *chromedriver-v34.2.0-win32-arm64.zip
+-cb1973b0c2f5565974d5c2cb51816692f064b6cdc7897fa341d528ba7f9b14bf *chromedriver-v34.2.0-win32-ia32.zip
+-af5575b4727c3dbe7272016cbbaa8872043f843168a47d86748a50397efb4f77 *chromedriver-v34.2.0-win32-x64.zip
+-fcc718af2a28fb953290dc971e945818b4dbb293f297e6e25acb669d450cc0dd *electron-api.json
+-fa47e752e559a6472b87d8907f63296ed8cd53ecf862a4ae113018474d40aa8e *electron-v34.2.0-darwin-arm64-dsym-snapshot.zip
+-336c3374e721e2379901141be6345459f78d243b037c65b55bac4ae8cb14bfbe *electron-v34.2.0-darwin-arm64-dsym.zip
+-ac3b9d712d9f036f066d8eba42797117a513e2d250fcc117f0354300b7d5c1e5 *electron-v34.2.0-darwin-arm64-symbols.zip
+-ee447c17b2ac545e48083113d7e39a916821c1316f60f42cbcbee4fffe7c022a *electron-v34.2.0-darwin-arm64.zip
+-d7510bc038d06b26690ac9a78fbb256626502303ff7f5b1c2242f64a02832b1b *electron-v34.2.0-darwin-x64-dsym-snapshot.zip
+-0e95c2bbda00afe78e6229b824e3ffe0cc8612956dc11a5a30380224acdbecae *electron-v34.2.0-darwin-x64-dsym.zip
+-6d734ef8e8fd007071aae9a13534894dd801f11900f3e73e49cf5352b426e575 *electron-v34.2.0-darwin-x64-symbols.zip
+-8ef741819c8a5370dabc3b9df5e6ac217366477c5d5c656ed23c800bc984d887 *electron-v34.2.0-darwin-x64.zip
+-c2f448882a0392ebfd9810058a6a9580b087002c74fca3dcd3cf4ba5c3b27a7c *electron-v34.2.0-linux-arm64-debug.zip
+-51e887c382593021127593ceba89ad662d3a6de0f748b94fe3a0ce78a7393923 *electron-v34.2.0-linux-arm64-symbols.zip
+-818c91309da8ff948c43df58a996c05c0d27daa690e1d659355d9db01e351919 *electron-v34.2.0-linux-arm64.zip
+-c2f448882a0392ebfd9810058a6a9580b087002c74fca3dcd3cf4ba5c3b27a7c *electron-v34.2.0-linux-armv7l-debug.zip
+-71ec2b7473db766194bcf04648229c4affedce06e150e692745cc72dbc3749c5 *electron-v34.2.0-linux-armv7l-symbols.zip
+-0c75996c6bf2d37d0441d3e1021386a9348f8d21783d75571cdb10ede606424f *electron-v34.2.0-linux-armv7l.zip
+-d1f17be8df8ec6dc1a23afd8a7752f0b949c755a493b8a2c1e83f76c629258ca *electron-v34.2.0-linux-x64-debug.zip
+-d8fa79154b0b663dbd0054d69f53aec326997449ef21943d27225a2d6899660f *electron-v34.2.0-linux-x64-symbols.zip
+-f12a02d86cc657500978d263ec6d1841b6e2085cd3bd4d30a97cfe14685396f3 *electron-v34.2.0-linux-x64.zip
+-71ef8bfebb8513a405fd2beb44ad18f802bbac2248f81a5328ddaaa12906d70c *electron-v34.2.0-mas-arm64-dsym-snapshot.zip
+-437aca6cad3158f15fd852e5913462637052940f812b20ccc10fccc133d5a0d6 *electron-v34.2.0-mas-arm64-dsym.zip
+-7f253375a7b43d34b770c03153e47185be7a64bc0c10a783993a93144eb35492 *electron-v34.2.0-mas-arm64-symbols.zip
+-1f601c20430b036b485c7dc02a39a297f0d08905462a4568306c12f299375e2f *electron-v34.2.0-mas-arm64.zip
+-d32664181804a17f825bf1fbfd8f0cbe01e0b41b284937359e6d9754b3481ed8 *electron-v34.2.0-mas-x64-dsym-snapshot.zip
+-f6b394b89fb77dfeefdf525739fe8cd9695f8c2ac2251ed7c571a376cde059e9 *electron-v34.2.0-mas-x64-dsym.zip
+-539328d93e9bc122e6e34faeab6a42f4845c523f796c7a11bbdcfe5e856f6b98 *electron-v34.2.0-mas-x64-symbols.zip
+-749b6ced7a9d35a719ad98d4c3bf1a08c315c19ce97d2497235d4ac302cda665 *electron-v34.2.0-mas-x64.zip
+-e843ea4cb7a93686728d056c957c124760886167932ff619b518e45917edf38a *electron-v34.2.0-win32-arm64-pdb.zip
+-4908423be5f8ad1b5dd737edfd69ee0870460e16bb639bb963b0981bda2628e4 *electron-v34.2.0-win32-arm64-symbols.zip
+-9d13b2bd61416eec28f43faa399cc5c0dc9e36dec226314bbf397828f55d74de *electron-v34.2.0-win32-arm64-toolchain-profile.zip
+-1629cec7b5620e6ca3b5305c393ae147d1a3871a8f164d686b7bee3810fc1109 *electron-v34.2.0-win32-arm64.zip
+-e7182f1ef5ed13187fe12f35133cefb50c59e1d52ada758cbb72813dda575205 *electron-v34.2.0-win32-ia32-pdb.zip
+-a10f778f62bf060a7e38f5ea75ea472679b9ef4f12767ee0703e6d77effae78a *electron-v34.2.0-win32-ia32-symbols.zip
+-9d13b2bd61416eec28f43faa399cc5c0dc9e36dec226314bbf397828f55d74de *electron-v34.2.0-win32-ia32-toolchain-profile.zip
+-96396712a0240f04471f71246b3885a513b08e3f2d40154272d34e59419db7e6 *electron-v34.2.0-win32-ia32.zip
+-0c55ef5b1a6ea4604e3f0e9f8b5e946944abd1cfc3b974432d40e924a9996812 *electron-v34.2.0-win32-x64-pdb.zip
+-d6b67cf12edabcc62ae21e7c90ac6b1161dbefe4e6b765c69fc7040096b7d026 *electron-v34.2.0-win32-x64-symbols.zip
+-9d13b2bd61416eec28f43faa399cc5c0dc9e36dec226314bbf397828f55d74de *electron-v34.2.0-win32-x64-toolchain-profile.zip
+-a4fdf617dca787b7f1c6f8d0d1cb69c8adb37ee23f9553fe69803f9cad713360 *electron-v34.2.0-win32-x64.zip
+-5ca44a4ee9cc74a56c9556ce3f3774986dbb8b4f4953088c7f4577bfba4356a8 *electron.d.ts
+-86247a6815cc98f321374edcbfc0ab7ee79bcb13a5c25213f42151e4059ec690 *ffmpeg-v34.2.0-darwin-arm64.zip
+-e94f4707a91194f97d0451f9d5a27982c873a5c13d83d20926ce6fdb613f536c *ffmpeg-v34.2.0-darwin-x64.zip
+-947d7b7cb035eab94cc15b602dfa8a925cf238c1d9225c01732fe0c41f59c571 *ffmpeg-v34.2.0-linux-arm64.zip
+-64d74b6b94ac4fd755b97e0ec8d50af9cd73810fdb52f6c081b13a3337ace0ea *ffmpeg-v34.2.0-linux-armv7l.zip
+-a62cb20c5e5f2ba6f1df6f1bc406cc30f7ed44fe6380b506afa333d1b4ad7a87 *ffmpeg-v34.2.0-linux-x64.zip
+-715bbb3d193b1ca57d4b329edd05cd6b125dc188cdb73d1c66f220f62c8562e3 *ffmpeg-v34.2.0-mas-arm64.zip
+-866bf47106e8c3e50f046783eb8f5c756069c6de962a46f4edc7a5ee7e4593ee *ffmpeg-v34.2.0-mas-x64.zip
+-71a2a6c4cca15ccbcbf8912f5d73f855b0ca79804f941f68527ae808f8163957 *ffmpeg-v34.2.0-win32-arm64.zip
+-399f841cca166781078ca42c8ea060e3d5850ec6cb79716186d0806f3ce20842 *ffmpeg-v34.2.0-win32-ia32.zip
+-afad2a44f20a0c0c01fb1fea637f3f821842399593c9961c74d650ca12d32cbb *ffmpeg-v34.2.0-win32-x64.zip
+-c95fdc9dba05aa68aeccb69d4c34f0cb1fb98d7f5291d974d0b638488693655f *hunspell_dictionaries.zip
+-0abe74138afdb6e45a085d77407659f13c75ab96f694313d4e98bd662f9c6df2 *libcxx-objects-v34.2.0-linux-arm64.zip
+-3d0cbf6fb150b006428eab78235856d2204d5e93ca85f162e429b4c8bd9b0d3b *libcxx-objects-v34.2.0-linux-armv7l.zip
+-3a5491e32cec825499919be1b8bf0550d28fe5a31ff00a95572d49a58bb4820a *libcxx-objects-v34.2.0-linux-x64.zip
+-ff8753d52f759041b8e5462125ee2b96798fe8b5047f8fb8ae60cd07af2fb13d *libcxx_headers.zip
+-c98cce0091681bc367a48f66c5f4602961aa9cb6dd1a995d8969d6b39ce732f3 *libcxxabi_headers.zip
+-78a9606190fb227460ddcd276ad540873595d6a82fd1007f42900f53347e3eb1 *mksnapshot-v34.2.0-darwin-arm64.zip
+-6d4587a36f509356a908b6752de527cfe8a294a2d435b82ea3a98288c3a3a178 *mksnapshot-v34.2.0-darwin-x64.zip
+-17737bd34f7feefc5143b745f2c4f0e5a41678780e144eb43de41f8d4b9d7852 *mksnapshot-v34.2.0-linux-arm64-x64.zip
+-565aa9a84d913b7b5eb8d3b868cff151cb8a6c16548233ffd92b2f9bf3789227 *mksnapshot-v34.2.0-linux-armv7l-x64.zip
+-7332d7864ab4e5ee7fa8d00580d9357f30d0e69d3d1434d67c61f79f666314a4 *mksnapshot-v34.2.0-linux-x64.zip
+-cc81bfc9894378a9fc8a777429e04cc80860663b3dff8eba1f8cc72559a4f23d *mksnapshot-v34.2.0-mas-arm64.zip
+-c98230088698638159f6e7e0c5ddde3cb4dba9fa81d76e3c58fc86f96b63ef81 *mksnapshot-v34.2.0-mas-x64.zip
+-cc7b42943d998e1083ad8119dc2201dd27d709c15aa2a9b78f409485d2927592 *mksnapshot-v34.2.0-win32-arm64-x64.zip
+-ade9e3126f113318e226f9bdeba068b4383b30a98517a361386eff448459effa *mksnapshot-v34.2.0-win32-ia32.zip
+-344292ea318dc0e21f37bc7c82d57a57449f0fb278d9868f1b1b597bdcb1f36f *mksnapshot-v34.2.0-win32-x64.zip
++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
 diff --git a/package-lock.json b/package-lock.json
-index b4c9991..24303fc 100644
+index bdf4631..1691dae 100644
 --- a/package-lock.json
 +++ b/package-lock.json
-@@ -97,3 +97,3 @@
+@@ -98,3 +98,3 @@
          "deemon": "^1.8.0",
--        "electron": "32.2.6",
-+        "electron": "32.2.7",
+-        "electron": "34.2.0",
++        "electron": "34.3.2",
          "eslint": "^9.11.1",
-@@ -5817,5 +5817,5 @@
+@@ -6101,5 +6101,5 @@
      "node_modules/electron": {
--      "version": "32.2.6",
--      "resolved": "https://registry.npmjs.org/electron/-/electron-32.2.6.tgz",
--      "integrity": "sha512-aGG1MLvWCf+ECUFBCmaCF52F8312OPAJfph2D0FSsFmlbfnJuNevZCbty2lFzsiIMtU7/QRo6d0ksbgR4s7y3w==",
-+      "version": "32.2.7",
-+      "resolved": "https://registry.npmjs.org/electron/-/electron-32.2.7.tgz",
-+      "integrity": "sha512-y8jbQRG3xogF70XPlk5c+dWe5iRfUBo28o2NMpKd/CcW7ENIaWtBlGima8/8nmRdAaYTy1+yIt6KB0Lon9H8cA==",
+-      "version": "34.2.0",
+-      "resolved": "https://registry.npmjs.org/electron/-/electron-34.2.0.tgz",
+-      "integrity": "sha512-SYwBJNeXBTm1q/ErybQMUBZAYqEreBUqBwTrNkw1rV4YatDZk5Aittpcus3PPeC4UoI/tqmJ946uG8AKHTd6CA==",
++      "version": "34.3.2",
++      "resolved": "https://registry.npmjs.org/electron/-/electron-34.3.2.tgz",
++      "integrity": "sha512-n9tzmFexVLxipZXwMTY30H10f0X9k2OP0SkpSwL5VvnDZi0l/Hc+8CEArKkQPbbSf/IS7nxgc96gtTaR+XoSBg==",
        "dev": true,
 diff --git a/package.json b/package.json
-index f7a7f68..a74c7ad 100644
+index 7aab481..4ddc6f0 100644
 --- a/package.json
 +++ b/package.json
-@@ -155,3 +155,3 @@
+@@ -156,3 +156,3 @@
      "deemon": "^1.8.0",
--    "electron": "32.2.6",
-+    "electron": "32.2.7",
+-    "electron": "34.2.0",
++    "electron": "34.3.2",
      "eslint": "^9.11.1",

patches/version-0-release.patch

@@ -1,23 +1,23 @@
 diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index 4f00317..e5d08e5 100644
+index e0df76f..04354d8 100644
 --- a/build/gulpfile.reh.js
 +++ b/build/gulpfile.reh.js
-@@ -307,2 +307,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -310,2 +310,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const name = product.nameShort;
 +		const release = packageJson.release;
  
-@@ -310,3 +311,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -313,3 +314,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
 -			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined, type: 'module' }))
 +			.pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined, type: 'module' }))
  			.pipe(es.through(function (file) {
-@@ -318,3 +319,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -321,3 +322,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, release }))
  			.pipe(es.through(function (file) {
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index 030c39a..51772c9 100644
+index a63f693..62e0080 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
 @@ -261,3 +261,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
@@ -73,7 +73,7 @@ index 98175f5..afacbe3 100644
 +			RawVersion: `${pkg.version.replace(/-\w+$/, '')}.${pkg.release}`,
  			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
 diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
-index ac7c552..8cfc209 100644
+index 52c4c94..00fc9f8 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
 @@ -58,2 +58,3 @@ export interface IProductConfiguration {
@@ -104,30 +104,30 @@ index 1a2a619..2a8d683 100644
 +			release: pkg.release
  		});
 diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
-index 039233d..c8ced77 100644
+index 7563b30..0873839 100644
 --- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
 @@ -23,2 +23,3 @@ import { ResultKind } from '../../../../platform/keybinding/common/keybindingRes
- import { CancellationToken } from '../../../../base/common/cancellation.js';
+ import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 +import { getReleaseString } from '../../../../workbench/common/release.js';
  
-@@ -80,2 +81,4 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
+@@ -81,2 +82,4 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
  		const detailString = (useAgo: boolean): string => {
 +			const releaseString = getReleaseString();
 +
  			return localize('aboutDetail',
-@@ -86,3 +89,3 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
+@@ -87,3 +90,3 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
  				navigator.userAgent
 -			);
 +			).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);
  		};
 diff --git a/src/vs/workbench/common/release.ts b/src/vs/workbench/common/release.ts
 new file mode 100644
-index 0000000..2a8ea57
+index 0000000..82dbe6a
 --- /dev/null
 +++ b/src/vs/workbench/common/release.ts
 @@ -0,0 +1,14 @@
-+import { language } from 'vs/base/common/platform';
++import { language } from '../../base/common/platform.js';
 +
 +const DEFAULT_LABEL = 'Release:';
 +const LABELS: { [key: string]: string } = {
@@ -142,12 +142,12 @@ index 0000000..2a8ea57
 +	return LABELS[language] ?? DEFAULT_LABEL;
 +}
 diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
-index 6c61a59..e76a188 100644
+index 6c61a59..d58f8fc 100644
 --- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
 @@ -15,2 +15,3 @@ import { process } from '../../../../base/parts/sandbox/electron-sandbox/globals
  import { getActiveWindow } from '../../../../base/browser/dom.js';
-+import { getReleaseString } from '../../../../workbench/common/release';
++import { getReleaseString } from '../../../../workbench/common/release.js';
  
 @@ -80,2 +81,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
  		const osProps = await this.nativeHostService.getOSProperties();

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 48638aa..8f738e7 100644
+index a1ec3fe..f954720 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 48638aa..8f738e7 100644
 +	}
  }
 diff --git a/src/vs/platform/update/electron-main/updateService.darwin.ts b/src/vs/platform/update/electron-main/updateService.darwin.ts
-index d3f27d3..8454ff3 100644
+index 57398fb..8e36930 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';
@@ -76,7 +76,7 @@ index d3f27d3..8454ff3 100644
 +import { IRequestService, asJson } from '../../request/common/request.js';
  import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 @@ -19,2 +19,4 @@ import { IUpdate, State, StateType, UpdateType } from '../common/update.js';
- import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification, UpdateNotAvailableClassification } from './abstractUpdateService.js';
+ import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification } from './abstractUpdateService.js';
 +import { CancellationToken } from '../../../base/common/cancellation.js';
 +import * as semver from 'semver';
  
@@ -123,16 +123,16 @@ index d3f27d3..8454ff3 100644
 +			})
  	}
 diff --git a/src/vs/platform/update/electron-main/updateService.linux.ts b/src/vs/platform/update/electron-main/updateService.linux.ts
-index 6e076c7..81556b6 100644
+index dd18900..920dc10 100644
 --- a/src/vs/platform/update/electron-main/updateService.linux.ts
 +++ b/src/vs/platform/update/electron-main/updateService.linux.ts
-@@ -33,3 +33,3 @@ export class LinuxUpdateService extends AbstractUpdateService {
+@@ -31,3 +31,3 @@ export class LinuxUpdateService extends AbstractUpdateService {
  	protected buildUpdateFeedUrl(quality: string): string {
 -		return createUpdateURL(`linux-${process.arch}`, quality, this.productService);
 +		return createUpdateURL(this.productService, quality, process.platform, process.arch);
  	}
 diff --git a/src/vs/platform/update/electron-main/updateService.win32.ts b/src/vs/platform/update/electron-main/updateService.win32.ts
-index 61109e5..06981b3 100644
+index db92de2..06981b3 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';
@@ -142,7 +142,7 @@ index 61109e5..06981b3 100644
 @@ -25,4 +24,5 @@ import { asJson, IRequestService } from '../../request/common/request.js';
  import { ITelemetryService } from '../../telemetry/common/telemetry.js';
 -import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, UpdateType } from '../common/update.js';
--import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification, UpdateNotAvailableClassification } from './abstractUpdateService.js';
+-import { AbstractUpdateService, createUpdateURL, UpdateErrorClassification } from './abstractUpdateService.js';
 +import { AvailableForDownload, DisablementReason, IUpdate, State, StateType, Target, UpdateType } from '../common/update.js';
 +import { AbstractUpdateService, createUpdateURL} from './abstractUpdateService.js';
 +import * as semver from 'semver';
@@ -193,28 +193,27 @@ index 61109e5..06981b3 100644
 -		return createUpdateURL(platform, quality, this.productService);
 +		return createUpdateURL(this.productService, quality, process.platform, process.arch, target);
  	}
-@@ -126,4 +141,10 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
- 				if (!update || !update.url || !update.version || !update.productVersion) {
--					this.telemetryService.publicLog2<{ explicit: boolean }, UpdateNotAvailableClassification>('update:notAvailable', { explicit: !!context });
+@@ -130,2 +145,10 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ 
++				const fetchedVersion = update.productVersion.replace(/(\d+\.\d+\.\d+)(?:\.(\d+))(\-\w+)?/, '$1$3+$2');
++				const currentVersion = `${this.productService.version}+${this.productService.release}`;
++
++				if(semver.compareBuild(currentVersion, fetchedVersion) >= 0) {
 +					this.setState(State.Idle(updateType));
 +					return Promise.resolve(null);
 +				}
 +
-+				const fetchedVersion = update.productVersion.replace(/(\d+\.\d+\.\d+)(?:\.(\d+))(\-\w+)?/, '$1$3+$2');
-+				const currentVersion = `${this.productService.version}+${this.productService.release}`;
- 
-+				if(semver.compareBuild(currentVersion, fetchedVersion) >= 0) {
- 					this.setState(State.Idle(updateType));
-@@ -158,3 +179,3 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+ 				if (updateType === UpdateType.Archive) {
+@@ -156,3 +179,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) {
-@@ -170,3 +191,2 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+@@ -168,3 +191,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);
-@@ -254,6 +274,14 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
+@@ -252,6 +274,14 @@ export class Win32UpdateService extends AbstractUpdateService implements IRelaun
  		} else {
 -			spawn(this.availableUpdate.packagePath, ['/silent', '/log', '/mergetasks=runcode,!desktopicon,!quicklaunchicon'], {
 -				detached: true,

patches/windows/policies.patch

@@ -0,0 +1,258 @@
+diff --git a/build/.moduleignore b/build/.moduleignore
+index 6b7f365..2211e6e 100644
+--- a/build/.moduleignore
++++ b/build/.moduleignore
+@@ -125,9 +125,11 @@ vsda/**
+ 
+-@vscode/policy-watcher/build/**
+-@vscode/policy-watcher/.husky/**
+-@vscode/policy-watcher/src/**
+-@vscode/policy-watcher/binding.gyp
+-@vscode/policy-watcher/README.md
+-@vscode/policy-watcher/index.d.ts
+-!@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
++@vscodium/policy-watcher/.github/**
++@vscodium/policy-watcher/.husky/**
++@vscodium/policy-watcher/build/**
++@vscodium/policy-watcher/src/**
++@vscodium/policy-watcher/.release-it.yml
++@vscodium/policy-watcher/binding.gyp
++@vscodium/policy-watcher/README.md
++@vscodium/policy-watcher/index.d.ts
++!@vscodium/policy-watcher/build/Release/vscode-policy-watcher.node
+ 
+diff --git a/build/lib/policies.js b/build/lib/policies.js
+index b76d9ff..a84f490 100644
+--- a/build/lib/policies.js
++++ b/build/lib/policies.js
+@@ -64,3 +64,3 @@ class BasePolicy {
+         return [
+-            `<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\Microsoft\\${regKey}" presentation="$(presentation.${this.name})">`,
++            `<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\!!ORG_NAME!!\\${regKey}" presentation="$(presentation.${this.name})">`,
+             `	<parentCategory ref="${this.category.name.nlsKey}" />`,
+@@ -376,3 +376,3 @@ function renderADMX(regKey, versions, categories, policies) {
+ 	<policyNamespaces>
+-		<target prefix="${regKey}" namespace="Microsoft.Policies.${regKey}" />
++		<target prefix="${regKey}" namespace="!!ORG_NAME!!.Policies.${regKey}" />
+ 	</policyNamespaces>
+diff --git a/build/lib/policies.ts b/build/lib/policies.ts
+index 2488920..8b268ce 100644
+--- a/build/lib/policies.ts
++++ b/build/lib/policies.ts
+@@ -80,3 +80,3 @@ abstract class BasePolicy implements Policy {
+ 		return [
+-			`<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\Microsoft\\${regKey}" presentation="$(presentation.${this.name})">`,
++			`<policy name="${this.name}" class="Both" displayName="$(string.${this.name})" explainText="$(string.${this.name}_${this.description.nlsKey.replace(/\./g, '_')})" key="Software\\Policies\\!!ORG_NAME!!\\${regKey}" presentation="$(presentation.${this.name})">`,
+ 			`	<parentCategory ref="${this.category.name.nlsKey}" />`,
+@@ -553,3 +553,3 @@ function renderADMX(regKey: string, versions: string[], categories: Category[],
+ 	<policyNamespaces>
+-		<target prefix="${regKey}" namespace="Microsoft.Policies.${regKey}" />
++		<target prefix="${regKey}" namespace="!!ORG_NAME!!.Policies.${regKey}" />
+ 	</policyNamespaces>
+diff --git a/eslint.config.js b/eslint.config.js
+index 8e3d288..1fa7cc3 100644
+--- a/eslint.config.js
++++ b/eslint.config.js
+@@ -793,3 +793,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 d4bc1fb..195cbe1 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -18,3 +18,2 @@
+         "@vscode/iconv-lite-umd": "0.7.0",
+-        "@vscode/policy-watcher": "^1.1.10",
+         "@vscode/proxy-agent": "^0.32.0",
+@@ -29,2 +28,3 @@
+         "@vscode/windows-registry": "^1.1.0",
++        "@vscodium/policy-watcher": "^1.1.10-2503041159",
+         "@xterm/addon-clipboard": "^0.2.0-beta.81",
+@@ -2831,22 +2831,2 @@
+     },
+-    "node_modules/@vscode/policy-watcher": {
+-      "version": "1.1.10",
+-      "resolved": "https://registry.npmjs.org/@vscode/policy-watcher/-/policy-watcher-1.1.10.tgz",
+-      "integrity": "sha512-erRJiryjhP//MnRZo+j0LxjVSFa4eZMR9HeAGxIuxlZCQrnvrIG5nv/4qBxiMH0+uE4Z74YY/Ct0wus6l9U/xg==",
+-      "hasInstallScript": true,
+-      "license": "MIT",
+-      "dependencies": {
+-        "bindings": "^1.5.0",
+-        "node-addon-api": "^8.2.0"
+-      }
+-    },
+-    "node_modules/@vscode/policy-watcher/node_modules/node-addon-api": {
+-      "version": "8.2.0",
+-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.2.0.tgz",
+-      "integrity": "sha512-qnyuI2ROiCkye42n9Tj5aX1ns7rzj6n7zW1XReSnLSL9v/vbLeR6fJq6PU27YU/ICfYw6W7Ouk/N7cysWu/hlw==",
+-      "license": "MIT",
+-      "engines": {
+-        "node": "^18 || ^20 || >= 21"
+-      }
+-    },
+     "node_modules/@vscode/proxy-agent": {
+@@ -3247,2 +3227,22 @@
+     },
++    "node_modules/@vscodium/policy-watcher": {
++      "version": "1.1.10-2503041159",
++      "resolved": "https://registry.npmjs.org/@vscodium/policy-watcher/-/policy-watcher-1.1.10-2503041159.tgz",
++      "integrity": "sha512-Jz8MKbNIB4nJPnr3l3xmyp1VvrkFhOlcjZDoUzQAoVuAfkovedhvPkoZkiB21ygGb4ZxU0ApJXHfzanee0ltWA==",
++      "hasInstallScript": true,
++      "license": "MIT",
++      "dependencies": {
++        "bindings": "^1.5.0",
++        "node-addon-api": "^8.2.0"
++      }
++    },
++    "node_modules/@vscodium/policy-watcher/node_modules/node-addon-api": {
++      "version": "8.3.0",
++      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.3.0.tgz",
++      "integrity": "sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg==",
++      "license": "MIT",
++      "engines": {
++        "node": "^18 || ^20 || >= 21"
++      }
++    },
+     "node_modules/@webassemblyjs/ast": {
+diff --git a/package.json b/package.json
+index 925462f..c4b6304 100644
+--- a/package.json
++++ b/package.json
+@@ -76,3 +76,3 @@
+     "@vscode/iconv-lite-umd": "0.7.0",
+-    "@vscode/policy-watcher": "^1.1.10",
++    "@vscodium/policy-watcher": "^1.1.10-2503041159",
+     "@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
+--- a/src/vs/base/test/node/uri.perf.data.txt
++++ b/src/vs/base/test/node/uri.perf.data.txt
+@@ -14698,48 +14698,48 @@
+ /Users/example/node_modules/@vscode/node-addon-api/node_addon_api.Makefile
+-/Users/example/node_modules/@vscode/policy-watcher/LICENSE
+-/Users/example/node_modules/@vscode/policy-watcher/binding.gyp
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/LICENSE.md
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/conversion.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/eslint-format.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/clang-format.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/README.md
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/tools/check-napi.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/except.gypi
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi-inl.deprecated.h
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/index.js
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/README.md
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi-inl.h
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/node_api.gyp
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/napi.h
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/package.json
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/noexcept.gypi
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/common.gypi
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/nothing.c
+-/Users/example/node_modules/@vscode/policy-watcher/node_modules/node-addon-api/package-support.json
+-/Users/example/node_modules/@vscode/policy-watcher/index.js
+-/Users/example/node_modules/@vscode/policy-watcher/README.md
+-/Users/example/node_modules/@vscode/policy-watcher/package.json
+-/Users/example/node_modules/@vscode/policy-watcher/build/vscode-policy-watcher.target.mk
+-/Users/example/node_modules/@vscode/policy-watcher/build/gyp-mac-tool
+-/Users/example/node_modules/@vscode/policy-watcher/build/Makefile
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/main.o
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/vscode-policy-watcher.node
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/vscode-policy-watcher.node.d
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o.d
+-/Users/example/node_modules/@vscode/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/main.o.d
+-/Users/example/node_modules/@vscode/policy-watcher/build/config.gypi
+-/Users/example/node_modules/@vscode/policy-watcher/build/binding.Makefile
+-/Users/example/node_modules/@vscode/policy-watcher/index.d.ts
+-/Users/example/node_modules/@vscode/policy-watcher/src/main.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/macos/PolicyWatcher.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/PolicyWatcher.hh
+-/Users/example/node_modules/@vscode/policy-watcher/src/linux/PolicyWatcher.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/Policy.hh
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/RegistryPolicy.hh
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/PolicyWatcher.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/NumberPolicy.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/StringPolicy.hh
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/StringPolicy.cc
+-/Users/example/node_modules/@vscode/policy-watcher/src/windows/NumberPolicy.hh
++/Users/example/node_modules/@vscodium/policy-watcher/LICENSE
++/Users/example/node_modules/@vscodium/policy-watcher/binding.gyp
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/LICENSE.md
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/conversion.js
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/eslint-format.js
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/clang-format.js
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/README.md
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/tools/check-napi.js
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/except.gypi
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi-inl.deprecated.h
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/index.js
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/README.md
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi-inl.h
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/node_api.gyp
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/napi.h
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/package.json
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/noexcept.gypi
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/common.gypi
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/nothing.c
++/Users/example/node_modules/@vscodium/policy-watcher/node_modules/node-addon-api/package-support.json
++/Users/example/node_modules/@vscodium/policy-watcher/index.js
++/Users/example/node_modules/@vscodium/policy-watcher/README.md
++/Users/example/node_modules/@vscodium/policy-watcher/package.json
++/Users/example/node_modules/@vscodium/policy-watcher/build/vscode-policy-watcher.target.mk
++/Users/example/node_modules/@vscodium/policy-watcher/build/gyp-mac-tool
++/Users/example/node_modules/@vscodium/policy-watcher/build/Makefile
++/Users/example/node_modules/@vscodium/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/main.o
++/Users/example/node_modules/@vscodium/policy-watcher/build/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o
++/Users/example/node_modules/@vscodium/policy-watcher/build/Release/vscode-policy-watcher.node
++/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/vscode-policy-watcher.node.d
++/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/macos/PolicyWatcher.o.d
++/Users/example/node_modules/@vscodium/policy-watcher/build/Release/.deps/Release/obj.target/vscode-policy-watcher/src/main.o.d
++/Users/example/node_modules/@vscodium/policy-watcher/build/config.gypi
++/Users/example/node_modules/@vscodium/policy-watcher/build/binding.Makefile
++/Users/example/node_modules/@vscodium/policy-watcher/index.d.ts
++/Users/example/node_modules/@vscodium/policy-watcher/src/main.cc
++/Users/example/node_modules/@vscodium/policy-watcher/src/macos/PolicyWatcher.cc
++/Users/example/node_modules/@vscodium/policy-watcher/src/PolicyWatcher.hh
++/Users/example/node_modules/@vscodium/policy-watcher/src/linux/PolicyWatcher.cc
++/Users/example/node_modules/@vscodium/policy-watcher/src/Policy.hh
++/Users/example/node_modules/@vscodium/policy-watcher/src/windows/RegistryPolicy.hh
++/Users/example/node_modules/@vscodium/policy-watcher/src/windows/PolicyWatcher.cc
++/Users/example/node_modules/@vscodium/policy-watcher/src/windows/NumberPolicy.cc
++/Users/example/node_modules/@vscodium/policy-watcher/src/windows/StringPolicy.hh
++/Users/example/node_modules/@vscodium/policy-watcher/src/windows/StringPolicy.cc
++/Users/example/node_modules/@vscodium/policy-watcher/src/windows/NumberPolicy.hh
+ /Users/example/node_modules/@vscode/vscode-languagedetection/CODE_OF_CONDUCT.md
+diff --git a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+index e0b99f3..f3af586 100644
+--- a/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
++++ b/src/vs/platform/environment/test/node/nativeModules.integrationTest.ts
+@@ -62,5 +62,5 @@ flakySuite('Native Modules (all platforms)', () => {
+ 
+-	test('@vscode/policy-watcher', async () => {
+-		const watcher = await import('@vscode/policy-watcher');
+-		assert.ok(typeof watcher.createWatcher === 'function', testErrorMessage('@vscode/policy-watcher'));
++	test('@vscodium/policy-watcher', async () => {
++		const watcher = await import('@vscodium/policy-watcher');
++		assert.ok(typeof watcher.createWatcher === 'function', testErrorMessage('@vscodium/policy-watcher'));
+ 	});
+diff --git a/src/vs/platform/policy/node/nativePolicyService.ts b/src/vs/platform/policy/node/nativePolicyService.ts
+index 67f7892..5b8859c 100644
+--- a/src/vs/platform/policy/node/nativePolicyService.ts
++++ b/src/vs/platform/policy/node/nativePolicyService.ts
+@@ -8,3 +8,3 @@ import { IStringDictionary } from '../../../base/common/collections.js';
+ import { Throttler } from '../../../base/common/async.js';
+-import type { PolicyUpdate, Watcher } from '@vscode/policy-watcher';
++import type { PolicyUpdate, Watcher } from '@vscodium/policy-watcher';
+ import { MutableDisposable } from '../../../base/common/lifecycle.js';
+@@ -27,3 +27,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
+ 
+-		const { createWatcher } = await import('@vscode/policy-watcher');
++		const { createWatcher } = await import('@vscodium/policy-watcher');
+ 
+@@ -31,3 +31,3 @@ export class NativePolicyService extends AbstractPolicyService implements IPolic
+ 			try {
+-				this.watcher.value = createWatcher(this.productName, policyDefinitions, update => {
++				this.watcher.value = createWatcher('!!ORG_NAME!!', this.productName, policyDefinitions, update => {
+ 					this._onDidPolicyChange(update);

prepare_vscode.sh

@@ -21,51 +21,40 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; }
 # apply patches
 { set +x; } 2>/dev/null
 
+echo "APP_NAME=\"${APP_NAME}\""
+echo "APP_NAME_LC=\"${APP_NAME_LC}\""
+echo "BINARY_NAME=\"${BINARY_NAME}\""
+echo "GH_REPO_PATH=\"${GH_REPO_PATH}\""
+echo "ORG_NAME=\"${ORG_NAME}\""
+
 for file in ../patches/*.patch; do
   if [[ -f "${file}" ]]; then
-    echo applying patch: "${file}";
-    # grep '^+++' "${file}"  | sed -e 's#+++ [ab]/#./vscode/#' | while read line; do shasum -a 256 "${line}"; done
-    if ! git apply --ignore-whitespace "${file}"; then
-      echo failed to apply patch "${file}" >&2
-      exit 1
-    fi
+    apply_patch "${file}"
   fi
 done
 
 if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
   for file in ../patches/insider/*.patch; do
     if [[ -f "${file}" ]]; then
-      echo applying patch: "${file}";
-      if ! git apply --ignore-whitespace "${file}"; then
-        echo failed to apply patch "${file}" >&2
-        exit 1
-      fi
+      apply_patch "${file}"
+    fi
+  done
+fi
+
+if [[ -d "../patches/${OS_NAME}/" ]]; then
+  for file in "../patches/${OS_NAME}/"*.patch; do
+    if [[ -f "${file}" ]]; then
+      apply_patch "${file}"
     fi
   done
 fi
 
 for file in ../patches/user/*.patch; do
   if [[ -f "${file}" ]]; then
-    echo applying user patch: "${file}";
-    if ! git apply --ignore-whitespace "${file}"; then
-      echo failed to apply patch "${file}" >&2
-      exit 1
-    fi
+    apply_patch "${file}"
   fi
 done
 
-if [[ -d "../patches/${OS_NAME}/" ]]; then
-  for file in "../patches/${OS_NAME}/"*.patch; do
-    if [[ -f "${file}" ]]; then
-      echo applying patch: "${file}";
-      if ! git apply --ignore-whitespace "${file}"; then
-        echo failed to apply patch "${file}" >&2
-        exit 1
-      fi
-    fi
-  done
-fi
-
 set -x
 
 export ELECTRON_SKIP_BINARY_DOWNLOAD=1
@@ -83,6 +72,9 @@ elif [[ "${OS_NAME}" == "windows" ]]; then
   fi
 fi
 
+mv .npmrc .npmrc.bak
+cp ../npmrc .npmrc
+
 for i in {1..5}; do # try 5 times
   npm ci && break
   if [[ $i == 3 ]]; then
@@ -94,6 +86,8 @@ for i in {1..5}; do # try 5 times
   sleep $(( 15 * (i + 1)))
 done
 
+mv .npmrc.bak .npmrc
+
 setpath() {
   local jsonTmp
   { set +x; } 2>/dev/null
@@ -115,7 +109,7 @@ cp product.json{,.bak}
 
 setpath "product" "checksumFailMoreInfoUrl" "https://go.microsoft.com/fwlink/?LinkId=828886"
 setpath "product" "documentationUrl" "https://go.microsoft.com/fwlink/?LinkID=533484#vscode"
-setpath_json "product" "extensionsGallery" '{"serviceUrl": "https://open-vsx.org/vscode/gallery", "itemUrl": "https://open-vsx.org/vscode/item"}'
+setpath_json "product" "extensionsGallery" '{"serviceUrl": "https://open-vsx.org/vscode/gallery", "itemUrl": "https://open-vsx.org/vscode/item", "extensionUrlTemplate": "https://open-vsx.org/vscode/gallery/{publisher}/{name}/latest"}'
 setpath "product" "introductoryVideosUrl" "https://go.microsoft.com/fwlink/?linkid=832146"
 setpath "product" "keyboardShortcutsUrlLinux" "https://go.microsoft.com/fwlink/?linkid=832144"
 setpath "product" "keyboardShortcutsUrlMac" "https://go.microsoft.com/fwlink/?linkid=832143"

product.json

@@ -49,8 +49,7 @@
   "extensionEnabledApiProposals": {
     "ms-vscode.vscode-selfhost-test-provider": [
       "testObserver",
-      "testRelatedCode",
-      "attributableCoverage"
+      "testRelatedCode"
     ],
     "VisualStudioExptTeam.vscodeintellicode-completions": [
       "inlineCompletionsAdditions"
@@ -87,9 +86,14 @@
       "quickPickItemTooltip",
       "terminalDataWriteEvent",
       "terminalExecuteCommandEvent",
-      "contribIssueReporter",
       "notebookReplDocument",
-      "notebookVariableProvider"
+      "notebookVariableProvider",
+      "terminalShellEnv",
+      "terminalShellType"
+    ],
+    "ms-python.vscode-python-envs": [
+      "terminalShellEnv",
+      "terminalShellType"
     ],
     "ms-dotnettools.dotnet-interactive-vscode": [
       "notebookMessaging"
@@ -194,7 +198,6 @@
       "contribMultiDiffEditorMenus",
       "contribShareMenu",
       "diffCommand",
-      "fileComments",
       "quickDiffProvider",
       "shareProvider",
       "tabInputTextMerge",
@@ -217,7 +220,6 @@
       "defaultChatParticipant",
       "embeddings",
       "chatEditing",
-      "chatVariableResolver",
       "chatProvider",
       "mappedEditsProvider",
       "aiRelatedInformation",
@@ -233,14 +235,20 @@
       "contribCommentsViewThreadMenus",
       "newSymbolNamesProvider",
       "findFiles2",
+      "chatReferenceDiagnostic",
       "extensionsAny",
       "authLearnMore",
       "testObserver",
       "aiTextSearchProvider",
+      "chatReadonlyPromptReference",
       "documentFiltersExclusive",
       "chatParticipantPrivate",
       "contribDebugCreateConfiguration",
-      "inlineEdit"
+      "inlineEdit",
+      "inlineCompletionsAdditions",
+      "chatReferenceBinaryData",
+      "languageModelSystem",
+      "languageModelCapabilities"
     ],
     "GitHub.remotehub": [
       "contribRemoteHelp",
@@ -260,11 +268,8 @@
     "ms-python.gather": [
       "notebookCellExecutionState"
     ],
-    "ms-python.vscode-pylance": [
-      "notebookCellExecutionState"
-    ],
+    "ms-python.vscode-pylance": [],
     "ms-python.debugpy": [
-      "contribIssueReporter",
       "contribViewsWelcome",
       "debugVisualization",
       "portsAttributes"
@@ -276,7 +281,6 @@
       "notebookDeprecated",
       "notebookMessaging",
       "notebookMime",
-      "notebookCellExecutionState",
       "portsAttributes",
       "quickPickSortByLabel",
       "notebookKernelSource",
@@ -289,9 +293,10 @@
       "notebookVariableProvider",
       "notebookReplDocument"
     ],
-    "dbaeumer.vscode-eslint": [
-      "notebookCellExecutionState"
+    "ms-toolsai.tensorboard": [
+      "portsAttributes"
     ],
+    "dbaeumer.vscode-eslint": [],
     "ms-vscode.azure-sphere-tools-ui": [
       "tunnels"
     ],
@@ -302,10 +307,8 @@
       "extensionsAny"
     ],
     "ms-vscode.cpptools": [
-      "terminalDataWriteEvent"
-    ],
-    "redhat.java": [
-      "documentPaste"
+      "terminalDataWriteEvent",
+      "chatParticipantAdditions"
     ],
     "vscjava.vscode-java-pack": [],
     "ms-dotnettools.csdevkit": [
@@ -329,14 +332,13 @@
     "ms-toolsai.datawrangler": [],
     "ms-vscode.vscode-commander": [],
     "ms-vscode.vscode-websearchforcopilot": [],
-    "ms-vscode.vscode-copilot-data-analysis": [
-      "chatVariableResolver",
-      "chatProvider"
-    ],
     "ms-vscode.vscode-copilot-vision": [
       "chatReferenceBinaryData",
       "codeActionAI"
     ],
+    "ms-autodev.vscode-autodev": [
+      "chatParticipantAdditions"
+    ],
     "jeanp413.open-remote-ssh": [
       "resolvers",
       "tunnels",

release.sh

@@ -13,7 +13,7 @@ REPOSITORY_NAME="${ASSETS_REPOSITORY/*\//}"
 
 npm install -g github-release-cli
 
-if [[ $( gh release view --repo "${ASSETS_REPOSITORY}" "${RELEASE_VERSION}" 2>&1 ) =~ "release not found" ]]; then
+if [[ $( gh release view "${RELEASE_VERSION}" --repo "${ASSETS_REPOSITORY}" 2>&1 ) =~ "release not found" ]]; then
   echo "Creating release '${RELEASE_VERSION}'"
 
   if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
@@ -25,14 +25,14 @@ if [[ $( gh release view --repo "${ASSETS_REPOSITORY}" "${RELEASE_VERSION}" 2>&1
 
     . ./utils.sh
 
-    RELEASE_NOTES=$( gh release view "${RELEASE_VERSION}" --json "body" --jq ".body" )
+    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
 
-    gh release edit "${RELEASE_VERSION}" --notes-file release_notes.txt
+    gh release edit "${RELEASE_VERSION}" --repo "${ASSETS_REPOSITORY}" --notes-file release_notes.txt
   fi
 fi
 

release_notes.txt

@@ -67,8 +67,8 @@ RELEASE_NOTES
   <tr>
     <td>AppImage</td>
     <td>
-      <a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-RELEASE_VERSION.glibc2.25-x86_64.AppImage">VSCodium-RELEASE_VERSION.glibc2.25-x86_64.AppImage</a><br />
-      <a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-RELEASE_VERSION.glibc2.25-x86_64.AppImage.zsync">VSCodium-RELEASE_VERSION.glibc2.25-x86_64.AppImage.zsync</a>
+      <a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-RELEASE_VERSION.glibc2.29-x86_64.AppImage">VSCodium-RELEASE_VERSION.glibc2.29-x86_64.AppImage</a><br />
+      <a href="https://github.com/VSCodium/vscodium/releases/download/RELEASE_VERSION/VSCodium-RELEASE_VERSION.glibc2.29-x86_64.AppImage.zsync">VSCodium-RELEASE_VERSION.glibc2.29-x86_64.AppImage.zsync</a>
     </td>
   </tr>
   <tr>

src/insider/resources/linux/code.svg

@@ -11,17 +11,11 @@
       <stop offset="1" stop-color="#FFFFFF"/>
     </linearGradient>
   </defs>
-  <symbol id="circle">
+  <g id="circle" transform="translate(1.8 1.8),scale(0.965)">
     <path d="M50,3.642 L50,3.642 C76.608,3.642 98.179,25.213 98.179,51.821 L98.179,51.821 C98.179,78.43 76.608,100 50,100 L50,100 C23.392,100 1.821,78.43 1.821,51.821 L1.821,51.821 C1.821,25.213 23.392,3.642 50,3.642 z" fill="#808080" id="rect6638" opacity="0.5"/>
     <path d="M50,0 L50,0 C76.608,0 98.179,21.57 98.179,48.179 L98.179,48.179 C98.179,74.787 76.608,96.358 50,96.358 L50,96.358 C23.392,96.358 1.821,74.787 1.821,48.179 L1.821,48.179 C1.821,21.57 23.392,0 50,0 z" fill="url(#Gradient_2)" id="rect5668" />
-  </symbol>
-  <symbol id="codium">
-    <path d="M48.26,2.274 C45.406,4.105 44.583,7.898 46.422,10.742 C56.531,26.397 58.917,38.205 57.882,48.553 C53.698,68.369 44.603,72.389 36.655,72.389 C28.895,72.389 30.973,59.618 36.806,55.88 C40.288,53.706 44.748,52.293 48.171,52.293 C51.563,52.293 54.313,49.552 54.313,46.17 C54.313,42.787 51.563,40.046 48.171,40.046 C44.173,40.046 40.251,40.886 36.59,42.316 C37.338,38.787 37.614,34.973 36.647,30.919 C35.179,24.763 30.953,18.883 23.615,13.183 C22.33,12.183 20.7,11.734 19.083,11.934 C17.466,12.134 15.995,12.966 14.994,14.248 C12.912,16.918 13.394,20.766 16.072,22.843 C22.05,27.486 24.024,30.923 24.699,33.752 C25.374,36.581 24.831,39.616 23.475,43.786 C21.742,49.406 19.73,54.423 18.848,59.234 C18.414,61.602 18.377,64.179 18.265,66.238 C13.96,62.042 12.275,56.502 12.275,48.407 C12.274,45.025 9.524,42.283 6.133,42.284 C2.744,42.287 -0.002,45.027 -0.003,48.407 C-0.003,59.463 3.23,69.983 11.895,77.001 C19.739,84.474 39.686,81.712 39.686,93.709 C39.686,97.095 44.642,98.743 48.033,98.743 C51.511,98.743 55.888,96.418 55.888,93.709 C55.888,80.097 70.233,71.824 93.848,71.86 C97.24,71.865 99.992,69.126 99.997,65.744 C100.003,62.361 97.259,59.614 93.867,59.608 C92.252,59.606 90.678,59.661 89.126,59.753 C91.766,53.544 92.937,46.708 92.695,39.324 C92.583,35.943 89.745,33.293 86.356,33.403 C82.963,33.513 80.305,36.346 80.416,39.729 C80.736,49.397 80.374,58.03 73.171,62.581 C71.123,63.874 68.742,64.996 66.484,64.996 C68.237,60.228 69.561,55.195 70.103,49.77 C70.449,46.308 70.486,42.195 70.091,39 C69.478,34.05 68.738,28.436 70.617,24.207 C72.305,20.565 76.087,19.04 81.64,19.04 C85.029,19.037 87.775,16.296 87.776,12.917 C87.778,9.534 85.031,6.79 81.64,6.787 C73.388,6.787 67.133,11.13 63.587,16.377 C61.733,12.417 59.475,8.336 56.747,4.112 C55.866,2.747 54.478,1.788 52.887,1.443 C52.099,1.272 51.285,1.257 50.491,1.399 C49.697,1.542 48.939,1.839 48.26,2.274 z" fill="url(#Gradient_1)" id="path6008"/>
-  </symbol>
-  <g id="Layer_1" transform="translate(1.8 1.8),scale(0.965)">
-    <use href="#circle"/>
   </g>
-  <g id="Layer_2" transform="translate(16.4 14.9),scale(0.67)">
-    <use href="#codium"/>
+  <g id="codium" transform="translate(16.4 14.9),scale(0.67)">
+    <path d="M48.26,2.274 C45.406,4.105 44.583,7.898 46.422,10.742 C56.531,26.397 58.917,38.205 57.882,48.553 C53.698,68.369 44.603,72.389 36.655,72.389 C28.895,72.389 30.973,59.618 36.806,55.88 C40.288,53.706 44.748,52.293 48.171,52.293 C51.563,52.293 54.313,49.552 54.313,46.17 C54.313,42.787 51.563,40.046 48.171,40.046 C44.173,40.046 40.251,40.886 36.59,42.316 C37.338,38.787 37.614,34.973 36.647,30.919 C35.179,24.763 30.953,18.883 23.615,13.183 C22.33,12.183 20.7,11.734 19.083,11.934 C17.466,12.134 15.995,12.966 14.994,14.248 C12.912,16.918 13.394,20.766 16.072,22.843 C22.05,27.486 24.024,30.923 24.699,33.752 C25.374,36.581 24.831,39.616 23.475,43.786 C21.742,49.406 19.73,54.423 18.848,59.234 C18.414,61.602 18.377,64.179 18.265,66.238 C13.96,62.042 12.275,56.502 12.275,48.407 C12.274,45.025 9.524,42.283 6.133,42.284 C2.744,42.287 -0.002,45.027 -0.003,48.407 C-0.003,59.463 3.23,69.983 11.895,77.001 C19.739,84.474 39.686,81.712 39.686,93.709 C39.686,97.095 44.642,98.743 48.033,98.743 C51.511,98.743 55.888,96.418 55.888,93.709 C55.888,80.097 70.233,71.824 93.848,71.86 C97.24,71.865 99.992,69.126 99.997,65.744 C100.003,62.361 97.259,59.614 93.867,59.608 C92.252,59.606 90.678,59.661 89.126,59.753 C91.766,53.544 92.937,46.708 92.695,39.324 C92.583,35.943 89.745,33.293 86.356,33.403 C82.963,33.513 80.305,36.346 80.416,39.729 C80.736,49.397 80.374,58.03 73.171,62.581 C71.123,63.874 68.742,64.996 66.484,64.996 C68.237,60.228 69.561,55.195 70.103,49.77 C70.449,46.308 70.486,42.195 70.091,39 C69.478,34.05 68.738,28.436 70.617,24.207 C72.305,20.565 76.087,19.04 81.64,19.04 C85.029,19.037 87.775,16.296 87.776,12.917 C87.778,9.534 85.031,6.79 81.64,6.787 C73.388,6.787 67.133,11.13 63.587,16.377 C61.733,12.417 59.475,8.336 56.747,4.112 C55.866,2.747 54.478,1.788 52.887,1.443 C52.099,1.272 51.285,1.257 50.491,1.399 C49.697,1.542 48.939,1.839 48.26,2.274 z" fill="url(#Gradient_1)" id="path6008"/>
   </g>
 </svg>

src/stable/resources/linux/code.svg

@@ -11,17 +11,11 @@
       <stop offset="1" stop-color="#FFFFFF"/>
     </linearGradient>
   </defs>
-  <symbol id="circle">
+  <g id="circle" transform="translate(1.8 1.8),scale(0.965)">
     <path d="M50,3.642 L50,3.642 C76.608,3.642 98.179,25.213 98.179,51.821 L98.179,51.821 C98.179,78.43 76.608,100 50,100 L50,100 C23.392,100 1.821,78.43 1.821,51.821 L1.821,51.821 C1.821,25.213 23.392,3.642 50,3.642 z" fill="#808080" id="rect6638" opacity="0.5"/>
     <path d="M50,0 L50,0 C76.608,0 98.179,21.57 98.179,48.179 L98.179,48.179 C98.179,74.787 76.608,96.358 50,96.358 L50,96.358 C23.392,96.358 1.821,74.787 1.821,48.179 L1.821,48.179 C1.821,21.57 23.392,0 50,0 z" fill="url(#Gradient_2)" id="rect5668" />
-  </symbol>
-  <symbol id="codium">
-    <path d="M48.26,2.274 C45.406,4.105 44.583,7.898 46.422,10.742 C56.531,26.397 58.917,38.205 57.882,48.553 C53.698,68.369 44.603,72.389 36.655,72.389 C28.895,72.389 30.973,59.618 36.806,55.88 C40.288,53.706 44.748,52.293 48.171,52.293 C51.563,52.293 54.313,49.552 54.313,46.17 C54.313,42.787 51.563,40.046 48.171,40.046 C44.173,40.046 40.251,40.886 36.59,42.316 C37.338,38.787 37.614,34.973 36.647,30.919 C35.179,24.763 30.953,18.883 23.615,13.183 C22.33,12.183 20.7,11.734 19.083,11.934 C17.466,12.134 15.995,12.966 14.994,14.248 C12.912,16.918 13.394,20.766 16.072,22.843 C22.05,27.486 24.024,30.923 24.699,33.752 C25.374,36.581 24.831,39.616 23.475,43.786 C21.742,49.406 19.73,54.423 18.848,59.234 C18.414,61.602 18.377,64.179 18.265,66.238 C13.96,62.042 12.275,56.502 12.275,48.407 C12.274,45.025 9.524,42.283 6.133,42.284 C2.744,42.287 -0.002,45.027 -0.003,48.407 C-0.003,59.463 3.23,69.983 11.895,77.001 C19.739,84.474 39.686,81.712 39.686,93.709 C39.686,97.095 44.642,98.743 48.033,98.743 C51.511,98.743 55.888,96.418 55.888,93.709 C55.888,80.097 70.233,71.824 93.848,71.86 C97.24,71.865 99.992,69.126 99.997,65.744 C100.003,62.361 97.259,59.614 93.867,59.608 C92.252,59.606 90.678,59.661 89.126,59.753 C91.766,53.544 92.937,46.708 92.695,39.324 C92.583,35.943 89.745,33.293 86.356,33.403 C82.963,33.513 80.305,36.346 80.416,39.729 C80.736,49.397 80.374,58.03 73.171,62.581 C71.123,63.874 68.742,64.996 66.484,64.996 C68.237,60.228 69.561,55.195 70.103,49.77 C70.449,46.308 70.486,42.195 70.091,39 C69.478,34.05 68.738,28.436 70.617,24.207 C72.305,20.565 76.087,19.04 81.64,19.04 C85.029,19.037 87.775,16.296 87.776,12.917 C87.778,9.534 85.031,6.79 81.64,6.787 C73.388,6.787 67.133,11.13 63.587,16.377 C61.733,12.417 59.475,8.336 56.747,4.112 C55.866,2.747 54.478,1.788 52.887,1.443 C52.099,1.272 51.285,1.257 50.491,1.399 C49.697,1.542 48.939,1.839 48.26,2.274 z" fill="url(#Gradient_1)" id="path6008"/>
-  </symbol>
-  <g id="Layer_1" transform="translate(1.8 1.8),scale(0.965)">
-    <use href="#circle"/>
   </g>
-  <g id="Layer_2" transform="translate(16.4 14.9),scale(0.67)">
-    <use href="#codium"/>
+  <g id="codium" transform="translate(16.4 14.9),scale(0.67)">
+    <path d="M48.26,2.274 C45.406,4.105 44.583,7.898 46.422,10.742 C56.531,26.397 58.917,38.205 57.882,48.553 C53.698,68.369 44.603,72.389 36.655,72.389 C28.895,72.389 30.973,59.618 36.806,55.88 C40.288,53.706 44.748,52.293 48.171,52.293 C51.563,52.293 54.313,49.552 54.313,46.17 C54.313,42.787 51.563,40.046 48.171,40.046 C44.173,40.046 40.251,40.886 36.59,42.316 C37.338,38.787 37.614,34.973 36.647,30.919 C35.179,24.763 30.953,18.883 23.615,13.183 C22.33,12.183 20.7,11.734 19.083,11.934 C17.466,12.134 15.995,12.966 14.994,14.248 C12.912,16.918 13.394,20.766 16.072,22.843 C22.05,27.486 24.024,30.923 24.699,33.752 C25.374,36.581 24.831,39.616 23.475,43.786 C21.742,49.406 19.73,54.423 18.848,59.234 C18.414,61.602 18.377,64.179 18.265,66.238 C13.96,62.042 12.275,56.502 12.275,48.407 C12.274,45.025 9.524,42.283 6.133,42.284 C2.744,42.287 -0.002,45.027 -0.003,48.407 C-0.003,59.463 3.23,69.983 11.895,77.001 C19.739,84.474 39.686,81.712 39.686,93.709 C39.686,97.095 44.642,98.743 48.033,98.743 C51.511,98.743 55.888,96.418 55.888,93.709 C55.888,80.097 70.233,71.824 93.848,71.86 C97.24,71.865 99.992,69.126 99.997,65.744 C100.003,62.361 97.259,59.614 93.867,59.608 C92.252,59.606 90.678,59.661 89.126,59.753 C91.766,53.544 92.937,46.708 92.695,39.324 C92.583,35.943 89.745,33.293 86.356,33.403 C82.963,33.513 80.305,36.346 80.416,39.729 C80.736,49.397 80.374,58.03 73.171,62.581 C71.123,63.874 68.742,64.996 66.484,64.996 C68.237,60.228 69.561,55.195 70.103,49.77 C70.449,46.308 70.486,42.195 70.091,39 C69.478,34.05 68.738,28.436 70.617,24.207 C72.305,20.565 76.087,19.04 81.64,19.04 C85.029,19.037 87.775,16.296 87.776,12.917 C87.778,9.534 85.031,6.79 81.64,6.787 C73.388,6.787 67.133,11.13 63.587,16.377 C61.733,12.417 59.475,8.336 56.747,4.112 C55.866,2.747 54.478,1.788 52.887,1.443 C52.099,1.272 51.285,1.257 50.491,1.399 C49.697,1.542 48.939,1.839 48.26,2.274 z" fill="url(#Gradient_1)" id="path6008"/>
   </g>
 </svg>

stable.json

@@ -1,4 +0,0 @@
-{
-  "tag": "1.96.4",
-  "commit": "cd4ee3b1c348a13bafd8f9ad8060705f6d4b9cba"
-}

update_qualityjson.sh

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-  echo "Will not update version JSON because we did not build"
-  exit 0
-fi
-
-if [[ -z "${GH_TOKEN}" ]] && [[ -z "${GITHUB_TOKEN}" ]] && [[ -z "${GH_ENTERPRISE_TOKEN}" ]] && [[ -z "${GITHUB_ENTERPRISE_TOKEN}" ]]; then
-  echo "Will not update ${VSCODE_QUALITY}.json because no GITHUB_TOKEN defined"
-  exit 0
-fi
-
-jsonTmp=$( cat "${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )
-echo "${jsonTmp}" > "${VSCODE_QUALITY}.json" && unset jsonTmp
-
-git config user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )-ci@not-real.com"
-git config user.name "${GITHUB_USERNAME} CI"
-git add .
-
-CHANGES=$( git status --porcelain )
-
-if [[ -n "${CHANGES}" ]]; then
-  git commit -m "build(${VSCODE_QUALITY}): update to commit ${MS_COMMIT:0:7}"
-
-  BRANCH_NAME=$( git rev-parse --abbrev-ref HEAD )
-
-  if ! git push origin "${BRANCH_NAME}" --quiet; then
-    git pull origin "${BRANCH_NAME}"
-    git push origin "${BRANCH_NAME}" --quiet
-  fi
-fi

update_upstream.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2129
+
+set -e
+
+if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+  echo "Will not update version JSON because we did not build"
+  exit 0
+fi
+
+jsonTmp=$( cat "./upstream/${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )
+echo "${jsonTmp}" > "./upstream/${VSCODE_QUALITY}.json" && unset jsonTmp
+
+# stage notary files
+git add upstream/*
+
+# discard changed files
+git restore .
+
+CHANGES=$( git status --porcelain )
+
+if [[ -n "${CHANGES}" ]]; then
+  git commit -S -m "build(${VSCODE_QUALITY}): update to commit ${MS_COMMIT:0:7}"
+
+  BRANCH_NAME=$( git rev-parse --abbrev-ref HEAD )
+
+  if ! git push origin "${BRANCH_NAME}" --quiet; then
+    git pull origin "${BRANCH_NAME}"
+    git push origin "${BRANCH_NAME}" --quiet
+  fi
+fi

upstream/insider.json

@@ -0,0 +1,4 @@
+{
+  "tag": "1.98.0",
+  "commit": "6609ac3d66f4eade5cf376d1cb76f13985724bcb"
+}

upstream/stable.json

@@ -0,0 +1,4 @@
+{
+  "tag": "1.98.2",
+  "commit": "ddc367ed5c8936efe395cffeec279b04ffd7db78"
+}

utils.sh

@@ -1,15 +1,38 @@
 #!/usr/bin/env bash
 
+APP_NAME="${APP_NAME:-VSCodium}"
+APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
+BINARY_NAME="${BINARY_NAME:-codium}"
+GH_REPO_PATH="${GH_REPO_PATH:-VSCodium/vscodium}"
+ORG_NAME="${ORG_NAME:-VSCodium}"
+
 # All common functions can be added to this file
 
+apply_patch() {
+  if [[ -z "$2" ]]; then
+    echo applying patch: "$1";
+  fi
+  # grep '^+++' "$1"  | sed -e 's#+++ [ab]/#./vscode/#' | while read line; do shasum -a 256 "${line}"; done
+
+  replace "s|!!APP_NAME!!|${APP_NAME}|g" "$1"
+  replace "s|!!APP_NAME_LC!!|${APP_NAME_LC}|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"
+
+  if ! git apply --ignore-whitespace "$1"; then
+    echo failed to apply patch "$1" >&2
+    exit 1
+  fi
+}
+
 exists() { type -t "$1" &> /dev/null; }
 
-is_gnu_sed () {
+is_gnu_sed() {
   sed --version &> /dev/null
 }
 
-replace () {
-  echo "${1}"
+replace() {
   if is_gnu_sed; then
     sed -i -E "${1}" "${2}"
   else