Merge branch 'master' into insider

2024-07-22 18:42:21 +02:00 · 2024-07-22 18:42:21 +02:00 · 7538e45f92
commit 7538e45f92
parent 8f2868d2ea 51f2ec84c1
31 changed files with 1208 additions and 674 deletions
--- a/.github/workflows/insider-linux.yml
+++ b/.github/workflows/insider-linux.yml
@ -24,6 +24,7 @@ on:
    - '**/*.md'

 env:
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
  APP_NAME: VSCodium
  ASSETS_REPOSITORY: ${{ github.repository }}-insiders
  BINARY_NAME: codium-insiders
@ -149,6 +150,9 @@ jobs:
        - vscode_arch: armhf
          npm_arch: arm
          image: vscodium/vscodium-linux-build-agent:bionic-armhf
+        - vscode_arch: riscv64
+          npm_arch: riscv64
+          image: vscodium/vscodium-linux-build-agent:focal-riscv64
    container:
      image: ${{ matrix.image }}
    env:
@ -424,7 +428,7 @@ jobs:
        platform:
        - amd64
        - arm64
-    if: needs.check.outputs.SHOULD_DEPLOY == 'yes'
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_SNAP != 'yes'

    steps:
      - uses: actions/checkout@v3
--- a/.github/workflows/stable-linux.yml
+++ b/.github/workflows/stable-linux.yml
@ -24,6 +24,7 @@ on:
    - '**/*.md'

 env:
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
  APP_NAME: VSCodium
  ASSETS_REPOSITORY: ${{ github.repository }}
  BINARY_NAME: codium
@ -148,6 +149,9 @@ jobs:
        - vscode_arch: armhf
          npm_arch: arm
          image: vscodium/vscodium-linux-build-agent:bionic-armhf
+        - vscode_arch: riscv64
+          npm_arch: riscv64
+          image: vscodium/vscodium-linux-build-agent:focal-riscv64
    container:
      image: ${{ matrix.image }}
    env:
@ -420,7 +424,7 @@ jobs:
        platform:
        - amd64
        - arm64
-    if: needs.check.outputs.SHOULD_DEPLOY == 'yes'
+    if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_SNAP != 'yes'

    steps:
      - uses: actions/checkout@v3
@ -461,7 +465,7 @@ jobs:
          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
        with:
          snap: ${{ steps.build.outputs.snap }}
-          release: stable
+          release: ${{ vars.SNAP_STORE_CHANNEL }}
        if: env.SHOULD_DEPLOY_TO_STORE == 'yes'

  deb-rpm-repo-hook:
--- a/README.md
+++ b/README.md
@ -190,10 +190,6 @@ The minimal version is limited by the core component Electron, you may want to c
 - [x] Windows 10 / Server 2012 R2 or newer x64
 - [x] Windows 10 / Server 2012 R2 or newer arm64

-## <a id="donate"></a>Donate
-
-If you would like to support the development of VSCodium, feel free to send BTC to `3PgjE95yzBDTrSPxPiqoxSgZFuKPPAix1N` (<a href="https://github.com/stripedpajamas" target="_blank">@stripedpajamas</a>).
-
 ## <a id="thanks"></a>Special thanks

 <table>
@ -209,6 +205,10 @@ If you would like to support the development of VSCodium, feel free to send BTC
    <td><a href="https://www.macstadium.com" target="_blank"><img src="https://images.prismic.io/macstadium/66fbce64-707e-41f3-b547-241908884716_MacStadium_Logo.png?w=128&q=75" width="128" height="49" alt="MacStadium logo" /></a></td>
    <td>for providing a Mac mini M1</td>
  </tr>
+  <tr>
+    <td><a href="https://github.com/daiyam" target="_blank">@daiyam</a></td>
+    <td>for macOS certificate</td>
+  </tr>
 </table>

 ## <a id="license"></a>License
--- a/announcements-extra.json
+++ b/announcements-extra.json
@ -1,2 +1,7 @@
 [
+   {
+    "id": "#1227",
+    "title": "Issue(macOS): manual update to `1.90.x`",
+    "url": "https://github.com/VSCodium/vscodium/issues/1917"
+  },
 ]
--- a/check_tags.sh
+++ b/check_tags.sh
@ -3,17 +3,22 @@

 set -e

-if [[ -z "${GITHUB_TOKEN}" ]]; then
+if [[ -z "${GH_TOKEN}" ]] && [[ -z "${GITHUB_TOKEN}" ]] && [[ -z "${GH_ENTERPRISE_TOKEN}" ]] && [[ -z "${GITHUB_ENTERPRISE_TOKEN}" ]]; then
  echo "Will not build because no GITHUB_TOKEN defined"
  exit 0
+else
+  GITHUB_TOKEN="${GH_TOKEN:-${GITHUB_TOKEN:-${GH_ENTERPRISE_TOKEN:-${GITHUB_ENTERPRISE_TOKEN}}}}"
 fi

+# Support for GitHub Enterprise
+GH_HOST="${GH_HOST:-github.com}"
+
 APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"

 if [[ "${SHOULD_DEPLOY}" == "no" ]]; then
  ASSETS="null"
 else
-  GITHUB_RESPONSE=$( curl -s -H "Authorization: token ${GITHUB_TOKEN}" "https://api.github.com/repos/${ASSETS_REPOSITORY}/releases/latest" )
+  GITHUB_RESPONSE=$( curl -s -H "Authorization: token ${GITHUB_TOKEN}" "https://api.${GH_HOST}/repos/${ASSETS_REPOSITORY}/releases/latest" )
  LATEST_VERSION=$( echo "${GITHUB_RESPONSE}" | jq -c -r '.tag_name' )
  RECHECK_ASSETS="${SHOULD_BUILD}"

@ -330,10 +335,16 @@ elif [[ "${ASSETS}" != "null" ]]; then

      # linux-riscv64
      if [[ "${VSCODE_ARCH}" == "riscv64" || "${CHECK_ALL}" == "yes" ]]; then
