Merge branch 'insider'

2024-12-22 16:31:41 +03:00 · 2024-10-29 20:12:14 +01:00 · 2024-10-29 20:12:14 +01:00 · 820be10fd0
commit 820be10fd0
parent 5db0194218 606a83c4c5
30 changed files with 589 additions and 240 deletions
--- a/.github/workflows/insider-linux.yml
+++ b/.github/workflows/insider-linux.yml
@ -92,10 +92,16 @@ jobs:
          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
        run: ./get_pr.sh

+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '18.17'
+          node-version: '20.17'
        if: env.SHOULD_BUILD == 'yes'

      - name: Install Yarn
@ -254,18 +260,24 @@ 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
-        - vscode_arch: armhf
+        - slug: ARM
+          vscode_arch: armhf
          npm_arch: arm
-        - vscode_arch: ppc64le
+        - slug: PPC64
+          vscode_arch: ppc64le
          npm_arch: ppc64
-        - vscode_arch: riscv64
+        - slug: RISCV64
+          vscode_arch: riscv64
          npm_arch: riscv64
    env:
      BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
+      DISABLED: ${{ vars[format('DISABLE_INSIDER_LINUX_REH_{0}', matrix.slug)] }}
      MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
      MS_TAG: ${{ needs.check.outputs.MS_TAG }}
      RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
@ -278,54 +290,67 @@ jobs:
      - uses: actions/checkout@v3
        with:
          ref: ${{ env.GITHUB_BRANCH }}
+        if: env.DISABLED != 'yes'

      - name: Switch to relevant branch
        env:
          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
        run: ./get_pr.sh
+        if: env.DISABLED != 'yes'
+
+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+        if: env.DISABLED != 'yes'

      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '18.17'
+          node-version: '20.17'
+        if: env.DISABLED != 'yes'

      - name: Setup Python 3
        uses: actions/setup-python@v5
        with:
          python-version: '3.11'
+        if: env.DISABLED != 'yes'

      - name: Install libkrb5-dev
        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
+        if: env.DISABLED != 'yes'

      - name: Install GH
        run: ./install_gh.sh
-        if: env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes'

      - name: Check existing VSCodium tags/releases
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CHECK_ONLY_REH: 'yes'
        run: ./check_tags.sh
+        if: env.DISABLED != 'yes'

      - name: Download vscode artifact
        uses: actions/download-artifact@v3
        with:
          name: vscode
-        if: env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != '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_linux_reh.sh
-        if: env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != '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: Release
        env:
          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
          GITHUB_USERNAME: ${{ github.repository_owner }}
        run: ./release.sh
-        if: (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != '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
@ -333,7 +358,7 @@ jobs:
          name: reh-linux-${{ 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'

  reh_alpine:
    needs:
@ -369,6 +394,12 @@ jobs:
          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
        run: ./get_pr.sh

+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+
      - name: Install GH
        run: ./install_gh.sh
        if: env.SHOULD_DEPLOY == 'yes'
--- a/.github/workflows/insider-macos.yml
+++ b/.github/workflows/insider-macos.yml
@ -59,7 +59,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.12'
+          node-version: '20.18'

      - name: Setup Python 3
        uses: actions/setup-python@v5
--- a/.github/workflows/insider-spearhead.yml
+++ b/.github/workflows/insider-spearhead.yml
@ -38,7 +38,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.12'
+          node-version: '20.18'

      - name: Clone VSCode repo
        run: . get_repo.sh
--- a/.github/workflows/insider-windows.yml
+++ b/.github/workflows/insider-windows.yml
@ -44,7 +44,6 @@ jobs:
      matrix:
        vscode_arch:
          - x64
-          # - ia32
          - arm64
    outputs:
      RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
@ -63,7 +62,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.12'
+          node-version: '20.18'

      - name: Install Yarn
        run: npm install -g yarn
@ -83,6 +82,7 @@ jobs:

      - name: Check existing VSCodium tags/releases
        env:
+          DISABLE_MSI: ${{ vars.DISABLE_INSIDER_MSI }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: ./check_tags.sh
        if: env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true'
@ -99,6 +99,36 @@ jobs:
        run: ./prepare_assets.sh
        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')

+      - name: Upload unsigned artifacts
+        id: upload-unsigned-artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: unsigned-${{ matrix.vscode_arch }}
+          path: |
+            assets/*.exe
+            assets/*.msi
+          retention-days: 1
+        if: env.SHOULD_BUILD == 'yes' && vars.DISABLE_INSIDER_WINDOWS_SIGNING != 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
+
+      - name: Signing
+        uses: signpath/github-action-submit-signing-request@v1
+        with:
+          api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
+          organization-id: ${{ secrets.SIGNPATH_ORGANIZATION_ID }}
+          project-slug: ${{ secrets.SIGNPATH_PROJECT_SLUG }}
+          signing-policy-slug: ${{ secrets.SIGNPATH_POLICY_SLUG }}
+          github-artifact-id: ${{ steps.upload-unsigned-artifacts.outputs.artifact-id }}
+          artifact-configuration-slug: ${{ matrix.vscode_arch }}
+          wait-for-completion: true
+          # 3h to manually approve the request
+          wait-for-completion-timeout-in-seconds: 10800
+          output-artifact-directory: assets/
+        if: env.SHOULD_BUILD == 'yes' && vars.DISABLE_INSIDER_WINDOWS_SIGNING != 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
+
+      - name: Prepare checksums
+        run: ./prepare_checksums.sh
+        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
+
      - name: Release
        env:
          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
--- a/.github/workflows/stable-linux.yml
+++ b/.github/workflows/stable-linux.yml
@ -91,10 +91,16 @@ jobs:
          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
        run: ./get_pr.sh

+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '18.17'
+          node-version: '20.17'
        if: env.SHOULD_BUILD == 'yes'

      - name: Install Yarn
@ -253,18 +259,24 @@ 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
-        - vscode_arch: armhf
+        - slug: ARM
+          vscode_arch: armhf
          npm_arch: arm
-        - vscode_arch: ppc64le
+        - slug: PPC64
+          vscode_arch: ppc64le
          npm_arch: ppc64
-        - vscode_arch: riscv64
+        - slug: RISCV64
+          vscode_arch: riscv64
          npm_arch: riscv64
    env:
      BUILD_SOURCEVERSION: ${{ needs.compile.outputs.BUILD_SOURCEVERSION }}
+      DISABLED: ${{ vars[format('DISABLE_STABLE_LINUX_REH_{0}', matrix.slug)] }}
      MS_COMMIT: ${{ needs.check.outputs.MS_COMMIT }}
      MS_TAG: ${{ needs.check.outputs.MS_TAG }}
      RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }}
@ -277,54 +289,67 @@ jobs:
      - uses: actions/checkout@v3
        with:
          ref: ${{ env.GITHUB_BRANCH }}
+        if: env.DISABLED != 'yes'

      - name: Switch to relevant branch
        env:
          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
        run: ./get_pr.sh
+        if: env.DISABLED != 'yes'
+
+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+        if: env.DISABLED != 'yes'

      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '18.17'
+          node-version: '20.17'
+        if: env.DISABLED != 'yes'

      - name: Setup Python 3
        uses: actions/setup-python@v5
        with:
          python-version: '3.11'
+        if: env.DISABLED != 'yes'

      - name: Install libkrb5-dev
        run: sudo apt-get update -y && sudo apt-get install -y libkrb5-dev
+        if: env.DISABLED != 'yes'

      - name: Install GH
        run: ./install_gh.sh
-        if: env.SHOULD_DEPLOY == 'yes'
+        if: env.DISABLED != 'yes' && env.SHOULD_DEPLOY == 'yes'

      - name: Check existing VSCodium tags/releases
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          CHECK_ONLY_REH: 'yes'
        run: ./check_tags.sh
+        if: env.DISABLED != 'yes'

      - name: Download vscode artifact
        uses: actions/download-artifact@v3
        with:
          name: vscode
-        if: env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != '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_linux_reh.sh
-        if: env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != '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: Release
        env:
          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
          GITHUB_USERNAME: ${{ github.repository_owner }}
        run: ./release.sh
-        if: (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != '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
@ -332,7 +357,7 @@ jobs:
          name: reh-linux-${{ 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'

  reh_alpine:
    needs:
@ -368,6 +393,12 @@ jobs:
          PULL_REQUEST_ID: ${{ github.event.inputs.checkout_pr }}
        run: ./get_pr.sh

+      - name: Setup GCC
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: 10
+          platform: x64
+
      - name: Install GH
        run: ./install_gh.sh
        if: env.SHOULD_DEPLOY == 'yes'
--- a/.github/workflows/stable-macos.yml
+++ b/.github/workflows/stable-macos.yml
@ -58,7 +58,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.12'
+          node-version: '20.18'

      - name: Setup Python 3
        uses: actions/setup-python@v5
--- a/.github/workflows/stable-spearhead.yml
+++ b/.github/workflows/stable-spearhead.yml
@ -33,7 +33,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.12'
+          node-version: '20.18'

      - name: Clone VSCode repo
        run: . get_repo.sh
--- a/.github/workflows/stable-windows.yml
+++ b/.github/workflows/stable-windows.yml
@ -30,7 +30,6 @@ env:
  VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
  VSCODE_QUALITY: stable

-
 jobs:
  build:
    runs-on: windows-2019
@ -44,7 +43,6 @@ jobs:
      matrix:
        vscode_arch:
          - x64
-          # - ia32
          - arm64
    outputs:
      RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
@ -63,7 +61,7 @@ jobs:
      - name: Setup Node.js environment
        uses: actions/setup-node@v4
        with:
-          node-version: '20.12'
+          node-version: '20.18'

      - name: Install Yarn
        run: npm install -g yarn
@ -83,6 +81,7 @@ jobs:

      - name: Check existing VSCodium tags/releases
        env:
+          DISABLE_MSI: ${{ vars.DISABLE_STABLE_MSI }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        run: ./check_tags.sh
        if: env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true'
@ -99,6 +98,36 @@ jobs:
        run: ./prepare_assets.sh
        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')

+      - name: Upload unsigned artifacts
+        id: upload-unsigned-artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: unsigned-${{ matrix.vscode_arch }}
+          path: |
+            assets/*.exe
+            assets/*.msi
+          retention-days: 1
+        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
+
+      - name: Signing
+        uses: signpath/github-action-submit-signing-request@v1
+        with:
+          api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
+          organization-id: ${{ secrets.SIGNPATH_ORGANIZATION_ID }}
+          project-slug: ${{ secrets.SIGNPATH_PROJECT_SLUG }}
+          signing-policy-slug: ${{ secrets.SIGNPATH_POLICY_SLUG }}
+          github-artifact-id: ${{ steps.upload-unsigned-artifacts.outputs.artifact-id }}
+          artifact-configuration-slug: ${{ matrix.vscode_arch }}
+          wait-for-completion: true
+          # 3h to manually approve the request
+          wait-for-completion-timeout-in-seconds: 10800
+          output-artifact-directory: assets/
+        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
+
+      - name: Prepare checksums
+        run: ./prepare_checksums.sh
+        if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true')
+
      - name: Release
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1 @@
-20.14
+20.18
--- a/README.md
+++ b/README.md
@ -209,6 +209,10 @@ The minimal version is limited by the core component Electron, you may want to c
    <td><a href="https://github.com/daiyam" target="_blank">@daiyam</a></td>
    <td>for macOS certificate</td>
  </tr>
+  <tr>
+    <td><a href="https://signpath.org/" target="_blank"><img src="https://avatars.githubusercontent.com/u/34448643" height="30" alt="SignPath logo" /></a></td>
+    <td>free code signing on Windows provided by <a href="https://signpath.io/" target="_blank">SignPath.io</a>, certificate by <a href="https://signpath.org/" target="_blank">SignPath Foundation</a></td>
+  </tr>
 </table>

 ## <a id="license"></a>License
--- a/build/update_patches.sh
+++ b/build/update_patches.sh
@ -47,6 +47,12 @@ if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
  done
 fi

-for FILE in ../patches/linux/*/*.patch; do
-  check_file "${FILE}"
+for ARCH in alpine linux osx windows; do
+  for FILE in "../patches/${ARCH}/"*.patch; do
+    check_file "${FILE}"
+  done
+
+  for FILE in "../patches/${ARCH}/"*/*.patch; do
+    check_file "${FILE}"
+  done
 done
--- a/check_tags.sh
+++ b/check_tags.sh
@ -163,14 +163,18 @@ elif [[ "${ASSETS}" != "null" ]]; then
        export SHOULD_BUILD_ZIP="no"
      fi

-      if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then
+      if [[ "${DISABLE_MSI}" == "yes" ]]; then
+          export SHOULD_BUILD_MSI="no"
+      elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then
        echo "Building on Windows ia32 because we have no msi"
        export SHOULD_BUILD="yes"
      else
        export SHOULD_BUILD_MSI="no"
      fi

-      if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then
+      if [[ "${DISABLE_MSI}" == "yes" ]]; then
+          export SHOULD_BUILD_MSI_NOUP="no"
+      elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then
        echo "Building on Windows ia32 because we have no updates-disabled msi"
        export SHOULD_BUILD="yes"
      else
@ -218,14 +222,18 @@ elif [[ "${ASSETS}" != "null" ]]; then
        export SHOULD_BUILD_ZIP="no"
      fi

-      if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then
+      if [[ "${DISABLE_MSI}" == "yes" ]]; then
+          export SHOULD_BUILD_MSI="no"
+      elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then
        echo "Building on Windows x64 because we have no msi"
        export SHOULD_BUILD="yes"
      else
        export SHOULD_BUILD_MSI="no"
      fi

-      if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then
+      if [[ "${DISABLE_MSI}" == "yes" ]]; then
+          export SHOULD_BUILD_MSI_NOUP="no"
+      elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then
        echo "Building on Windows x64 because we have no updates-disabled msi"
        export SHOULD_BUILD="yes"
      else
@ -545,6 +553,10 @@ else
      export SHOULD_BUILD_REH="no"
      export SHOULD_BUILD_REH_WEB="no"
    fi
+    if [[ "${DISABLE_MSI}" == "yes" ]]; then
+      export SHOULD_BUILD_MSI="no"
+      export SHOULD_BUILD_MSI_NOUP="no"
+    fi
  fi

  echo "Release assets do not exist at all, continuing build"
--- a/electron.riscv64.sh
+++ b/electron.riscv64.sh
@ -2,7 +2,7 @@

 set -ex

-export ELECTRON_VERSION="30.5.1"
+export ELECTRON_VERSION="32.2.1"
 export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}.riscv1"

-echo "dfae1ccddec728faa7e5dcc92fb38ee7c40251e7f7638817da1c2a94dd37b5c2 *electron-v${ELECTRON_VERSION}-linux-riscv64.zip" >> build/checksums/electron.txt
+echo "03b1b478ab7b9d40da5c47edef0bbeeb528a8bed5335018ff38e513b7df43c7f *electron-v${ELECTRON_VERSION}-linux-riscv64.zip" >> build/checksums/electron.txt
--- a/insider.json
+++ b/insider.json
@ -1,4 +1,4 @@
 {
-  "tag": "1.93.0",
-  "commit": "5b066ec2e30cf46bc636d6d27af5404713f6b0f8"
+  "tag": "1.95.0",
+  "commit": "912bb683695358a54ae0c670461738984cbb5b95"
 }
--- a/package_linux_bin.sh
+++ b/package_linux_bin.sh
@ -31,9 +31,8 @@ if [[ "${VSCODE_ARCH}" == "riscv64" ]]; then

  if [[ "${ELECTRON_VERSION}" != "$(yarn config get target)" ]]; then
    # Fail the pipeline if electron target doesn't match what is used.
-    # Look for releases here if electron version used by vscode changed:
-    # https://github.com/riscv-forks/electron-riscv-releases/releases
    echo "Electron RISC-V binary version doesn't match target electron version!"
+    echo "Releases available at: https://github.com/${VSCODE_ELECTRON_REPO}/releases"
    exit 1
  fi
 fi
--- a/package_linux_reh.sh
+++ b/package_linux_reh.sh
@ -73,6 +73,28 @@ if [[ -d "../patches/linux/reh/" ]]; then
  done
 fi

+if [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
+  INCLUDES=$(cat <<EOF
+{
+  "target_defaults": {
+    "conditions": [
+      ["OS=='linux'", {
+        'cflags_cc!': [ '-std=gnu++20' ],
+        'cflags_cc': [ '-std=gnu++2a' ],
+      }]
+    ]
+  }
+}
+EOF
+)
+
+  if [ ! -d "$HOME/.gyp" ]; then
+    mkdir -p "$HOME/.gyp"
+  fi
+
+  echo "${INCLUDES}" > "$HOME/.gyp/include.gypi"
+fi
+
 for i in {1..5}; do # try 5 times
  npm ci --prefix build && break
  if [[ $i == 3 ]]; then
--- a/patches/brand.patch
+++ b/patches/brand.patch
@ -62,7 +62,7 @@ index 1be4d0e..73a8f3e 100644
 -export const redundantImplicitActivationEvent = l10n.t("This activation event can be removed as VS Code generates these automatically from your package.json contribution declarations.");
 +export const redundantImplicitActivationEvent = l10n.t("This activation event can be removed as VSCodium generates these automatically from your package.json contribution declarations.");
 diff --git a/extensions/extension-editing/src/extensionLinter.ts b/extensions/extension-editing/src/extensionLinter.ts
-index b69dac0..293e866 100644
+index be7eea1..389e89e 100644
 --- a/extensions/extension-editing/src/extensionLinter.ts
 +++ b/extensions/extension-editing/src/extensionLinter.ts
@@ -34,4 +34,4 @@ const relativeUrlRequiresHttpsRepository = l10n.t("Relative image URLs require a
@ -73,37 +73,37 @@ index b69dac0..293e866 100644
 +const bumpEngineForImplicitActivationEvents = l10n.t("This activation event can be removed for extensions targeting engine version ^1.75 as VSCodium will generate these automatically from your package.json contribution declarations.");
 const starActivation = l10n.t("Using '*' activation is usually a bad idea as it impacts performance.");
 diff --git a/extensions/git/package.nls.json b/extensions/git/package.nls.json
-index bad361b..300261a 100644
+index 78a6b0f..10712a2 100644
 --- a/extensions/git/package.nls.json
 +++ b/extensions/git/package.nls.json
-@@ -221,3 +221,3 @@
+@@ -222,3 +222,3 @@
 			"{Locked='](command:git.showOutput'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -249,4 +249,4 @@
+@@ -250,4 +250,4 @@
 	"config.showCommitInput": "Controls whether to show the commit input in the Git source control panel.",
 -	"config.terminalAuthentication": "Controls whether to enable VS Code to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
 -	"config.terminalGitEditor": "Controls whether to enable VS Code to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
 +	"config.terminalAuthentication": "Controls whether to enable VSCodium to be the authentication handler for Git processes spawned in the Integrated Terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
 +	"config.terminalGitEditor": "Controls whether to enable VSCodium to be the Git editor for Git processes spawned in the integrated terminal. Note: Terminals need to be restarted to pick up a change in this setting.",
 	"config.timeline.showAuthor": "Controls whether to show the commit author in the Timeline view.",
-@@ -305,3 +305,3 @@
+@@ -306,3 +306,3 @@
 			"{Locked='](command:workbench.action.reloadWindow'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -313,3 +313,3 @@
+@@ -314,3 +314,3 @@
 			"{Locked='](command:workbench.action.reloadWindow'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -321,3 +321,3 @@
+@@ -322,3 +322,3 @@
 			"{Locked='](command:workbench.action.reloadWindow'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -327,6 +327,6 @@
+@@ -328,6 +328,6 @@
 	"view.workbench.scm.disabled": {
 -		"message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "If you would like to use Git features, please enable Git in your [settings](command:workbench.action.openSettings?%5B%22git.enabled%22%5D).\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
@ -112,7 +112,7 @@ index bad361b..300261a 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -335,6 +335,6 @@
+@@ -336,6 +336,6 @@
 	"view.workbench.scm.empty": {
 -		"message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "In order to use Git features, you can open a folder containing a Git repository or clone from a URL.\n[Open Folder](command:vscode.openFolder)\n[Clone Repository](command:git.clone)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
@ -121,7 +121,7 @@ index bad361b..300261a 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -343,6 +343,6 @@
+@@ -344,6 +344,6 @@
 	"view.workbench.scm.folder": {
 -		"message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "The folder currently open doesn't have a Git repository. You can initialize a repository which will enable source control features powered by Git.\n[Initialize Repository](command:git.init?%5Btrue%5D)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
@ -130,7 +130,7 @@ index bad361b..300261a 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -351,6 +351,6 @@
+@@ -352,6 +352,6 @@
 	"view.workbench.scm.workspace": {
 -		"message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "The workspace currently open doesn't have any folders containing Git repositories. You can initialize a repository on a folder which will enable source control features powered by Git.\n[Initialize Repository](command:git.init)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
@ -139,7 +139,7 @@ index bad361b..300261a 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -359,6 +359,6 @@
+@@ -360,6 +360,6 @@
 	"view.workbench.scm.emptyWorkspace": {
 -		"message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "The workspace currently open doesn't have any folders containing Git repositories.\n[Add Folder to Workspace](command:workbench.action.addRootFolder)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
@ -148,27 +148,27 @@ index bad361b..300261a 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -377,3 +377,3 @@
+@@ -378,3 +378,3 @@
 			"{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -386,3 +386,3 @@
+@@ -387,3 +387,3 @@
 			"{Locked='](command:workbench.action.openSettings?%5B%22git.openRepositoryInParentFolders%22%5D'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -394,3 +394,3 @@
+@@ -395,3 +395,3 @@
 			"{Locked='](command:git.manageUnsafeRepositories'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -402,3 +402,3 @@
+@@ -403,3 +403,3 @@
 			"{Locked='](command:git.manageUnsafeRepositories'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -407,6 +407,6 @@
+@@ -408,6 +408,6 @@
 	"view.workbench.scm.closedRepository": {
 -		"message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "A Git repository was found that was previously closed.\n[Reopen Closed Repository](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
@ -177,7 +177,7 @@ index bad361b..300261a 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -415,6 +415,6 @@
+@@ -416,6 +416,6 @@
 	"view.workbench.scm.closedRepositories": {
 -		"message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm).",
 +		"message": "Git repositories were found that were previously closed.\n[Reopen Closed Repositories](command:git.reopenClosedRepositories)\nTo learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm).",
@ -186,12 +186,12 @@ index bad361b..300261a 100644
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -426,3 +426,3 @@
+@@ -427,3 +427,3 @@
 			"{Locked='](command:git.clone'}",
 -			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VS Code",
 +			"Do not translate the 'command:*' part inside of the '(..)'. It is an internal command syntax for VSCodium",
 			"Please make sure there is no space between the right bracket and left parenthesis:  ]( this is an internal syntax for links"
-@@ -430,3 +430,3 @@
+@@ -431,3 +431,3 @@
 	},
 -	"view.workbench.learnMore": "To learn more about how to use Git and source control in VS Code [read our docs](https://aka.ms/vscode-scm)."
 +	"view.workbench.learnMore": "To learn more about how to use Git and source control in VSCodium [read our docs](https://aka.ms/vscode-scm)."
@ -359,11 +359,11 @@ index b18b340..ca2eb2d 100644
 +					"comment": "The simpler (?<=\\bProcess\\.|\\bCommandLine\\.) breaks VSCodium / Atom, see https://github.com/textmate/swift.tmbundle/issues/29",
 					"name": "support.variable.swift",
 diff --git a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json
-index d9c4ddb..4f0516c 100644
+index 4027c81..6885e91 100644
 --- a/extensions/typescript-language-features/package.nls.json
 +++ b/extensions/typescript-language-features/package.nls.json
@@ -75,4 +75,4 @@
- 	"configuration.tsserver.experimental.enableProjectDiagnostics": "(Experimental) Enables project wide error reporting.",
+ 	"configuration.tsserver.experimental.enableProjectDiagnostics": "Enables project wide error reporting.",
 -	"typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use VS Code's locale.",
 -	"typescript.locale.auto": "Use VS Code's configured display language",
 +	"typescript.locale": "Sets the locale used to report JavaScript and TypeScript errors. Defaults to use VSCodium's locale.",
@ -374,15 +374,19 @@ index d9c4ddb..4f0516c 100644
 -	"typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code.",
 +	"typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VSCodium.",
 	"typescript.updateImportsOnFileMove.enabled.prompt": "Prompt on each rename.",
-@@ -166,5 +166,5 @@
+@@ -166,8 +166,8 @@
 	"typescript.suggest.enabled": "Enabled/disable autocomplete suggestions.",
 -	"configuration.surveys.enabled": "Enabled/disable occasional surveys that help us improve VS Code's JavaScript and TypeScript support.",
 +	"configuration.surveys.enabled": "Enabled/disable occasional surveys that help us improve VSCodium's JavaScript and TypeScript support.",
 	"configuration.suggest.completeJSDocs": "Enable/disable suggestion to complete JSDoc comments.",
 -	"configuration.tsserver.useVsCodeWatcher": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
 +	"configuration.tsserver.useVsCodeWatcher": "Use VSCodium's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
+ 	"configuration.tsserver.useVsCodeWatcher.deprecation": "Please use the `#typescript.tsserver.watchOptions#` setting instead.",
 	"configuration.tsserver.watchOptions": "Configure which watching strategies should be used to keep track of files and directories.",
-@@ -234,6 +234,6 @@
+-	"configuration.tsserver.watchOptions.vscode": "Use VS Code's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
+	"configuration.tsserver.watchOptions.vscode": "Use VSCodium's file watchers instead of TypeScript's. Requires using TypeScript 5.4+ in the workspace.",
+ 	"configuration.tsserver.watchOptions.watchFile": "Strategy for how individual files are watched.",
+@@ -236,6 +236,6 @@
 	"configuration.suggest.objectLiteralMethodSnippets.enabled": "Enable/disable snippet completions for methods in object literals.",
 -	"configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VS Code is running in a trusted context.",
 +	"configuration.tsserver.web.projectWideIntellisense.enabled": "Enable/disable project-wide IntelliSense on web. Requires that VSCodium is running in a trusted context.",
@ -390,8 +394,8 @@ index d9c4ddb..4f0516c 100644
 	"configuration.tsserver.web.typeAcquisition.enabled": "Enable/disable package acquisition on the web. This enables IntelliSense for imported packages. Requires `#typescript.tsserver.web.projectWideIntellisense.enabled#`. Currently not supported for Safari.",
 -	"configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VS Code to detect a Node installation.",
 +	"configuration.tsserver.nodePath": "Run TS Server on a custom Node installation. This can be a path to a Node executable, or 'node' if you want VSCodium to detect a Node installation.",
- 	"configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.6+.",
-@@ -249,6 +249,6 @@
+ 	"configuration.updateImportsOnPaste": "Automatically update imports when pasting code. Requires TypeScript 5.7+.",
+@@ -251,6 +251,6 @@
 	"walkthroughs.nodejsWelcome.debugJsFile.title": "Run and Debug your JavaScript",
 -	"walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VS Code's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)",
 +	"walkthroughs.nodejsWelcome.debugJsFile.description": "Once you've installed Node.js, you can run JavaScript programs at a terminal by entering ``node your-file-name.js``\nAnother easy way to run Node.js programs is by using VSCodium's debugger which lets you run your code, pause at different points, and help you understand what's going on step-by-step.\n[Start Debugging](command:javascript-walkthrough.commands.debugJsFile)",
@ -428,20 +432,20 @@ index e85c715..9059335 100644
 +			vscode.l10n.t("Please open a folder in VSCodium to use a TypeScript or JavaScript project"));
 		return;
 diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
-index a1f06a3..4d04671 100644
+index b5fdb18..22cb40c 100644
 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
 +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
-@@ -664,3 +664,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
+@@ -663,3 +663,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 						prompt = vscode.window.showErrorMessage<vscode.MessageItem>(
 -							vscode.l10n.t("The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList));
 +							vscode.l10n.t("The JS/TS language service immediately crashed 5 times. The service will not be restarted.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList));
 					} else {
-@@ -685,3 +685,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
+@@ -684,3 +684,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 							prompt = vscode.window.showWarningMessage<vscode.MessageItem>(
 -								vscode.l10n.t("The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList));
 +								vscode.l10n.t("The JS/TS language service crashed 5 times in the last 5 Minutes.\nThis may be caused by a plugin contributed by one of these extensions: {0}\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList));
 						} else {
-@@ -699,3 +699,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
+@@ -698,3 +698,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 						prompt = vscode.window.showWarningMessage<vscode.MessageItem>(
 -							vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VS Code.", pluginExtensionList));
 +							vscode.l10n.t("The JS/TS language service crashed.\nThis may be caused by a plugin contributed by one of these extensions: {0}.\nPlease try disabling these extensions before filing an issue against VSCodium.", pluginExtensionList));
@ -525,10 +529,10 @@ index fa001b5..13abac2 100644
 +			throw Error(`Failed to download and unzip VSCodium ${quality} - ${commit}`);
 		}
 diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
-index 2942951..86c5653 100644
+index 603edcc..9f67963 100644
 --- a/src/vs/code/electron-main/app.ts
 +++ b/src/vs/code/electron-main/app.ts
-@@ -532,3 +532,3 @@ export class CodeApplication extends Disposable {
+@@ -543,3 +543,3 @@ export class CodeApplication extends Disposable {
 	async startup(): Promise<void> {
 -		this.logService.debug('Starting VS Code');
 +		this.logService.debug('Starting VSCodium');
@ -640,10 +644,10 @@ index d3f27d3..6a7e37a 100644
 +			comment: 'This is used to know how often VSCodium has successfully downloaded the update.';
 		};
 diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts
-index 9314c9d..c3ee8de 100644
+index 6e2da22..da82b84 100644
 --- a/src/vs/server/node/server.cli.ts
 +++ b/src/vs/server/node/server.cli.ts
-@@ -455,3 +455,3 @@ function asExtensionIdOrVSIX(inputs: string[] | undefined) {
+@@ -457,3 +457,3 @@ function asExtensionIdOrVSIX(inputs: string[] | undefined) {
 function fatal(message: string, err: any): void {
 -	console.error('Unable to connect to VS Code server: ' + message);
 +	console.error('Unable to connect to VSCodium server: ' + message);
@ -685,10 +689,10 @@ index 54b14a3..c075afb 100644
 +	test('Opening a notebook results in VSCodium firing the event onDidChangeActiveNotebookEditor twice #118470', function () {
 		let count = 0;
 diff --git a/src/vs/workbench/browser/workbench.contribution.ts b/src/vs/workbench/browser/workbench.contribution.ts
-index 30699b3..cd6647a 100644
+index 4d2143e..d712f4a 100644
 --- a/src/vs/workbench/browser/workbench.contribution.ts
 +++ b/src/vs/workbench/browser/workbench.contribution.ts
-@@ -658,3 +658,3 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
+@@ -654,3 +654,3 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
 		localize('profileName', "`${profileName}`: name of the profile in which the workspace is opened (e.g. Data Science (Profile)). Ignored if default profile is used."),
 -		localize('appName', "`${appName}`: e.g. VS Code."),
 +		localize('appName', "`${appName}`: e.g. VSCodium."),
@ -775,7 +779,7 @@ index 3930f44..89051bd 100644
 +						const message = requireReload ? localize('ReinstallAction.successReload', "Please reload VSCodium to complete reinstalling the extension {0}.", extension.identifier.id)
 							: localize('ReinstallAction.success', "Reinstalling the extension {0} is completed.", extension.identifier.id);
 diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
-index e34a900..c976572 100644
+index 1575be2..74384e1 100644
 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
 +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
@@ -452,3 +452,3 @@ export class Extension implements IExtension {
@ -908,64 +912,59 @@ index 6a5728c..2c561bd 100644
 +							message: nls.localize('TaskSystem.noProcess', 'The launched task doesn\'t exist anymore. If the task spawned background processes exiting VSCodium might result in orphaned processes. To avoid this start the last background process with a wait flag.'),
 							primaryButton: nls.localize({ key: 'TaskSystem.exitAnyways', comment: ['&& denotes a mnemonic'] }, "&&Exit Anyways"),
 diff --git a/src/vs/workbench/contrib/terminal/browser/terminalView.ts b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
-index 13d0821..171a99d 100644
+index dd683b4..07bce78 100644
 --- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
 +++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
-@@ -202,3 +202,3 @@ export class TerminalViewPane extends ViewPane {
+@@ -203,3 +203,3 @@ export class TerminalViewPane extends ViewPane {
 					}];
 -					this._notificationService.prompt(Severity.Warning, nls.localize('terminal.monospaceOnly', "The terminal only supports monospace fonts. Be sure to restart VS Code if this is a newly installed font."), choices);
 +					this._notificationService.prompt(Severity.Warning, nls.localize('terminal.monospaceOnly', "The terminal only supports monospace fonts. Be sure to restart VSCodium if this is a newly installed font."), choices);
 				}
 diff --git a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
-index 4b36691..a87a683 100644
+index 33ca655..353692a 100644
 --- a/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
 +++ b/src/vs/workbench/contrib/terminal/common/terminalConfiguration.ts
-@@ -296,3 +296,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -287,3 +287,3 @@ const terminalConfiguration: IConfigurationNode = {
 		[TerminalSettingId.DetectLocale]: {
 -			markdownDescription: localize('terminal.integrated.detectLocale', "Controls whether to detect and set the `$LANG` environment variable to a UTF-8 compliant option since VS Code's terminal only supports UTF-8 encoded data coming from the shell."),
 +			markdownDescription: localize('terminal.integrated.detectLocale', "Controls whether to detect and set the `$LANG` environment variable to a UTF-8 compliant option since VSCodium's terminal only supports UTF-8 encoded data coming from the shell."),
 			type: 'string',
-@@ -310,3 +310,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -301,3 +301,3 @@ const terminalConfiguration: IConfigurationNode = {
 			markdownEnumDescriptions: [
 -				localize('terminal.integrated.gpuAcceleration.auto', "Let VS Code detect which renderer will give the best experience."),
 +				localize('terminal.integrated.gpuAcceleration.auto', "Let VSCodium detect which renderer will give the best experience."),
 				localize('terminal.integrated.gpuAcceleration.on', "Enable GPU acceleration within the terminal."),
-@@ -398,3 +398,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -389,3 +389,3 @@ const terminalConfiguration: IConfigurationNode = {
 				'terminal.integrated.commandsToSkipShell',
 -				"A set of command IDs whose keybindings will not be sent to the shell but instead always be handled by VS Code. This allows keybindings that would normally be consumed by the shell to act instead the same as when the terminal is not focused, for example `Ctrl+P` to launch Quick Open.\n\n&nbsp;\n\nMany commands are skipped by default. To override a default and pass that command's keybinding to the shell instead, add the command prefixed with the `-` character. For example add `-workbench.action.quickOpen` to allow `Ctrl+P` to reach the shell.\n\n&nbsp;\n\nThe following list of default skipped commands is truncated when viewed in Settings Editor. To see the full list, {1} and search for the first command from the list below.\n\n&nbsp;\n\nDefault Skipped Commands:\n\n{0}",
 +				"A set of command IDs whose keybindings will not be sent to the shell but instead always be handled by VSCodium. This allows keybindings that would normally be consumed by the shell to act instead the same as when the terminal is not focused, for example `Ctrl+P` to launch Quick Open.\n\n&nbsp;\n\nMany commands are skipped by default. To override a default and pass that command's keybinding to the shell instead, add the command prefixed with the `-` character. For example add `-workbench.action.quickOpen` to allow `Ctrl+P` to reach the shell.\n\n&nbsp;\n\nThe following list of default skipped commands is truncated when viewed in Settings Editor. To see the full list, {1} and search for the first command from the list below.\n\n&nbsp;\n\nDefault Skipped Commands:\n\n{0}",
 				DEFAULT_COMMANDS_TO_SKIP_SHELL.sort().map(command => `- ${command}`).join('\n'),
-@@ -410,3 +410,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -401,3 +401,3 @@ const terminalConfiguration: IConfigurationNode = {
 		[TerminalSettingId.AllowChords]: {
 -			markdownDescription: localize('terminal.integrated.allowChords', "Whether or not to allow chord keybindings in the terminal. Note that when this is true and the keystroke results in a chord it will bypass {0}, setting this to false is particularly useful when you want ctrl+k to go to your shell (not VS Code).", '`#terminal.integrated.commandsToSkipShell#`'),
 +			markdownDescription: localize('terminal.integrated.allowChords', "Whether or not to allow chord keybindings in the terminal. Note that when this is true and the keystroke results in a chord it will bypass {0}, setting this to false is particularly useful when you want ctrl+k to go to your shell (not VSCodium).", '`#terminal.integrated.commandsToSkipShell#`'),
 			type: 'boolean',
-@@ -421,3 +421,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -412,3 +412,3 @@ const terminalConfiguration: IConfigurationNode = {
 			restricted: true,
 -			markdownDescription: localize('terminal.integrated.env.osx', "Object with environment variables that will be added to the VS Code process to be used by the terminal on macOS. Set to `null` to delete the environment variable."),
 +			markdownDescription: localize('terminal.integrated.env.osx', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on macOS. Set to `null` to delete the environment variable."),
 			type: 'object',
-@@ -430,3 +430,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -421,3 +421,3 @@ const terminalConfiguration: IConfigurationNode = {
 			restricted: true,
 -			markdownDescription: localize('terminal.integrated.env.linux', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Linux. Set to `null` to delete the environment variable."),
 +			markdownDescription: localize('terminal.integrated.env.linux', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on Linux. Set to `null` to delete the environment variable."),
 			type: 'object',
-@@ -439,3 +439,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -430,3 +430,3 @@ const terminalConfiguration: IConfigurationNode = {
 			restricted: true,
 -			markdownDescription: localize('terminal.integrated.env.windows', "Object with environment variables that will be added to the VS Code process to be used by the terminal on Windows. Set to `null` to delete the environment variable."),
 +			markdownDescription: localize('terminal.integrated.env.windows', "Object with environment variables that will be added to the VSCodium process to be used by the terminal on Windows. Set to `null` to delete the environment variable."),
 			type: 'object',
-@@ -468,3 +468,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -459,3 +459,3 @@ const terminalConfiguration: IConfigurationNode = {
 		[TerminalSettingId.ExperimentalWindowsUseConptyDll]: {
 -			markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll shipped with VS Code, instead of the one bundled with Windows."),
 +			markdownDescription: localize('terminal.integrated.experimentalWindowsUseConptyDll', "Whether to use the experimental conpty.dll shipped with VSCodium, instead of the one bundled with Windows."),
 			type: 'boolean',
-@@ -568,3 +568,3 @@ const terminalConfiguration: IConfigurationNode = {
- 		[TerminalSettingId.AutoReplies]: {
-			markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VS Code if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'),
-+			markdownDescription: localize('terminal.integrated.autoReplies', "A set of messages that, when encountered in the terminal, will be automatically responded to. Provided the message is specific enough, this can help automate away common responses.\n\nRemarks:\n\n- Use {0} to automatically respond to the terminate batch job prompt on Windows.\n- The message includes escape sequences so the reply might not happen with styled text.\n- Each reply can only happen once every second.\n- Use {1} in the reply to mean the enter key.\n- To unset a default key, set the value to null.\n- Restart VSCodium if new don't apply.", '`"Terminate batch job (Y/N)": "Y\\r"`', '`"\\r"`'),
- 			type: 'object',
-@@ -581,3 +581,3 @@ const terminalConfiguration: IConfigurationNode = {
+@@ -560,3 +560,3 @@ const terminalConfiguration: IConfigurationNode = {
 			restricted: true,
 -			markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VS Code insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegrations.decorationsEnabled#`', '`#editor.accessibilitySupport#`'),
 +			markdownDescription: localize('terminal.integrated.shellIntegration.enabled', "Determines whether or not shell integration is auto-injected to support features like enhanced command tracking and current working directory detection. \n\nShell integration works by injecting the shell with a startup script. The script gives VSCodium insight into what is happening within the terminal.\n\nSupported shells:\n\n- Linux/macOS: bash, fish, pwsh, zsh\n - Windows: pwsh, git bash\n\nThis setting applies only when terminals are created, so you will need to restart your terminals for it to take effect.\n\n Note that the script injection may not work if you have custom arguments defined in the terminal profile, have enabled {1}, have a [complex bash `PROMPT_COMMAND`](https://code.visualstudio.com/docs/editor/integrated-terminal#_complex-bash-promptcommand), or other unsupported setup. To disable decorations, see {0}", '`#terminal.integrated.shellIntegrations.decorationsEnabled#`', '`#editor.accessibilitySupport#`'),
@ -980,7 +979,7 @@ index c0a82e3..b0b75e4 100644
 +				description: localize('suggest.builtinCompletions.pwshCode', 'Custom PowerShell argument completers will be registered for VSCodium\'s `codium` and `codium-insiders` CLIs. This is currently very basic and always suggests flags and subcommands without checking context.'),
 				type: 'boolean'
 diff --git a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
-index 9359908..7bab151 100644
+index 9a7b334..7a9aee9 100644
 --- a/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
 +++ b/src/vs/workbench/contrib/themes/browser/themes.contribution.ts
@@ -914,3 +914,3 @@ class DefaultThemeUpdatedNotificationContribution implements IWorkbenchContribut
@ -1047,15 +1046,15 @@ index 3f1c098..3b2a175 100644
 +											description: localize('walkthroughs.steps.completionEvents.onCommand', 'Check off step when a given command is executed anywhere in VSCodium.'),
 											body: 'onCommand:${1:commandId}'
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
-index 0f8c49a..c8eec3a 100644
+index 9628466..2ab04b1 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/common/gettingStartedContent.ts
-@@ -213,3 +213,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -214,3 +214,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 		id: 'Setup',
 -		title: localize('gettingStarted.setup.title', "Get Started with VS Code"),
 +		title: localize('gettingStarted.setup.title', "Get Started with VSCodium"),
 		description: localize('gettingStarted.setup.description', "Customize your editor, learn the basics, and start coding"),
-@@ -235,6 +235,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -237,6 +237,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.extensions.title', "Code with extensions"),
 -					description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VS Code's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
 +					description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VSCodium's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
@ -1064,7 +1063,7 @@ index 0f8c49a..c8eec3a 100644
 -						type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions-web.svg'
 +						type: 'svg', altText: 'VSCodium extension marketplace with featured language extensions', path: 'extensions-web.svg'
 					},
-@@ -253,5 +253,5 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -255,5 +255,5 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.settings.title', "Tune your settings"),
 -					description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VS Code and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')),
 +					description: localize('gettingStarted.settings.description.interpolated', "Customize every aspect of VSCodium and your extensions to your liking. Commonly used settings are listed first to get you started.\n{0}", Button(localize('tweakSettings', "Open Settings"), 'command:toSide:workbench.action.openSettings')),
@ -1072,34 +1071,34 @@ index 0f8c49a..c8eec3a 100644
 -						type: 'svg', altText: 'VS Code Settings', path: 'settings.svg'
 +						type: 'svg', altText: 'VSCodium Settings', path: 'settings.svg'
 					},
-@@ -271,3 +271,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -273,3 +273,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.commandPalette.title', "Unlock productivity with the Command Palette "),
 -					description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
 +					description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VSCodium.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
 					media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' },
-@@ -277,3 +277,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -279,3 +279,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
 -					description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')),
 +					description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VSCodium.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFileFolder')),
 					when: 'isMac && workspaceFolderCount == 0',
-@@ -286,3 +286,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -288,3 +288,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
 -					description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VS Code.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')),
 +					description: localize('gettingStarted.setup.OpenFolder.description.interpolated', "You're all set to start coding. Open a project folder to get your files into VSCodium.\n{0}", Button(localize('pickFolder', "Pick a Folder"), 'command:workbench.action.files.openFolder')),
 					when: '!isMac && workspaceFolderCount == 0',
-@@ -304,4 +304,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -306,4 +306,4 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.videoTutorial.title', "Watch video tutorials"),
 -					description: localize('gettingStarted.videoTutorial.description.interpolated', "Watch the first in a series of short & practical video tutorials for VS Code's key features.\n{0}", Button(localize('watch', "Watch Tutorial"), 'https://aka.ms/vscode-getting-started-video')),
 -					media: { type: 'svg', altText: 'VS Code Settings', path: 'learn.svg' },
 +					description: localize('gettingStarted.videoTutorial.description.interpolated', "Watch the first in a series of short & practical video tutorials for VSCodium's key features.\n{0}", Button(localize('watch', "Watch Tutorial"), 'https://aka.ms/vscode-getting-started-video')),
 +					media: { type: 'svg', altText: 'VSCodium Settings', path: 'learn.svg' },
 				}
-@@ -313,3 +313,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -315,3 +315,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 		id: 'SetupWeb',
 -		title: localize('gettingStarted.setupWeb.title', "Get Started with VS Code for the Web"),
 +		title: localize('gettingStarted.setupWeb.title', "Get Started with VSCodium for the Web"),
 		description: localize('gettingStarted.setupWeb.description', "Customize your editor, learn the basics, and start coding"),
-@@ -344,6 +344,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -347,6 +347,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.extensions.title', "Code with extensions"),
 -					description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VS Code's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
 +					description: localize('gettingStarted.extensionsWeb.description.interpolated', "Extensions are VSCodium's power-ups. A growing number are becoming available in the web.\n{0}", Button(localize('browsePopularWeb', "Browse Popular Web Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
@ -1108,22 +1107,22 @@ index 0f8c49a..c8eec3a 100644
 -						type: 'svg', altText: 'VS Code extension marketplace with featured language extensions', path: 'extensions-web.svg'
 +						type: 'svg', altText: 'VSCodium extension marketplace with featured language extensions', path: 'extensions-web.svg'
 					},
-@@ -372,3 +372,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -375,3 +375,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.commandPalette.title', "Unlock productivity with the Command Palette "),
 -					description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VS Code.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
 +					description: localize('gettingStarted.commandPalette.description.interpolated', "Run commands without reaching for your mouse to accomplish any task in VSCodium.\n{0}", Button(localize('commandPalette', "Open Command Palette"), 'command:workbench.action.showCommands')),
 					media: { type: 'svg', altText: 'Command Palette overlay for searching and executing commands.', path: 'commandPalette.svg' },
-@@ -378,3 +378,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -381,3 +381,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.setup.OpenFolder.title', "Open up your code"),
 -					description: localize('gettingStarted.setup.OpenFolderWeb.description.interpolated', "You're all set to start coding. You can open a local project or a remote repository to get your files into VS Code.\n{0}\n{1}", Button(localize('openFolder', "Open Folder"), 'command:workbench.action.addRootFolder'), Button(localize('openRepository', "Open Repository"), 'command:remoteHub.openRepository')),
 +					description: localize('gettingStarted.setup.OpenFolderWeb.description.interpolated', "You're all set to start coding. You can open a local project or a remote repository to get your files into VSCodium.\n{0}\n{1}", Button(localize('openFolder', "Open Folder"), 'command:workbench.action.addRootFolder'), Button(localize('openRepository', "Open Repository"), 'command:remoteHub.openRepository')),
 					when: 'workspaceFolderCount == 0',
-@@ -399,3 +399,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -402,3 +402,3 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 		title: localize('gettingStarted.setupAccessibility.title', "Get Started with Accessibility Features"),
 -		description: localize('gettingStarted.setupAccessibility.description', "Learn the tools and shortcuts that make VS Code accessible. Note that some actions are not actionable from within the context of the walkthrough."),
 +		description: localize('gettingStarted.setupAccessibility.description', "Learn the tools and shortcuts that make VSCodium accessible. Note that some actions are not actionable from within the context of the walkthrough."),
 		isFeatured: true,
-@@ -506,6 +506,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
+@@ -511,6 +511,6 @@ export const walkthroughs: GettingStartedWalkthroughContent = [
 					title: localize('gettingStarted.extensions.title', "Code with extensions"),
 -					description: localize('gettingStarted.extensions.description.interpolated', "Extensions are VS Code's power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}", Button(localize('browsePopular', "Browse Popular Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
 +					description: localize('gettingStarted.extensions.description.interpolated', "Extensions are VSCodium's power-ups. They range from handy productivity hacks, expanding out-of-the-box features, to adding completely new capabilities.\n{0}", Button(localize('browsePopular', "Browse Popular Extensions"), 'command:workbench.extensions.action.showPopularExtensions')),
@ -1171,24 +1170,24 @@ index 0ab6828..6c8b5ef 100644
 +				markdownDescription: localize('workspace.trust.emptyWindow.description', "Controls whether or not the empty window is trusted by default within VSCodium. When used with `#{0}#`, you can enable the full functionality of VSCodium without prompting in an empty window.", WORKSPACE_TRUST_UNTRUSTED_FILES),
 				tags: [WORKSPACE_TRUST_SETTING_TAG],
 diff --git a/src/vs/workbench/electron-sandbox/desktop.contribution.ts b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
-index f6bae66..a4d5856 100644
+index 60b0276..db5bbc1 100644
 --- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
 +++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
-@@ -401,3 +401,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
+@@ -403,3 +403,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
 				type: 'boolean',
 -				description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running VS Code as elevated on Linux and running under Applocker on Windows.")
 +				description: localize('argv.disableChromiumSandbox', "Disables the Chromium sandbox. This is useful when running VSCodium as elevated on Linux and running under Applocker on Windows.")
 			},
-@@ -405,3 +405,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
+@@ -407,3 +407,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from '../../platform/window/electron-s
 				type: 'boolean',
 -				description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running VS Code extension tests or when you're experiencing difficulties with the credential store.")
 +				description: localize('argv.useInMemorySecretStorage', "Ensures that an in-memory store will be used for secret storage instead of using the OS's credential store. This is often used when running VSCodium extension tests or when you're experiencing difficulties with the credential store.")
 			}
 diff --git a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
-index 45bd7f0..8705da3 100644
+index 90ff933..8b40a84 100644
 --- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
 +++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
-@@ -762,3 +762,3 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
+@@ -765,3 +765,3 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
 
 -		const productName = localize('VS Code for Web', "{0} for the Web", this.productService.nameLong);
 +		const productName = localize('VSCodium for Web', "{0} for the Web", this.productService.nameLong);
@ -1208,7 +1207,7 @@ index ac3c7ed..542bb3c 100644
 +	comment: 'This is used to understand the drop funnel of extension URI handling by the OS & VSCodium.';
 };
 diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
-index bb8220b..ca56b50 100644
+index 03fbc7d..1903754 100644
 --- a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
 +++ b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -178,3 +178,3 @@ export const schema: IJSONSchema = {
--- a/patches/build-version.patch
+++ b/patches/build-version.patch
@ -1,43 +1,43 @@
 diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index e314794..fce8d15 100644
+index 53ef6f3..411da6b 100644
 --- a/build/gulpfile.reh.js
 +++ b/build/gulpfile.reh.js
-@@ -343,2 +343,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -307,2 +307,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 		const name = product.nameShort;
 +		const release = packageJson.release;
 
-@@ -346,3 +347,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -310,3 +311,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, ...(!isAMD() ? { type: 'module' } : {}) })) // TODO@esm this should be configured in the top level package.json
-+			.pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined, ...(!isAMD() ? { type: 'module' } : {}) })) // TODO@esm this should be configured in the top level package.json
+-			.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) {
-@@ -354,3 +355,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -318,3 +319,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 9dfb6a3..a4277ff 100644
+index d59b42d..61670c0 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -320,3 +320,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -268,3 +268,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 
 -		let version = packageJson.version;
 +		let version = packageJson.version
 		const quality = product.quality;
-@@ -328,3 +328,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -276,3 +276,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const name = product.nameShort;
-		const packageJsonUpdates = { name, version, ...(!isAMD() ? { type: 'module', main: 'out/main.js' } : {}) }; // TODO@esm this should be configured in the top level package.json
+-		const packageJsonUpdates = { name, version };
 +		const release = packageJson.release;
-+		const packageJsonUpdates = { name, version, release, ...(!isAMD() ? { type: 'module', main: 'out/main.js' } : {}) }; // TODO@esm this should be configured in the top level package.json
+		const packageJsonUpdates = { name, version, release };
 
-@@ -345,3 +346,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -293,3 +294,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
 -			.pipe(json({ commit, date: readISODate('out-build'), checksums, version }))
 +			.pipe(json({ commit, date: readISODate('out-build'), checksums, version, release }))
 			.pipe(es.through(function (file) {
 diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
-index 5fa5a5d..b08e376 100644
+index fb0e5a4..170c60b 100644
 --- a/build/gulpfile.vscode.linux.js
 +++ b/build/gulpfile.vscode.linux.js
@@ -27,4 +27,2 @@ const commit = getVersion(root);
@ -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 c397b1a..ccf7911 100644
+index 1f58ce0..1555ae2 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
@@ -58,2 +58,3 @@ export interface IProductConfiguration {
@ -90,7 +90,7 @@ index 5f6efd5..da3c54d 100644
 +		output.push(`Version:          ${this.productService.nameShort} ${this.productService.version} ${this.productService.release || 'Release unknown'} (${this.productService.commit || 'Commit unknown'}, ${this.productService.date || 'Date unknown'})`);
 		output.push(`OS Version:       ${osLib.type()} ${osLib.arch()} ${osLib.release()}`);
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index a98043f..b54a78f 100644
+index 1a2a619..2a8d683 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
@@ -43,6 +43,7 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
--- a/patches/crash-reporter.patch
+++ b/patches/crash-reporter.patch
@ -1,13 +1,14 @@
-diff --git a/src/main.js b/src/main.js
-index 19dde20..d9611f2 100644
--- a/src/main.js
-+++ b/src/main.js
-@@ -409,6 +409,8 @@ function configureCrashReporter() {
- 					argv.splice(endOfArgsMarkerIndex, 0, '--crash-reporter-id', crashReporterId);
+diff --git a/src/main.ts b/src/main.ts
+index ff9a5e8..6fb7fd2 100644
+--- a/src/main.ts
+++ b/src/main.ts
+@@ -467,6 +467,9 @@ function configureCrashReporter(): void {
 				}
 			}
-+		} else {
-+			return;
 		}
+		else {
+			return;
+		}
 	}
 
+ 	// Start crash reporter for all processes
--- a/patches/helper/settings.patch
+++ b/patches/helper/settings.patch
@ -3,7 +3,7 @@ index 99e495a..996044a 100644
 --- a/.vscode/settings.json
 +++ b/.vscode/settings.json
@@ -10,5 +10,5 @@
- 		"cli/target": true,
+ 		"build/**/*.js.map": true,
 -		"build/**/*.js": {
 -			"when": "$(basename).ts"
 -		}
--- a/patches/linux/client/disable-remote.patch
+++ b/patches/linux/client/disable-remote.patch
@ -1,8 +1,14 @@
-diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
-index e38c2cb..e00627c 100644
--- a/build/npm/postinstall.js
-+++ b/build/npm/postinstall.js
-@@ -134,2 +134,3 @@ for (let dir of dirs) {
- 		setNpmrcConfig('remote', opts.env);
-+		continue;
- 	}
+diff --git a/build/npm/dirs.js b/build/npm/dirs.js
+index b9645e6..22f3450 100644
+--- a/build/npm/dirs.js
+++ b/build/npm/dirs.js
+@@ -47,4 +47,2 @@ const dirs = [
+ 	'extensions/vscode-test-resolver',
+-	'remote',
+-	'remote/web',
+ 	'test/automation',
+@@ -59,4 +57,2 @@ if (fs.existsSync(`${__dirname}/../../.build/distro/npm`)) {
+ 	dirs.push('.build/distro/npm');
+-	dirs.push('.build/distro/npm/remote');
+-	dirs.push('.build/distro/npm/remote/web');
+ }
--- a/patches/linux/fix-build.patch
+++ b/patches/linux/fix-build.patch
@ -1,39 +1,39 @@
 diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
-index 28ddfb0..0fd18a1 100644
+index fb0e5a4..412a6cc 100644
 --- a/build/gulpfile.vscode.linux.js
 +++ b/build/gulpfile.vscode.linux.js
-@@ -192,2 +192,3 @@ function prepareRpmPackage(arch) {
+@@ -197,2 +197,3 @@ function prepareRpmPackage(arch) {
 		const spec = code.pipe(es.through(
 +			null,
 			async function () {
-@@ -306,4 +307,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
+@@ -312,4 +313,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
 	const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
 -	gulp.task(prepareDebTask);
 -	const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, buildDebPackage(arch));
 +	const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, task.series(prepareDebTask, buildDebPackage(arch)));
 	gulp.task(buildDebTask);
-@@ -312,4 +312,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
+@@ -318,4 +318,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
 	const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
 -	gulp.task(prepareRpmTask);
 -	const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, buildRpmPackage(arch));
 +	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 19adbeb..fef80a5 100644
+index 80b11b3..0a0ca71 100644
 --- a/build/linux/dependencies-generator.js
 +++ b/build/linux/dependencies-generator.js
@@ -24,3 +24,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/124.0.6367.243:chrome/installer/linux/BUILD.gn;l=64-80
-@@ -56,3 +56,3 @@ async function getDependencies(packageType, buildDir, applicationName, arch) {
+ // 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) {
     // Add the tunnel binary.
 -    files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
 +    // files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
     // Add the main executable.
 diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
-index 5fe4ac5..1d3e68a 100644
+index 3163aee..dca1845 100644
 --- a/build/linux/dependencies-generator.ts
 +++ b/build/linux/dependencies-generator.ts
@@ -25,3 +25,3 @@ import product = require('../../product.json');
@ -41,17 +41,9 @@ index 5fe4ac5..1d3e68a 100644
 -const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true;
 +const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
 
-@@ -61,3 +61,3 @@ export async function getDependencies(packageType: 'deb' | 'rpm', buildDir: stri
+@@ -62,3 +62,3 @@ export async function getDependencies(packageType: 'deb' | 'rpm', buildDir: stri
 	// Add the tunnel binary.
 -	files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
 +	// files.push(path.join(buildDir, 'bin', product.tunnelApplicationName));
 	// Add the main executable.
-diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
-index c9e57db..bda2604 100644
--- a/resources/linux/rpm/code.spec.template
-+++ b/resources/linux/rpm/code.spec.template
-@@ -87 +87,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
- %{_datadir}/zsh/site-functions/_%{name}
-+
-+%config(noreplace) /usr/share/%{name}/resources/app/product.json
-\ No newline at end of file
+  
--- a/patches/linux/fix-reh-bootstrap.patch
+++ b/patches/linux/fix-reh-bootstrap.patch
@ -1,24 +1,25 @@
-diff --git a/src/bootstrap-amd.js b/src/bootstrap-amd.js
-index 9c8daf5..297e106 100644
--- a/src/bootstrap-amd.js
-+++ b/src/bootstrap-amd.js
-@@ -17,3 +17,3 @@ import * as fs from 'fs';
+diff --git a/src/bootstrap-esm.ts b/src/bootstrap-esm.ts
+index f2cf101..d974f65 100644
+--- a/src/bootstrap-esm.ts
+++ b/src/bootstrap-esm.ts
+@@ -8,3 +8,3 @@ import * as fs from 'fs';
 import { fileURLToPath } from 'url';
 -import { createRequire, register } from 'node:module';
 +import * as Module from 'node:module';
 import { product, pkg } from './bootstrap-meta.js';
-@@ -23,3 +23,3 @@ import * as performance from './vs/base/common/performance.js';
- /** @ts-ignore */
+@@ -14,3 +14,4 @@ import { INLSConfiguration } from './vs/nls.js';
+ 
 -const require = createRequire(import.meta.url);
+// @ts-ignore
 +const require = Module.createRequire(import.meta.url);
- /** @type any */
-@@ -29,3 +29,4 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
+ const __dirname = path.dirname(fileURLToPath(import.meta.url));
+@@ -18,3 +19,4 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 // Install a hook to module resolution to map 'fs' to 'original-fs'
 -if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
 +// @ts-ignore
 +if (Module.register && (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron'])) {
 	const jsCode = `
-@@ -44,3 +45,4 @@ if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
+@@ -33,3 +35,4 @@ if (process.env['ELECTRON_RUN_AS_NODE'] || process.versions['electron']) {
 	}`;
 -	register(`data:text/javascript;base64,${Buffer.from(jsCode).toString('base64')}`, import.meta.url);
 +	// @ts-ignore
--- a/patches/linux/reh/node16.patch
+++ b/patches/linux/reh/node16.patch
@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index e314794..8248247 100644
+index 53ef6f3..7dedc4b 100644
 --- a/build/gulpfile.reh.js
 +++ b/build/gulpfile.reh.js
-@@ -437,16 +437,2 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -401,16 +401,2 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 
 -		if (platform === 'linux' && process.env['VSCODE_NODE_GLIBC'] === '-glibc-2.17') {
 -			result = es.merge(result,
@ -20,15 +20,15 @@ index e314794..8248247 100644
 -
 		result = inlineMeta(result, {
 diff --git a/remote/package-lock.json b/remote/package-lock.json
-index 5872575..a559230 100644
+index 290e188..fc8fd04 100644
 --- a/remote/package-lock.json
 +++ b/remote/package-lock.json
@@ -37,3 +37,3 @@
         "native-watchdog": "^1.4.1",
-        "node-pty": "1.1.0-beta21",
+-        "node-pty": "^1.1.0-beta22",
 +        "node-pty": "1.1.0-beta4",
         "tas-client-umd": "0.2.0",
-@@ -712,2 +712,8 @@
+@@ -703,2 +703,8 @@
     },
 +    "node_modules/nan": {
 +      "version": "2.20.0",
@ -37,11 +37,11 @@ index 5872575..a559230 100644
 +      "license": "MIT"
 +    },
     "node_modules/napi-build-utils": {
-@@ -750,16 +756,9 @@
+@@ -745,8 +751,9 @@
     "node_modules/node-pty": {
-      "version": "1.1.0-beta21",
-      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta21.tgz",
-      "integrity": "sha512-FYpnY9g8qMQLTpqyeY9NVli6YfCWwvG6v6gmaDBbPjlc1VMp/+Zivq0SStDrRr1aciGnFCZzpL0BzdMnmbDnAw==",
+-      "version": "1.1.0-beta22",
+-      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta22.tgz",
+-      "integrity": "sha512-CpT334H2oAIULlENvd9U+VBW4ZL+G3clOnpXYzUIurlPCLnl/9xen/KDHBLRcwhZuWcHxIrsCxR1TDCdVDtr0w==",
 +      "version": "1.1.0-beta4",
 +      "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0-beta4.tgz",
 +      "integrity": "sha512-CgffN9AxVtH4g7vDxtanm2qaR7jw3oet9r+ArzziGiFvmds9SdR3gXkZF0fqZWSxhTHZusJWvsuKvRv+5O2K8A==",
@ -49,22 +49,14 @@ index 5872575..a559230 100644
 +      "license": "MIT",
       "dependencies": {
 -        "node-addon-api": "^7.1.0"
-      }
-    },
-    "node_modules/node-pty/node_modules/node-addon-api": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz",
-      "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==",
-      "engines": {
-        "node": "^16 || ^18 || >= 20"
 +        "nan": "^2.17.0"
       }
 diff --git a/remote/package.json b/remote/package.json
-index c107b04..112501b 100644
+index e8ea864..08d756d 100644
 --- a/remote/package.json
 +++ b/remote/package.json
@@ -32,3 +32,3 @@
     "native-watchdog": "^1.4.1",
-    "node-pty": "1.1.0-beta21",
+-    "node-pty": "^1.1.0-beta22",
 +    "node-pty": "1.1.0-beta4",
     "tas-client-umd": "0.2.0",
--- a/patches/linux/rpm.patch
+++ b/patches/linux/rpm.patch
@ -1,9 +1,14 @@
 diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
-index c9e57db..ef27166 100644
+index a73bc02..242bab0 100644
 --- a/resources/linux/rpm/code.spec.template
 +++ b/resources/linux/rpm/code.spec.template
@@ -2,3 +2,3 @@ Name:     @@NAME@@
 Version:  @@VERSION@@
 -Release:  @@RELEASE@@.el8
-+Release:  el8
+Release:  el9
 Summary:  Code editing. Redefined.
+@@ -88 +88,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
+ %{_datadir}/zsh/site-functions/_%{name}
+
+%config(noreplace) /usr/share/%{name}/resources/app/product.json
+\ No newline at end of file
--- a/patches/linux/update-xdg-path.patch
+++ b/patches/linux/update-xdg-path.patch
@ -0,0 +1,22 @@
+diff --git a/extensions/git/src/ipc/ipcServer.ts b/extensions/git/src/ipc/ipcServer.ts
+index a7142fe..526ca17 100644
+--- a/extensions/git/src/ipc/ipcServer.ts
+++ b/extensions/git/src/ipc/ipcServer.ts
+@@ -20,3 +20,7 @@ function getIPCHandlePath(id: string): string {
+ 	if (process.platform !== 'darwin' && process.env['XDG_RUNTIME_DIR']) {
+-		return path.join(process.env['XDG_RUNTIME_DIR'] as string, `vscode-git-${id}.sock`);
+		if (!!process.env.FLATPAK_ID) {
+			return path.join(process.env['XDG_RUNTIME_DIR'] as string, 'app', process.env.FLATPAK_ID, `vscode-git-${id}.sock`);
+		} else {
+			return path.join(process.env['XDG_RUNTIME_DIR'] as string, `vscode-git-${id}.sock`);
+		}
+ 	}
+diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts
+index 629f2c4..ec1acba 100644
+--- a/src/vs/base/parts/ipc/node/ipc.net.ts
+++ b/src/vs/base/parts/ipc/node/ipc.net.ts
+@@ -774,3 +774,3 @@ function unmask(buffer: VSBuffer, mask: number): void {
+ // Related to https://github.com/microsoft/vscode/issues/30624
+-export const XDG_RUNTIME_DIR = <string | undefined>process.env['XDG_RUNTIME_DIR'];
+export const XDG_RUNTIME_DIR = <string | undefined>(!!process.env.FLATPAK_ID ? join(process.env['XDG_RUNTIME_DIR'] as string, 'app', process.env.FLATPAK_ID) : process.env['XDG_RUNTIME_DIR']);
+ 
--- a/patches/merge-user-product.patch
+++ b/patches/merge-user-product.patch
@ -1,35 +1,36 @@
-diff --git a/src/main.js b/src/main.js
-index 10bd503..4d55178 100644
--- a/src/main.js
-+++ b/src/main.js
-@@ -42,2 +42,6 @@ import { resolveNLSConfiguration } from './vs/base/node/nls.js';
- import { getUNCHost, addUNCHostToAllowlist } from './vs/base/node/unc.js';
-+import { createRequire } from 'node:module'
-+
-+/** @ts-ignore */
-+const require = createRequire(import.meta.url)
+diff --git a/src/main.ts b/src/main.ts
+index ff9a5e8..2135d00 100644
+--- a/src/main.ts
+++ b/src/main.ts
+@@ -8,2 +8,3 @@ import * as fs from 'original-fs';
+ import * as os from 'os';
+import { createRequire } from 'node:module';
+ import { performance } from 'perf_hooks';
+@@ -24,2 +25,3 @@ import { NativeParsedArgs } from './vs/platform/environment/common/argv.js';
+ const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
 
-@@ -132,2 +136,14 @@ registerListeners();
+@@ -112,2 +114,14 @@ registerListeners();
 
 +function resolveUserProduct() {
-+	const userDataPath = getUserDataPath({}, product.nameShort ?? 'code-oss-dev');
-+	const userProductPath = `file:///${userDataPath}/product.json`;
+	const userProductPath = path.join(userDataPath, 'product.json');
 +
 +	try {
 +		// Assign the product configuration to the global scope
-+		const productPath = require(fileURLToPath(userProductPath));
-+		global["_VSCODE_USER_PRODUCT_JSON"] = productPath;
+		const productJson = require(userProductPath);
+		// @ts-expect-error
+		globalThis._VSCODE_USER_PRODUCT_JSON = productJson;
 +	} catch (ex) {
 +	}
 +}
 +
 /**
-@@ -208,2 +224,3 @@ function startup(codeCachePath, nlsConfig) {
+@@ -183,2 +197,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 a98043f..204ce1b 100644
+index 1a2a619..9bf5ac0 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) {
--- a/patches/optional-tree-sitter.patch
+++ b/patches/optional-tree-sitter.patch
@ -0,0 +1,161 @@
+diff --git a/build/package-lock.json b/build/package-lock.json
+index 1e373f2..3ea31d0 100644
+--- a/build/package-lock.json
+++ b/build/package-lock.json
+@@ -53,3 +53,2 @@
+         "through2": "^4.0.2",
+-        "tree-sitter": "^0.20.5",
+         "vscode-universal-bundler": "^0.1.3",
+@@ -59,2 +58,3 @@
+       "optionalDependencies": {
+        "tree-sitter": "^0.20.5",
+         "tree-sitter-typescript": "^0.20.5",
+@@ -1381,3 +1381,3 @@
+       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+-      "devOptional": true,
+      "optional": true,
+       "dependencies": {
+@@ -1433,3 +1433,2 @@
+       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+-      "devOptional": true,
+       "funding": [
+@@ -1448,2 +1447,3 @@
+       ],
+      "optional": true,
+       "dependencies": {
+@@ -1622,3 +1622,3 @@
+       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+-      "devOptional": true
+      "optional": true
+     },
+@@ -1830,3 +1830,3 @@
+       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+-      "devOptional": true,
+      "optional": true,
+       "engines": {
+@@ -1896,3 +1896,3 @@
+       "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+-      "devOptional": true,
+      "optional": true,
+       "engines": {
+@@ -2150,3 +2150,3 @@
+       "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+-      "devOptional": true,
+      "optional": true,
+       "engines": {
+@@ -2281,3 +2281,3 @@
+       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+-      "devOptional": true
+      "optional": true
+     },
+@@ -2363,3 +2363,3 @@
+       "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==",
+-      "devOptional": true
+      "optional": true
+     },
+@@ -2676,3 +2676,2 @@
+       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+-      "devOptional": true,
+       "funding": [
+@@ -2690,3 +2689,4 @@
+         }
+-      ]
+      ],
+      "optional": true
+     },
+@@ -2713,3 +2713,3 @@
+       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+-      "devOptional": true
+      "optional": true
+     },
+@@ -3165,3 +3165,3 @@
+       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+-      "devOptional": true
+      "optional": true
+     },
+@@ -3183,3 +3183,3 @@
+       "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==",
+-      "devOptional": true
+      "optional": true
+     },
+@@ -3189,3 +3189,3 @@
+       "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==",
+-      "devOptional": true
+      "optional": true
+     },
+@@ -3195,3 +3195,3 @@
+       "integrity": "sha512-qWO5l3SCqbwQavymOmtTVuCWZE23++S+rxyoHjXqUmPyzRcaoI4lA2gO55/drddGnedAyjA7sk76SfQ5lfUMnw==",
+-      "devOptional": true,
+      "optional": true,
+       "dependencies": {
+@@ -3207,3 +3207,3 @@
+       "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+-      "devOptional": true,
+      "optional": true,
+       "dependencies": {
+@@ -3475,3 +3475,3 @@
+       "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==",
+-      "devOptional": true,
+      "optional": true,
+       "dependencies": {
+@@ -3559,3 +3559,3 @@
+       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+-      "devOptional": true,
+      "optional": true,
+       "dependencies": {
+@@ -3772,3 +3772,2 @@
+       "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+-      "devOptional": true,
+       "funding": [
+@@ -3786,3 +3785,4 @@
+         }
+-      ]
+      ],
+      "optional": true
+     },
+@@ -3792,3 +3792,2 @@
+       "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==",
+-      "devOptional": true,
+       "funding": [
+@@ -3807,2 +3806,3 @@
+       ],
+      "optional": true,
+       "dependencies": {
+@@ -3901,3 +3901,3 @@
+       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+-      "devOptional": true,
+      "optional": true,
+       "engines": {
+@@ -3934,3 +3934,3 @@
+       "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+-      "devOptional": true,
+      "optional": true,
+       "dependencies": {
+@@ -3946,3 +3946,3 @@
+       "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+-      "devOptional": true,
+      "optional": true,
+       "dependencies": {
+@@ -4029,4 +4029,4 @@
+       "integrity": "sha512-GxJodajVpfgb3UREzzIbtA1hyRnTxVbWVXrbC6sk4xTMH5ERMBJk9HJNq4c8jOJeUaIOmLcwg+t6mez/PDvGqg==",
+-      "devOptional": true,
+       "hasInstallScript": true,
+      "optional": true,
+       "dependencies": {
+@@ -4066,3 +4066,3 @@
+       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+-      "devOptional": true,
+      "optional": true,
+       "dependencies": {
+diff --git a/build/package.json b/build/package.json
+index aa94a21..9644be4 100644
+--- a/build/package.json
+++ b/build/package.json
+@@ -47,3 +47,2 @@
+     "through2": "^4.0.2",
+-    "tree-sitter": "^0.20.5",
+     "vscode-universal-bundler": "^0.1.3",
+@@ -59,2 +58,3 @@
+   "optionalDependencies": {
+    "tree-sitter": "^0.20.5",
+     "tree-sitter-typescript": "^0.20.5",
--- a/prepare_assets.sh
+++ b/prepare_assets.sh
@ -5,18 +5,6 @@ set -e

 APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"

-. ./utils.sh
-
-npm install -g checksum
-
-sum_file() {
-  if [[ -f "${1}" ]]; then
-    echo "Calculating checksum for ${1}"
-    checksum -a sha256 "${1}" > "${1}".sha256
-    checksum "${1}" > "${1}".sha1
-  fi
-}
-
 mkdir -p assets

 if [[ "${OS_NAME}" == "osx" ]]; then
@ -226,12 +214,6 @@ if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then
  cd ..
 fi

-cd assets
-
-for FILE in *; do
-  if [[ -f "${FILE}" ]]; then
-    sum_file "${FILE}"
-  fi
-done
-
-cd ..
+if [[ "${OS_NAME}" != "windows" ]]; then
+  ./prepare_checksums.sh
+fi
--- a/prepare_checksums.sh
+++ b/prepare_checksums.sh
@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+set -e
+
+npm install -g checksum
+
+sum_file() {
+  if [[ -f "${1}" ]]; then
+    echo "Calculating checksum for ${1}"
+    checksum -a sha256 "${1}" > "${1}".sha256
+    checksum "${1}" > "${1}".sha1
+  fi
+}
+
+cd assets
+
+for FILE in *; do
+  if [[ -f "${FILE}" ]]; then
+    sum_file "${FILE}"
+  fi
+done
+
+cd ..
 @ -1 +1 @@
 .14
 .18