-        SHOULD_BUILD_APPIMAGE="no"
-        SHOULD_BUILD_DEB="no"
-        SHOULD_BUILD_RPM="no"
-        SHOULD_BUILD_TAR="no"
+        export SHOULD_BUILD_DEB="no"
+        export SHOULD_BUILD_RPM="no"
+        export SHOULD_BUILD_APPIMAGE="no"
+      
+        if [[ -z $( contains "${APP_NAME}-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
+          echo "Building on Linux RISC-V 64 because we have no TAR"
+          export SHOULD_BUILD="yes"
+        else
+          export SHOULD_BUILD_TAR="no"
+        fi

        if [[ -z $( contains "${APP_NAME_LC}-reh-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then
          echo "Building on Linux RISC-V 64 because we have no REH archive"
@ -343,7 +354,7 @@ elif [[ "${ASSETS}" != "null" ]]; then
        fi

        if [[ "${SHOULD_BUILD}" != "yes" ]]; then
-          echo "Already have all the Linux PowerPC64LE builds"
+          echo "Already have all the Linux riscv64 builds"
        fi
      fi

@ -394,10 +405,13 @@ else
  if [[ "${IS_SPEARHEAD}" == "yes" ]]; then
    export SHOULD_BUILD_SRC="yes"
  elif [[ "${OS_NAME}" == "linux" ]]; then
-    if [[ "${VSCODE_ARCH}" == "ppc64le" || "${VSCODE_ARCH}" == "riscv64" ]]; then
+    if [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
      SHOULD_BUILD_DEB="no"
      SHOULD_BUILD_RPM="no"
      SHOULD_BUILD_TAR="no"
+    elif [[ "${VSCODE_ARCH}" == "riscv64" ]]; then
+      SHOULD_BUILD_DEB="no"
+      SHOULD_BUILD_RPM="no"
    fi
    if [[ "${VSCODE_ARCH}" != "x64" ]]; then
      export SHOULD_BUILD_APPIMAGE="no"
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@ -6,6 +6,7 @@
  - [Fonts showing up as rectangles](#linux-fonts-rectangle)
  - [Global menu workaround for KDE](#linux-kde-global-menu)
  - [Flatpak most common issues](#linux-flatpak-most-common-issues)
+  - [Remote SSH doesn't work](#linux-remote-ssh)
 - [macOS](#macos)
  - [App can't be opened because Apple cannot check it for malicious software](#macos-unidentified-developer)
  - ["VSCodium.app" is damaged and can’t be opened. You should move it to the Bin](#macos-quarantine)
@ -55,6 +56,14 @@ Credits: [Gerson](https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/-/issues/

 - If you have any other problems with the flatpak package try to look on the [FAQ](https://github.com/flathub/com.vscodium.codium?tab=readme-ov-file#faq) maybe the solution is already there or open an [issue](https://github.com/flathub/com.vscodium.codium/issues).

+##### <a id="linux-remote-ssh"></a>*Remote SSH doesn't work*
+
+Use the VSCodium's compatible extension [Open Remote - SSH](https://open-vsx.org/extension/jeanp413/open-remote-ssh).
+
+On the server, in the `sshd` config, `AllowTcpForwarding` need to be set to `yes`.
+
+It might requires additional dependeincies due to the OS/distro (alpine).
+
 ## <a id="macos"></a>macOS

 Since the App is signed with a self-signed certificate, on the first launch, you might see the following messages:
--- a/package_linux_bin.sh
+++ b/package_linux_bin.sh
@ -16,8 +16,30 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; }
 export VSCODE_SKIP_NODE_VERSION_CHECK=1
 export VSCODE_SYSROOT_PREFIX='-glibc-2.17'

-if [[ -d "../patches/${OS_NAME}/client/" ]]; then
-  for file in "../patches/${OS_NAME}/client/"*.patch; do
+if [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
+  export VSCODE_SYSROOT_REPO='VSCodium/vscode-linux-build-agent'
+  export VSCODE_SYSROOT_VERSION='20240129-253798'
+  export VSCODE_SYSROOT_PREFIX='-glibc-2.28'
+fi
+
+if [[ "${VSCODE_ARCH}" == "riscv64" ]]; then
+  export VSCODE_ELECTRON_REPO='riscv-forks/electron-riscv-releases'
+  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+  ELECTRON_VERSION="29.4.0"
+  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!"
+    exit 1
+  fi
+  export VSCODE_ELECTRON_TAG="v${ELECTRON_VERSION}.riscv3"
+  echo "c2b55b6fee59dd2f29138b0052536d5c254c04c29bc322bd3e877bb457799fca *electron-v29.4.0-linux-riscv64.zip" >> build/checksums/electron.txt
+fi
+
+if [[ -d "../patches/linux/client/" ]]; then
+  for file in "../patches/linux/client/"*.patch; do
    if [[ -f "${file}" ]]; then
      echo applying patch: "${file}";
      if ! git apply --ignore-whitespace "${file}"; then
@ -37,7 +59,11 @@ for i in {1..5}; do # try 5 times
  echo "Yarn failed $i, trying again..."
 done

+if [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
+  source ./build/azure-pipelines/linux/setup-env.sh
+else
  ./build/azure-pipelines/linux/setup-env.sh
+fi

 for i in {1..5}; do # try 5 times
  yarn --check-files && break
--- a/package_linux_reh.sh
+++ b/package_linux_reh.sh
@ -12,8 +12,14 @@ tar -xzf ./vscode.tar.gz
 cd vscode || { echo "'vscode' dir not found"; exit 1; }

 GLIBC_VERSION="2.17"
+GLIBCXX_VERSION="3.4.22"
+NODE_VERSION="16.20.2"
+
 if [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
  GLIBC_VERSION="2.28"
+elif [[ "${VSCODE_ARCH}" == "riscv64" ]]; then
+  # Unofficial RISC-V nodejs builds doesn't provide v16.x
+  NODE_VERSION="18.18.1"
 fi

 export VSCODE_PLATFORM='linux'
@ -32,16 +38,36 @@ elif [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:bionic-devtoolset-ppc64le"
  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+  export VSCODE_SYSROOT_REPO='VSCodium/vscode-linux-build-agent'
+  export VSCODE_SYSROOT_VERSION='20240129-253798'
 elif [[ "${VSCODE_ARCH}" == "riscv64" ]]; then
  VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME="vscodium/vscodium-linux-build-agent:focal-devtoolset-riscv64"
  export ELECTRON_SKIP_BINARY_DOWNLOAD=1
  export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
-  # Unofficial RISC-V nodejs builds doesn't provide v16.x
-  sed -i '/target/s/"16.*"/"18.18.1"/' remote/.yarnrc
 fi

 export VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME

+sed -i "/target/s/\"20.*\"/\"${NODE_VERSION}\"/" remote/.yarnrc
+
+if [[ "${NODE_VERSION}" != 16* ]]; then
+  if [[ -f "../patches/linux/reh/node16.patch" ]]; then
+    mv "../patches/linux/reh/node16.patch" "../patches/linux/reh/node16.patch.no"
+  fi
+fi
+
+if [[ -d "../patches/linux/reh/" ]]; then
+  for file in "../patches/linux/reh/"*.patch; do
+    if [[ -f "${file}" ]]; then
+      echo applying patch: "${file}";
+      if ! git apply --ignore-whitespace "${file}"; then
+        echo failed to apply patch "${file}" >&2
+        exit 1
+      fi
+    fi
+  done
+fi
+
 for i in {1..5}; do # try 5 times
  yarn --cwd build --frozen-lockfile --check-files && break
  if [[ $i == 3 ]]; then
@ -66,8 +92,6 @@ for i in {1..5}; do # try 5 times
  echo "Yarn failed $i, trying again..."
 done

-EXPECTED_GLIBC_VERSION="${GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="3.4.22" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
-
 node build/azure-pipelines/distro/mixin-npm

 export VSCODE_NODE_GLIBC="-glibc-${GLIBC_VERSION}"
@ -75,6 +99,8 @@ export VSCODE_NODE_GLIBC="-glibc-${GLIBC_VERSION}"
 yarn gulp minify-vscode-reh
 yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"

+EXPECTED_GLIBC_VERSION="${GLIBC_VERSION}" EXPECTED_GLIBCXX_VERSION="${GLIBCXX_VERSION}" SEARCH_PATH="../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" ./build/azure-pipelines/linux/verify-glibc-requirements.sh
+
 cd ..

 APP_NAME_LC="$( echo "${APP_NAME}" | awk '{print tolower($0)}' )"
--- 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 dd1727e..6a5d304 100644
+index b69dac0..293e866 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
@ -354,22 +354,22 @@ index 6259b15..385797a 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 4f27690..6a09471 100644
+index cba2400..f2dbf28 100644
 --- a/extensions/typescript-language-features/package.nls.json
 +++ b/extensions/typescript-language-features/package.nls.json
-@@ -74,4 +74,4 @@
+@@ -75,4 +75,4 @@
 	"configuration.tsserver.experimental.enableProjectDiagnostics": "(Experimental) 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.",
 +	"typescript.locale.auto": "Use VSCodium's configured display language",
 	"configuration.implicitProjectConfig.module": "Sets the module system for the program. See more: https://www.typescriptlang.org/tsconfig#module.",
-@@ -158,3 +158,3 @@
+@@ -159,3 +159,3 @@
 	"typescript.workspaceSymbols.excludeLibrarySymbols": "Exclude symbols that come from library files in Go to Symbol in Workspace results. Requires using TypeScript 5.3+ in the workspace.",
 -	"typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VS Code.",
 +	"typescript.updateImportsOnFileMove.enabled": "Enable/disable automatic updating of import paths when you rename or move a file in VSCodium.",
 	"typescript.updateImportsOnFileMove.enabled.prompt": "Prompt on each rename.",
-@@ -164,5 +164,5 @@
+@@ -165,5 +165,5 @@
 	"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.",
@ -377,16 +377,7 @@ index 4f27690..6a09471 100644
 -	"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.watchOptions": "Configure which watching strategies should be used to keep track of files and directories.",
-@@ -217,6 +217,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.",
- 	"configuration.tsserver.web.projectWideIntellisense.suppressSemanticErrors": "Suppresses semantic errors on web even when project wide IntelliSense is enabled. This is always on when project wide IntelliSense is not enabled or available. See `#typescript.tsserver.web.projectWideIntellisense.enabled#`",
- 	"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.5+.",
-@@ -231,6 +231,6 @@
+@@ -232,6 +232,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)",
@ -395,6 +386,22 @@ index 4f27690..6a09471 100644
 -	"walkthroughs.nodejsWelcome.learnMoreAboutJs.description": "Want to get more comfortable with JavaScript, Node.js, and VS Code? Be sure to check out our docs!\nWe've got lots of resources for learning [JavaScript](https://code.visualstudio.com/docs/nodejs/working-with-javascript) and [Node.js](https://code.visualstudio.com/docs/nodejs/nodejs-tutorial).\n\n[Learn More](https://code.visualstudio.com/docs/nodejs/nodejs-tutorial)",
 +	"walkthroughs.nodejsWelcome.learnMoreAboutJs.description": "Want to get more comfortable with JavaScript, Node.js, and VSCodium? Be sure to check out our docs!\nWe've got lots of resources for learning [JavaScript](https://code.visualstudio.com/docs/nodejs/working-with-javascript) and [Node.js](https://code.visualstudio.com/docs/nodejs/nodejs-tutorial).\n\n[Learn More](https://code.visualstudio.com/docs/nodejs/nodejs-tutorial)",
 	"walkthroughs.nodejsWelcome.learnMoreAboutJs.altText": "Learn more about JavaScript and Node.js in Visual Studio Code."
+diff --git a/extensions/typescript-language-features/package.nls.json.rej b/extensions/typescript-language-features/package.nls.json.rej
+new file mode 100644
+index 0000000..e9b89de
+--- /dev/null
+++ b/extensions/typescript-language-features/package.nls.json.rej
+@@ -0,0 +1,10 @@
+diff a/extensions/typescript-language-features/package.nls.json b/extensions/typescript-language-features/package.nls.json	(rejected hunks)
+@@ -217,6 +217,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.",
+ 	"configuration.tsserver.web.projectWideIntellisense.suppressSemanticErrors": "Suppresses semantic errors on web even when project wide IntelliSense is enabled. This is always on when project wide IntelliSense is not enabled or available. See `#typescript.tsserver.web.projectWideIntellisense.enabled#`",
+ 	"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.5+.",
 diff --git a/extensions/typescript-language-features/src/tsServer/versionManager.ts b/extensions/typescript-language-features/src/tsServer/versionManager.ts
 index 43a2413..277a089 100644
 --- a/extensions/typescript-language-features/src/tsServer/versionManager.ts
@ -423,26 +430,26 @@ index 04f08a1..2b2b1bb 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 24742f9..13011a5 100644
+index da6408b..6b11126 100644
 --- a/extensions/typescript-language-features/src/typescriptServiceClient.ts
 +++ b/extensions/typescript-language-features/src/typescriptServiceClient.ts
-@@ -639,3 +639,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
+@@ -640,3 +640,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 {
-@@ -660,3 +660,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
+@@ -661,3 +661,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 {
-@@ -674,3 +674,3 @@ export default class TypeScriptServiceClient extends Disposable implements IType
+@@ -675,3 +675,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), reportIssueItem);
 +							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), reportIssueItem);
 					} else {
 diff --git a/extensions/vscode-api-tests/package.json b/extensions/vscode-api-tests/package.json
-index 868f7cf..d10e730 100644
+index 7e8b968..baf5f0e 100644
 --- a/extensions/vscode-api-tests/package.json
 +++ b/extensions/vscode-api-tests/package.json
@@ -2,3 +2,3 @@
@ -520,7 +527,7 @@ 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 46193cd..30a8d77 100644
+index 1c4a565..123576b 100644
 --- a/src/vs/code/electron-main/app.ts
 +++ b/src/vs/code/electron-main/app.ts
@@ -571,3 +571,3 @@ export class CodeApplication extends Disposable {
@ -547,7 +554,7 @@ index 296245b..cf03674 100644
 +export const ProductQualityContext = new RawContextKey<string>('productQualityType', '', localize('productQualityType', "Quality type of VSCodium"));
 
 diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
-index 2bcc19c..6c43d52 100644
+index 29613db..ccb82fb 100644
 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts
 +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts
@@ -149,3 +149,3 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
@ -560,12 +567,12 @@ index 2bcc19c..6c43d52 100644
 -			throw new Error(nls.localize('removeError', "Error while removing the extension: {0}. Please Quit and Start VS Code before trying again.", toErrorMessage(e)));
 +			throw new Error(nls.localize('removeError', "Error while removing the extension: {0}. Please Quit and Start VSCodium before trying again.", toErrorMessage(e)));
 		}
-@@ -942,3 +942,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
+@@ -970,3 +970,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 					} catch (e) {
 -						throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 +						throw new Error(nls.localize('restartCode', "Please restart VSCodium before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 					}
-@@ -953,3 +953,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
+@@ -981,3 +981,3 @@ class InstallExtensionInProfileTask extends AbstractExtensionTask<ILocalExtensio
 				} catch (e) {
 -					throw new Error(nls.localize('restartCode', "Please restart VS Code before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
 +					throw new Error(nls.localize('restartCode', "Please restart VSCodium before reinstalling {0}.", this.manifest.displayName || this.manifest.name));
@ -659,7 +666,7 @@ index 15730c3..3e257b6 100644
 +	static readonly TestItem = new ApiCommandArgument('testItem', 'A VSCodium TestItem', v => v instanceof TestItemImpl, extHostTypeConverter.TestItem.from);
 
 diff --git a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts
-index 5a7ed7e..e5a8047 100644
+index 49a2f01..e39520d 100644
 --- a/src/vs/workbench/api/test/browser/extHostNotebook.test.ts
 +++ b/src/vs/workbench/api/test/browser/extHostNotebook.test.ts
@@ -362,3 +362,3 @@ suite('NotebookCell#Document', function () {
@ -668,10 +675,10 @@ index 5a7ed7e..e5a8047 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 8494c96..63f6ec3 100644
+index ae4d22c..a909a0a 100644
 --- a/src/vs/workbench/browser/workbench.contribution.ts
 +++ b/src/vs/workbench/browser/workbench.contribution.ts
-@@ -645,3 +645,3 @@ const registry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Con
+@@ -646,3 +646,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."),
@ -686,36 +693,36 @@ index 4233162..9bd6599 100644
 +						description: nls.localize('debugServer', "For debug extension development only: if a port is specified VSCodium tries to connect to a debug adapter running in server mode"),
 						default: 4711
 diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
-index 0ff4dca..a0b1776 100644
+index 33f961f..97d5060 100644
 --- a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
 +++ b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
-@@ -303,3 +303,3 @@ CommandsRegistry.registerCommand({
+@@ -301,3 +301,3 @@ CommandsRegistry.registerCommand({
 				description: '(optional) Options for installing the extension. Object with the following properties: ' +
 -					'`installOnlyNewlyAddedFromExtensionPackVSIX`: When enabled, VS Code installs only newly added extensions from the extension pack VSIX. This option is considered only when installing VSIX. ',
 +					'`installOnlyNewlyAddedFromExtensionPackVSIX`: When enabled, VSCodium installs only newly added extensions from the extension pack VSIX. This option is considered only when installing VSIX. ',
 				isOptional: true,
-@@ -310,3 +310,3 @@ CommandsRegistry.registerCommand({
+@@ -308,3 +308,3 @@ CommandsRegistry.registerCommand({
 							'type': 'boolean',
 -							'description': localize('workbench.extensions.installExtension.option.installOnlyNewlyAddedFromExtensionPackVSIX', "When enabled, VS Code installs only newly added extensions from the extension pack VSIX. This option is considered only while installing a VSIX."),
 +							'description': localize('workbench.extensions.installExtension.option.installOnlyNewlyAddedFromExtensionPackVSIX', "When enabled, VSCodium installs only newly added extensions from the extension pack VSIX. This option is considered only while installing a VSIX."),
 							default: false
-@@ -315,3 +315,3 @@ CommandsRegistry.registerCommand({
+@@ -313,3 +313,3 @@ CommandsRegistry.registerCommand({
 							'type': 'boolean',
 -							'description': localize('workbench.extensions.installExtension.option.installPreReleaseVersion', "When enabled, VS Code installs the pre-release version of the extension if available."),
 +							'description': localize('workbench.extensions.installExtension.option.installPreReleaseVersion', "When enabled, VSCodium installs the pre-release version of the extension if available."),
 							default: false
-@@ -320,3 +320,3 @@ CommandsRegistry.registerCommand({
+@@ -318,3 +318,3 @@ CommandsRegistry.registerCommand({
 							'type': 'boolean',
 -							'description': localize('workbench.extensions.installExtension.option.donotSync', "When enabled, VS Code do not sync this extension when Settings Sync is on."),
 +							'description': localize('workbench.extensions.installExtension.option.donotSync', "When enabled, VSCodium do not sync this extension when Settings Sync is on."),
 							default: false
-@@ -866,3 +866,3 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
- 							const requireReload = !(extension.local && extensionService.canAddExtension(toExtensionDescription(extension.local)));
-							const message = requireReload ? localize('InstallVSIXAction.successReload', "Completed installing {0} extension from VSIX. Please reload Visual Studio Code to enable it.", extension.displayName || extension.name)
-+							const message = requireReload ? localize('InstallVSIXAction.successReload', "Completed installing {0} extension from VSIX. Please reload VSCodium to enable it.", extension.displayName || extension.name)
- 								: localize('InstallVSIXAction.success', "Completed installing {0} extension from VSIX.", extension.displayName || extension.name);
+@@ -875,3 +875,3 @@ class ExtensionsContributions extends Disposable implements IWorkbenchContributi
+ 						Severity.Info,
+-						localize('InstallVSIXAction.successReload', "Completed installing extension from VSIX. Please reload Visual Studio Code to enable it."),
+						localize('InstallVSIXAction.successReload', "Completed installing extension from VSIX. Please reload VSCodium to enable it."),
+ 						[{
 diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
-index fc17420..0017062 100644
+index fccbb36..473bc79 100644
 --- a/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
 +++ b/src/vs/workbench/contrib/extensions/browser/extensionsActions.ts
@@ -105,3 +105,3 @@ export class PromptExtensionInstallFailureAction extends Action {
@ -723,41 +730,41 @@ index fc17420..0017062 100644
 -			const productName = isWeb ? localize('VS Code for Web', "{0} for the Web", this.productService.nameLong) : this.productService.nameLong;
 +			const productName = isWeb ? localize('VSCodium for Web', "{0} for the Web", this.productService.nameLong) : this.productService.nameLong;
 			const message = localize('cannot be installed', "The '{0}' extension is not available in {1}. Click 'More Information' to learn more.", this.extension.displayName || this.extension.identifier.id, productName);
-@@ -386,3 +386,3 @@ export class InstallAction extends ExtensionAction {
+@@ -467,3 +467,3 @@ export class InstallAction extends ExtensionAction {
 			} else if (this.extension.deprecationInfo.settings) {
 -				detail = localize('deprecated with alternate settings message', "This extension is deprecated as this functionality is now built-in to VS Code.");
 +				detail = localize('deprecated with alternate settings message', "This extension is deprecated as this functionality is now built-in to VSCodium.");
 
-@@ -774,3 +774,3 @@ export class UninstallAction extends ExtensionAction {
+@@ -855,3 +855,3 @@ export class UninstallAction extends ExtensionAction {
 			await this.extensionsWorkbenchService.uninstall(this.extension);
 -			alert(localize('uninstallExtensionComplete', "Please reload Visual Studio Code to complete the uninstallation of the extension {0}.", this.extension.displayName));
 +			alert(localize('uninstallExtensionComplete', "Please reload VSCodium to complete the uninstallation of the extension {0}.", this.extension.displayName));
 		} catch (error) {
-@@ -2386,3 +2386,3 @@ export class ExtensionStatusAction extends ExtensionAction {
+@@ -2466,3 +2466,3 @@ export class ExtensionStatusAction extends ExtensionAction {
 				const link = `[${localize('settings', "settings")}](${URI.parse(`command:workbench.action.openSettings?${encodeURIComponent(JSON.stringify([this.extension.deprecationInfo.settings.map(setting => `@id:${setting}`).join(' ')]))}`)})`;
 -				this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to VS Code. Configure these {0} to use this functionality.", link)) }, true);
 +				this.updateStatus({ icon: warningIcon, message: new MarkdownString(localize('deprecated with alternate settings tooltip', "This extension is deprecated as this functionality is now built-in to VSCodium. Configure these {0} to use this functionality.", link)) }, true);
 			} else {
-@@ -2410,3 +2410,3 @@ export class ExtensionStatusAction extends ExtensionAction {
+@@ -2490,3 +2490,3 @@ export class ExtensionStatusAction extends ExtensionAction {
 			if (this.extensionManagementServerService.webExtensionManagementServer) {
 -				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);
 				const message = new MarkdownString(`${localize('not web tooltip', "The '{0}' extension is not available in {1}.", this.extension.displayName || this.extension.identifier.id, productName)} [${localize('learn why', "Learn Why")}](https://aka.ms/vscode-web-extensions-guide)`);
-@@ -2686,3 +2686,3 @@ export class ReinstallAction extends Action {
+@@ -2766,3 +2766,3 @@ export class ReinstallAction extends Action {
 						const requireReload = !(extension.local && this.extensionService.canAddExtension(toExtensionDescription(extension.local)));
 -						const message = requireReload ? localize('ReinstallAction.successReload', "Please reload Visual Studio Code to complete reinstalling the extension {0}.", extension.identifier.id)
 +						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 3eb8c7e..58eb9c9 100644
+index 826da44..9b74912 100644
 --- a/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
 +++ b/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
-@@ -406,3 +406,3 @@ export class Extension implements IExtension {
+@@ -409,3 +409,3 @@ export class Extension implements IExtension {
 			return Promise.resolve(`# ${this.displayName || this.name}
 -**Notice:** This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
 +**Notice:** This extension is bundled with VSCodium. It can be disabled but not uninstalled.
 ## Features
-@@ -444,3 +444,3 @@ ${this.description}
+@@ -447,3 +447,3 @@ ${this.description}
 		if (this.type === ExtensionType.System) {
 -			return Promise.resolve(`Please check the [VS Code Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`);
 +			return Promise.resolve(`Please check the [VSCodium Release Notes](command:${ShowCurrentReleaseNotesActionId}) for changes to the built-in extensions.`);
@ -841,7 +848,7 @@ index b24d91f..a098a62 100644
 +		const message = await this.tasExperimentService?.getTreatment<string>('CESSurveyMessage') ?? nls.localize('cesSurveyQuestion', 'Got a moment to help the VSCodium team? Please tell us about your experience with VSCodium so far.');
 		const button = await this.tasExperimentService?.getTreatment<string>('CESSurveyButton') ?? nls.localize('giveFeedback', "Give Feedback");
 diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
-index 0e9b787..0cb2d8c 100644
+index e11e8a8..640356b 100644
 --- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
 +++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -3174,3 +3174,3 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
@ -882,7 +889,7 @@ index 9efbc2a..18c7aec 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 966c4ea..fe0fc91 100644
+index 3cf3c28..f284ee4 100644
 --- a/src/vs/workbench/contrib/terminal/browser/terminalView.ts
 +++ b/src/vs/workbench/contrib/terminal/browser/terminalView.ts
@@ -201,3 +201,3 @@ export class TerminalViewPane extends ViewPane {
@ -1109,24 +1116,24 @@ index 541f119..64f3b80 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 e1519b9..4c0d94f 100644
+index 4ae3a9f..0e45baa 100644
 --- a/src/vs/workbench/electron-sandbox/desktop.contribution.ts
 +++ b/src/vs/workbench/electron-sandbox/desktop.contribution.ts
-@@ -391,3 +391,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from 'vs/platform/window/electron-sand
+@@ -395,3 +395,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from 'vs/platform/window/electron-sand
 				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.")
 			},
-@@ -395,3 +395,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from 'vs/platform/window/electron-sand
+@@ -399,3 +399,3 @@ import { MAX_ZOOM_LEVEL, MIN_ZOOM_LEVEL } from 'vs/platform/window/electron-sand
 				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 7e4bc40..f6a1272 100644
+index 68d30c4..79363b4 100644
 --- a/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
 +++ b/src/vs/workbench/services/extensionManagement/common/extensionManagementService.ts
-@@ -711,3 +711,3 @@ export class ExtensionManagementService extends Disposable implements IWorkbench
+@@ -721,3 +721,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);
@ -1141,7 +1148,7 @@ index 696f822..f548e73 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 f39fd30..4dbc5ce 100644
+index b5ef3e6..2fbb031 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 = {
@ -1183,35 +1190,35 @@ index f39fd30..4dbc5ce 100644
 -			description: nls.localize('vscode.extension.activationEvents', 'Activation events for the VS Code extension.'),
 +			description: nls.localize('vscode.extension.activationEvents', 'Activation events for the VSCodium extension.'),
 			type: 'array',
-@@ -389,3 +389,3 @@ export const schema: IJSONSchema = {
+@@ -399,3 +399,3 @@ export const schema: IJSONSchema = {
 						label: '*',
 -						description: nls.localize('vscode.extension.activationEvents.star', 'An activation event emitted on VS Code startup. To ensure a great end user experience, please use this activation event in your extension only when no other activation events combination works in your use-case.'),
 +						description: nls.localize('vscode.extension.activationEvents.star', 'An activation event emitted on VSCodium startup. To ensure a great end user experience, please use this activation event in your extension only when no other activation events combination works in your use-case.'),
 						body: '*'
-@@ -561,3 +561,3 @@ export const schema: IJSONSchema = {
+@@ -571,3 +571,3 @@ export const schema: IJSONSchema = {
 				'vscode:prepublish': {
 -					description: nls.localize('vscode.extension.scripts.prepublish', 'Script executed before the package is published as a VS Code extension.'),
 +					description: nls.localize('vscode.extension.scripts.prepublish', 'Script executed before the package is published as a VSCodium extension.'),
 					type: 'string'
-@@ -565,3 +565,3 @@ export const schema: IJSONSchema = {
+@@ -575,3 +575,3 @@ export const schema: IJSONSchema = {
 				'vscode:uninstall': {
 -					description: nls.localize('vscode.extension.scripts.uninstall', 'Uninstall hook for VS Code extension. Script that gets executed when the extension is completely uninstalled from VS Code which is when VS Code is restarted (shutdown and start) after the extension is uninstalled. Only Node scripts are supported.'),
 +					description: nls.localize('vscode.extension.scripts.uninstall', 'Uninstall hook for VSCodium extension. Script that gets executed when the extension is completely uninstalled from VSCodium which is when VSCodium is restarted (shutdown and start) after the extension is uninstalled. Only Node scripts are supported.'),
 					type: 'string'
 diff --git a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
-index cdd507e..c390af5 100644
+index b7b77b2..2e8efb1 100644
 --- a/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
 +++ b/src/vs/workbench/services/extensions/electron-sandbox/nativeExtensionService.ts
-@@ -174,3 +174,3 @@ export class NativeExtensionService extends AbstractExtensionService implements
+@@ -166,3 +166,3 @@ export class NativeExtensionService extends AbstractExtensionService implements
 					[{
 -						label: nls.localize('relaunch', "Relaunch VS Code"),
 +						label: nls.localize('relaunch', "Relaunch VSCodium"),
 						run: () => {
 diff --git a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
-index e454c34..6b180d5 100644
+index ff84581..18e03ba 100644
 --- a/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
 +++ b/src/vs/workbench/services/userDataProfile/browser/userDataProfileManagement.ts
-@@ -169,3 +169,3 @@ export class UserDataProfileManagementService extends Disposable implements IUse
+@@ -174,3 +174,3 @@ export class UserDataProfileManagementService extends Disposable implements IUse
 				const { confirmed } = await this.dialogService.confirm({
 -					message: reloadMessage ?? localize('reload message', "Switching a profile requires reloading VS Code."),
 +					message: reloadMessage ?? localize('reload message', "Switching a profile requires reloading VSCodium."),
--- a/patches/feat-announcements.patch
+++ b/patches/feat-announcements.patch
@ -1,8 +1,8 @@
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
-index 66b9062..0a659dc 100644
+index c581ac0..f11c0f0 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
-@@ -315,2 +315,8 @@ configurationRegistry.registerConfiguration({
+@@ -319,2 +319,8 @@ configurationRegistry.registerConfiguration({
 		},
 +		'workbench.welcomePage.extraAnnouncements': {
 +			scope: ConfigurationScope.MACHINE,
@ -12,10 +12,10 @@ index 66b9062..0a659dc 100644
 +		},
 		'workbench.startupEditor': {
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-index a73549a..fc95016 100644
+index 664c55b..43f9e2e 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-@@ -115,4 +115,8 @@ type GettingStartedActionEvent = {
+@@ -113,4 +113,8 @@ type GettingStartedActionEvent = {
 type RecentEntry = (IRecentFolder | IRecentWorkspace) & { id: string };
 +type AnnouncementEntry = { id: string, title: string, url: string };
 
@ -24,35 +24,26 @@ index a73549a..fc95016 100644
 +const BUILTIN_ANNOUNCEMENTS: AnnouncementEntry[] = [/* BUILTIN_ANNOUNCEMENTS */];
 +
 export class GettingStartedPage extends EditorPane {
-@@ -151,2 +155,4 @@ export class GettingStartedPage extends EditorPane {
+@@ -149,2 +153,4 @@ export class GettingStartedPage extends EditorPane {
 	private gettingStartedList?: GettingStartedIndexList<IResolvedWalkthrough>;
 +	private announcementList?: GettingStartedIndexList<AnnouncementEntry>;
 +	private announcementData?: AnnouncementEntry[];
- 	private videoList?: GettingStartedIndexList<IWelcomePageStartEntry>;
-@@ -844,2 +850,3 @@ export class GettingStartedPage extends EditorPane {
+ 
+@@ -812,2 +818,3 @@ export class GettingStartedPage extends EditorPane {
 		const gettingStartedList = this.buildGettingStartedWalkthroughsList();
 +		const announcementList = await this.buildAnnouncementList();
 
-@@ -856,6 +863,6 @@ export class GettingStartedPage extends EditorPane {
- 					this.container.classList.remove('noVideos');
-					reset(rightColumn, videoList?.getDomElement(), gettingStartedList.getDomElement());
-+					reset(rightColumn, videoList?.getDomElement(), gettingStartedList.getDomElement(), announcementList.getDomElement());
- 				} else {
- 					this.container.classList.add('noVideos');
+@@ -822,3 +829,3 @@ export class GettingStartedPage extends EditorPane {
+ 				this.container.classList.remove('noWalkthroughs');
 -				reset(rightColumn, gettingStartedList.getDomElement());
 +				reset(rightColumn, gettingStartedList.getDomElement(), announcementList.getDomElement());
 			}
-@@ -866,3 +873,3 @@ export class GettingStartedPage extends EditorPane {
- 					this.container.classList.remove('noVideos');
-					reset(rightColumn, videoList?.getDomElement());
-+					reset(rightColumn, videoList?.getDomElement(), announcementList.getDomElement());
- 				}
-@@ -870,3 +877,3 @@ export class GettingStartedPage extends EditorPane {
- 					this.container.classList.add('noVideos');
+@@ -826,3 +833,3 @@ export class GettingStartedPage extends EditorPane {
+ 				this.container.classList.add('noWalkthroughs');
 -				reset(rightColumn);
 +				reset(rightColumn, announcementList.getDomElement());
 			}
-@@ -1023,2 +1030,55 @@ export class GettingStartedPage extends EditorPane {
+@@ -978,2 +985,55 @@ export class GettingStartedPage extends EditorPane {
 
 +	private async buildAnnouncementList(): Promise<GettingStartedIndexList<AnnouncementEntry>> {
 +		const renderAnnouncement = (announcement: AnnouncementEntry) => {
--- a/patches/linux/client/node16.patch
+++ b/patches/linux/client/node16.patch
@ -0,0 +1,227 @@
+diff --git a/build/package.json b/build/package.json
+index 0bbeed3..012ead3 100644
+--- a/build/package.json
+++ b/build/package.json
+@@ -5,5 +5,2 @@
+   "devDependencies": {
+-    "@azure/cosmos": "^3",
+-    "@azure/identity": "^4.2.1",
+-    "@azure/storage-blob": "^12.17.0",
+     "@electron/get": "^2.0.0",
+@@ -49,2 +46,3 @@
+     "mkdirp": "^1.0.4",
+    "node-fetch": "^2.6.7",
+     "source-map": "0.6.1",
+diff --git a/build/yarn.lock b/build/yarn.lock
+index d99ceff..e7ae542 100644
+--- a/build/yarn.lock
+++ b/build/yarn.lock
+@@ -4,199 +4,2 @@
+ 
+-"@azure/abort-controller@^1.0.0":
+-  version "1.0.2"
+-  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.0.2.tgz#822405c966b2aec16fb62c1b19d37eaccf231995"
+-  integrity sha512-XUyTo+bcyxHEf+jlN2MXA7YU9nxVehaubngHV1MIZZaqYmZqykkoeAz/JMMEeR7t3TcyDwbFa3Zw8BZywmIx4g==
+-  dependencies:
+-    tslib "^2.0.0"
+-
+-"@azure/abort-controller@^2.0.0":
+-  version "2.1.2"
+-  resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-2.1.2.tgz#42fe0ccab23841d9905812c58f1082d27784566d"
+-  integrity sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==
+-  dependencies:
+-    tslib "^2.6.2"
+-
+-"@azure/core-asynciterator-polyfill@^1.0.0":
+-  version "1.0.0"
+-  resolved "https://registry.yarnpkg.com/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.0.tgz#dcccebb88406e5c76e0e1d52e8cc4c43a68b3ee7"
+-  integrity sha512-kmv8CGrPfN9SwMwrkiBK9VTQYxdFQEGe0BmQk+M8io56P9KNzpAxcWE/1fxJj7uouwN4kXF0BHW8DNlgx+wtCg==
+-
+-"@azure/core-auth@^1.3.0", "@azure/core-auth@^1.5.0":
+-  version "1.5.0"
+-  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.5.0.tgz#a41848c5c31cb3b7c84c409885267d55a2c92e44"
+-  integrity sha512-udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw==
+-  dependencies:
+-    "@azure/abort-controller" "^1.0.0"
+-    "@azure/core-util" "^1.1.0"
+-    tslib "^2.2.0"
+-
+-"@azure/core-client@^1.4.0":
+-  version "1.5.0"
+-  resolved "https://registry.yarnpkg.com/@azure/core-client/-/core-client-1.5.0.tgz#7aabb87d20e08db3683a117191c844bc19adb74e"
+-  integrity sha512-YNk8i9LT6YcFdFO+RRU0E4Ef+A8Y5lhXo6lz61rwbG8Uo7kSqh0YqK04OexiilM43xd6n3Y9yBhLnb1NFNI9dA==
+-  dependencies:
+-    "@azure/abort-controller" "^1.0.0"
+-    "@azure/core-asynciterator-polyfill" "^1.0.0"
+-    "@azure/core-auth" "^1.3.0"
+-    "@azure/core-rest-pipeline" "^1.5.0"
+-    "@azure/core-tracing" "1.0.0-preview.13"
+-    "@azure/logger" "^1.0.0"
+-    tslib "^2.2.0"
+-
+-"@azure/core-http@^3.0.0":
+-  version "3.0.0"
+-  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-3.0.0.tgz#345845f9ba479a5ee41efc3fd7a13e82d2a0ec47"
+-  integrity sha512-BxI2SlGFPPz6J1XyZNIVUf0QZLBKFX+ViFjKOkzqD18J1zOINIQ8JSBKKr+i+v8+MB6LacL6Nn/sP/TE13+s2Q==
+-  dependencies:
+-    "@azure/abort-controller" "^1.0.0"
+-    "@azure/core-auth" "^1.3.0"
+-    "@azure/core-tracing" "1.0.0-preview.13"
+-    "@azure/core-util" "^1.1.1"
+-    "@azure/logger" "^1.0.0"
+-    "@types/node-fetch" "^2.5.0"
+-    "@types/tunnel" "^0.0.3"
+-    form-data "^4.0.0"
+-    node-fetch "^2.6.7"
+-    process "^0.11.10"
+-    tslib "^2.2.0"
+-    tunnel "^0.0.6"
+-    uuid "^8.3.0"
+-    xml2js "^0.4.19"
+-
+-"@azure/core-lro@^2.2.0":
+-  version "2.2.1"
+-  resolved "https://registry.yarnpkg.com/@azure/core-lro/-/core-lro-2.2.1.tgz#5527b41037c658d3aefc19d68633e51e53d6e6a3"
+-  integrity sha512-HE6PBl+mlKa0eBsLwusHqAqjLc5n9ByxeDo3Hz4kF3B1hqHvRkBr4oMgoT6tX7Hc3q97KfDctDUon7EhvoeHPA==
+-  dependencies:
+-    "@azure/abort-controller" "^1.0.0"
+-    "@azure/core-tracing" "1.0.0-preview.13"
+-    "@azure/logger" "^1.0.0"
+-    tslib "^2.2.0"
+-
+-"@azure/core-paging@^1.1.1":
+-  version "1.1.3"
+-  resolved "https://registry.yarnpkg.com/@azure/core-paging/-/core-paging-1.1.3.tgz#3587c9898a0530cacb64bab216d7318468aa5efc"
+-  integrity sha512-his7Ah40ThEYORSpIAwuh6B8wkGwO/zG7gqVtmSE4WAJ46e36zUDXTKReUCLBDc6HmjjApQQxxcRFy5FruG79A==
+-  dependencies:
+-    "@azure/core-asynciterator-polyfill" "^1.0.0"
+-
+-"@azure/core-rest-pipeline@^1.1.0", "@azure/core-rest-pipeline@^1.2.0", "@azure/core-rest-pipeline@^1.5.0":
+-  version "1.7.0"
+-  resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.7.0.tgz#71f42c19af160422cc84513809ff9668d8047087"
+-  integrity sha512-e2awPzwMKHrmvYgZ0qIKNkqnCM1QoDs7A0rOiS3OSAlOQOz/kL7PPKHXwFMuBeaRvS8i7fgobJn79q2Cji5f+Q==
+-  dependencies:
+-    "@azure/abort-controller" "^1.0.0"
+-    "@azure/core-auth" "^1.3.0"
+-    "@azure/core-tracing" "1.0.0-preview.13"
+-    "@azure/logger" "^1.0.0"
+-    form-data "^4.0.0"
+-    http-proxy-agent "^4.0.1"
+-    https-proxy-agent "^5.0.0"
+-    tslib "^2.2.0"
+-    uuid "^8.3.0"
+-
+-"@azure/core-tracing@1.0.0-preview.13":
+-  version "1.0.0-preview.13"
+-  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz#55883d40ae2042f6f1e12b17dd0c0d34c536d644"
+-  integrity sha512-KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ==
+-  dependencies:
+-    "@opentelemetry/api" "^1.0.1"
+-    tslib "^2.2.0"
+-
+-"@azure/core-tracing@^1.0.0":
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/@azure/core-tracing/-/core-tracing-1.0.1.tgz#352a38cbea438c4a83c86b314f48017d70ba9503"
+-  integrity sha512-I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw==
+-  dependencies:
+-    tslib "^2.2.0"
+-
+-"@azure/core-util@^1.1.0", "@azure/core-util@^1.1.1", "@azure/core-util@^1.3.0":
+-  version "1.9.0"
+-  resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.9.0.tgz#469afd7e6452d5388b189f90d33f7756b0b210d1"
+-  integrity sha512-AfalUQ1ZppaKuxPPMsFEUdX6GZPB3d9paR9d/TTL7Ow2De8cJaC7ibi7kWVlFAVPCYo31OcnGymc0R89DX8Oaw==
+-  dependencies:
+-    "@azure/abort-controller" "^2.0.0"
+-    tslib "^2.6.2"
+-
+-"@azure/cosmos@^3":
+-  version "3.17.3"
+-  resolved "https://registry.yarnpkg.com/@azure/cosmos/-/cosmos-3.17.3.tgz#380398496af8ef3473ae0a9ad8cdbab32d91eb08"
+-  integrity sha512-wBglkQ6Irjv5Vo2iw8fd6eYj60WYRSSg4/0DBkeOP6BwQ4RA91znsOHd6s3qG6UAbNgYuzC9Nnq07vlFFZkHEw==
+-  dependencies:
+-    "@azure/abort-controller" "^1.0.0"
+-    "@azure/core-auth" "^1.3.0"
+-    "@azure/core-rest-pipeline" "^1.2.0"
+-    "@azure/core-tracing" "^1.0.0"
+-    debug "^4.1.1"
+-    fast-json-stable-stringify "^2.1.0"
+-    jsbi "^3.1.3"
+-    node-abort-controller "^3.0.0"
+-    priorityqueuejs "^1.0.0"
+-    semaphore "^1.0.5"
+-    tslib "^2.2.0"
+-    universal-user-agent "^6.0.0"
+-    uuid "^8.3.0"
+-
+-"@azure/identity@^4.2.1":
+-  version "4.2.1"
+-  resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-4.2.1.tgz#22b366201e989b7b41c0e1690e103bd579c31e4c"
+-  integrity sha512-U8hsyC9YPcEIzoaObJlRDvp7KiF0MGS7xcWbyJSVvXRkC/HXo1f0oYeBYmEvVgRfacw7GHf6D6yAoh9JHz6A5Q==
+-  dependencies:
+-    "@azure/abort-controller" "^1.0.0"
+-    "@azure/core-auth" "^1.5.0"
+-    "@azure/core-client" "^1.4.0"
+-    "@azure/core-rest-pipeline" "^1.1.0"
+-    "@azure/core-tracing" "^1.0.0"
+-    "@azure/core-util" "^1.3.0"
+-    "@azure/logger" "^1.0.0"
+-    "@azure/msal-browser" "^3.11.1"
+-    "@azure/msal-node" "^2.9.2"
+-    events "^3.0.0"
+-    jws "^4.0.0"
+-    open "^8.0.0"
+-    stoppable "^1.1.0"
+-    tslib "^2.2.0"
+-
+-"@azure/logger@^1.0.0":
+-  version "1.0.1"
+-  resolved "https://registry.yarnpkg.com/@azure/logger/-/logger-1.0.1.tgz#19b333203d1b2931353d8879e814b64a7274837a"
+-  integrity sha512-QYQeaJ+A5x6aMNu8BG5qdsVBnYBop9UMwgUvGihSjf1PdZZXB+c/oMdM2ajKwzobLBh9e9QuMQkN9iL+IxLBLA==
+-  dependencies:
+-    tslib "^2.0.0"
+-
+-"@azure/msal-browser@^3.11.1":
+-  version "3.17.0"
+-  resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-3.17.0.tgz#dee9ccae586239e7e0708b261f7ffa5bc7e00fb7"
+-  integrity sha512-csccKXmW2z7EkZ0I3yAoW/offQt+JECdTIV/KrnRoZyM7wCSsQWODpwod8ZhYy7iOyamcHApR9uCh0oD1M+0/A==
+-  dependencies:
+-    "@azure/msal-common" "14.12.0"
+-
+-"@azure/msal-common@14.12.0":
+-  version "14.12.0"
+-  resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-14.12.0.tgz#844abe269b071f8fa8949dadc2a7b65bbb147588"
+-  integrity sha512-IDDXmzfdwmDkv4SSmMEyAniJf6fDu3FJ7ncOjlxkDuT85uSnLEhZi3fGZpoR7T4XZpOMx9teM9GXBgrfJgyeBw==
+-
+-"@azure/msal-node@^2.9.2":
+-  version "2.9.2"
+-  resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-2.9.2.tgz#e6d3c1661012c1bd0ef68e328f73a2fdede52931"
+-  integrity sha512-8tvi6Cos3m+0KmRbPjgkySXi+UQU/QiuVRFnrxIwt5xZlEEFa69O04RTaNESGgImyBBlYbo2mfE8/U8Bbdk1WQ==
+-  dependencies:
+-    "@azure/msal-common" "14.12.0"
+-    jsonwebtoken "^9.0.0"
+-    uuid "^8.3.0"
+-
+-"@azure/storage-blob@^12.17.0":
+-  version "12.17.0"
+-  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.17.0.tgz#04aad7f59cb08dbbe5b1b672a9f5b6256c8c9006"
+-  integrity sha512-sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ==
+-  dependencies:
+-    "@azure/abort-controller" "^1.0.0"
+-    "@azure/core-http" "^3.0.0"
+-    "@azure/core-lro" "^2.2.0"
+-    "@azure/core-paging" "^1.1.1"
+-    "@azure/core-tracing" "1.0.0-preview.13"
+-    "@azure/logger" "^1.0.0"
+-    events "^3.0.0"
+-    tslib "^2.2.0"
+-
+ "@electron/get@^2.0.0":
+diff --git a/package.json b/package.json
+index ae706de..b56b40d 100644
+--- a/package.json
+++ b/package.json
+@@ -134,3 +134,3 @@
+     "@vscode/gulp-electron": "^1.36.0",
+-    "@vscode/l10n-dev": "0.0.35",
+    "@vscode/l10n-dev": "0.0.30",
+     "@vscode/telemetry-extractor": "^1.10.2",
--- a/patches/linux/client/use-n16-libs.patch
+++ b/patches/linux/client/use-n16-libs.patch
@ -1,9 +0,0 @@
-diff --git a/package.json b/package.json
-index fc7e1dd..bc0a020 100644
--- a/package.json
-+++ b/package.json
-@@ -135,3 +135,3 @@
-     "@vscode/gulp-electron": "^1.36.0",
-    "@vscode/l10n-dev": "0.0.35",
-+    "@vscode/l10n-dev": "0.0.30",
-     "@vscode/telemetry-extractor": "^1.10.2",
--- a/patches/linux/fix-build.patch
+++ b/patches/linux/fix-build.patch
@ -1,19 +1,19 @@
 diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
-index 8c2b62f..843e8d4 100644
+index 28ddfb0..0fd18a1 100644
 --- a/build/gulpfile.vscode.linux.js
 +++ b/build/gulpfile.vscode.linux.js
-@@ -187,2 +187,3 @@ function prepareRpmPackage(arch) {
+@@ -192,2 +192,3 @@ function prepareRpmPackage(arch) {
 		const spec = code.pipe(es.through(
 +			null,
 			async function () {
-@@ -302,4 +303,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
- 	const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(util.rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
+@@ -306,4 +307,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);
-@@ -308,4 +308,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
- 	const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(util.rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
+@@ -312,4 +312,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)));
--- a/patches/linux/use-node16.patch
+++ b/patches/linux/use-node16.patch
--- a/patches/linux/ppc64le-and-riscv64-support.patch
+++ b/patches/linux/ppc64le-and-riscv64-support.patch
@ -0,0 +1,735 @@
+diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh
+index 9bfbf9a..3064f78 100755
+--- a/build/azure-pipelines/linux/setup-env.sh
+++ b/build/azure-pipelines/linux/setup-env.sh
+@@ -9,2 +9,6 @@ fi
+ 
+if [ "$npm_config_arch" == "riscv64" ]; then
+  exit 0
+fi
+
+ export VSCODE_SYSROOT_DIR=$PWD/.build/sysroots
+@@ -69,2 +73,17 @@ elif [ "$npm_config_arch" == "arm" ]; then
+   fi
+elif [ "$npm_config_arch" == "ppc64" ]; then
+  if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then
+    # Set compiler toolchain for client native modules
+    export CC=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-gcc
+    export CXX=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-g++
+    export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot"
+    export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/usr/lib/powerpc64le-linux-gnu -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/lib/powerpc64le-linux-gnu"
+
+    # Set compiler toolchain for remote server
+    export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-gcc
+    export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-g++
+    export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot"
+    export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/usr/lib/powerpc64le-linux-gnu -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/lib/powerpc64le-linux-gnu"
+  fi
+
+ fi
+diff --git a/build/azure-pipelines/linux/verify-glibc-requirements.sh b/build/azure-pipelines/linux/verify-glibc-requirements.sh
+index 19482c2..f49d910 100755
+--- a/build/azure-pipelines/linux/verify-glibc-requirements.sh
+++ b/build/azure-pipelines/linux/verify-glibc-requirements.sh
+@@ -9,2 +9,4 @@ elif [ "$VSCODE_ARCH" == "armhf" ]; then
+   TRIPLE="arm-rpi-linux-gnueabihf"
+elif [ "$VSCODE_ARCH" == "ppc64le" ]; then
+  TRIPLE="powerpc64le-linux-gnu"
+ fi
+diff --git a/build/checksums/vscode-sysroot.txt b/build/checksums/vscode-sysroot.txt
+index 0b5f38c..9f3b02b 100644
+--- a/build/checksums/vscode-sysroot.txt
+++ b/build/checksums/vscode-sysroot.txt
+@@ -6 +6,2 @@
+ dbb927408393041664a020661f2641c9785741be3d29b050b9dac58980967784  x86_64-linux-gnu-glibc-2.28.tar.gz
+fa8176d27be18bb0eeb7f55b0fa22255050b430ef68c29136599f02976eb0b1b  powerpc64le-linux-gnu-glibc-2.28.tar.gz
+diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
+index a6cfbe5..96840f2 100644
+--- a/build/gulpfile.reh.js
+++ b/build/gulpfile.reh.js
+@@ -46,2 +46,4 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'arm64' },
+	{ platform: 'linux', arch: 'ppc64le' },
+	{ platform: 'linux', arch: 'riscv64' },
+ 	{ platform: 'alpine', arch: 'arm64' },
+@@ -213,2 +215,10 @@ function nodejs(platform, arch) {
+ 		case 'linux':
+			if (arch === 'riscv64') {
+				return fetchUrls(`/download/release/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`,
+					{ base: 'https://unofficial-builds.nodejs.org', checksumSha256 }).pipe(flatmap(stream => stream.pipe(gunzip()).pipe
+						(untar())))
+					.pipe(filter('**/node'))
+					.pipe(util.setExecutableBit('**'))
+					.pipe(rename('node'));
+			}
+ 			return (product.nodejsRepository !== 'https://nodejs.org' ?
+diff --git a/build/gulpfile.scan.js b/build/gulpfile.scan.js
+index 6f8144b..8a8195e 100644
+--- a/build/gulpfile.scan.js
+++ b/build/gulpfile.scan.js
+@@ -26,2 +26,4 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'arm64' },
+	{ platform: 'linux', arch: 'ppc64le' },
+	{ platform: 'linux', arch: 'riscv64' },
+ ];
+diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
+index c6202c7..d68bd8c 100644
+--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
+@@ -341,2 +341,12 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+ 
+		const electronOverride = {};
+		if (process.env.VSCODE_ELECTRON_REPO) {
+			// electron doesn't support riscv64 and ppc64le, override the repo with `VSCODE_ELECTRON_REPO`.
+			electronOverride.repo = process.env.VSCODE_ELECTRON_REPO;
+		}
+
+		if (process.env.VSCODE_ELECTRON_TAG) {
+			electronOverride.tag = process.env.VSCODE_ELECTRON_TAG;
+		}
+
+ 		let result = all
+@@ -345,3 +355,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+ 			.pipe(filter(['**', '!**/.github/**'], { dot: true })) // https://github.com/microsoft/vscode/issues/116523
+-			.pipe(electron({ ...config, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))
+			.pipe(electron({ ...config, ...electronOverride, platform, arch: arch === 'armhf' ? 'arm' : arch, ffmpegChromium: false }))
+ 			.pipe(filter(['**', '!LICENSE', '!version'], { dot: true }));
+@@ -434,2 +444,4 @@ const BUILD_TARGETS = [
+ 	{ platform: 'linux', arch: 'arm64' },
+	{ platform: 'linux', arch: 'ppc64le' },
+	{ platform: 'linux', arch: 'riscv64' },
+ ];
+diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
+index 28ddfb0..cb3169c 100644
+--- a/build/gulpfile.vscode.linux.js
+++ b/build/gulpfile.vscode.linux.js
+@@ -33,3 +33,3 @@ const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
+ function getDebPackageArch(arch) {
+-	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64' }[arch];
+	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64', ppc64le: 'ppc64el', riscv64: 'riscv64' }[arch];
+ }
+@@ -141,3 +141,3 @@ function getRpmBuildPath(rpmArch) {
+ function getRpmPackageArch(arch) {
+-	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64' }[arch];
+	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64', ppc64le: 'ppc64le', riscv64: 'riscv64' }[arch];
+ }
+@@ -301,2 +301,4 @@ const BUILD_TARGETS = [
+ 	{ arch: 'arm64' },
+	{ arch: 'ppc64le' },
+	{ arch: 'riscv64' },
+ ];
+diff --git a/build/linux/debian/calculate-deps.js b/build/linux/debian/calculate-deps.js
+index bbcb6bf..d00158f 100644
+--- a/build/linux/debian/calculate-deps.js
+++ b/build/linux/debian/calculate-deps.js
+@@ -51,2 +51,8 @@ function calculatePackageDeps(binaryPath, arch, chromiumSysroot, vscodeSysroot)
+             break;
+		case 'ppc64el':
+			cmd.push(`-l${chromiumSysroot}/usr/lib/powerpc64le-linux-gnu`, `-l${chromiumSysroot}/lib/powerpc64le-linux-gnu`, `-l${vscodeSysroot}/usr/lib/powerpc64le-linux-gnu`, `-l${vscodeSysroot}/lib/powerpc64le-linux-gnu`);
+			break;
+		case 'riscv64':
+			cmd.push(`-l${chromiumSysroot}/usr/lib/riscv64-linux-gnu`, `-l${chromiumSysroot}/lib/riscv64-linux-gnu`, `-l${vscodeSysroot}/usr/lib/riscv64-linux-gnu`, `-l${vscodeSysroot}/lib/riscv64-linux-gnu`);
+			break;
+     }
+diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts
+index 92f8065..b86b4db 100644
+--- a/build/linux/debian/calculate-deps.ts
+++ b/build/linux/debian/calculate-deps.ts
+@@ -61,2 +61,14 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, chromi
+ 			break;
+		case 'ppc64el':
+			cmd.push(`-l${chromiumSysroot}/usr/lib/powerpc64le-linux-gnu`,
+				`-l${chromiumSysroot}/lib/powerpc64le-linux-gnu`,
+				`-l${vscodeSysroot}/usr/lib/powerpc64le-linux-gnu`,
+				`-l${vscodeSysroot}/lib/powerpc64le-linux-gnu`);
+			break;
+		case 'riscv64':
+			cmd.push(`-l${chromiumSysroot}/usr/lib/riscv64-linux-gnu`,
+				`-l${chromiumSysroot}/lib/riscv64-linux-gnu`,
+				`-l${vscodeSysroot}/usr/lib/riscv64-linux-gnu`,
+				`-l${vscodeSysroot}/lib/riscv64-linux-gnu`);
+			break;
+ 	}
+diff --git a/build/linux/debian/dep-lists.js b/build/linux/debian/dep-lists.js
+index d843c09..3b869cb 100644
+--- a/build/linux/debian/dep-lists.js
+++ b/build/linux/debian/dep-lists.js
+@@ -141,2 +141,81 @@ exports.referenceGeneratedDepsByArch = {
+         'xdg-utils (>= 1.0.2)'
+    ],
+	'ppc64el': [
+        'ca-certificates',
+        'libasound2 (>= 1.0.17)',
+        'libatk-bridge2.0-0 (>= 2.5.3)',
+        'libatk1.0-0 (>= 2.2.0)',
+        'libatspi2.0-0 (>= 2.9.90)',
+        'libc6 (>= 2.17)',
+        'libc6 (>= 2.28)',
+        'libcairo2 (>= 1.6.0)',
+        'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
+        'libdbus-1-3 (>= 1.9.14)',
+        'libdrm2 (>= 2.4.75)',
+        'libexpat1 (>= 2.1~beta3)',
+        'libgbm1 (>= 17.1.0~rc2)',
+        'libglib2.0-0 (>= 2.37.3)',
+        'libgssapi-krb5-2 (>= 1.17)',
+        'libgtk-3-0 (>= 3.9.10)',
+        'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
+        'libkrb5-3 (>= 1.6.dfsg.2)',
+        'libnspr4 (>= 2:4.9-2~)',
+        'libnss3 (>= 2:3.30)',
+        'libnss3 (>= 3.26)',
+        'libpango-1.0-0 (>= 1.14.0)',
+        'libstdc++6 (>= 4.1.1)',
+        'libstdc++6 (>= 5)',
+        'libstdc++6 (>= 5.2)',
+        'libstdc++6 (>= 6)',
+        'libx11-6',
+        'libx11-6 (>= 2:1.4.99.1)',
+        'libxcb1 (>= 1.9.2)',
+        'libxcomposite1 (>= 1:0.4.4-1)',
+        'libxdamage1 (>= 1:1.1)',
+        'libxext6',
+        'libxfixes3',
+        'libxkbcommon0 (>= 0.5.0)',
+        'libxkbfile1 (>= 1:1.1.0)',
+        'libxrandr2',
+        'xdg-utils (>= 1.0.2)'
+    ],
+	'riscv64': [
+        'ca-certificates',
+        'libatomic1',
+        'libasound2 (>= 1.0.17)',
+        'libatk-bridge2.0-0 (>= 2.5.3)',
+        'libatk1.0-0 (>= 2.2.0)',
+        'libatspi2.0-0 (>= 2.9.90)',
+        'libc6 (>= 2.17)',
+        'libc6 (>= 2.28)',
+        'libcairo2 (>= 1.6.0)',
+        'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
+        'libdbus-1-3 (>= 1.0.2)',
+        'libdrm2 (>= 2.4.60)',
+        'libexpat1 (>= 2.0.1)',
+        'libgbm1 (>= 17.1.0~rc2)',
+        'libglib2.0-0 (>= 2.16.0)',
+        'libglib2.0-0 (>= 2.39.4)',
+        'libgtk-3-0 (>= 3.9.10)',
+        'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
+        'libnspr4 (>= 2:4.9-2~)',
+        'libnss3 (>= 2:3.22)',
+        'libnss3 (>= 3.26)',
+        'libpango-1.0-0 (>= 1.14.0)',
+        'libsecret-1-0 (>= 0.18)',
+        'libstdc++6 (>= 4.1.1)',
+        'libstdc++6 (>= 5)',
+        'libstdc++6 (>= 5.2)',
+        'libstdc++6 (>= 6)',
+        'libx11-6',
+        'libx11-6 (>= 2:1.4.99.1)',
+        'libxcb1 (>= 1.9.2)',
+        'libxcomposite1 (>= 1:0.4.4-1)',
+        'libxdamage1 (>= 1:1.1)',
+        'libxext6',
+        'libxfixes3',
+        'libxkbcommon0 (>= 0.4.1)',
+        'libxkbfile1',
+        'libxrandr2',
+        'xdg-utils (>= 1.0.2)'
+     ]
+diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts
+index 4028370..ff4df2f 100644
+--- a/build/linux/debian/dep-lists.ts
+++ b/build/linux/debian/dep-lists.ts
+@@ -141,2 +141,81 @@ export const referenceGeneratedDepsByArch = {
+ 		'xdg-utils (>= 1.0.2)'
+	],
+	'ppc64el': [
+		'ca-certificates',
+		'libasound2 (>= 1.0.17)',
+		'libatk-bridge2.0-0 (>= 2.5.3)',
+		'libatk1.0-0 (>= 2.2.0)',
+		'libatspi2.0-0 (>= 2.9.90)',
+		'libc6 (>= 2.17)',
+		'libc6 (>= 2.28)',
+		'libcairo2 (>= 1.6.0)',
+		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
+		'libdbus-1-3 (>= 1.9.14)',
+		'libdrm2 (>= 2.4.75)',
+		'libexpat1 (>= 2.1~beta3)',
+		'libgbm1 (>= 17.1.0~rc2)',
+		'libglib2.0-0 (>= 2.37.3)',
+		'libgssapi-krb5-2 (>= 1.17)',
+		'libgtk-3-0 (>= 3.9.10)',
+		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
+		'libkrb5-3 (>= 1.6.dfsg.2)',
+		'libnspr4 (>= 2:4.9-2~)',
+		'libnss3 (>= 2:3.30)',
+		'libnss3 (>= 3.26)',
+		'libpango-1.0-0 (>= 1.14.0)',
+		'libstdc++6 (>= 4.1.1)',
+		'libstdc++6 (>= 5)',
+		'libstdc++6 (>= 5.2)',
+		'libstdc++6 (>= 6)',
+		'libx11-6',
+		'libx11-6 (>= 2:1.4.99.1)',
+		'libxcb1 (>= 1.9.2)',
+		'libxcomposite1 (>= 1:0.4.4-1)',
+		'libxdamage1 (>= 1:1.1)',
+		'libxext6',
+		'libxfixes3',
+		'libxkbcommon0 (>= 0.5.0)',
+		'libxkbfile1 (>= 1:1.1.0)',
+		'libxrandr2',
+		'xdg-utils (>= 1.0.2)'
+	],
+	'riscv64': [
+		'ca-certificates',
+		'libatomic1',
+		'libasound2 (>= 1.0.17)',
+		'libatk-bridge2.0-0 (>= 2.5.3)',
+		'libatk1.0-0 (>= 2.2.0)',
+		'libatspi2.0-0 (>= 2.9.90)',
+		'libc6 (>= 2.17)',
+		'libc6 (>= 2.28)',
+		'libcairo2 (>= 1.6.0)',
+		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
+		'libdbus-1-3 (>= 1.0.2)',
+		'libdrm2 (>= 2.4.60)',
+		'libexpat1 (>= 2.0.1)',
+		'libgbm1 (>= 17.1.0~rc2)',
+		'libglib2.0-0 (>= 2.16.0)',
+		'libglib2.0-0 (>= 2.39.4)',
+		'libgtk-3-0 (>= 3.9.10)',
+		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
+		'libnspr4 (>= 2:4.9-2~)',
+		'libnss3 (>= 2:3.22)',
+		'libnss3 (>= 3.26)',
+		'libpango-1.0-0 (>= 1.14.0)',
+		'libsecret-1-0 (>= 0.18)',
+		'libstdc++6 (>= 4.1.1)',
+		'libstdc++6 (>= 5)',
+		'libstdc++6 (>= 5.2)',
+		'libstdc++6 (>= 6)',
+		'libx11-6',
+		'libx11-6 (>= 2:1.4.99.1)',
+		'libxcb1 (>= 1.9.2)',
+		'libxcomposite1 (>= 1:0.4.4-1)',
+		'libxdamage1 (>= 1:1.1)',
+		'libxext6',
+		'libxfixes3',
+		'libxkbcommon0 (>= 0.4.1)',
+		'libxkbfile1',
+		'libxrandr2',
+		'xdg-utils (>= 1.0.2)'
+ 	]
+diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
+index feca7d3..f075ebc 100644
+--- a/build/linux/debian/install-sysroot.js
+++ b/build/linux/debian/install-sysroot.js
+@@ -72,3 +72,6 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
+         try {
+-            const response = await fetch(`https://api.github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, {
+            // if VSCODE_SYSROOT_REPO and VSCODE_SYSROOT_VERSION are set, use those instead
+            const repo = process.env['VSCODE_SYSROOT_REPO'] ?? 'Microsoft/vscode-linux-build-agent';
+            const actualVersion = process.env['VSCODE_SYSROOT_VERSION'] ?? version;
+            const response = await fetch(`https://api.github.com/repos/${repo}/releases/tags/v${actualVersion}`, {
+                 headers: ghApiHeaders,
+@@ -81,3 +84,3 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
+                 if (!asset) {
+-                    throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`);
+                    throw new Error(`Could not find asset in release of ${repo} @ ${actualVersion}`);
+                 }
+@@ -136,2 +139,10 @@ async function getVSCodeSysroot(arch) {
+             break;
+	    case 'ppc64le':
+	             expectedName = `powerpc64le-linux-gnu${prefix}.tar.gz`;
+	             triple = `powerpc64le-linux-gnu`;
+	             break;
+	    case 'riscv64':
+	             expectedName = `riscv64-linux-gnu${prefix}.tar.gz`;
+	             triple = 'riscv64-linux-gnu';
+	             break;
+     }
+diff --git a/build/linux/debian/install-sysroot.ts b/build/linux/debian/install-sysroot.ts
+index aa417dc..58f0eee 100644
+--- a/build/linux/debian/install-sysroot.ts
+++ b/build/linux/debian/install-sysroot.ts
+@@ -84,3 +84,6 @@ async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000)
+ 		try {
+-			const response = await fetch(`https://api.github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, {
+			// if VSCODE_SYSROOT_REPO and VSCODE_SYSROOT_VERSION are set, use those instead
+			const repo = process.env['VSCODE_SYSROOT_REPO'] ?? 'Microsoft/vscode-linux-build-agent';
+			const actualVersion = process.env['VSCODE_SYSROOT_VERSION'] ?? version;
+			const response = await fetch(`https://api.github.com/repos/${repo}/releases/tags/v${actualVersion}`, {
+ 				headers: ghApiHeaders,
+@@ -93,3 +96,3 @@ async function fetchUrl(options: IFetchOptions, retries = 10, retryDelay = 1000)
+ 				if (!asset) {
+-					throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`);
+					throw new Error(`Could not find asset in release of ${repo} @ ${actualVersion}`);
+ 				}
+@@ -153,2 +156,10 @@ export async function getVSCodeSysroot(arch: DebianArchString): Promise<string>
+ 			break;
+		case 'ppc64el':
+			expectedName = `powerpc64le-linux-gnu${prefix}.tar.gz`;
+			triple = 'powerpc64le-linux-gnu'
+			break;
+		case 'riscv64':
+			expectedName = `riscv64-linux-gnu${prefix}.tar.gz`;
+			triple = 'riscv64-linux-gnu';
+			break;
+ 	}
+diff --git a/build/linux/debian/types.js b/build/linux/debian/types.js
+index ce21d50..cadefc2 100644
+--- a/build/linux/debian/types.js
+++ b/build/linux/debian/types.js
+@@ -8,3 +8,3 @@ exports.isDebianArchString = isDebianArchString;
+ function isDebianArchString(s) {
+-    return ['amd64', 'armhf', 'arm64'].includes(s);
+    return ['amd64', 'armhf', 'arm64', 'ppc64el', 'riscv64'].includes(s);
+ }
+diff --git a/build/linux/debian/types.ts b/build/linux/debian/types.ts
+index e97485e..24fe452 100644
+--- a/build/linux/debian/types.ts
+++ b/build/linux/debian/types.ts
+@@ -5,6 +5,6 @@
+ 
+-export type DebianArchString = 'amd64' | 'armhf' | 'arm64';
+export type DebianArchString = 'amd64' | 'armhf' | 'arm64' | 'ppc64el' | 'riscv64';
+ 
+ export function isDebianArchString(s: string): s is DebianArchString {
+-	return ['amd64', 'armhf', 'arm64'].includes(s);
+	return ['amd64', 'armhf', 'arm64', 'ppc64el', 'riscv64'].includes(s);
+ }
+diff --git a/build/linux/rpm/dep-lists.js b/build/linux/rpm/dep-lists.js
+index 8be4772..5841d47 100644
+--- a/build/linux/rpm/dep-lists.js
+++ b/build/linux/rpm/dep-lists.js
+@@ -316,2 +316,102 @@ exports.referenceGeneratedDepsByArch = {
+         'xdg-utils'
+    ],
+    "ppc64le": [
+        'ca-certificates',
+        'ld-linux-x86-64.so.2()(64bit)',
+        'ld-linux-x86-64.so.2(GLIBC_2.3)(64bit)',
+        'ld64.so.2()(64bit)',
+        'ld64.so.2(GLIBC_2.17)(64bit)',
+        'libX11.so.6()(64bit)',
+        'libXcomposite.so.1()(64bit)',
+        'libXdamage.so.1()(64bit)',
+        'libXext.so.6()(64bit)',
+        'libXfixes.so.3()(64bit)',
+        'libXrandr.so.2()(64bit)',
+        'libasound.so.2()(64bit)',
+        'libasound.so.2(ALSA_0.9)(64bit)',
+        'libasound.so.2(ALSA_0.9.0rc4)(64bit)',
+        'libatk-1.0.so.0()(64bit)',
+        'libatk-bridge-2.0.so.0()(64bit)',
+        'libatspi.so.0()(64bit)',
+        'libc.so.6()(64bit)',
+        'libc.so.6(GLIBC_2.14)(64bit)',
+        'libc.so.6(GLIBC_2.17)(64bit)',
+        'libc.so.6(GLIBC_2.2.5)(64bit)',
+        'libc.so.6(GLIBC_2.28)(64bit)',
+        'libc.so.6(GLIBC_2.4)(64bit)',
+        'libc.so.6(GLIBC_2.9)(64bit)',
+        'libcairo.so.2()(64bit)',
+        'libcups.so.2()(64bit)',
+        'libcurl.so.4()(64bit)',
+        'libdbus-1.so.3()(64bit)',
+        'libdbus-1.so.3(LIBDBUS_1_3)(64bit)',
+        'libdl.so.2()(64bit)',
+        'libdl.so.2(GLIBC_2.17)(64bit)',
+        'libdrm.so.2()(64bit)',
+        'libexpat.so.1()(64bit)',
+        'libgbm.so.1()(64bit)',
+        'libgcc_s.so.1()(64bit)',
+        'libgcc_s.so.1(GCC_3.0)(64bit)',
+        'libgcc_s.so.1(GCC_3.4.4)(64bit)',
+        'libgio-2.0.so.0()(64bit)',
+        'libglib-2.0.so.0()(64bit)',
+        'libgobject-2.0.so.0()(64bit)',
+        'libgssapi_krb5.so.2()(64bit)',
+        'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)',
+        'libgtk-3.so.0()(64bit)',
+        'libkrb5.so.3()(64bit)',
+        'libkrb5.so.3(krb5_3_MIT)(64bit)',
+        'libm.so.6()(64bit)',
+        'libm.so.6(GLIBC_2.17)(64bit)',
+        'libm.so.6(GLIBC_2.2.5)(64bit)',
+        'libm.so.6(GLIBC_2.27)(64bit)',
+        'libnspr4.so()(64bit)',
+        'libnss3.so()(64bit)',
+        'libnss3.so(NSS_3.11)(64bit)',
+        'libnss3.so(NSS_3.12)(64bit)',
+        'libnss3.so(NSS_3.12.1)(64bit)',
+        'libnss3.so(NSS_3.2)(64bit)',
+        'libnss3.so(NSS_3.22)(64bit)',
+        'libnss3.so(NSS_3.3)(64bit)',
+        'libnss3.so(NSS_3.30)(64bit)',
+        'libnss3.so(NSS_3.4)(64bit)',
+        'libnss3.so(NSS_3.5)(64bit)',
+        'libnss3.so(NSS_3.9.2)(64bit)',
+        'libnssutil3.so()(64bit)',
+        'libnssutil3.so(NSSUTIL_3.12.3)(64bit)',
+        'libpango-1.0.so.0()(64bit)',
+        'libpthread.so.0()(64bit)',
+        'libpthread.so.0(GLIBC_2.17)(64bit)',
+        'libpthread.so.0(GLIBC_2.2.5)(64bit)',
+        'libpthread.so.0(GLIBC_2.3.2)(64bit)',
+        'libpthread.so.0(GLIBC_2.3.3)(64bit)',
+        'libsmime3.so()(64bit)',
+        'libsmime3.so(NSS_3.10)(64bit)',
+        'libsmime3.so(NSS_3.2)(64bit)',
+        'libssl3.so(NSS_3.28)(64bit)',
+        'libstdc++.so.6()(64bit)',
+        'libstdc++.so.6(CXXABI_1.3)(64bit)',
+        'libstdc++.so.6(CXXABI_1.3.5)(64bit)',
+        'libstdc++.so.6(CXXABI_1.3.8)(64bit)',
+        'libstdc++.so.6(CXXABI_1.3.9)(64bit)',
+        'libstdc++.so.6(GLIBCXX_3.4)(64bit)',
+        'libstdc++.so.6(GLIBCXX_3.4.11)(64bit)',
+        'libstdc++.so.6(GLIBCXX_3.4.14)(64bit)',
+        'libstdc++.so.6(GLIBCXX_3.4.15)(64bit)',
+        'libstdc++.so.6(GLIBCXX_3.4.18)(64bit)',
+        'libstdc++.so.6(GLIBCXX_3.4.19)(64bit)',
+        'libstdc++.so.6(GLIBCXX_3.4.20)(64bit)',
+        'libstdc++.so.6(GLIBCXX_3.4.21)(64bit)',
+        'libstdc++.so.6(GLIBCXX_3.4.22)(64bit)',
+        'libstdc++.so.6(GLIBCXX_3.4.5)(64bit)',
+        'libstdc++.so.6(GLIBCXX_3.4.9)(64bit)',
+        'libutil.so.1()(64bit)',
+        'libutil.so.1(GLIBC_2.2.5)(64bit)',
+        'libxcb.so.1()(64bit)',
+        'libxkbcommon.so.0()(64bit)',
+        'libxkbcommon.so.0(V_0.5.0)(64bit)',
+        'libxkbfile.so.1()(64bit)',
+        'rpmlib(FileDigests) <= 4.6.0-1',
+        'rtld(GNU_HASH)',
+        'xdg-utils'
+     ]
+diff --git a/build/linux/rpm/dep-lists.ts b/build/linux/rpm/dep-lists.ts
+index 24b18d5..924e626 100644
+--- a/build/linux/rpm/dep-lists.ts
+++ b/build/linux/rpm/dep-lists.ts
+@@ -315,2 +315,102 @@ export const referenceGeneratedDepsByArch = {
+ 		'xdg-utils'
+	],
+	"ppc64le": [
+		'ca-certificates',
+		'ld-linux-x86-64.so.2()(64bit)',
+		'ld-linux-x86-64.so.2(GLIBC_2.3)(64bit)',
+		'ld64.so.2()(64bit)',
+		'ld64.so.2(GLIBC_2.17)(64bit)',
+		'libX11.so.6()(64bit)',
+		'libXcomposite.so.1()(64bit)',
+		'libXdamage.so.1()(64bit)',
+		'libXext.so.6()(64bit)',
+		'libXfixes.so.3()(64bit)',
+		'libXrandr.so.2()(64bit)',
+		'libasound.so.2()(64bit)',
+		'libasound.so.2(ALSA_0.9)(64bit)',
+		'libasound.so.2(ALSA_0.9.0rc4)(64bit)',
+		'libatk-1.0.so.0()(64bit)',
+		'libatk-bridge-2.0.so.0()(64bit)',
+		'libatspi.so.0()(64bit)',
+		'libc.so.6()(64bit)',
+		'libc.so.6(GLIBC_2.14)(64bit)',
+		'libc.so.6(GLIBC_2.17)(64bit)',
+		'libc.so.6(GLIBC_2.2.5)(64bit)',
+		'libc.so.6(GLIBC_2.28)(64bit)',
+		'libc.so.6(GLIBC_2.4)(64bit)',
+		'libc.so.6(GLIBC_2.9)(64bit)',
+		'libcairo.so.2()(64bit)',
+		'libcups.so.2()(64bit)',
+		'libcurl.so.4()(64bit)',
+		'libdbus-1.so.3()(64bit)',
+		'libdbus-1.so.3(LIBDBUS_1_3)(64bit)',
+		'libdl.so.2()(64bit)',
+		'libdl.so.2(GLIBC_2.17)(64bit)',
+		'libdrm.so.2()(64bit)',
+		'libexpat.so.1()(64bit)',
+		'libgbm.so.1()(64bit)',
+		'libgcc_s.so.1()(64bit)',
+		'libgcc_s.so.1(GCC_3.0)(64bit)',
+		'libgcc_s.so.1(GCC_3.4.4)(64bit)',
+		'libgio-2.0.so.0()(64bit)',
+		'libglib-2.0.so.0()(64bit)',
+		'libgobject-2.0.so.0()(64bit)',
+		'libgssapi_krb5.so.2()(64bit)',
+		'libgssapi_krb5.so.2(gssapi_krb5_2_MIT)(64bit)',
+		'libgtk-3.so.0()(64bit)',
+		'libkrb5.so.3()(64bit)',
+		'libkrb5.so.3(krb5_3_MIT)(64bit)',
+		'libm.so.6()(64bit)',
+		'libm.so.6(GLIBC_2.17)(64bit)',
+		'libm.so.6(GLIBC_2.2.5)(64bit)',
+		'libm.so.6(GLIBC_2.27)(64bit)',
+		'libnspr4.so()(64bit)',
+		'libnss3.so()(64bit)',
+		'libnss3.so(NSS_3.11)(64bit)',
+		'libnss3.so(NSS_3.12)(64bit)',
+		'libnss3.so(NSS_3.12.1)(64bit)',
+		'libnss3.so(NSS_3.2)(64bit)',
+		'libnss3.so(NSS_3.22)(64bit)',
+		'libnss3.so(NSS_3.3)(64bit)',
+		'libnss3.so(NSS_3.30)(64bit)',
+		'libnss3.so(NSS_3.4)(64bit)',
+		'libnss3.so(NSS_3.5)(64bit)',
+		'libnss3.so(NSS_3.9.2)(64bit)',
+		'libnssutil3.so()(64bit)',
+		'libnssutil3.so(NSSUTIL_3.12.3)(64bit)',
+		'libpango-1.0.so.0()(64bit)',
+		'libpthread.so.0()(64bit)',
+		'libpthread.so.0(GLIBC_2.17)(64bit)',
+		'libpthread.so.0(GLIBC_2.2.5)(64bit)',
+		'libpthread.so.0(GLIBC_2.3.2)(64bit)',
+		'libpthread.so.0(GLIBC_2.3.3)(64bit)',
+		'libsmime3.so()(64bit)',
+		'libsmime3.so(NSS_3.10)(64bit)',
+		'libsmime3.so(NSS_3.2)(64bit)',
+		'libssl3.so(NSS_3.28)(64bit)',
+		'libstdc++.so.6()(64bit)',
+		'libstdc++.so.6(CXXABI_1.3)(64bit)',
+		'libstdc++.so.6(CXXABI_1.3.5)(64bit)',
+		'libstdc++.so.6(CXXABI_1.3.8)(64bit)',
+		'libstdc++.so.6(CXXABI_1.3.9)(64bit)',
+		'libstdc++.so.6(GLIBCXX_3.4)(64bit)',
+		'libstdc++.so.6(GLIBCXX_3.4.11)(64bit)',
+		'libstdc++.so.6(GLIBCXX_3.4.14)(64bit)',
+		'libstdc++.so.6(GLIBCXX_3.4.15)(64bit)',
+		'libstdc++.so.6(GLIBCXX_3.4.18)(64bit)',
+		'libstdc++.so.6(GLIBCXX_3.4.19)(64bit)',
+		'libstdc++.so.6(GLIBCXX_3.4.20)(64bit)',
+		'libstdc++.so.6(GLIBCXX_3.4.21)(64bit)',
+		'libstdc++.so.6(GLIBCXX_3.4.22)(64bit)',
+		'libstdc++.so.6(GLIBCXX_3.4.5)(64bit)',
+		'libstdc++.so.6(GLIBCXX_3.4.9)(64bit)',
+		'libutil.so.1()(64bit)',
+		'libutil.so.1(GLIBC_2.2.5)(64bit)',
+		'libxcb.so.1()(64bit)',
+		'libxkbcommon.so.0()(64bit)',
+		'libxkbcommon.so.0(V_0.5.0)(64bit)',
+		'libxkbfile.so.1()(64bit)',
+		'rpmlib(FileDigests) <= 4.6.0-1',
+		'rtld(GNU_HASH)',
+		'xdg-utils'
+ 	]
+diff --git a/build/linux/rpm/types.js b/build/linux/rpm/types.js
+index a20b9c2..99a8cff 100644
+--- a/build/linux/rpm/types.js
+++ b/build/linux/rpm/types.js
+@@ -8,3 +8,3 @@ exports.isRpmArchString = isRpmArchString;
+ function isRpmArchString(s) {
+-    return ['x86_64', 'armv7hl', 'aarch64'].includes(s);
+    return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le', 'riscv64'].includes(s);
+ }
+diff --git a/build/linux/rpm/types.ts b/build/linux/rpm/types.ts
+index c6a01da..d94537e 100644
+--- a/build/linux/rpm/types.ts
+++ b/build/linux/rpm/types.ts
+@@ -5,6 +5,6 @@
+ 
+-export type RpmArchString = 'x86_64' | 'armv7hl' | 'aarch64';
+export type RpmArchString = 'x86_64' | 'armv7hl' | 'aarch64' | 'ppc64le' | 'riscv64';
+ 
+ export function isRpmArchString(s: string): s is RpmArchString {
+-	return ['x86_64', 'armv7hl', 'aarch64'].includes(s);
+	return ['x86_64', 'armv7hl', 'aarch64', 'ppc64le', 'riscv64'].includes(s);
+ }
+diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs
+index 4bec13d..3debda1 100644
+--- a/cli/src/update_service.rs
+++ b/cli/src/update_service.rs
+@@ -216,2 +216,5 @@ pub enum Platform {
+ 	LinuxARM32Legacy,
+	LinuxPPC64LE,
+	LinuxPPC64LELegacy,
+	LinuxRISCV64,
+ 	DarwinX64,
+@@ -229,2 +232,4 @@ impl Platform {
+ 			Platform::LinuxARM32 => Some("linux-armhf".to_owned()),
+			Platform::LinuxPPC64LE => Some("linux-ppc64le".to_owned()),
+			Platform::LinuxRISCV64 => Some("linux-riscv64".to_owned()),
+ 			Platform::DarwinX64 => Some("darwin".to_owned()),
+@@ -247,2 +252,5 @@ impl Platform {
+ 			Platform::LinuxARM32Legacy => "server-linux-legacy-armhf",
+			Platform::LinuxPPC64LE => "server-linux-ppc64le",
+			Platform::LinuxPPC64LELegacy => "server-linux-legacy-ppc64le",
+			Platform::LinuxRISCV64 => "server-linux-riscv64",
+ 			Platform::DarwinX64 => "server-darwin",
+@@ -266,2 +274,5 @@ impl Platform {
+ 			Platform::LinuxARM32Legacy => "cli-linux-armhf",
+			Platform::LinuxPPC64LE => "cli-linux-ppc64le",
+			Platform::LinuxPPC64LELegacy => "cli-linux-ppc64le",
+			Platform::LinuxRISCV64 => "cli-linux-riscv64",
+ 			Platform::DarwinX64 => "cli-darwin-x64",
+@@ -298,2 +309,6 @@ impl Platform {
+ 			Some(Platform::LinuxARM64)
+		} else if cfg!(all(target_os = "linux", target_arch = "ppc64le")) {
+			Some(Platform::LinuxPPC64LE)
+		} else if cfg!(all(target_os = "linux", target_arch = "riscv64")) {
+			Some(Platform::LinuxRISCV64)
+ 		} else if cfg!(all(target_os = "macos", target_arch = "x86_64")) {
+@@ -325,2 +340,5 @@ impl fmt::Display for Platform {
+ 			Platform::LinuxARM32Legacy => "LinuxARM32Legacy",
+			Platform::LinuxPPC64LE => "LinuxPPC64LE",
+			Platform::LinuxPPC64LELegacy => "LinuxPPC64LELegacy",
+			Platform::LinuxRISCV64 => "LinuxRISCV64",
+ 			Platform::DarwinX64 => "DarwinX64",
+diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
+index 5d4953a..f22ff60 100644
+--- a/cli/src/util/prereqs.rs
+++ b/cli/src/util/prereqs.rs
+@@ -76,2 +76,6 @@ impl PreReqChecker {
+ 					Platform::LinuxARM32
+				} else if cfg!(target_arch = "ppc64le") {
+					Platform::LinuxPPC64LE
+				} else if cfg!(target_arch = "riscv64") {
+					Platform::LinuxRISCV64
+ 				} else {
+@@ -85,2 +89,4 @@ impl PreReqChecker {
+ 					Platform::LinuxARM32Legacy
+				} else if cfg!(target_arch = "ppc64le") {
+					Platform::LinuxPPC64LELegacy
+ 				} else {
+diff --git a/resources/server/bin/helpers/check-requirements-linux.sh b/resources/server/bin/helpers/check-requirements-linux.sh
+index 0795578..c057746 100644
+--- a/resources/server/bin/helpers/check-requirements-linux.sh
+++ b/resources/server/bin/helpers/check-requirements-linux.sh
+@@ -52,2 +52,4 @@ case $ARCH in
+ 		;;
+    ppc64el) LDCONFIG_ARCH="64bit";;
+    riscv64) LDCONFIG_ARCH="RISC-V";;
+ esac
+diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
+index 68f2198..1c15fe4 100644
+--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
+@@ -41,2 +41,4 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) {
+ 		case TargetPlatform.LINUX_ARMHF: return 'Linux ARM';
+		case TargetPlatform.LINUX_PPC64LE: return 'Linux PowerPC64';
+		case TargetPlatform.LINUX_RISCV64: return 'Linux RISC-V 64';
+ 
+@@ -64,2 +66,4 @@ export function toTargetPlatform(targetPlatform: string): TargetPlatform {
+ 		case TargetPlatform.LINUX_ARMHF: return TargetPlatform.LINUX_ARMHF;
+		case TargetPlatform.LINUX_PPC64LE: return TargetPlatform.LINUX_PPC64LE;
+		case TargetPlatform.LINUX_RISCV64: return TargetPlatform.LINUX_RISCV64;
+ 
+@@ -99,2 +103,8 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string |
+ 			}
+			if (arch === 'ppc64le') {
+				return TargetPlatform.LINUX_PPC64LE;
+			}
+			if (arch === 'riscv64') {
+				return TargetPlatform.LINUX_RISCV64;
+			}
+ 			return TargetPlatform.UNKNOWN;
+diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
+index 4dd080d..e154312 100644
+--- a/src/vs/platform/extensions/common/extensions.ts
+++ b/src/vs/platform/extensions/common/extensions.ts
+@@ -306,2 +306,4 @@ export const enum TargetPlatform {
+ 	LINUX_ARMHF = 'linux-armhf',
+	LINUX_PPC64LE = 'linux-ppc64le',
+	LINUX_RISCV64 = 'linux-riscv64',
+ 
--- a/patches/linux/reh.patch.no
+++ b/patches/linux/reh.patch.no
@ -1,42 +0,0 @@
-diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index 595d0ce..2e94d99 100644
--- a/build/gulpfile.reh.js
-+++ b/build/gulpfile.reh.js
-@@ -375,10 +375,2 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
- 
-		if (platform === 'linux' || platform === 'alpine') {
-			result = es.merge(result,
-				gulp.src(`resources/server/bin/helpers/check-requirements-linux.sh`, { base: '.' })
-					.pipe(rename(`bin/helpers/check-requirements.sh`))
-					.pipe(util.setExecutableBit())
-			);
-		}
-
- 		return result.pipe(vfs.dest(destination));
-diff --git a/resources/server/bin/code-server-linux.sh b/resources/server/bin/code-server-linux.sh
-index e3d96bd..3df32df 100644
--- a/resources/server/bin/code-server-linux.sh
-+++ b/resources/server/bin/code-server-linux.sh
-@@ -11,22 +11,2 @@ ROOT="$(dirname "$(dirname "$(readlink -f "$0")")")"
- 
-# Do not remove this check.
-# Provides a way to skip the server requirements check from
-# outside the install flow. A system process can create this
-# file before the server is downloaded and installed.
-skip_check=0
-if [ -f "/tmp/vscode-skip-server-requirements-check" ]; then
-	echo "!!! WARNING: Skipping server pre-requisite check !!!"
-	echo "!!! Server stability is not guaranteed. Proceed at your own risk. !!!"
-	skip_check=1
-fi
-
-# Check platform requirements
-if [ "$(echo "$@" | grep -c -- "--skip-requirements-check")" -eq 0 ] && [ $skip_check -eq 0 ]; then
-	$ROOT/bin/helpers/check-requirements.sh
-	exit_code=$?
-	if [ $exit_code -ne 0 ]; then
-		exit $exit_code
-	fi
-fi
-
- "$ROOT/node" ${INSPECT:-} "$ROOT/out/server-main.js" "$@"
--- a/patches/linux/reh/node16.patch
+++ b/patches/linux/reh/node16.patch
@ -19,15 +19,6 @@ index c2b81d0..2e94d99 100644
 -		}
 -
 		return result.pipe(vfs.dest(destination));
-diff --git a/remote/.yarnrc b/remote/.yarnrc
-index 4c99388..71a7164 100644
--- a/remote/.yarnrc
-+++ b/remote/.yarnrc
-@@ -1,3 +1,3 @@
- disturl "https://nodejs.org/dist"
-target "20.11.1"
-+target "16.20.2"
- ms_build_id "275039"
 diff --git a/remote/package.json b/remote/package.json
 index b84f513..42d8e41 100644
 --- a/remote/package.json
--- a/patches/linux/verify-glibc.patch
+++ b/patches/linux/verify-glibc.patch
@ -1,14 +0,0 @@
-diff --git a/build/azure-pipelines/linux/verify-glibc-requirements.sh b/build/azure-pipelines/linux/verify-glibc-requirements.sh
-index f07c0ba..bd9aac1 100755
--- a/build/azure-pipelines/linux/verify-glibc-requirements.sh
-+++ b/build/azure-pipelines/linux/verify-glibc-requirements.sh
-@@ -36,3 +36,3 @@ for file in $files; do
-   if [[ "$glibc_version" != "$EXPECTED_GLIBC_VERSION" ]]; then
-    echo "Error: File $file has dependency on GLIBC > $EXPECTED_GLIBC_VERSION"
-+    echo "Error: File $file has dependency on GLIBC($glibc_version) != $EXPECTED_GLIBC_VERSION"
-     exit 1
-@@ -40,3 +40,3 @@ for file in $files; do
-   if [[ "$glibcxx_version" != "$EXPECTED_GLIBCXX_VERSION" ]]; then
-    echo "Error: File $file has dependency on GLIBCXX > $EXPECTED_GLIBCXX_VERSION"
-+    echo "Error: File $file has dependency on GLIBCXX($glibcxx_version) != $EXPECTED_GLIBCXX_VERSION"
-     exit 1
--- a/patches/fix-darwin-codesign.patch
+++ b/patches/fix-darwin-codesign.patch
--- a/patches/ppc64le-and-riscv64-support.patch
+++ b/patches/ppc64le-and-riscv64-support.patch
@ -1,458 +0,0 @@
-diff --git a/build/azure-pipelines/linux/setup-env.sh b/build/azure-pipelines/linux/setup-env.sh
-index e42a6b12b1f..e17f0e2bb17 100755
--- a/build/azure-pipelines/linux/setup-env.sh
-+++ b/build/azure-pipelines/linux/setup-env.sh
-@@ -7,6 +7,10 @@ if [ "$SYSROOT_ARCH" == "x64" ]; then
-   SYSROOT_ARCH="amd64"
- fi
- 
-+if [ "$npm_config_arch" == "riscv64" ]; then
-+  exit 0
-+fi
-+
- export VSCODE_SYSROOT_DIR=$PWD/.build/sysroots
- SYSROOT_ARCH="$SYSROOT_ARCH" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()'
- 
-@@ -67,4 +71,19 @@ elif [ "$npm_config_arch" == "arm" ]; then
-     export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot"
-     export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/usr/lib/arm-linux-gnueabihf -L$VSCODE_SYSROOT_DIR/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot/lib/arm-linux-gnueabihf"
-   fi
-+elif [ "$npm_config_arch" == "ppc64" ]; then
-+  if [ "$(echo "$@" | grep -c -- "--only-remote")" -eq 0 ]; then
-+    # Set compiler toolchain for client native modules
-+    export CC=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-gcc
-+    export CXX=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-g++
-+    export CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot"
-+    export LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/usr/lib/powerpc64le-linux-gnu -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/lib/powerpc64le-linux-gnu"
-+
-+    # Set compiler toolchain for remote server
-+    export VSCODE_REMOTE_CC=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-gcc
-+    export VSCODE_REMOTE_CXX=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/bin/powerpc64le-linux-gnu-g++
-+    export VSCODE_REMOTE_CXXFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot"
-+    export VSCODE_REMOTE_LDFLAGS="--sysroot=$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/usr/lib/powerpc64le-linux-gnu -L$VSCODE_SYSROOT_DIR/powerpc64le-linux-gnu/powerpc64le-linux-gnu/sysroot/lib/powerpc64le-linux-gnu"
-+  fi
-+
- fi
-diff --git a/build/azure-pipelines/linux/verify-glibc-requirements.sh b/build/azure-pipelines/linux/verify-glibc-requirements.sh
-index f07c0ba..1cb257b 100755
--- a/build/azure-pipelines/linux/verify-glibc-requirements.sh
-+++ b/build/azure-pipelines/linux/verify-glibc-requirements.sh
-@@ -7,6 +7,8 @@ if [ "$VSCODE_ARCH" == "arm64" ]; then
-   TRIPLE="aarch64-linux-gnu"
- elif [ "$VSCODE_ARCH" == "armhf" ]; then
-   TRIPLE="arm-rpi-linux-gnueabihf"
-+elif [ "$VSCODE_ARCH" == "ppc64le" ]; then
-+  TRIPLE="powerpc64le-linux-gnu"
- fi
- 
- # Get all files with .node extension from remote/node_modules folder
-diff --git a/build/checksums/vscode-sysroot.txt b/build/checksums/vscode-sysroot.txt
-index 0b5f38c60ce..70770276503 100644
--- a/build/checksums/vscode-sysroot.txt
-+++ b/build/checksums/vscode-sysroot.txt
-@@ -4,3 +4,4 @@
- 7aea163f7fad8cc50000c86b5108be880121d35e2f55d016ef8c96bbe54129eb  arm-rpi-linux-gnueabihf-glibc-2.28.tar.gz
- 5aae21115f1d284c3cdf32c83db15771b59bc80793f1423032abf5a823c0d658  x86_64-linux-gnu-glibc-2.17.tar.gz
- dbb927408393041664a020661f2641c9785741be3d29b050b9dac58980967784  x86_64-linux-gnu-glibc-2.28.tar.gz
-+fa8176d27be18bb0eeb7f55b0fa22255050b430ef68c29136599f02976eb0b1b  powerpc64le-linux-gnu-glibc-2.28.tar.gz
-diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index c2b81d0cf7c..fa5de83a076 100644
--- a/build/gulpfile.reh.js
-+++ b/build/gulpfile.reh.js
-@@ -44,6 +44,8 @@ const BUILD_TARGETS = [
- 	{ platform: 'linux', arch: 'x64' },
- 	{ platform: 'linux', arch: 'armhf' },
- 	{ platform: 'linux', arch: 'arm64' },
-+	{ platform: 'linux', arch: 'ppc64le' },
-+	{ platform: 'linux', arch: 'riscv64' },
- 	{ platform: 'alpine', arch: 'arm64' },
- 	// legacy: we use to ship only one alpine so it was put in the arch, but now we ship
- 	// multiple alpine images and moved to a better model (alpine as the platform)
-@@ -210,6 +212,14 @@ function nodejs(platform, arch) {
- 				.pipe(rename('node.exe'));
- 		case 'darwin':
- 		case 'linux':
-+			if (arch === 'riscv64') {
-+				return fetchUrls(`/download/release/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`,
-+					{ base: 'https://unofficial-builds.nodejs.org', checksumSha256 }).pipe(flatmap(stream => stream.pipe(gunzip()).pipe
-+						(untar())))
-+					.pipe(filter('**/node'))
-+					.pipe(util.setExecutableBit('**'))
-+					.pipe(rename('node'));
-+			}
- 			return (product.nodejsRepository !== 'https://nodejs.org' ?
- 				fetchGithub(product.nodejsRepository, { version: `${nodeVersion}-${internalNodeVersion}`, name: `node-v${nodeVersion}${glibcPrefix}-${platform}-${arch}.tar.gz`, checksumSha256 }) :
- 				fetchUrls(`/dist/v${nodeVersion}/node-v${nodeVersion}-${platform}-${arch}.tar.gz`, { base: 'https://nodejs.org', checksumSha256 })
-diff --git a/build/gulpfile.scan.js b/build/gulpfile.scan.js
-index 6f8144b0954..8a8195e9b66 100644
--- a/build/gulpfile.scan.js
-+++ b/build/gulpfile.scan.js
-@@ -24,6 +24,8 @@ const BUILD_TARGETS = [
- 	{ platform: 'linux', arch: 'x64' },
- 	{ platform: 'linux', arch: 'armhf' },
- 	{ platform: 'linux', arch: 'arm64' },
-+	{ platform: 'linux', arch: 'ppc64le' },
-+	{ platform: 'linux', arch: 'riscv64' },
- ];
- 
- BUILD_TARGETS.forEach(buildTarget => {
-diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index e1507e0424f..80ed8d91a41 100644
--- a/build/gulpfile.vscode.js
-+++ b/build/gulpfile.vscode.js
-@@ -429,6 +429,8 @@ const BUILD_TARGETS = [
- 	{ platform: 'linux', arch: 'x64' },
- 	{ platform: 'linux', arch: 'armhf' },
- 	{ platform: 'linux', arch: 'arm64' },
-+	{ platform: 'linux', arch: 'ppc64le' },
-+	{ platform: 'linux', arch: 'riscv64' },
- ];
- BUILD_TARGETS.forEach(buildTarget => {
- 	const dashed = (str) => (str ? `-${str}` : ``);
-diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
-index 8c2b62f7b2a..a58ec3d7725 100644
--- a/build/gulpfile.vscode.linux.js
-+++ b/build/gulpfile.vscode.linux.js
-@@ -28,7 +28,7 @@ const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
-  * @param {string} arch
-  */
- function getDebPackageArch(arch) {
-	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64' }[arch];
-+	return { x64: 'amd64', armhf: 'armhf', arm64: 'arm64', ppc64le: 'ppc64le', riscv64: 'riscv64' }[arch];
- }
- 
- function prepareDebPackage(arch) {
-@@ -134,7 +134,7 @@ function getRpmBuildPath(rpmArch) {
-  * @param {string} arch
-  */
- function getRpmPackageArch(arch) {
-	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64' }[arch];
-+	return { x64: 'x86_64', armhf: 'armv7hl', arm64: 'aarch64', ppc64le: 'ppc64le', riscv64: 'riscv64' }[arch];
- }
- 
- /**
-@@ -295,6 +295,8 @@ const BUILD_TARGETS = [
- 	{ arch: 'x64' },
- 	{ arch: 'armhf' },
- 	{ arch: 'arm64' },
-+	{ arch: 'ppc64le' },
-+	{ arch: 'riscv64' },
- ];
- 
- BUILD_TARGETS.forEach(({ arch }) => {
-diff --git a/build/linux/debian/calculate-deps.ts b/build/linux/debian/calculate-deps.ts
-index 92f8065f262..4d930b269aa 100644
--- a/build/linux/debian/calculate-deps.ts
-+++ b/build/linux/debian/calculate-deps.ts
-@@ -59,6 +59,18 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, chromi
- 				`-l${vscodeSysroot}/usr/lib/aarch64-linux-gnu`,
- 				`-l${vscodeSysroot}/lib/aarch64-linux-gnu`);
- 			break;
-+		case 'ppc64le':
-+			cmd.push(`-l${chromiumSysroot}/usr/lib/powerpc64le-linux-gnu`,
-+				`-l${chromiumSysroot}/lib/powerpc64le-linux-gnu`,
-+				`-l${vscodeSysroot}/usr/lib/powerpc64le-linux-gnu`,
-+				`-l${vscodeSysroot}/lib/powerpc64le-linux-gnu`);
-+			break;
-+		case 'riscv64':
-+			cmd.push(`-l${chromiumSysroot}/usr/lib/riscv64-linux-gnu`,
-+				`-l${chromiumSysroot}/lib/riscv64-linux-gnu`,
-+				`-l${vscodeSysroot}/usr/lib/riscv64-linux-gnu`,
-+				`-l${vscodeSysroot}/lib/riscv64-linux-gnu`);
-+			break;
- 	}
- 	cmd.push(`-l${chromiumSysroot}/usr/lib`);
- 	cmd.push(`-L${vscodeSysroot}/debian/libxkbfile1/DEBIAN/shlibs`);
-diff --git a/build/linux/debian/dep-lists.ts b/build/linux/debian/dep-lists.ts
-index 3d6c2eba6e9..0856a0514bd 100644
--- a/build/linux/debian/dep-lists.ts
-+++ b/build/linux/debian/dep-lists.ts
-@@ -140,5 +140,84 @@ export const referenceGeneratedDepsByArch = {
- 		'libxkbfile1 (>= 1:1.1.0)',
- 		'libxrandr2',
- 		'xdg-utils (>= 1.0.2)'
-	]
-+	],
-+	'ppc64le': [
-+		'ca-certificates',
-+		'libasound2 (>= 1.0.17)',
-+		'libatk-bridge2.0-0 (>= 2.5.3)',
-+		'libatk1.0-0 (>= 2.2.0)',
-+		'libatspi2.0-0 (>= 2.9.90)',
-+		'libc6 (>= 2.17)',
-+		'libc6 (>= 2.28)',
-+		'libcairo2 (>= 1.6.0)',
-+		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
-+		'libdbus-1-3 (>= 1.9.14)',
-+		'libdrm2 (>= 2.4.75)',
-+		'libexpat1 (>= 2.1~beta3)',
-+		'libgbm1 (>= 17.1.0~rc2)',
-+		'libglib2.0-0 (>= 2.37.3)',
-+		'libgssapi-krb5-2 (>= 1.17)',
-+		'libgtk-3-0 (>= 3.9.10)',
-+		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-+		'libkrb5-3 (>= 1.6.dfsg.2)',
-+		'libnspr4 (>= 2:4.9-2~)',
-+		'libnss3 (>= 2:3.30)',
-+		'libnss3 (>= 3.26)',
-+		'libpango-1.0-0 (>= 1.14.0)',
-+		'libstdc++6 (>= 4.1.1)',
-+		'libstdc++6 (>= 5)',
-+		'libstdc++6 (>= 5.2)',
-+		'libstdc++6 (>= 6)',
-+		'libx11-6',
-+		'libx11-6 (>= 2:1.4.99.1)',
-+		'libxcb1 (>= 1.9.2)',
-+		'libxcomposite1 (>= 1:0.4.4-1)',
-+		'libxdamage1 (>= 1:1.1)',
-+		'libxext6',
-+		'libxfixes3',
-+		'libxkbcommon0 (>= 0.5.0)',
-+		'libxkbfile1 (>= 1:1.1.0)',
-+		'libxrandr2',
-+		'xdg-utils (>= 1.0.2)'
-+	],
-+	'riscv64': [
-+		'ca-certificates',
-+		'libatomic1',
-+		'libasound2 (>= 1.0.17)',
-+		'libatk-bridge2.0-0 (>= 2.5.3)',
-+		'libatk1.0-0 (>= 2.2.0)',
-+		'libatspi2.0-0 (>= 2.9.90)',
-+		'libc6 (>= 2.17)',
-+		'libc6 (>= 2.28)',
-+		'libcairo2 (>= 1.6.0)',
-+		'libcurl3-gnutls | libcurl3-nss | libcurl4 | libcurl3',
-+		'libdbus-1-3 (>= 1.0.2)',
-+		'libdrm2 (>= 2.4.60)',
-+		'libexpat1 (>= 2.0.1)',
-+		'libgbm1 (>= 17.1.0~rc2)',
-+		'libglib2.0-0 (>= 2.16.0)',
-+		'libglib2.0-0 (>= 2.39.4)',
-+		'libgtk-3-0 (>= 3.9.10)',
-+		'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
-+		'libnspr4 (>= 2:4.9-2~)',
-+		'libnss3 (>= 2:3.22)',
-+		'libnss3 (>= 3.26)',
-+		'libpango-1.0-0 (>= 1.14.0)',
-+		'libsecret-1-0 (>= 0.18)',
-+		'libstdc++6 (>= 4.1.1)',
-+		'libstdc++6 (>= 5)',
-+		'libstdc++6 (>= 5.2)',
-+		'libstdc++6 (>= 6)',
-+		'libx11-6',
-+		'libx11-6 (>= 2:1.4.99.1)',
-+		'libxcb1 (>= 1.9.2)',
-+		'libxcomposite1 (>= 1:0.4.4-1)',
-+		'libxdamage1 (>= 1:1.1)',
-+		'libxext6',
-+		'libxfixes3',
-+		'libxkbcommon0 (>= 0.4.1)',
-+		'libxkbfile1',
-+		'libxrandr2',
-+		'xdg-utils (>= 1.0.2)'
-+	],
- };
-diff --git a/build/linux/debian/install-sysroot.js b/build/linux/debian/install-sysroot.js
-index feca7d3..59c1c6a 100644
--- a/build/linux/debian/install-sysroot.js
-+++ b/build/linux/debian/install-sysroot.js
-@@ -70,7 +70,9 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
-         const timeout = setTimeout(() => controller.abort(), 30 * 1000);
-         const version = '20240129-253798';
-         try {
-            const response = await fetch(`https://api.github.com/repos/Microsoft/vscode-linux-build-agent/releases/tags/v${version}`, {
-+            // If the assetName starts with 'powerpc64le', we fetch from VSCodium/vscode-linux-build-agent
-+            const repo = options.assetName.startsWith('powerpc64le') ? 'VSCodium/vscode-linux-build-agent' : 'Microsoft/vscode-linux-build-agent';
-+            const response = await fetch(`https://api.github.com/repos/${repo}/releases/tags/v${version}`, {
-                 headers: ghApiHeaders,
-                 signal: controller.signal /* Typings issue with lib.dom.d.ts */
-             });
-@@ -79,7 +81,7 @@ async function fetchUrl(options, retries = 10, retryDelay = 1000) {
-                 const contents = Buffer.from(await response.arrayBuffer());
-                 const asset = JSON.parse(contents.toString()).assets.find((a) => a.name === options.assetName);
-                 if (!asset) {
-                    throw new Error(`Could not find asset in release of Microsoft/vscode-linux-build-agent @ ${version}`);
-+                    throw new Error(`Could not find asset in release of ${repo} @ ${version}`);
-                 }
-                 console.log(`Found asset ${options.assetName} @ ${asset.url}.`);
-                 const assetResponse = await fetch(asset.url, {
-@@ -134,6 +136,14 @@ async function getVSCodeSysroot(arch) {
-             expectedName = `arm-rpi-linux-gnueabihf${prefix}.tar.gz`;
-             triple = 'arm-rpi-linux-gnueabihf';
-             break;
-+		case 'ppc64le':
-+			expectedName = `powerpc64le-linux-gnu${prefix}.tar.gz`;
-+			triple = `powerpc64le-linux-gnu`;
-+			break;
-+		case 'riscv64':
-+			expectedName = `DUMMY`;
-+			triple = 'riscv64-linux-gnu';
-+			break;
-     }
-     console.log(`Fetching ${expectedName} for ${triple}`);
-     const checksumSha256 = getVSCodeSysrootChecksum(expectedName);
-diff --git a/build/linux/debian/types.ts b/build/linux/debian/types.ts
-index e97485ef128..01b121bc928 100644
--- a/build/linux/debian/types.ts
-+++ b/build/linux/debian/types.ts
-@@ -3,8 +3,8 @@
-  *  Licensed under the MIT License. See License.txt in the project root for license information.
-  *--------------------------------------------------------------------------------------------*/
- 
-export type DebianArchString = 'amd64' | 'armhf' | 'arm64';
-+export type DebianArchString = 'amd64' | 'armhf' | 'arm64' | 'ppc64le' | 'riscv64';
- 
- export function isDebianArchString(s: string): s is DebianArchString {
-	return ['amd64', 'armhf', 'arm64'].includes(s);
-+	return ['amd64', 'armhf', 'arm64', 'ppc64le', 'riscv64'].includes(s);
- }
-diff --git a/cli/src/update_service.rs b/cli/src/update_service.rs
-index 4bec13d6e86..3debda1224a 100644
--- a/cli/src/update_service.rs
-+++ b/cli/src/update_service.rs
-@@ -214,6 +214,9 @@ pub enum Platform {
- 	LinuxARM64Legacy,
- 	LinuxARM32,
- 	LinuxARM32Legacy,
-+	LinuxPPC64LE,
-+	LinuxPPC64LELegacy,
-+	LinuxRISCV64,
- 	DarwinX64,
- 	DarwinARM64,
- 	WindowsX64,
-@@ -227,6 +230,8 @@ impl Platform {
- 			Platform::LinuxX64 => Some("linux-x64".to_owned()),
- 			Platform::LinuxARM64 => Some("linux-arm64".to_owned()),
- 			Platform::LinuxARM32 => Some("linux-armhf".to_owned()),
-+			Platform::LinuxPPC64LE => Some("linux-ppc64le".to_owned()),
-+			Platform::LinuxRISCV64 => Some("linux-riscv64".to_owned()),
- 			Platform::DarwinX64 => Some("darwin".to_owned()),
- 			Platform::DarwinARM64 => Some("darwin-arm64".to_owned()),
- 			Platform::WindowsX64 => Some("win32-x64-archive".to_owned()),
-@@ -245,6 +250,9 @@ impl Platform {
- 			Platform::LinuxARM64Legacy => "server-linux-legacy-arm64",
- 			Platform::LinuxARM32 => "server-linux-armhf",
- 			Platform::LinuxARM32Legacy => "server-linux-legacy-armhf",
-+			Platform::LinuxPPC64LE => "server-linux-ppc64le",
-+			Platform::LinuxPPC64LELegacy => "server-linux-legacy-ppc64le",
-+			Platform::LinuxRISCV64 => "server-linux-riscv64",
- 			Platform::DarwinX64 => "server-darwin",
- 			Platform::DarwinARM64 => "server-darwin-arm64",
- 			Platform::WindowsX64 => "server-win32-x64",
-@@ -264,6 +272,9 @@ impl Platform {
- 			Platform::LinuxARM64Legacy => "cli-linux-arm64",
- 			Platform::LinuxARM32 => "cli-linux-armhf",
- 			Platform::LinuxARM32Legacy => "cli-linux-armhf",
-+			Platform::LinuxPPC64LE => "cli-linux-ppc64le",
-+			Platform::LinuxPPC64LELegacy => "cli-linux-ppc64le",
-+			Platform::LinuxRISCV64 => "cli-linux-riscv64",
- 			Platform::DarwinX64 => "cli-darwin-x64",
- 			Platform::DarwinARM64 => "cli-darwin-arm64",
- 			Platform::WindowsARM64 => "cli-win32-arm64",
-@@ -296,6 +307,10 @@ impl Platform {
- 			Some(Platform::LinuxARM32)
- 		} else if cfg!(all(target_os = "linux", target_arch = "aarch64")) {
- 			Some(Platform::LinuxARM64)
-+		} else if cfg!(all(target_os = "linux", target_arch = "ppc64le")) {
-+			Some(Platform::LinuxPPC64LE)
-+		} else if cfg!(all(target_os = "linux", target_arch = "riscv64")) {
-+			Some(Platform::LinuxRISCV64)
- 		} else if cfg!(all(target_os = "macos", target_arch = "x86_64")) {
- 			Some(Platform::DarwinX64)
- 		} else if cfg!(all(target_os = "macos", target_arch = "aarch64")) {
-@@ -323,6 +338,9 @@ impl fmt::Display for Platform {
- 			Platform::LinuxARM64Legacy => "LinuxARM64Legacy",
- 			Platform::LinuxARM32 => "LinuxARM32",
- 			Platform::LinuxARM32Legacy => "LinuxARM32Legacy",
-+			Platform::LinuxPPC64LE => "LinuxPPC64LE",
-+			Platform::LinuxPPC64LELegacy => "LinuxPPC64LELegacy",
-+			Platform::LinuxRISCV64 => "LinuxRISCV64",
- 			Platform::DarwinX64 => "DarwinX64",
- 			Platform::DarwinARM64 => "DarwinARM64",
- 			Platform::WindowsX64 => "WindowsX64",
-diff --git a/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
-index 20a5bc94b37..50678354245 100644
--- a/cli/src/util/prereqs.rs
-+++ b/cli/src/util/prereqs.rs
-@@ -73,6 +73,10 @@ impl PreReqChecker {
- 					Platform::LinuxX64
- 				} else if cfg!(target_arch = "arm") {
- 					Platform::LinuxARM32
-+				} else if cfg!(target_arch = "ppc64le") {
-+					Platform::LinuxPPC64LE
-+				} else if cfg!(target_arch = "riscv64") {
-+					Platform::LinuxRISCV64
- 				} else {
- 					Platform::LinuxARM64
- 				});
-@@ -82,6 +86,8 @@ impl PreReqChecker {
- 					Platform::LinuxX64Legacy
- 				} else if cfg!(target_arch = "arm") {
- 					Platform::LinuxARM32Legacy
-+				} else if cfg!(target_arch = "ppc64le") {
-+					Platform::LinuxPPC64LELegacy
- 				} else {
- 					Platform::LinuxARM64Legacy
- 				});
-diff --git a/resources/server/bin/helpers/check-requirements-linux.sh b/resources/server/bin/helpers/check-requirements-linux.sh
-index 079557869e3..c057746b870 100644
--- a/resources/server/bin/helpers/check-requirements-linux.sh
-+++ b/resources/server/bin/helpers/check-requirements-linux.sh
-@@ -50,6 +50,8 @@ case $ARCH in
- 			LDCONFIG_ARCH="AArch64"
- 		fi
- 		;;
-+    ppc64el) LDCONFIG_ARCH="64bit";;
-+    riscv64) LDCONFIG_ARCH="RISC-V";;
- esac
- 
- if [ "$OS_ID" != "alpine" ]; then
-diff --git a/src/vs/platform/extensionManagement/common/extensionManagement.ts b/src/vs/platform/extensionManagement/common/extensionManagement.ts
-index 9dae82eba07..94246285b26 100644
--- a/src/vs/platform/extensionManagement/common/extensionManagement.ts
-+++ b/src/vs/platform/extensionManagement/common/extensionManagement.ts
-@@ -33,6 +33,8 @@ export function TargetPlatformToString(targetPlatform: TargetPlatform) {
- 		case TargetPlatform.LINUX_X64: return 'Linux 64 bit';
- 		case TargetPlatform.LINUX_ARM64: return 'Linux ARM 64';
- 		case TargetPlatform.LINUX_ARMHF: return 'Linux ARM';
-+		case TargetPlatform.LINUX_PPC64LE: return 'Linux PowerPC';
-+		case TargetPlatform.LINUX_RISCV64: return 'Linux RISC-V 64';
- 
- 		case TargetPlatform.ALPINE_X64: return 'Alpine Linux 64 bit';
- 		case TargetPlatform.ALPINE_ARM64: return 'Alpine ARM 64';
-@@ -56,6 +58,8 @@ export function toTargetPlatform(targetPlatform: string): TargetPlatform {
- 		case TargetPlatform.LINUX_X64: return TargetPlatform.LINUX_X64;
- 		case TargetPlatform.LINUX_ARM64: return TargetPlatform.LINUX_ARM64;
- 		case TargetPlatform.LINUX_ARMHF: return TargetPlatform.LINUX_ARMHF;
-+		case TargetPlatform.LINUX_PPC64LE: return TargetPlatform.LINUX_PPC64LE;
-+		case TargetPlatform.LINUX_RISCV64: return TargetPlatform.LINUX_RISCV64;
- 
- 		case TargetPlatform.ALPINE_X64: return TargetPlatform.ALPINE_X64;
- 		case TargetPlatform.ALPINE_ARM64: return TargetPlatform.ALPINE_ARM64;
-@@ -91,6 +95,12 @@ export function getTargetPlatform(platform: Platform | 'alpine', arch: string |
- 			if (arch === 'arm') {
- 				return TargetPlatform.LINUX_ARMHF;
- 			}
-+			if (arch === 'ppc64le') {
-+				return TargetPlatform.LINUX_PPC64LE;
-+			}
-+			if (arch === 'riscv64') {
-+				return TargetPlatform.LINUX_RISCV64;
-+			}
- 			return TargetPlatform.UNKNOWN;
- 
- 		case 'alpine':
-diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
-index 331aba1b55f..cade78e6557 100644
--- a/src/vs/platform/extensions/common/extensions.ts
-+++ b/src/vs/platform/extensions/common/extensions.ts
-@@ -303,6 +303,8 @@ export const enum TargetPlatform {
- 	LINUX_X64 = 'linux-x64',
- 	LINUX_ARM64 = 'linux-arm64',
- 	LINUX_ARMHF = 'linux-armhf',
-+	LINUX_PPC64LE = 'linux-ppc64le',
-+	LINUX_RISCV64 = 'linux-riscv64',
- 
- 	ALPINE_X64 = 'alpine-x64',
- 	ALPINE_ARM64 = 'alpine-arm64',
--- a/patches/windows/update-msi.patch
+++ b/patches/windows/update-msi.patch
--- a/patches/windows/update.patch
+++ b/patches/windows/update.patch
--- a/patches/windows/win7.patch
+++ b/patches/windows/win7.patch
--- a/product.json
+++ b/product.json
@ -48,14 +48,12 @@
  ],
  "extensionEnabledApiProposals": {
    "ms-vscode.vscode-selfhost-test-provider": [
-      "testObserver"
+      "testObserver",
+      "attributableCoverage"
    ],
    "VisualStudioExptTeam.vscodeintellicode-completions": [
      "inlineCompletionsAdditions"
    ],
-    "ms-toolsai.datawrangler": [
-      "debugFocus"
-    ],
    "ms-vsliveshare.vsliveshare": [
      "contribMenuBarHome",
      "contribShareMenu",
@ -189,6 +187,7 @@
      "contribCommentThreadAdditionalMenu",
      "contribCommentsViewThreadMenus",
      "contribEditorContentMenu",
+      "contribMultiDiffEditorMenus",
      "contribShareMenu",
      "diffCommand",
      "fileComments",
@ -210,9 +209,9 @@
      "terminalExecuteCommandEvent",
      "terminalSelection",
      "terminalQuickFixProvider",
-      "chatParticipant",
      "chatParticipantAdditions",
      "defaultChatParticipant",
+      "embeddings",
      "chatVariableResolver",
      "chatProvider",
      "mappedEditsProvider",
@ -221,11 +220,17 @@
      "findTextInFiles",
      "textSearchProvider",
      "contribSourceControlInputBoxMenu",
+      "contribCommentEditorActionsMenu",
+      "contribCommentThreadAdditionalMenu",
+      "contribCommentsViewThreadMenus",
      "newSymbolNamesProvider",
      "findFiles2",
      "extensionsAny",
      "authLearnMore",
-      "testObserver"
+      "testObserver",
+      "aiTextSearchProvider",
+      "documentFiltersExclusive",
+      "chatParticipantPrivate"
    ],
    "GitHub.remotehub": [
      "contribRemoteHelp",
@ -284,6 +289,11 @@
    "ms-azuretools.vscode-azureresourcegroups": [
      "authGetSessions"
    ],
+    "ms-azuretools.vscode-azure-github-copilot": [
+      "chatParticipantAdditions",
+      "embeddings",
+      "languageModelSystem"
+    ],
    "ms-vscode.anycode": [
      "extensionsAny"
    ],
@ -307,9 +317,9 @@
      "fileSearchProvider",
      "textSearchProvider"
    ],
-    "apidev.azure-api-center": [
-      "chatParticipant",
-      "languageModels"
+    "TeamsDevApp.ms-teams-vscode-extension": [
+      "chatParticipantAdditions",
+      "languageModelSystem"
    ],
    "jeanp413.open-remote-ssh": [
      "resolvers",
--- a/release.sh
+++ b/release.sh
@ -2,7 +2,7 @@

 set -e

-if [[ -z "${GITHUB_TOKEN}" ]]; then
+if [[ -z "${GH_TOKEN}" ]] && [[ -z "${GITHUB_TOKEN}" ]] && [[ -z "${GH_ENTERPRISE_TOKEN}" ]] && [[ -z "${GITHUB_ENTERPRISE_TOKEN}" ]]; then
  echo "Will not release because no GITHUB_TOKEN defined"
  exit
 fi
--- a/src/insider/resources/linux/code.desktop
+++ b/src/insider/resources/linux/code.desktop
@ -2,7 +2,7 @@
 Name=@@NAME_LONG@@
 Comment=Code Editing. Redefined.
 GenericName=Text Editor
-Exec=@@EXEC@@ --unity-launch %F
+Exec=@@EXEC@@ %F
 Icon=@@ICON@@
 Type=Application
 StartupNotify=false
--- a/src/stable/resources/linux/code.desktop
+++ b/src/stable/resources/linux/code.desktop
@ -2,7 +2,7 @@
 Name=@@NAME_LONG@@
 Comment=Code Editing. Redefined.
 GenericName=Text Editor
-Exec=@@EXEC@@ --unity-launch %F
+Exec=@@EXEC@@ %F
 Icon=@@ICON@@
 Type=Application
 StartupNotify=false
--- a/stable.json
+++ b/stable.json
@ -1,4 +1,4 @@
 {
-  "tag": "1.89.0",
-  "commit": "b58957e67ee1e712cebf466b995adf4c5307b2bd"
+  "tag": "1.91.1",
+  "commit": "f1e16e1e6214d7c44d078b1f0607b2388f29d729"
 }
--- a/stores/snapcraft/check_version.sh
+++ b/stores/snapcraft/check_version.sh
@ -7,10 +7,13 @@ export SHOULD_BUILD="no"
 export SHOULD_DEPLOY_TO_RELEASE="no"
 export SHOULD_DEPLOY_TO_STORE="no"

+# Support for GitHub Enterprise
+GH_HOST="${GH_HOST:-github.com}"
+
 if [[ "${GENERATE_ASSETS}" == "true" ]]; then
  export SHOULD_BUILD="yes"
 else
-  wget --quiet "https://api.github.com/repos/${ASSETS_REPOSITORY}/releases" -O gh_latest.json
+  wget --quiet "https://api.${GH_HOST}/repos/${ASSETS_REPOSITORY}/releases" -O gh_latest.json
  SNAP_URL=$( jq -r 'map(select(.tag_name == "'"${RELEASE_VERSION}"'"))|first.assets[].browser_download_url|select(endswith("'"_${ARCHITECTURE}.snap"'"))' gh_latest.json )

  if [[ -z "${SNAP_URL}" ]]; then
--- a/update_qualityjson.sh
+++ b/update_qualityjson.sh
@ -7,7 +7,7 @@ if [[ "${SHOULD_BUILD}" != "yes" ]]; then
  exit 0
 fi

-if [[ -z "${GITHUB_TOKEN}" ]]; then
+if [[ -z "${GH_TOKEN}" ]] && [[ -z "${GITHUB_TOKEN}" ]] && [[ -z "${GH_ENTERPRISE_TOKEN}" ]] && [[ -z "${GITHUB_ENTERPRISE_TOKEN}" ]]; then
  echo "Will not update ${VSCODE_QUALITY}.json because no GITHUB_TOKEN defined"
  exit 0
 fi
--- a/update_version.sh
+++ b/update_version.sh
@ -8,11 +8,16 @@ if [[ "${SHOULD_BUILD}" != "yes" && "${FORCE_UPDATE}" != "true" ]]; then
  exit 0
 fi

-if [[ -z "${GITHUB_TOKEN}" ]]; then
+if [[ -z "${GH_TOKEN}" ]] && [[ -z "${GITHUB_TOKEN}" ]] && [[ -z "${GH_ENTERPRISE_TOKEN}" ]] && [[ -z "${GITHUB_ENTERPRISE_TOKEN}" ]]; then
  echo "Will not update version JSON because no GITHUB_TOKEN defined"
  exit 0
+else
+  GITHUB_TOKEN="${GH_TOKEN:-${GITHUB_TOKEN:-${GH_ENTERPRISE_TOKEN:-${GITHUB_ENTERPRISE_TOKEN}}}}"
 fi

+# Support for GitHub Enterprise
+GH_HOST="${GH_HOST:-github.com}"
+
 if [[ "${FORCE_UPDATE}" == "true" ]]; then
  . version.sh
 fi
@ -23,7 +28,7 @@ if [[ -z "${BUILD_SOURCEVERSION}" ]]; then
 fi

 if [[ "${VSCODE_ARCH}" == "ppc64le" ]] || [[ "${VSCODE_ARCH}" == "riscv64" ]] ; then
-  echo "Skip ppc64le since only reh is published"
+  echo "Skip PPC64LE since only reh is published"
  exit 0
 fi

@ -47,7 +52,7 @@ fi
 # `sha256hash` in <filename>.sha256

 REPOSITORY_NAME="${VERSIONS_REPOSITORY/*\//}"
-URL_BASE="https://github.com/${ASSETS_REPOSITORY}/releases/download/${RELEASE_VERSION}"
+URL_BASE="https://${GH_HOST}/${ASSETS_REPOSITORY}/releases/download/${RELEASE_VERSION}"

 generateJson() {
  local url name version productVersion sha1hash sha256hash timestamp
@ -115,12 +120,12 @@ updateLatestVersion() {

 # init versions repo for later commiting + pushing the json file to it
 # thank you https://www.vinaygopinath.me/blog/tech/commit-to-master-branch-on-github-using-travis-ci/
-git clone "https://github.com/${VERSIONS_REPOSITORY}.git"
+git clone "https://${GH_HOST}/${VERSIONS_REPOSITORY}.git"
 cd "${REPOSITORY_NAME}" || { echo "'${REPOSITORY_NAME}' dir not found"; exit 1; }
 git config user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )-ci@not-real.com"
 git config user.name "${GITHUB_USERNAME} CI"
 git remote rm origin
-git remote add origin "https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com/${VERSIONS_REPOSITORY}.git" &> /dev/null
+git remote add origin "https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@${GH_HOST}/${VERSIONS_REPOSITORY}.git" &> /dev/null
 cd ..

 if [[ "${OS_NAME}" == "osx" ]]; then