feat: update to 1.78 (#1500)

Update README.md (updated special thanks for logo)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -34,6 +34,7 @@ If applicable, add screenshots to help explain your problem.
  - Architecture [e.g. x64, ia32, arm64]
  - Version [e.g. 1.33.0]
  - App Manager [e.g. Winget, Homebrew, Snap, AUR, RPM, Nix, ...]
+ - Sandboxed [e.g. no, Flatpak, Snap]
 
 **Additional context**
 Add any other context about the problem here.

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/insider-linux.yml

@@ -87,7 +87,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn
@@ -131,10 +131,10 @@ jobs:
           image: vscodium/vscodium-linux-build-agent:bionic-x64
         - vscode_arch: arm64
           npm_arch: arm64
-          image: vscodium/vscodium-linux-build-agent:stretch-arm64
-        - vscode_arch: armhf
-          npm_arch: armv7l
-          image: vscodium/vscodium-linux-build-agent:stretch-armhf
+          image: vscodium/vscodium-linux-build-agent:buster-arm64
+        # - vscode_arch: armhf
+        #   npm_arch: armv7l
+        #   image: vscodium/vscodium-linux-build-agent:buster-armhf
     container:
       image: ${{ matrix.image }}
       env:
@@ -159,7 +159,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn
@@ -255,7 +255,7 @@ jobs:
           SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
         run: ./stores/snapcraft/check_version.sh
 
-      - uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-qemu-action@v2
         if: env.SHOULD_DEPLOY == 'yes'
 
       - uses: diddlesnaps/snapcraft-multiarch-action@v1

.github/workflows/insider-macos.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Clone VSCode repo
         env:

.github/workflows/insider-spearhead.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Clone VSCode repo
         run: . get_repo.sh

.github/workflows/insider-windows.yml

@@ -41,7 +41,7 @@ jobs:
       matrix:
         vscode_arch:
           - x64
-          - ia32
+          # - ia32
           - arm64
     outputs:
       RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
@@ -55,13 +55,13 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn
 
       - name: Setup Python 3
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: '3.x'
 
@@ -128,7 +128,7 @@ jobs:
           RELEASE_VERSION: ${{ needs.build.outputs.RELEASE_VERSION }}
 
       - name: Release to WinGet
-        uses: vedantmgoyal2009/winget-releaser@v1
+        uses: vedantmgoyal2009/winget-releaser@v2
         with:
           identifier: ${{ env.APP_IDENTIFIER }}
           version: ${{ env.RELEASE_VERSION }}

.github/workflows/lock.yml

@@ -8,7 +8,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v3
+      - uses: dessant/lock-threads@v4
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: '90'

.github/workflows/stable-linux.yml

@@ -6,6 +6,9 @@ on:
       new_release:
         type: boolean
         description: Force new Release
+      force_version:
+        type: boolean
+        description: Force update version
   schedule:
     - cron: '0 18 * * *'
   push:
@@ -81,7 +84,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn
@@ -125,10 +128,10 @@ jobs:
           image: vscodium/vscodium-linux-build-agent:bionic-x64
         - vscode_arch: arm64
           npm_arch: arm64
-          image: vscodium/vscodium-linux-build-agent:stretch-arm64
-        - vscode_arch: armhf
-          npm_arch: armv7l
-          image: vscodium/vscodium-linux-build-agent:stretch-armhf
+          image: vscodium/vscodium-linux-build-agent:buster-arm64
+        # - vscode_arch: armhf
+        #   npm_arch: armv7l
+        #   image: vscodium/vscodium-linux-build-agent:buster-armhf
     container:
       image: ${{ matrix.image }}
       env:
@@ -151,7 +154,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn
@@ -188,10 +191,11 @@ jobs:
 
       - name: Update versions repo
         env:
+          FORCE_UPDATE: ${{ github.event.inputs.force_version }}
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./update_version.sh
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+        if: env.SHOULD_DEPLOY == 'yes'
 
   aur:
     needs:
@@ -240,7 +244,7 @@ jobs:
           SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
         run: ./stores/snapcraft/check_version.sh
 
-      - uses: docker/setup-qemu-action@v1
+      - uses: docker/setup-qemu-action@v2
         if: env.SHOULD_DEPLOY == 'yes'
 
       - uses: diddlesnaps/snapcraft-multiarch-action@v1

.github/workflows/stable-macos.yml

@@ -6,6 +6,9 @@ on:
       new_release:
         type: boolean
         description: Force new Release
+      force_version:
+        type: boolean
+        description: Force update version
   schedule:
     - cron: '0 18 * * *'
   push:
@@ -44,7 +47,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Clone VSCode repo
         run: . get_repo.sh
@@ -81,10 +84,11 @@ jobs:
 
       - name: Update versions repo
         env:
+          FORCE_UPDATE: ${{ github.event.inputs.force_version }}
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./update_version.sh
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+        if: env.SHOULD_DEPLOY == 'yes'
 
       - name: Clean up keychain
         if: always()

.github/workflows/stable-windows.yml

@@ -6,6 +6,9 @@ on:
       new_release:
         type: boolean
         description: Force new Release
+      force_version:
+        type: boolean
+        description: Force update version
   schedule:
     - cron: '0 18 * * *'
   push:
@@ -38,7 +41,7 @@ jobs:
       matrix:
         vscode_arch:
           - x64
-          - ia32
+          # - ia32
           - arm64
     outputs:
       RELEASE_VERSION: ${{ env.RELEASE_VERSION }}
@@ -50,13 +53,13 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 16.17
 
       - name: Install Yarn
         run: npm install -g yarn
 
       - name: Setup Python 3
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: '3.x'
 
@@ -93,10 +96,11 @@ jobs:
 
       - name: Update versions repo
         env:
+          FORCE_UPDATE: ${{ github.event.inputs.force_version }}
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
         run: ./update_version.sh
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+        if: env.SHOULD_DEPLOY == 'yes'
 
   winget:
     needs: build
@@ -117,7 +121,7 @@ jobs:
           RELEASE_VERSION: ${{ needs.build.outputs.RELEASE_VERSION }}
 
       - name: Release to WinGet
-        uses: vedantmgoyal2009/winget-releaser@v1
+        uses: vedantmgoyal2009/winget-releaser@v2
         with:
           identifier: ${{ env.APP_IDENTIFIER }}
           version: ${{ env.RELEASE_VERSION }}

.github/workflows/stale.yml

@@ -11,7 +11,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v8
         with:
           days-before-stale: 180
           days-before-close: 30

.nvmrc

@@ -1 +1 @@
-v16.14.2
+16.17

DOCS.md

@@ -45,51 +45,72 @@ Likewise, while the descriptions for "Extensions: Auto Check Updates" and "Exten
 
 ## <a id="extensions-marketplace"></a>Extensions + Marketplace
 
-### <a id="howto-openvsx-marketplace"></a>How to use the OpenVSX Marketplace
+Being a vscode based editor, VSCodium gets additional features by installing VS Code extensions.
+Unfortunately, as Microsoft [prohibits usages of the Microsoft marketplace by any other products](https://github.com/microsoft/vscode/issues/31168) or redistribution of `.vsix` files from it, in order to use VS Code extensions in non-Microsoft products those need to be installed differently.
 
-By default the `product.json` file is set up to use [open-vsx.org](https://open-vsx.org/) as extension gallery, which has an [adapter](https://github.com/eclipse/openvsx/wiki/Using-Open-VSX-in-VS-Code) to the Marketplace API used by VS Code. Since that is a rather new project, you will likely miss some extensions you know from the VS Code Marketplace. You have the following options to obtain such missing extensions:
+By default, the `product.json` file is set up to use [open-vsx.org](https://open-vsx.org/) as extension gallery, which has an [adapter](https://github.com/eclipse/openvsx/wiki/Using-Open-VSX-in-VS-Code) to the Marketplace API used by VS Code. Since that is a rather new project, you will likely miss some extensions you know from the VS Code Marketplace. You have the following options to obtain such missing extensions:
 
 * Ask the extension maintainers to publish to [open-vsx.org](https://open-vsx.org/) in addition to the VS Code Marketplace. The publishing process is documented in the [Open VSX Wiki](https://github.com/eclipse/openvsx/wiki/Publishing-Extensions).
 * Create a pull request to [this repository](https://github.com/open-vsx/publish-extensions) to have the [@open-vsx](https://github.com/open-vsx) service account publish the extensions for you.
-* Download and [install the vsix files](https://code.visualstudio.com/docs/editor/extension-gallery#_install-from-a-vsix).
+* Download and [install the vsix files](https://code.visualstudio.com/docs/editor/extension-gallery#_install-from-a-vsix), for example from the release page in their source repository.
 
+### <a id="howto-openvsx-marketplace"></a>How to use the Open VSX Registry
+
+As noted above, the [Open VSX Registry](https://open-vsx.org/) is the pre-set extension gallery in VSCodium. Using the extension view in VSCodium will therefore by default use it.  
 See [this article](https://www.gitpod.io/blog/open-vsx/) for more information on the motivation behind Open VSX.
 
-### <a id="howto-vscode-marketplace"></a>How to use the VS Code Marketplace
+### <a id="howto-switch-marketplace"></a>How to use a different extension gallery
 
-You can switch and use the VS Code marketplace by using the following solutions. However, note that [ this is not legal](https://github.com/microsoft/vscode/issues/31168).
+You can switch from the pre-set Open VSX Registry by configuring the endpoints using the following solutions.
+These examples use the URLs for Microsoft's VS Code Marketplace, see [below](#howto-vscode-marketplace) for more information on that.
 
 With the following environment variables:
 - `VSCODE_GALLERY_SERVICE_URL='https://marketplace.visualstudio.com/_apis/public/gallery'`
-- `VSCODE_GALLERY_CACHE_URL='https://vscode.blob.core.windows.net/gallery/index'`
 - `VSCODE_GALLERY_ITEM_URL='https://marketplace.visualstudio.com/items'`
+- `VSCODE_GALLERY_CACHE_URL='https://vscode.blob.core.windows.net/gallery/index'`
 - `VSCODE_GALLERY_CONTROL_URL=''`
-- `VSCODE_GALLERY_RECOMMENDATIONS_URL=''`
 
-Or by creating a custom `product.json` at the following location:
+Or by creating a custom `product.json` at the following location (replace `VSCodium` by `VSCodium - Insiders` if you use that):
 - Windows: `%APPDATA%\VSCodium` or `%USERPROFILE%\AppData\Roaming\VSCodium`
 - macOS: `~/Library/Application Support/VSCodium`
 - Linux: `$XDG_CONFIG_HOME/VSCodium` or `~/.config/VSCodium`
 
 with the content:
 
-```json
+- Note: set `cacheUrl` to empty string for every other extension gallery
+
+```jsonc
 {
   "extensionsGallery": {
     "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
-    "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
     "itemUrl": "https://marketplace.visualstudio.com/items",
-    "controlUrl": "",
-    "recommendationsUrl": ""
+    "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
+    "controlUrl": ""
   }
 }
 ```
 
-### <a id="howto-selfhost-marketplace"></a>How to self-host your own VS Code Marketplace
+### <a id="howto-selfhost-marketplace"></a>How to self-host your own extension gallery
 
-Individual developers and enterprise companies in regulated or security-conscious industries can self-host their own VS Code Marketplace using the [code-marketplace](https://coder.com/blog/running-a-private-vs-code-extension-marketplace) open-source project.
+Individual developers and enterprise companies in regulated or security-conscious industries can self-host their own extension gallery. In all of these cases you'd enter its endpoint URLs as noted above, replacing `marketplace.visualstudio.com` with `your-self-hosted-marketplace-address.example.com` (or IP address), setting `cacheUrl` / `VSCODE_GALLERY_CACHE_URL` to an empty string.
 
-> `code-marketplace` is a self-contained go binary that does not have a frontend or any mechanisms for extension authors to add or update extensions in the marketplace. It simply reads extensions from file storage and provides an API for VSCode compatible editors to consume.
+There are likely other options, but the following were reported to work:
+
+* [Open VSX](https://github.com/eclipse/openvsx) eclipse open-source project  
+  While the public instance which is run by the Eclipse Foundation is the pre-set endpoint in VSCodium, you can host your own instance.
+
+    > Open VSX is a [vendor-neutral](https://projects.eclipse.org/projects/ecd.openvsx) open-source alternative to the [Visual Studio Marketplace](https://marketplace.visualstudio.com/vscode). It provides a server application that manages [VS Code extensions](https://code.visualstudio.com/api) in a database, a web application similar to the VS Code Marketplace, and a command-line tool for publishing extensions similar to [vsce](https://code.visualstudio.com/api/working-with-extensions/publishing-extension#vsce).
+
+* [code-marketplace](https://coder.com/blog/running-a-private-vs-code-extension-marketplace) open-source project
+
+    > `code-marketplace` is a self-contained go binary that does not have a frontend or any mechanisms for extension authors to add or update extensions in the marketplace. It simply reads extensions from file storage and provides an API for VSCode compatible editors to consume.
+
+### <a id="howto-vscode-marketplace"></a>How to use the VS Code Marketplace
+
+As with any online service, ensure you've understood [its terms of use](https://aka.ms/vsmarketplace-ToU).  
+Also note that this extension gallery hosts multiple extensions that are non-free and have license-agreements that explicitly forbid using them in non-Microsoft products, along with using telemetry.
+
+The endpoint URLs are given in the [example above](#howto-switch-marketplace).
 
 
 ### <a id="proprietary-debugging-tools"></a>Proprietary Debugging Tools
@@ -102,7 +123,7 @@ A workaround exists to get debugging working in C# projects, by using Samsung's
 
 Like the debuggers mentioned above, some extensions you may find in the marketplace (like the [Remote Development Extensions](https://code.visualstudio.com/docs/remote/remote-overview)) only function with the official Visual Studio Code build. You can work around this by adding the extension's internal ID (found on the extension's page) to the `extensionAllowedProposedApi` property of the product.json in your VSCodium installation. For example:
 
-```json
+```jsonc
   "extensionAllowedProposedApi": [
     // ...
     "ms-vscode-remote.vscode-remote-extensionpack",
@@ -172,7 +193,7 @@ inode/directory=codium.desktop;org.gnome.Nautilus.desktop;
 This is a common question for Visual Studio Code and the procedure is slightly different in VSCodium because the `defaults` path is different.
 
 ```bash
-$ defaults write com.visualstudio.code.oss ApplePressAndHoldEnabled -bool false
+$ defaults write com.vscodium ApplePressAndHoldEnabled -bool false
 ```
 
 ## <a id="terminal-support"></a>How do I open VSCodium from the terminal?

README.md

@@ -1,6 +1,6 @@
 <div id="vscodium-logo" align="center">
     <br />
-    <img src="./src/stable/resources/linux/code.png" alt="VSCodium Logo" width="200"/>
+    <img src="./icons/stable/codium_cnl.svg" alt="VSCodium Logo" width="200"/>
     <h1>VSCodium</h1>
     <h3>Free/Libre Open Source Software Binaries of VS Code</h3>
 </div>
@@ -13,9 +13,9 @@
 [![codium](https://snapcraft.io//codium/badge.svg)](https://snapcraft.io/codium)
 [![codium](https://snapcraft.io//codium/trending.svg?name=0)](https://snapcraft.io/codium)
 
-[![build status (linux)](https://img.shields.io/github/workflow/status/VSCodium/vscodium/linux_build/master?label=build%28linux%29)](https://github.com/VSCodium/vscodium/actions/workflows/linux.yml?query=branch%3Amaster)
-[![build status (macos)](https://img.shields.io/github/workflow/status/VSCodium/vscodium/macos_build/master?label=build%28macos%29)](https://github.com/VSCodium/vscodium/actions/workflows/macos.yml?query=branch%3Amaster)
-[![build status (windows)](https://img.shields.io/github/workflow/status/VSCodium/vscodium/windows_build/master?label=build%28windows%29)](https://github.com/VSCodium/vscodium/actions/workflows/windows.yml?query=branch%3Amaster)
+[![build status (linux)](https://img.shields.io/github/actions/workflow/status/VSCodium/vscodium/stable-linux.yml?branch=master&label=build%28linux%29)](https://github.com/VSCodium/vscodium/actions/workflows/stable-linux.yml?query=branch%3Amaster)
+[![build status (macos)](https://img.shields.io/github/actions/workflow/status/VSCodium/vscodium/stable-macos.yml?branch=master&label=build%28macOS%29)](https://github.com/VSCodium/vscodium/actions/workflows/stable-macos.yml?query=branch%3Amaster)
+[![build status (windows)](https://img.shields.io/github/actions/workflow/status/VSCodium/vscodium/stable-windows.yml?branch=master&label=build%28windows%29)](https://github.com/VSCodium/vscodium/actions/workflows/stable-windows.yml?query=branch%3Amaster)
 
 </div>
 
@@ -166,13 +166,9 @@ If you would like to support the development of VSCodium, feel free to send BTC
 Special thanks to:
 
 <table>
-  <tr>
-    <td>@estatra</td>
-    <td>for the latest logo</td>
-  </tr>
   <tr>
     <td><a href="https://github.com/jaredreich" target="_blank">@jaredreich</a></td>
-    <td>for the previous logo</td>
+    <td>for the logo</td>
   </tr>
   <tr>
     <td><a href="https://github.com/PalinuroSec" target="_blank">@PalinuroSec</a></td>

announcements-builtin.json

@@ -1,7 +1,2 @@
 [
-  {
-    "id": "#1218",
-    "title": "💡 Discussion: New icon",
-    "url": "https://github.com/VSCodium/vscodium/discussions/1218"
-  }
 ]

announcements-extra.json

@@ -1,12 +1,2 @@
 [
-  {
-    "id": "#1227",
-    "title": "🐛 Issue: Update to `1.71.0`",
-    "url": "https://github.com/VSCodium/vscodium/issues/1227"
-  },
-  {
-    "id": "#1264",
-    "title": "🐛 Issue: Support for Windows 7",
-    "url": "https://github.com/VSCodium/vscodium/issues/1264"
-  }
 ]

build/build.sh

@@ -7,8 +7,9 @@
 export APP_NAME="VSCodium"
 export CI_BUILD="no"
 export SHOULD_BUILD="yes"
-export SKIP_BUILD="no"
 export SKIP_ASSETS="yes"
+export SKIP_BUILD="no"
+export SKIP_SOURCE="no"
 export VSCODE_LATEST="no"
 export VSCODE_QUALITY="stable"
 
@@ -26,6 +27,9 @@ while getopts ":ilop" opt; do
     p)
       export SKIP_ASSETS="no"
       ;;
+    s)
+      export SKIP_SOURCE="yes"
+      ;;
   esac
 done
 
@@ -50,29 +54,29 @@ else
 fi
 
 echo "OS_NAME=\"${OS_NAME}\""
+echo "SKIP_SOURCE=\"${SKIP_SOURCE}\""
 echo "SKIP_BUILD=\"${SKIP_BUILD}\""
 echo "SKIP_ASSETS=\"${SKIP_ASSETS}\""
 echo "VSCODE_ARCH=\"${VSCODE_ARCH}\""
 echo "VSCODE_LATEST=\"${VSCODE_LATEST}\""
 echo "VSCODE_QUALITY=\"${VSCODE_QUALITY}\""
 
-if [[ "${SKIP_BUILD}" == "no" ]]; then
+if [[ "${SKIP_SOURCE}" == "no" ]]; then
   rm -rf vscode* VSCode*
 
   . get_repo.sh
+  . version.sh
 
   # save variables for later
   echo "MS_TAG=\"${MS_TAG}\"" > build.env
   echo "MS_COMMIT=\"${MS_COMMIT}\"" >> build.env
   echo "RELEASE_VERSION=\"${RELEASE_VERSION}\"" >> build.env
   echo "BUILD_SOURCEVERSION=\"${BUILD_SOURCEVERSION}\"" >> build.env
-
-  . build.sh
-
-  if [[ "${VSCODE_QUALITY}" == "insider" && "${VSCODE_LATEST}" == "yes" ]]; then
-    echo "$( cat "insider.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )" > "insider.json"
-  fi
 else
+  if [[ "${SKIP_ASSETS}" != "no" ]]; then
+    rm -rf VSCode*
+  fi
+
   . build.env
 
   echo "MS_TAG=\"${MS_TAG}\""
@@ -81,6 +85,23 @@ else
   echo "BUILD_SOURCEVERSION=\"${BUILD_SOURCEVERSION}\""
 fi
 
+if [[ "${SKIP_BUILD}" == "no" ]]; then
+  if [[ "${SKIP_SOURCE}" != "no" ]]; then
+    cd vscode || { echo "'vscode' dir not found"; exit 1; }
+
+    git add .
+    git reset -q --hard HEAD
+
+    cd ..
+  fi
+
+  . build.sh
+
+  if [[ "${VSCODE_QUALITY}" == "insider" && "${VSCODE_LATEST}" == "yes" ]]; then
+    echo "$( cat "insider.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )" > "insider.json"
+  fi
+fi
+
 if [[ "${SKIP_ASSETS}" == "no" ]]; then
   if [[ "${OS_NAME}" == "windows" ]]; then
     rm -rf build/windows/msi/releasedir

build/update_api.sh

@@ -30,4 +30,6 @@ fi
 
 APIS=`cat ${DIRECTORY}/resources/app/product.json | jq -r '.extensionEnabledApiProposals'`
 
+APIS=`echo "${APIS}" | jq '. += {"jeanp413.open-remote-ssh": ["resolvers", "tunnels", "terminalDataWriteEvent", "contribRemoteHelp", "contribViewsRemote"]}'`
+
 cat <<< $(jq --argjson v "${APIS}" 'setpath(["extensionEnabledApiProposals"]; $v)' product.json) > product.json

build/update_patches.sh

@@ -1,21 +1,60 @@
 #!/bin/bash
 
+export VSCODE_QUALITY="stable"
+
+while getopts ":ilp" opt; do
+  case "$opt" in
+    i)
+      export VSCODE_QUALITY="insider"
+      ;;
+  esac
+done
+
 cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
 git add .
 git reset -q --hard HEAD
 
-for file in ../patches/*.patch; do
-  if [ -f "${file}" ]; then
-    echo applying patch: "${file}"
-    git apply --ignore-whitespace "${file}"
+for FILE in ../patches/*.patch; do
+  if [ -f "${FILE}" ]; then
+    echo applying patch: "${FILE}"
+    git apply --ignore-whitespace "${FILE}"
     if [ $? -ne 0 ]; then
-      echo failed to apply patch "${file}"
-      git apply --reject "${file}"
+      echo failed to apply patch "${FILE}"
+
+      git apply --reject "${FILE}"
+      git apply --reject "../patches/helper/settings.patch"
+
       read -p "Press any key when the conflict have been resolved..." -n1 -s
-      git diff -U1 > "${file}"
+
+      git restore .vscode/settings.json
+      git add .
+      git diff --staged -U1 > "${FILE}"
     fi
     git add .
     git reset -q --hard HEAD
   fi
 done
+
+if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
+  for FILE in ../patches/insider/*.patch; do
+    if [ -f "${FILE}" ]; then
+      echo applying patch: "${FILE}"
+      git apply --ignore-whitespace "${FILE}"
+      if [ $? -ne 0 ]; then
+        echo failed to apply patch "${FILE}"
+
+        git apply --reject "${FILE}"
+        git apply --reject "../patches/helper/settings.patch"
+
+        read -p "Press any key when the conflict have been resolved..." -n1 -s
+
+        git restore .vscode/settings.json
+        git add .
+        git diff --staged -U1 > "${FILE}"
+      fi
+      git add .
+      git reset -q --hard HEAD
+    fi
+  done
+fi

docs/build.md

@@ -38,6 +38,10 @@
 - imagemagick (for AppImage)
 
 ### <a id="dependencies-macos"></a>MacOS
+- imagemagick
+- png2icns (`npm install png2icns -g`)
+- librsvg
+
 
 ### <a id="dependencies-windows"></a>Windows
 

icons/README.md

@@ -0,0 +1,9 @@
+## Files
+
+| filename                  | color  | width | border |
+| ------------------------- | ------ | ----- | ------ |
+| `codium_clt.svg`          | light  |       |        |
+| `codium_cnl.svg`          | normal |       |        |
+| `codium_cnl_w80_b8.svg`   | normal | 80%   | 8pt    |
+| `codium_cnl_w100_b05.svg` | normal | 100%  | 0.5pt  |
+

icons/build_icons.sh

@@ -6,16 +6,18 @@ set -e
 # set -o xtrace
 
 QUALITY="stable"
+COLOR="blue1"
 
 while getopts ":i" opt; do
   case "$opt" in
     i)
       export QUALITY="insider"
+      export COLOR="orange1"
       ;;
   esac
 done
 
-check_programs() {
+check_programs() { # {{{
   for arg in "$@"
   do
     if ! command -v "${arg}" >/dev/null 2>&1
@@ -24,14 +26,32 @@ check_programs() {
       exit
     fi
   done
-}
+} # }}}
 
-check_programs "icns2png" "composite" "convert" "png2icns" "icotool"
+check_programs "icns2png" "composite" "convert" "png2icns" "icotool" "rsvg-convert" "sed"
+
+. ./utils.sh
 
 SRC_PREFIX=""
 VSCODE_PREFIX=""
 
-build_darwin_types() {
+build_darwin_main() { # {{{
+  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/darwin/code.icns" ]; then
+    rsvg-convert -w 655 -h 655 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite "code_logo.png" -gravity center "icons/template_macos.png" "code_1024.png"
+    convert "code_1024.png" -resize 512x512 code_512.png
+    convert "code_1024.png" -resize 256x256 code_256.png
+    convert "code_1024.png" -resize 128x128 code_128.png
+
+    png2icns "${SRC_PREFIX}src/${QUALITY}/resources/darwin/code.icns" code_512.png code_256.png code_128.png
+
+    rm code_1024.png code_512.png code_256.png code_128.png code_logo.png
+  fi
+} # }}}
+
+build_darwin_types() { # {{{
+  rsvg-convert -w 128 -h 128 "icons/${QUALITY}/codium_cnl_w80_b8.svg" -o "code_logo.png"
+
   for file in "${VSCODE_PREFIX}"vscode/resources/darwin/*
   do
     if [ -f "${file}" ]; then
@@ -41,7 +61,7 @@ build_darwin_types() {
         icns2png -x -s 512x512 "${file}" -o .
 
         composite -blend 100% -geometry +323+365 "icons/corner_512.png" "${name}_512x512x32.png" "${name}.png"
-        composite "icons/${QUALITY}/code_darwin.png" "${name}.png" "${name}.png"
+        composite -geometry +359+374 "code_logo.png" "${name}.png" "${name}.png"
 
         convert "${name}.png" -resize 256x256 "${name}_256.png"
 
@@ -51,23 +71,40 @@ build_darwin_types() {
       fi
     fi
   done
-}
 
-build_darwin_main() {
-  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/darwin/code.icns" ]; then
-    convert "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" -resize 512x512 code_512.png
-    convert "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" -resize 256x256 code_256.png
-    convert "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" -resize 128x128 code_128.png
+  rm "code_logo.png"
+} # }}}
 
-    png2icns "${SRC_PREFIX}src/${QUALITY}/resources/darwin/code.icns" code_512.png code_256.png code_128.png
-
-    rm code_512.png code_256.png code_128.png
+build_linux_main() { # {{{
+  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" ]; then
+    wget "https://raw.githubusercontent.com/VSCodium/icons/main/icons/linux/circle1/${COLOR}/paulo22s.png" -O "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png"
   fi
-}
 
-build_win32() {
+  mkdir -p "${SRC_PREFIX}src/${QUALITY}/resources/linux/rpm"
+
+  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/linux/rpm/code.xpm" ]; then
+    convert "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" "${SRC_PREFIX}src/${QUALITY}/resources/linux/rpm/code.xpm"
+  fi
+} # }}}
+
+build_media() { # {{{
+  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/src/vs/workbench/browser/media/code-icon.svg" ]; then
+    cp "icons/${QUALITY}/codium_clt.svg" "${SRC_PREFIX}src/${QUALITY}/src/vs/workbench/browser/media/code-icon.svg"
+    gsed -i 's|width="100" height="100"|width="1024" height="1024"|' "${SRC_PREFIX}src/${QUALITY}/src/vs/workbench/browser/media/code-icon.svg"
+  fi
+} # }}}
+
+build_windows_main() { # {{{
+  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico" ]; then
+    wget "https://raw.githubusercontent.com/VSCodium/icons/main/icons/win32/nobg/${COLOR}/paulo22s.ico" -O "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico"
+  fi
+} # }}}
+
+build_windows_types() { # {{{
   mkdir -p "${SRC_PREFIX}src/${QUALITY}/resources/win32"
 
+  rsvg-convert -b "#F5F6F7" -w 64 -h 64 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+
   for file in "${VSCODE_PREFIX}"vscode/resources/win32/*.ico
   do
     if [ -f "${file}" ]; then
@@ -76,88 +113,120 @@ build_win32() {
       if [[ ${name} != 'code' ]] && [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/${name}.ico" ]; then
         icotool -x -w 256 "${file}"
 
-        composite -geometry +150+185 "icons/${QUALITY}/code_64.png" "${name}_1_256x256x32.png" "${name}.png"
+        composite -geometry +150+185 "code_logo.png" "${name}_9_256x256x32.png" "${name}.png"
 
         convert "${name}.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "${SRC_PREFIX}src/${QUALITY}/resources/win32/${name}.ico"
 
-        rm "${name}_1_256x256x32.png" "${name}.png"
+        rm "${name}_9_256x256x32.png" "${name}.png"
       fi
     fi
   done
 
-  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico" ]; then
-    convert "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico"
+  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/code_70x70.png" ]; then
+    convert -size 70x70 canvas:transparent PNG32:"${SRC_PREFIX}src/${QUALITY}/resources/win32/code_70x70.png"
+    rsvg-convert -w 45 -h 45 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/code_70x70.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/code_70x70.png"
+  fi
+
+   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/code_150x150.png" ]; then
+    convert -size 150x150 canvas:transparent PNG32:"${SRC_PREFIX}src/${QUALITY}/resources/win32/code_150x150.png"
+    rsvg-convert -w 64 -h 64 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -geometry +44+25 "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/code_150x150.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/code_150x150.png"
   fi
 
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-100.bmp" ]; then
     convert -size 164x314 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-100.bmp"
-    composite -size 126x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-100.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-100.bmp"
+    rsvg-convert -w 126 -h 126 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-100.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-100.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-125.bmp" ]; then
     convert -size 192x386 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-125.bmp"
-    composite -size 147x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-125.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-125.bmp"
+    rsvg-convert -w 147 -h 147 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-125.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-125.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-150.bmp" ]; then
     convert -size 246x459 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-150.bmp"
-    composite -size 190x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-150.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-150.bmp"
+    rsvg-convert -w 190 -h 190 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-150.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-150.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-175.bmp" ]; then
     convert -size 273x556 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-175.bmp"
-    composite -size 211x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-175.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-175.bmp"
+    rsvg-convert -w 211 -h 211 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-175.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-175.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-200.bmp" ]; then
     convert -size 328x604 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-200.bmp"
-    composite -size 255x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-200.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-200.bmp"
+    rsvg-convert -w 255 -h 255 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-200.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-200.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-225.bmp" ]; then
     convert -size 355x700 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-225.bmp"
-    composite -size 273x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-225.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-225.bmp"
+    rsvg-convert -w 273 -h 273 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-225.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-225.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-250.bmp" ]; then
     convert -size 410x797 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-250.bmp"
-    composite -size 317x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-250.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-250.bmp"
+    rsvg-convert -w 317 -h 317 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-250.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-250.bmp"
   fi
 
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-100.bmp" ]; then
     convert -size 55x55 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-100.bmp"
-    composite -size 44x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-100.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-100.bmp"
+    rsvg-convert -w 44 -h 44 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-100.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-100.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-125.bmp" ]; then
     convert -size 64x68 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-125.bmp"
-    composite -size 52x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-125.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-125.bmp"
+    rsvg-convert -w 52 -h 52 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-125.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-125.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-150.bmp" ]; then
     convert -size 83x80 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-150.bmp"
-    composite -size 63x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-150.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-150.bmp"
+    rsvg-convert -w 63 -h 63 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-150.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-150.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-175.bmp" ]; then
     convert -size 92x97 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-175.bmp"
-    composite -size 76x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-175.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-175.bmp"
+    rsvg-convert -w 76 -h 76 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-175.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-175.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-200.bmp" ]; then
     convert -size 110x106 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-200.bmp"
-    composite -size 86x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-200.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-200.bmp"
+    rsvg-convert -w 86 -h 86 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-200.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-200.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-225.bmp" ]; then
     convert -size 119x123 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-225.bmp"
-    composite -size 103x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-225.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-225.bmp"
+    rsvg-convert -w 103 -h 103 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-225.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-225.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp" ]; then
     convert -size 138x140 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp"
-    composite -size 116x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp"
+    rsvg-convert -w 116 -h 116 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp" ]; then
     convert -size 493x58 xc:white "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp"
-    composite -geometry +438+6 \( "icons/${QUALITY}/codium_only.svg" -resize 50x50 \) "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp"
+    rsvg-convert -w 50 -h 50 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -geometry +438+6 "code_logo.png" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp" ]; then
     convert -size 493x312 xc:white "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp"
-    composite -geometry +22+152 \( "icons/${QUALITY}/codium_only.svg" -resize 120x90 \) "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp"
+    rsvg-convert -w 120 -h 120 "icons/${QUALITY}/codium_cnl.svg" -o "code_logo.png"
+    composite -geometry +22+152 "code_logo.png" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp"
   fi
-}
+
+  rm code_logo.png
+} # }}}
 
 if [ "${0}" == "${BASH_SOURCE}" ];
 then
+  build_darwin_main
+  build_linux_main
+  build_windows_main
+
   build_darwin_types
-  build_win32
+  build_windows_types
+
+  build_media
 fi

icons/insider/codium_clt.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="100" height="100" viewBox="0, 0, 100, 100">
+  <defs>
+    <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="199.997" y1="214.302" x2="296.665" y2="307.573" gradientTransform="matrix(1, 0, 0, 1, -200, -213)">
+      <stop offset="0" stop-color="#FFB062"/>
+      <stop offset="1" stop-color="#E04F00"/>
+    </linearGradient>
+  </defs>
+  <g id="Layer_1">
+    <path d="M48.26,2.274 C45.406,4.105 44.583,7.898 46.422,10.742 C56.531,26.397 58.917,38.205 57.882,48.553 C53.698,68.369 44.603,72.389 36.655,72.389 C28.895,72.389 30.973,59.618 36.806,55.88 C40.288,53.706 44.748,52.293 48.171,52.293 C51.563,52.293 54.313,49.552 54.313,46.17 C54.313,42.787 51.563,40.046 48.171,40.046 C44.173,40.046 40.251,40.886 36.59,42.316 C37.338,38.787 37.614,34.973 36.647,30.919 C35.179,24.763 30.953,18.883 23.615,13.183 C22.33,12.183 20.7,11.734 19.083,11.934 C17.466,12.134 15.995,12.966 14.994,14.248 C12.912,16.918 13.394,20.766 16.072,22.843 C22.05,27.486 24.024,30.923 24.699,33.752 C25.374,36.581 24.831,39.616 23.475,43.786 C21.742,49.406 19.73,54.423 18.848,59.234 C18.414,61.602 18.377,64.179 18.265,66.238 C13.96,62.042 12.275,56.502 12.275,48.407 C12.274,45.025 9.524,42.283 6.133,42.284 C2.744,42.287 -0.002,45.027 -0.003,48.407 C-0.003,59.463 3.23,69.983 11.895,77.001 C19.739,84.474 39.686,81.712 39.686,93.709 C39.686,97.095 44.642,98.743 48.033,98.743 C51.511,98.743 55.888,96.418 55.888,93.709 C55.888,80.097 70.233,71.824 93.848,71.86 C97.24,71.865 99.992,69.126 99.997,65.744 C100.003,62.361 97.259,59.614 93.867,59.608 C92.252,59.606 90.678,59.661 89.126,59.753 C91.766,53.544 92.937,46.708 92.695,39.324 C92.583,35.943 89.745,33.293 86.356,33.403 C82.963,33.513 80.305,36.346 80.416,39.729 C80.736,49.397 80.374,58.03 73.171,62.581 C71.123,63.874 68.742,64.996 66.484,64.996 C68.237,60.228 69.561,55.195 70.103,49.77 C70.449,46.308 70.486,42.195 70.091,39 C69.478,34.05 68.738,28.436 70.617,24.207 C72.305,20.565 76.087,19.04 81.64,19.04 C85.029,19.037 87.775,16.296 87.776,12.917 C87.778,9.534 85.031,6.79 81.64,6.787 C73.388,6.787 67.133,11.13 63.587,16.377 C61.733,12.417 59.475,8.336 56.747,4.112 C55.866,2.747 54.478,1.788 52.887,1.443 C52.099,1.272 51.285,1.257 50.491,1.399 C49.697,1.542 48.939,1.839 48.26,2.274 z" fill="url(#Gradient_1)" id="path6008"/>
+  </g>
+</svg>

icons/insider/codium_cnl.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="100" height="100" viewBox="0, 0, 100, 100">
+  <defs>
+    <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="199.997" y1="214.302" x2="296.665" y2="307.573" gradientTransform="matrix(1, 0, 0, 1, -200, -213)">
+      <stop offset="0" stop-color="#FFA348"/>
+      <stop offset="1" stop-color="#C64600"/>
+    </linearGradient>
+  </defs>
+  <g id="Layer_1">
+    <path d="M48.26,2.274 C45.406,4.105 44.583,7.898 46.422,10.742 C56.531,26.397 58.917,38.205 57.882,48.553 C53.698,68.369 44.603,72.389 36.655,72.389 C28.895,72.389 30.973,59.618 36.806,55.88 C40.288,53.706 44.748,52.293 48.171,52.293 C51.563,52.293 54.313,49.552 54.313,46.17 C54.313,42.787 51.563,40.046 48.171,40.046 C44.173,40.046 40.251,40.886 36.59,42.316 C37.338,38.787 37.614,34.973 36.647,30.919 C35.179,24.763 30.953,18.883 23.615,13.183 C22.33,12.183 20.7,11.734 19.083,11.934 C17.466,12.134 15.995,12.966 14.994,14.248 C12.912,16.918 13.394,20.766 16.072,22.843 C22.05,27.486 24.024,30.923 24.699,33.752 C25.374,36.581 24.831,39.616 23.475,43.786 C21.742,49.406 19.73,54.423 18.848,59.234 C18.414,61.602 18.377,64.179 18.265,66.238 C13.96,62.042 12.275,56.502 12.275,48.407 C12.274,45.025 9.524,42.283 6.133,42.284 C2.744,42.287 -0.002,45.027 -0.003,48.407 C-0.003,59.463 3.23,69.983 11.895,77.001 C19.739,84.474 39.686,81.712 39.686,93.709 C39.686,97.095 44.642,98.743 48.033,98.743 C51.511,98.743 55.888,96.418 55.888,93.709 C55.888,80.097 70.233,71.824 93.848,71.86 C97.24,71.865 99.992,69.126 99.997,65.744 C100.003,62.361 97.259,59.614 93.867,59.608 C92.252,59.606 90.678,59.661 89.126,59.753 C91.766,53.544 92.937,46.708 92.695,39.324 C92.583,35.943 89.745,33.293 86.356,33.403 C82.963,33.513 80.305,36.346 80.416,39.729 C80.736,49.397 80.374,58.03 73.171,62.581 C71.123,63.874 68.742,64.996 66.484,64.996 C68.237,60.228 69.561,55.195 70.103,49.77 C70.449,46.308 70.486,42.195 70.091,39 C69.478,34.05 68.738,28.436 70.617,24.207 C72.305,20.565 76.087,19.04 81.64,19.04 C85.029,19.037 87.775,16.296 87.776,12.917 C87.778,9.534 85.031,6.79 81.64,6.787 C73.388,6.787 67.133,11.13 63.587,16.377 C61.733,12.417 59.475,8.336 56.747,4.112 C55.866,2.747 54.478,1.788 52.887,1.443 C52.099,1.272 51.285,1.257 50.491,1.399 C49.697,1.542 48.939,1.839 48.26,2.274 z" fill="url(#Gradient_1)" id="path6008"/>
+  </g>
+</svg>

icons/insider/codium_cnl_w80_b8.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="100" height="100" viewBox="0, 0, 100, 100">
+  <defs>
+    <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="209.998" y1="224.042" x2="287.332" y2="298.658" gradientTransform="matrix(1, 0, 0, 1, -200, -213)">
+      <stop offset="0" stop-color="#FFA348"/>
+      <stop offset="1" stop-color="#C64600"/>
+    </linearGradient>
+  </defs>
+  <g id="Layer_1">
+    <g id="path6008">
+      <path d="M48.608,11.819 C46.325,13.284 45.666,16.318 47.138,18.594 C55.225,31.118 57.134,40.564 56.306,48.842 C52.958,64.695 45.682,67.911 39.324,67.911 C33.116,67.911 34.778,57.694 39.445,54.704 C42.23,52.965 45.798,51.834 48.537,51.834 C51.25,51.834 53.45,49.642 53.45,46.936 C53.45,44.23 51.25,42.037 48.537,42.037 C45.338,42.037 42.201,42.709 39.272,43.853 C39.87,41.03 40.091,37.978 39.318,34.735 C38.143,29.81 34.762,25.106 28.892,20.546 C27.864,19.746 26.56,19.387 25.266,19.547 C23.973,19.707 22.796,20.373 21.995,21.398 C20.33,23.534 20.715,26.613 22.858,28.274 C27.64,31.989 29.219,34.738 29.759,37.002 C30.299,39.265 29.865,41.693 28.78,45.029 C27.394,49.525 25.784,53.538 25.078,57.387 C24.731,59.282 24.702,61.343 24.612,62.99 C21.168,59.634 19.82,55.202 19.82,48.726 C19.819,46.02 17.619,43.826 14.906,43.827 C12.195,43.83 9.998,46.022 9.998,48.726 C9.998,57.57 12.584,65.986 19.516,71.601 C25.791,77.579 41.749,75.37 41.749,84.967 C41.749,87.676 45.714,88.994 48.426,88.994 C51.209,88.994 54.71,87.134 54.71,84.967 C54.71,74.078 66.186,67.459 85.078,67.488 C87.792,67.492 89.994,65.301 89.998,62.595 C90.002,59.889 87.807,57.691 85.094,57.686 C83.802,57.685 82.542,57.729 81.301,57.802 C83.413,52.835 84.35,47.366 84.156,41.459 C84.066,38.754 81.796,36.634 79.085,36.722 C76.37,36.81 74.244,39.077 74.333,41.783 C74.589,49.518 74.299,56.424 68.537,60.065 C66.898,61.099 64.994,61.997 63.187,61.997 C64.59,58.182 65.649,54.156 66.082,49.816 C66.359,47.046 66.389,43.756 66.073,41.2 C65.582,37.24 64.99,32.749 66.494,29.366 C67.844,26.452 70.87,25.232 75.312,25.232 C78.023,25.23 80.22,23.037 80.221,20.334 C80.222,17.627 78.025,15.432 75.312,15.43 C68.71,15.43 63.706,18.904 60.87,23.102 C59.386,19.934 57.58,16.669 55.398,13.29 C54.693,12.198 53.582,11.43 52.31,11.154 C51.679,11.018 51.028,11.006 50.393,11.119 C49.758,11.234 49.151,11.471 48.608,11.819 z" fill="url(#Gradient_1)"/>
+      <path d="M50.239,3.082 C53.179,3.136 51.93,2.991 54.005,3.336 C57.346,4.061 60.265,6.078 62.118,8.949 L63.123,10.561 C66.826,8.362 71.068,7.561 75.319,7.43 C82.445,7.436 88.225,13.21 88.221,20.336 C88.238,24.02 86.639,27.172 84.086,29.721 C88.987,31.499 91.733,36.199 92.152,41.197 C92.18,44.58 92.249,44.83 91.827,48.956 C91.745,49.763 91.546,50.554 91.405,51.353 C95.577,53.799 97.765,57.84 97.997,62.607 C97.987,69.735 92.194,75.498 85.066,75.488 C70.02,75.465 62.71,79.675 62.71,84.967 C62.71,92.511 55.258,96.994 48.426,96.994 C45.777,96.994 42.898,96.36 40.479,95.145 C36.759,93.25 34.123,89.987 33.806,85.737 C32.068,84.879 30.15,84.434 28.286,83.932 C27.813,83.807 27.57,83.743 27.327,83.678 C22.661,82.517 18.074,80.985 14.415,77.761 C5.537,70.611 2.229,59.744 1.998,48.723 C2,41.6 7.778,35.834 14.904,35.827 C17.181,35.748 18.943,36.49 20.983,37.35 C20.117,36.294 19.008,35.452 17.955,34.596 C12.316,30.222 11.298,22.107 15.69,16.475 C17.796,13.777 20.888,12.028 24.284,11.608 C27.68,11.188 31.105,12.131 33.799,14.229 C37.211,17.046 35.576,15.553 38.702,18.711 C37.495,13.28 39.864,8.25 44.288,5.086 L44.292,5.083 C45.718,4.17 47.309,3.546 48.984,3.244 L50.239,3.082 z M51.353,11.043 L50.393,11.119 C49.758,11.234 49.151,11.471 48.608,11.819 C46.325,13.284 45.666,16.318 47.138,18.594 C55.225,31.118 57.134,40.564 56.306,48.842 C52.958,64.695 45.682,67.911 39.324,67.911 C33.116,67.911 34.778,57.694 39.445,54.704 C42.23,52.965 45.798,51.834 48.537,51.834 C51.25,51.834 53.45,49.642 53.45,46.936 C53.45,44.23 51.25,42.037 48.537,42.037 C45.338,42.037 42.201,42.709 39.272,43.853 C39.87,41.03 40.091,37.978 39.318,34.735 C38.143,29.81 34.762,25.106 28.892,20.546 C27.864,19.746 26.56,19.387 25.266,19.547 C23.973,19.707 22.796,20.373 21.995,21.398 C20.33,23.534 20.715,26.613 22.858,28.274 C27.64,31.989 29.219,34.738 29.759,37.002 C30.299,39.265 29.865,41.693 28.78,45.029 C27.394,49.525 25.784,53.538 25.078,57.387 C24.731,59.282 24.702,61.343 24.612,62.99 C21.168,59.634 19.82,55.202 19.82,48.726 C19.819,46.02 17.619,43.826 14.906,43.827 C12.195,43.83 9.998,46.022 9.998,48.726 C9.998,57.57 12.584,65.986 19.516,71.601 C25.791,77.579 41.749,75.37 41.749,84.967 C41.749,87.676 45.714,88.994 48.426,88.994 C51.209,88.994 54.71,87.134 54.71,84.967 C54.71,74.078 66.186,67.459 85.078,67.488 C87.792,67.492 89.994,65.301 89.998,62.595 C90.002,59.889 87.807,57.691 85.094,57.686 C83.802,57.685 82.542,57.729 81.301,57.802 C83.413,52.835 84.35,47.366 84.156,41.459 C84.066,38.754 81.796,36.634 79.085,36.722 C76.37,36.81 74.244,39.077 74.333,41.783 C74.589,49.518 74.299,56.424 68.537,60.065 C66.898,61.099 64.994,61.997 63.187,61.997 C64.59,58.182 65.649,54.156 66.082,49.816 C66.359,47.046 66.389,43.756 66.073,41.2 C65.582,37.24 64.99,32.749 66.494,29.366 C67.844,26.452 70.87,25.232 75.312,25.232 C78.023,25.23 80.22,23.037 80.221,20.334 C80.222,17.627 78.025,15.432 75.312,15.43 C68.71,15.43 63.706,18.904 60.87,23.102 C59.386,19.934 57.58,16.669 55.398,13.29 C54.693,12.198 53.582,11.43 52.31,11.154 L51.353,11.043 z" fill="#FFFFFF"/>
+    </g>
+  </g>
+</svg>

icons/insider/codium_only.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="100" height="100" viewBox="0, 0, 100, 100">
-  <defs>
-    <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="2.763" y1="-0.313" x2="94.027" y2="95.408">
-      <stop offset="0" stop-color="#9C9234"/>
-      <stop offset="1" stop-color="#6C7F00"/>
-    </linearGradient>
-  </defs>
-  <g id="Layer_1">
-    <path d="M63.697,1.417 C64.354,0.381 65.529,-0.308 66.763,-0.313 C68.492,-0.317 70.138,0.654 71.139,2.037 C72.082,3.359 72.373,5.03 72.375,6.626 C72.36,8.87 71.843,11.075 71.227,13.222 C69.688,18.289 67.597,23.168 66.035,28.229 C64.315,33.972 63.49,40.372 65.801,46.074 C67.009,42.702 68.204,39.323 69.408,35.947 C69.75,35.055 70.2,34.041 71.156,33.675 C72.487,33.201 73.844,34.59 73.805,35.876 C73.441,37.749 72.735,39.534 72.179,41.356 C67.676,54.892 62.633,68.241 57.777,81.655 C64.235,75.75 70.713,69.867 77.179,63.973 C79.04,62.279 81.058,60.433 81.628,57.873 C82.197,55.36 81.139,52.866 79.94,50.708 C78.555,48.133 76.787,45.684 76.137,42.786 C75.81,41.285 75.909,39.558 76.921,38.328 C77.651,37.402 78.98,36.924 80.101,37.376 C81.208,37.799 81.876,38.862 82.399,39.866 C84.156,43.391 85.252,47.243 85.629,51.165 C86.829,48.744 88.043,46.333 89.245,43.914 C89.971,42.489 90.612,40.96 91.79,39.834 C92.501,39.132 93.537,38.69 94.54,38.918 C95.798,39.196 96.681,40.34 97.019,41.528 C97.402,42.79 96.997,44.104 96.59,45.303 C95.378,48.656 93.474,51.69 91.639,54.727 C89.081,58.747 86.364,62.67 83.398,66.402 C85.093,65.27 86.878,64.079 88.954,63.842 C90.918,63.579 93.089,64.729 93.739,66.646 C94.174,67.951 93.47,69.428 92.288,70.065 C90.554,71.032 88.502,71.019 86.575,71.105 C79.582,71.297 72.767,74.74 68.428,80.221 C65.004,84.592 63.255,90.023 59.78,94.358 C57.588,97 54.491,100.317 51.084,99.584 C46.547,98.609 46.547,91.518 45.416,88.003 C44.833,86.231 43.739,84.612 42.221,83.507 C40.894,82.527 39.305,81.965 37.699,81.657 C34.012,80.949 30.209,81.323 26.531,80.563 C24.69,80.188 22.877,79.45 21.471,78.177 C20.131,77.001 19.205,75.427 18.563,73.78 C17.177,70.192 16.895,66.299 15.663,62.666 C13.88,57.436 10.352,52.812 5.757,49.741 C4.788,49.087 3.735,48.449 3.108,47.429 C2.598,46.632 2.643,45.499 3.311,44.804 C4.437,43.578 6.472,43.477 7.773,44.491 C10.439,46.382 10.824,50.056 13.309,52.112 C13.313,48.718 13.296,45.327 13.29,41.935 C13.298,40.955 13.189,39.9 13.679,39.009 C14.125,38.165 15.359,37.936 16.076,38.569 C17.045,39.381 17.34,40.706 17.478,41.905 C17.96,46.58 18.426,51.257 18.91,55.935 C21.346,53.747 22.465,50.196 21.677,47.011 C21.438,45.994 21.051,44.948 21.27,43.893 C21.449,43.008 22.388,42.385 23.273,42.543 C24.268,42.678 24.978,43.531 25.351,44.407 C25.945,45.859 25.947,47.476 25.827,49.018 C25.474,52.53 23.988,55.773 22.963,59.115 C21.964,62.065 21.277,65.343 22.278,68.39 C23.17,71.239 25.431,73.491 28.084,74.768 C31.359,76.377 35.048,76.877 38.657,77.019 C36.463,73.179 34.077,69.116 34.118,64.548 C34.161,59.949 37.085,56.075 37.875,51.636 C39.221,44.272 35.898,36.267 29.712,32.042 C26.964,30.154 23.665,29.314 20.842,27.563 C18.288,26 15.994,23.218 16.395,20.05 C18.335,19.299 20.501,19.779 22.252,20.787 C25.674,22.613 27.851,26.075 31.29,27.873 C32.498,28.532 33.883,28.858 35.259,28.774 C36.004,26.988 35.259,24.988 34.057,23.597 C31.796,20.873 27.98,20.212 25.616,17.608 C24.431,16.249 23.77,14.307 24.268,12.53 C24.673,11.126 26.126,10.17 27.573,10.276 C29.716,10.409 31.561,11.751 33.026,13.228 C37.873,18.073 40.662,24.663 41.756,31.36 C43.048,39.259 42.044,47.317 40.453,55.095 C40.156,56.68 39.6,58.305 40.011,59.923 C40.188,60.672 40.728,61.445 41.558,61.512 C42.699,61.585 43.642,60.808 44.473,60.127 C47.072,58.004 49.138,55.146 49.99,51.873 C50.656,49.487 50.675,46.989 50.628,44.532 C50.641,43.303 50.55,41.946 51.285,40.882 C51.81,40.06 52.79,39.414 53.798,39.653 C54.588,39.803 55.148,40.488 55.389,41.222 C55.777,42.431 55.718,43.736 55.484,44.969 C54.741,48.372 54.069,51.819 52.723,55.05 C51.773,57.369 50.49,59.574 48.752,61.391 C46.836,63.422 44.469,65.05 42.925,67.417 C41.872,69.034 41.191,71.043 41.648,72.975 C41.982,74.516 43.155,75.774 44.57,76.416 C46.631,77.357 49.133,77.309 51.142,76.25 C52.736,75.388 53.869,73.898 54.771,72.367 C56.36,69.613 57.323,66.555 58.122,63.493 C59.351,58.549 60.075,53.48 60.359,48.393 C60.684,42.96 59.698,37.342 56.959,32.596 C55.503,30.055 53.444,27.891 51.039,26.235 C48.873,24.624 46.491,23.229 44.734,21.142 C43.091,19.208 41.952,16.598 42.55,14.031 C43.674,13.325 45.093,13.202 46.338,13.644 C48.687,14.443 50.527,16.329 51.713,18.463 C53.324,20.978 54.668,23.971 57.506,25.337 C55.197,20.795 52.816,16.292 50.479,11.766 C49.719,10.237 48.97,8.566 49.168,6.817 C49.312,5.484 50.55,4.391 51.887,4.397 C53.074,4.401 54.187,5.069 54.894,5.999 C55.701,7.046 56.087,8.336 56.451,9.589 C58.313,16.071 60.174,22.55 62.043,29.03 C64.392,24.555 65.385,19.37 64.717,14.348 C64.425,11.686 63.643,9.115 63.023,6.518 C62.601,4.819 62.728,2.913 63.697,1.417 z" fill="url(#Gradient_1)" id="Shape"/>
-  </g>
-</svg>

icons/stable/codium_clt.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="100" height="100" viewBox="0, 0, 100, 100">
+  <defs>
+    <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="199.997" y1="214.302" x2="296.665" y2="307.573" gradientTransform="matrix(1, 0, 0, 1, -200, -213)">
+      <stop offset="0" stop-color="#78AEED"/>
+      <stop offset="1" stop-color="#1D6BCA"/>
+    </linearGradient>
+  </defs>
+  <g id="Layer_1">
+    <path d="M48.26,2.274 C45.406,4.105 44.583,7.898 46.422,10.742 C56.531,26.397 58.917,38.205 57.882,48.553 C53.698,68.369 44.603,72.389 36.655,72.389 C28.895,72.389 30.973,59.618 36.806,55.88 C40.288,53.706 44.748,52.293 48.171,52.293 C51.563,52.293 54.313,49.552 54.313,46.17 C54.313,42.787 51.563,40.046 48.171,40.046 C44.173,40.046 40.251,40.886 36.59,42.316 C37.338,38.787 37.614,34.973 36.647,30.919 C35.179,24.763 30.953,18.883 23.615,13.183 C22.33,12.183 20.7,11.734 19.083,11.934 C17.466,12.134 15.995,12.966 14.994,14.248 C12.912,16.918 13.394,20.766 16.072,22.843 C22.05,27.486 24.024,30.923 24.699,33.752 C25.374,36.581 24.831,39.616 23.475,43.786 C21.742,49.406 19.73,54.423 18.848,59.234 C18.414,61.602 18.377,64.179 18.265,66.238 C13.96,62.042 12.275,56.502 12.275,48.407 C12.274,45.025 9.524,42.283 6.133,42.284 C2.744,42.287 -0.002,45.027 -0.003,48.407 C-0.003,59.463 3.23,69.983 11.895,77.001 C19.739,84.474 39.686,81.712 39.686,93.709 C39.686,97.095 44.642,98.743 48.033,98.743 C51.511,98.743 55.888,96.418 55.888,93.709 C55.888,80.097 70.233,71.824 93.848,71.86 C97.24,71.865 99.992,69.126 99.997,65.744 C100.003,62.361 97.259,59.614 93.867,59.608 C92.252,59.606 90.678,59.661 89.126,59.753 C91.766,53.544 92.937,46.708 92.695,39.324 C92.583,35.943 89.745,33.293 86.356,33.403 C82.963,33.513 80.305,36.346 80.416,39.729 C80.736,49.397 80.374,58.03 73.171,62.581 C71.123,63.874 68.742,64.996 66.484,64.996 C68.237,60.228 69.561,55.195 70.103,49.77 C70.449,46.308 70.486,42.195 70.091,39 C69.478,34.05 68.738,28.436 70.617,24.207 C72.305,20.565 76.087,19.04 81.64,19.04 C85.029,19.037 87.775,16.296 87.776,12.917 C87.778,9.534 85.031,6.79 81.64,6.787 C73.388,6.787 67.133,11.13 63.587,16.377 C61.733,12.417 59.475,8.336 56.747,4.112 C55.866,2.747 54.478,1.788 52.887,1.443 C52.099,1.272 51.285,1.257 50.491,1.399 C49.697,1.542 48.939,1.839 48.26,2.274 z" fill="url(#Gradient_1)" id="path6008"/>
+  </g>
+</svg>

icons/stable/codium_cnl.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="100" height="100" viewBox="0, 0, 100, 100">
+  <defs>
+    <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="199.997" y1="214.302" x2="296.665" y2="307.573" gradientTransform="matrix(1, 0, 0, 1, -200, -213)">
+      <stop offset="0" stop-color="#62A0EA"/>
+      <stop offset="1" stop-color="#1A5FB4"/>
+    </linearGradient>
+  </defs>
+  <g id="Layer_1">
+    <path d="M48.26,2.274 C45.406,4.105 44.583,7.898 46.422,10.742 C56.531,26.397 58.917,38.205 57.882,48.553 C53.698,68.369 44.603,72.389 36.655,72.389 C28.895,72.389 30.973,59.618 36.806,55.88 C40.288,53.706 44.748,52.293 48.171,52.293 C51.563,52.293 54.313,49.552 54.313,46.17 C54.313,42.787 51.563,40.046 48.171,40.046 C44.173,40.046 40.251,40.886 36.59,42.316 C37.338,38.787 37.614,34.973 36.647,30.919 C35.179,24.763 30.953,18.883 23.615,13.183 C22.33,12.183 20.7,11.734 19.083,11.934 C17.466,12.134 15.995,12.966 14.994,14.248 C12.912,16.918 13.394,20.766 16.072,22.843 C22.05,27.486 24.024,30.923 24.699,33.752 C25.374,36.581 24.831,39.616 23.475,43.786 C21.742,49.406 19.73,54.423 18.848,59.234 C18.414,61.602 18.377,64.179 18.265,66.238 C13.96,62.042 12.275,56.502 12.275,48.407 C12.274,45.025 9.524,42.283 6.133,42.284 C2.744,42.287 -0.002,45.027 -0.003,48.407 C-0.003,59.463 3.23,69.983 11.895,77.001 C19.739,84.474 39.686,81.712 39.686,93.709 C39.686,97.095 44.642,98.743 48.033,98.743 C51.511,98.743 55.888,96.418 55.888,93.709 C55.888,80.097 70.233,71.824 93.848,71.86 C97.24,71.865 99.992,69.126 99.997,65.744 C100.003,62.361 97.259,59.614 93.867,59.608 C92.252,59.606 90.678,59.661 89.126,59.753 C91.766,53.544 92.937,46.708 92.695,39.324 C92.583,35.943 89.745,33.293 86.356,33.403 C82.963,33.513 80.305,36.346 80.416,39.729 C80.736,49.397 80.374,58.03 73.171,62.581 C71.123,63.874 68.742,64.996 66.484,64.996 C68.237,60.228 69.561,55.195 70.103,49.77 C70.449,46.308 70.486,42.195 70.091,39 C69.478,34.05 68.738,28.436 70.617,24.207 C72.305,20.565 76.087,19.04 81.64,19.04 C85.029,19.037 87.775,16.296 87.776,12.917 C87.778,9.534 85.031,6.79 81.64,6.787 C73.388,6.787 67.133,11.13 63.587,16.377 C61.733,12.417 59.475,8.336 56.747,4.112 C55.866,2.747 54.478,1.788 52.887,1.443 C52.099,1.272 51.285,1.257 50.491,1.399 C49.697,1.542 48.939,1.839 48.26,2.274 z" fill="url(#Gradient_1)" id="path6008"/>
+  </g>
+</svg>

icons/stable/codium_cnl_w80_b8.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="100" height="100" viewBox="0, 0, 100, 100">
+  <defs>
+    <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="209.998" y1="224.042" x2="287.332" y2="298.658" gradientTransform="matrix(1, 0, 0, 1, -200, -213)">
+      <stop offset="0" stop-color="#62A0EA"/>
+      <stop offset="1" stop-color="#1A5FB4"/>
+    </linearGradient>
+  </defs>
+  <g id="Layer_1">
+    <g id="path6008">
+      <path d="M48.608,11.819 C46.325,13.284 45.666,16.318 47.138,18.594 C55.225,31.118 57.134,40.564 56.306,48.842 C52.958,64.695 45.682,67.911 39.324,67.911 C33.116,67.911 34.778,57.694 39.445,54.704 C42.23,52.965 45.798,51.834 48.537,51.834 C51.25,51.834 53.45,49.642 53.45,46.936 C53.45,44.23 51.25,42.037 48.537,42.037 C45.338,42.037 42.201,42.709 39.272,43.853 C39.87,41.03 40.091,37.978 39.318,34.735 C38.143,29.81 34.762,25.106 28.892,20.546 C27.864,19.746 26.56,19.387 25.266,19.547 C23.973,19.707 22.796,20.373 21.995,21.398 C20.33,23.534 20.715,26.613 22.858,28.274 C27.64,31.989 29.219,34.738 29.759,37.002 C30.299,39.265 29.865,41.693 28.78,45.029 C27.394,49.525 25.784,53.538 25.078,57.387 C24.731,59.282 24.702,61.343 24.612,62.99 C21.168,59.634 19.82,55.202 19.82,48.726 C19.819,46.02 17.619,43.826 14.906,43.827 C12.195,43.83 9.998,46.022 9.998,48.726 C9.998,57.57 12.584,65.986 19.516,71.601 C25.791,77.579 41.749,75.37 41.749,84.967 C41.749,87.676 45.714,88.994 48.426,88.994 C51.209,88.994 54.71,87.134 54.71,84.967 C54.71,74.078 66.186,67.459 85.078,67.488 C87.792,67.492 89.994,65.301 89.998,62.595 C90.002,59.889 87.807,57.691 85.094,57.686 C83.802,57.685 82.542,57.729 81.301,57.802 C83.413,52.835 84.35,47.366 84.156,41.459 C84.066,38.754 81.796,36.634 79.085,36.722 C76.37,36.81 74.244,39.077 74.333,41.783 C74.589,49.518 74.299,56.424 68.537,60.065 C66.898,61.099 64.994,61.997 63.187,61.997 C64.59,58.182 65.649,54.156 66.082,49.816 C66.359,47.046 66.389,43.756 66.073,41.2 C65.582,37.24 64.99,32.749 66.494,29.366 C67.844,26.452 70.87,25.232 75.312,25.232 C78.023,25.23 80.22,23.037 80.221,20.334 C80.222,17.627 78.025,15.432 75.312,15.43 C68.71,15.43 63.706,18.904 60.87,23.102 C59.386,19.934 57.58,16.669 55.398,13.29 C54.693,12.198 53.582,11.43 52.31,11.154 C51.679,11.018 51.028,11.006 50.393,11.119 C49.758,11.234 49.151,11.471 48.608,11.819 z" fill="url(#Gradient_1)"/>
+      <path d="M50.239,3.082 C53.179,3.136 51.93,2.991 54.005,3.336 C57.346,4.061 60.265,6.078 62.118,8.949 L63.123,10.561 C66.826,8.362 71.068,7.561 75.319,7.43 C82.445,7.436 88.225,13.21 88.221,20.336 C88.238,24.02 86.639,27.172 84.086,29.721 C88.987,31.499 91.733,36.199 92.152,41.197 C92.18,44.58 92.249,44.83 91.827,48.956 C91.745,49.763 91.546,50.554 91.405,51.353 C95.577,53.799 97.765,57.84 97.997,62.607 C97.987,69.735 92.194,75.498 85.066,75.488 C70.02,75.465 62.71,79.675 62.71,84.967 C62.71,92.511 55.258,96.994 48.426,96.994 C45.777,96.994 42.898,96.36 40.479,95.145 C36.759,93.25 34.123,89.987 33.806,85.737 C32.068,84.879 30.15,84.434 28.286,83.932 C27.813,83.807 27.57,83.743 27.327,83.678 C22.661,82.517 18.074,80.985 14.415,77.761 C5.537,70.611 2.229,59.744 1.998,48.723 C2,41.6 7.778,35.834 14.904,35.827 C17.181,35.748 18.943,36.49 20.983,37.35 C20.117,36.294 19.008,35.452 17.955,34.596 C12.316,30.222 11.298,22.107 15.69,16.475 C17.796,13.777 20.888,12.028 24.284,11.608 C27.68,11.188 31.105,12.131 33.799,14.229 C37.211,17.046 35.576,15.553 38.702,18.711 C37.495,13.28 39.864,8.25 44.288,5.086 L44.292,5.083 C45.718,4.17 47.309,3.546 48.984,3.244 L50.239,3.082 z M51.353,11.043 L50.393,11.119 C49.758,11.234 49.151,11.471 48.608,11.819 C46.325,13.284 45.666,16.318 47.138,18.594 C55.225,31.118 57.134,40.564 56.306,48.842 C52.958,64.695 45.682,67.911 39.324,67.911 C33.116,67.911 34.778,57.694 39.445,54.704 C42.23,52.965 45.798,51.834 48.537,51.834 C51.25,51.834 53.45,49.642 53.45,46.936 C53.45,44.23 51.25,42.037 48.537,42.037 C45.338,42.037 42.201,42.709 39.272,43.853 C39.87,41.03 40.091,37.978 39.318,34.735 C38.143,29.81 34.762,25.106 28.892,20.546 C27.864,19.746 26.56,19.387 25.266,19.547 C23.973,19.707 22.796,20.373 21.995,21.398 C20.33,23.534 20.715,26.613 22.858,28.274 C27.64,31.989 29.219,34.738 29.759,37.002 C30.299,39.265 29.865,41.693 28.78,45.029 C27.394,49.525 25.784,53.538 25.078,57.387 C24.731,59.282 24.702,61.343 24.612,62.99 C21.168,59.634 19.82,55.202 19.82,48.726 C19.819,46.02 17.619,43.826 14.906,43.827 C12.195,43.83 9.998,46.022 9.998,48.726 C9.998,57.57 12.584,65.986 19.516,71.601 C25.791,77.579 41.749,75.37 41.749,84.967 C41.749,87.676 45.714,88.994 48.426,88.994 C51.209,88.994 54.71,87.134 54.71,84.967 C54.71,74.078 66.186,67.459 85.078,67.488 C87.792,67.492 89.994,65.301 89.998,62.595 C90.002,59.889 87.807,57.691 85.094,57.686 C83.802,57.685 82.542,57.729 81.301,57.802 C83.413,52.835 84.35,47.366 84.156,41.459 C84.066,38.754 81.796,36.634 79.085,36.722 C76.37,36.81 74.244,39.077 74.333,41.783 C74.589,49.518 74.299,56.424 68.537,60.065 C66.898,61.099 64.994,61.997 63.187,61.997 C64.59,58.182 65.649,54.156 66.082,49.816 C66.359,47.046 66.389,43.756 66.073,41.2 C65.582,37.24 64.99,32.749 66.494,29.366 C67.844,26.452 70.87,25.232 75.312,25.232 C78.023,25.23 80.22,23.037 80.221,20.334 C80.222,17.627 78.025,15.432 75.312,15.43 C68.71,15.43 63.706,18.904 60.87,23.102 C59.386,19.934 57.58,16.669 55.398,13.29 C54.693,12.198 53.582,11.43 52.31,11.154 L51.353,11.043 z" fill="#FFFFFF"/>
+    </g>
+  </g>
+</svg>

icons/stable/codium_only.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="100" height="100" viewBox="0, 0, 100, 100">
-  <defs>
-    <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="2.763" y1="-0.313" x2="94.027" y2="95.408">
-      <stop offset="0" stop-color="#56CCF2"/>
-      <stop offset="1" stop-color="#2F80ED"/>
-    </linearGradient>
-  </defs>
-  <g id="Layer_1">
-    <path d="M63.697,1.417 C64.354,0.381 65.529,-0.308 66.763,-0.313 C68.492,-0.317 70.138,0.654 71.139,2.037 C72.082,3.359 72.373,5.03 72.375,6.626 C72.36,8.87 71.843,11.075 71.227,13.222 C69.688,18.289 67.597,23.168 66.035,28.229 C64.315,33.972 63.49,40.372 65.801,46.074 C67.009,42.702 68.204,39.323 69.408,35.947 C69.75,35.055 70.2,34.041 71.156,33.675 C72.487,33.201 73.844,34.59 73.805,35.876 C73.441,37.749 72.735,39.534 72.179,41.356 C67.676,54.892 62.633,68.241 57.777,81.655 C64.235,75.75 70.713,69.867 77.179,63.973 C79.04,62.279 81.058,60.433 81.628,57.873 C82.197,55.36 81.139,52.866 79.94,50.708 C78.555,48.133 76.787,45.684 76.137,42.786 C75.81,41.285 75.909,39.558 76.921,38.328 C77.651,37.402 78.98,36.924 80.101,37.376 C81.208,37.799 81.876,38.862 82.399,39.866 C84.156,43.391 85.252,47.243 85.629,51.165 C86.829,48.744 88.043,46.333 89.245,43.914 C89.971,42.489 90.612,40.96 91.79,39.834 C92.501,39.132 93.537,38.69 94.54,38.918 C95.798,39.196 96.681,40.34 97.019,41.528 C97.402,42.79 96.997,44.104 96.59,45.303 C95.378,48.656 93.474,51.69 91.639,54.727 C89.081,58.747 86.364,62.67 83.398,66.402 C85.093,65.27 86.878,64.079 88.954,63.842 C90.918,63.579 93.089,64.729 93.739,66.646 C94.174,67.951 93.47,69.428 92.288,70.065 C90.554,71.032 88.502,71.019 86.575,71.105 C79.582,71.297 72.767,74.74 68.428,80.221 C65.004,84.592 63.255,90.023 59.78,94.358 C57.588,97 54.491,100.317 51.084,99.584 C46.547,98.609 46.547,91.518 45.416,88.003 C44.833,86.231 43.739,84.612 42.221,83.507 C40.894,82.527 39.305,81.965 37.699,81.657 C34.012,80.949 30.209,81.323 26.531,80.563 C24.69,80.188 22.877,79.45 21.471,78.177 C20.131,77.001 19.205,75.427 18.563,73.78 C17.177,70.192 16.895,66.299 15.663,62.666 C13.88,57.436 10.352,52.812 5.757,49.741 C4.788,49.087 3.735,48.449 3.108,47.429 C2.598,46.632 2.643,45.499 3.311,44.804 C4.437,43.578 6.472,43.477 7.773,44.491 C10.439,46.382 10.824,50.056 13.309,52.112 C13.313,48.718 13.296,45.327 13.29,41.935 C13.298,40.955 13.189,39.9 13.679,39.009 C14.125,38.165 15.359,37.936 16.076,38.569 C17.045,39.381 17.34,40.706 17.478,41.905 C17.96,46.58 18.426,51.257 18.91,55.935 C21.346,53.747 22.465,50.196 21.677,47.011 C21.438,45.994 21.051,44.948 21.27,43.893 C21.449,43.008 22.388,42.385 23.273,42.543 C24.268,42.678 24.978,43.531 25.351,44.407 C25.945,45.859 25.947,47.476 25.827,49.018 C25.474,52.53 23.988,55.773 22.963,59.115 C21.964,62.065 21.277,65.343 22.278,68.39 C23.17,71.239 25.431,73.491 28.084,74.768 C31.359,76.377 35.048,76.877 38.657,77.019 C36.463,73.179 34.077,69.116 34.118,64.548 C34.161,59.949 37.085,56.075 37.875,51.636 C39.221,44.272 35.898,36.267 29.712,32.042 C26.964,30.154 23.665,29.314 20.842,27.563 C18.288,26 15.994,23.218 16.395,20.05 C18.335,19.299 20.501,19.779 22.252,20.787 C25.674,22.613 27.851,26.075 31.29,27.873 C32.498,28.532 33.883,28.858 35.259,28.774 C36.004,26.988 35.259,24.988 34.057,23.597 C31.796,20.873 27.98,20.212 25.616,17.608 C24.431,16.249 23.77,14.307 24.268,12.53 C24.673,11.126 26.126,10.17 27.573,10.276 C29.716,10.409 31.561,11.751 33.026,13.228 C37.873,18.073 40.662,24.663 41.756,31.36 C43.048,39.259 42.044,47.317 40.453,55.095 C40.156,56.68 39.6,58.305 40.011,59.923 C40.188,60.672 40.728,61.445 41.558,61.512 C42.699,61.585 43.642,60.808 44.473,60.127 C47.072,58.004 49.138,55.146 49.99,51.873 C50.656,49.487 50.675,46.989 50.628,44.532 C50.641,43.303 50.55,41.946 51.285,40.882 C51.81,40.06 52.79,39.414 53.798,39.653 C54.588,39.803 55.148,40.488 55.389,41.222 C55.777,42.431 55.718,43.736 55.484,44.969 C54.741,48.372 54.069,51.819 52.723,55.05 C51.773,57.369 50.49,59.574 48.752,61.391 C46.836,63.422 44.469,65.05 42.925,67.417 C41.872,69.034 41.191,71.043 41.648,72.975 C41.982,74.516 43.155,75.774 44.57,76.416 C46.631,77.357 49.133,77.309 51.142,76.25 C52.736,75.388 53.869,73.898 54.771,72.367 C56.36,69.613 57.323,66.555 58.122,63.493 C59.351,58.549 60.075,53.48 60.359,48.393 C60.684,42.96 59.698,37.342 56.959,32.596 C55.503,30.055 53.444,27.891 51.039,26.235 C48.873,24.624 46.491,23.229 44.734,21.142 C43.091,19.208 41.952,16.598 42.55,14.031 C43.674,13.325 45.093,13.202 46.338,13.644 C48.687,14.443 50.527,16.329 51.713,18.463 C53.324,20.978 54.668,23.971 57.506,25.337 C55.197,20.795 52.816,16.292 50.479,11.766 C49.719,10.237 48.97,8.566 49.168,6.817 C49.312,5.484 50.55,4.391 51.887,4.397 C53.074,4.401 54.187,5.069 54.894,5.999 C55.701,7.046 56.087,8.336 56.451,9.589 C58.313,16.071 60.174,22.55 62.043,29.03 C64.392,24.555 65.385,19.37 64.717,14.348 C64.425,11.686 63.643,9.115 63.023,6.518 C62.601,4.819 62.728,2.913 63.697,1.417 z" fill="url(#Gradient_1)" id="Shape"/>
-  </g>
-</svg>

insider.json

@@ -1,4 +1,4 @@
 {
-  "tag": "1.73.0",
-  "commit": "8fa188b2b301d36553cbc9ce1b0a146ccb93351f"
+  "tag": "1.78.0",
+  "commit": "2da5a0024fe2ca407f741f19340f1a10f4d692af"
 }

install_gh.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 GH_ARCH="amd64"
 
-VERSION=`curl "https://api.github.com/repos/cli/cli/releases/latest" | grep '"tag_name"' | sed -E 's/.*"([^"]+)".*/\1/' | cut -c2-`
+VERSION=`curl --retry 12 --retry-delay 30 "https://api.github.com/repos/cli/cli/releases/latest" | grep '"tag_name"' | sed -E 's/.*"([^"]+)".*/\1/' | cut -c2-`
 
-curl -sSL "https://github.com/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_linux_${GH_ARCH}.tar.gz" -o "gh_${VERSION}_linux_${GH_ARCH}.tar.gz"
+curl --retry 12 --retry-delay 120 -sSL "https://github.com/cli/cli/releases/download/v${VERSION}/gh_${VERSION}_linux_${GH_ARCH}.tar.gz" -o "gh_${VERSION}_linux_${GH_ARCH}.tar.gz"
 
 tar xf "gh_${VERSION}_linux_${GH_ARCH}.tar.gz"
 

patch.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-FILE="../patches/${1}.patch"
+if [[ "${1}" == *patch ]]; then
+  FILE="../patches/${1}"
+else
+  FILE="../patches/${1}.patch"
+fi
 
 cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
@@ -11,8 +15,12 @@ if [[ -f "${FILE}" ]]; then
   git apply --reject "${FILE}"
 fi
 
+git apply --reject "../patches/helper/settings.patch"
+
 read -p "Press any key when the conflict have been resolved..." -n1 -s
 
+git restore .vscode/settings.json
+
 git add .
 git diff --staged -U1 > "${FILE}"
 

patches/build-version.patch

@@ -1,78 +1,69 @@
-diff --git a/.vscode/settings.json b/.vscode/settings.json
-index 3907bc7..1772769 100644
---- a/.vscode/settings.json
-+++ b/.vscode/settings.json
-@@ -88,3 +88,3 @@
- 		"editor.defaultFormatter": "vscode.typescript-language-features",
--		"editor.formatOnSave": true
-+		// "editor.formatOnSave": true
- 	},
 diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
-index 980f647..959fb88 100644
+index 2e8ef58..6870416 100644
 --- a/build/gulpfile.reh.js
 +++ b/build/gulpfile.reh.js
-@@ -245,4 +245,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -251,4 +251,5 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const name = product.nameShort;
 +		const release = packageJson.release;
  		const packageJsonStream = gulp.src(['remote/package.json'], { base: 'remote' })
 -			.pipe(json({ name, version, dependencies: undefined, optionalDependencies: undefined }));
 +			.pipe(json({ name, version, release, dependencies: undefined, optionalDependencies: undefined }));
  
-@@ -251,3 +252,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+@@ -257,3 +258,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
  		const productJsonStream = gulp.src(['product.json'], { base: '.' })
 -			.pipe(json({ commit, date, version }));
 +			.pipe(json({ commit, date, version, release }));
  
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index 6947d1e..80f358e 100644
+index 3d3eee9..964dd18 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -224,3 +224,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -225,3 +225,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  
 -		let version = packageJson.version;
 +		let version = packageJson.version
  		const quality = product.quality;
-@@ -232,3 +232,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -233,3 +233,4 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  		const name = product.nameShort;
 -		const packageJsonUpdates = { name, version };
 +		const release = packageJson.release;
 +		const packageJsonUpdates = { name, version, release };
  
-@@ -243,3 +244,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -244,3 +245,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  		const date = new Date().toISOString();
 -		const productJsonUpdate = { commit, date, checksums, version };
 +		const productJsonUpdate = { commit, date, checksums, version, release };
  
 diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
-index 4a25ca5..ca33d2e 100644
+index 90f75cc..275c958 100644
 --- a/build/gulpfile.vscode.linux.js
 +++ b/build/gulpfile.vscode.linux.js
-@@ -24,4 +24,2 @@ const commit = util.getVersion(root);
+@@ -25,4 +25,2 @@ const commit = getVersion(root);
  
 -const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
 -
  /**
-@@ -87,3 +85,3 @@ function prepareDebPackage(arch) {
+@@ -88,3 +86,3 @@ function prepareDebPackage(arch) {
  					.pipe(replace('@@NAME@@', product.applicationName))
 -					.pipe(replace('@@VERSION@@', packageJson.version + '-' + linuxPackageRevision))
 +					.pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
  					.pipe(replace('@@ARCHITECTURE@@', debArch))
-@@ -192,4 +190,3 @@ function prepareRpmPackage(arch) {
+@@ -193,4 +191,3 @@ function prepareRpmPackage(arch) {
  			.pipe(replace('@@ICON@@', product.linuxIconName))
 -			.pipe(replace('@@VERSION@@', packageJson.version))
 -			.pipe(replace('@@RELEASE@@', linuxPackageRevision))
 +			.pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
  			.pipe(replace('@@ARCHITECTURE@@', rpmArch))
-@@ -266,3 +263,3 @@ function prepareSnapPackage(arch) {
+@@ -267,3 +264,3 @@ function prepareSnapPackage(arch) {
  			.pipe(replace('@@NAME@@', product.applicationName))
 -			.pipe(replace('@@VERSION@@', commit.substr(0, 8)))
 +			.pipe(replace('@@VERSION@@', `${packageJson.version}.${packageJson.release}`))
  			// Possible run-on values https://snapcraft.io/docs/architectures
 diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
-index 81ba509..43f5377 100644
+index 0d3abda..2606af5 100644
 --- a/build/gulpfile.vscode.win32.js
 +++ b/build/gulpfile.vscode.win32.js
-@@ -93,4 +93,4 @@ function buildWin32Setup(arch, target) {
+@@ -94,4 +94,4 @@ function buildWin32Setup(arch, target) {
  			DirName: product.win32DirName,
 -			Version: pkg.version,
 -			RawVersion: pkg.version.replace(/-\w+$/, ''),
@@ -80,7 +71,7 @@ index 81ba509..43f5377 100644
 +			RawVersion: `${pkg.version.replace(/-\w+$/, '')}.${pkg.release}`,
  			NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
 diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
-index 61659d2..5cafa06 100644
+index 06b8549..3af1f45 100644
 --- a/resources/linux/rpm/code.spec.template
 +++ b/resources/linux/rpm/code.spec.template
 @@ -2,3 +2,3 @@ Name:     @@NAME@@
@@ -89,30 +80,30 @@ index 61659d2..5cafa06 100644
 +Release:  el7
  Summary:  Code editing. Redefined.
 diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
-index e07695c..55ccc32 100644
+index 2526747..73c6b7f 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
-@@ -34,2 +34,3 @@ export interface IProductConfiguration {
+@@ -58,2 +58,3 @@ export interface IProductConfiguration {
  	readonly version: string;
 +	readonly release: string;
  	readonly date?: string;
 diff --git a/src/vs/platform/diagnostics/node/diagnosticsService.ts b/src/vs/platform/diagnostics/node/diagnosticsService.ts
-index 66e35c8..087c055 100644
+index 0be311f..d6c4a18 100644
 --- a/src/vs/platform/diagnostics/node/diagnosticsService.ts
 +++ b/src/vs/platform/diagnostics/node/diagnosticsService.ts
-@@ -238,3 +238,3 @@ export class DiagnosticsService implements IDiagnosticsService {
+@@ -224,3 +224,3 @@ export class DiagnosticsService implements IDiagnosticsService {
  		const output: string[] = [];
 -		output.push(`Version:          ${this.productService.nameShort} ${this.productService.version} (${this.productService.commit || 'Commit unknown'}, ${this.productService.date || 'Date unknown'})`);
 +		output.push(`Version:          ${this.productService.nameShort} ${this.productService.version} ${this.productService.release || 'Release unknown'} (${this.productService.commit || 'Commit unknown'}, ${this.productService.date || 'Date unknown'})`);
  		output.push(`OS Version:       ${osLib.type()} ${osLib.arch()} ${osLib.release()}`);
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index bceda01..4fe44e2 100644
+index 51a55e1..26dfe7b 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
-@@ -49,6 +49,7 @@ else if (typeof require?.__$__nodeRequire === 'function') {
+@@ -43,6 +43,7 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
  	if (!product.version) {
--		const pkg = require.__$__nodeRequire(joinPath(rootPath, 'package.json').fsPath) as { version: string };
-+		const pkg = require.__$__nodeRequire(joinPath(rootPath, 'package.json').fsPath) as { version: string, release: string };
+-		const pkg = globalThis._VSCODE_PACKAGE_JSON as { version: string };
++		const pkg = globalThis._VSCODE_PACKAGE_JSON as { version: string, release: string };
  
  		Object.assign(product, {
 -			version: pkg.version
@@ -120,19 +111,19 @@ index bceda01..4fe44e2 100644
 +			release: pkg.release
  		});
 diff --git a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
-index ec4ff95..2ed2c03 100644
+index 1dbc24a..8385b70 100644
 --- a/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
-@@ -22,2 +22,3 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
- import { MarkdownRenderer } from 'vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
+@@ -22,2 +22,3 @@ import { defaultButtonStyles, defaultCheckboxStyles, defaultDialogStyles, defaul
+ import { ResultKind } from 'vs/platform/keybinding/common/keybindingResolver';
 +import { getReleaseString } from 'vs/workbench/common/release';
  
-@@ -145,2 +146,4 @@ export class BrowserDialogHandler implements IDialogHandler {
+@@ -79,2 +80,4 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
  		const detailString = (useAgo: boolean): string => {
 +			const releaseString = getReleaseString();
 +
  			return localize('aboutDetail',
-@@ -151,3 +154,3 @@ export class BrowserDialogHandler implements IDialogHandler {
+@@ -85,3 +88,3 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
  				navigator.userAgent
 -			);
 +			).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);
@@ -157,27 +148,19 @@ index 0000000..2a8ea57
 +export function getReleaseString(): string {
 +	return LABELS[language] ?? DEFAULT_LABEL;
 +}
-diff --git a/src/vs/workbench/contrib/issue/browser/issueService.ts b/src/vs/workbench/contrib/issue/browser/issueService.ts
-index dc7430b..23def01 100644
---- a/src/vs/workbench/contrib/issue/browser/issueService.ts
-+++ b/src/vs/workbench/contrib/issue/browser/issueService.ts
-@@ -67,2 +67,3 @@ export class WebIssueService implements IWorkbenchIssueService {
- Version: ${this.productService.version}
-+Release: ${this.productService.release ?? 'unknown'}
- Commit: ${this.productService.commit ?? 'unknown'}
 diff --git a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
-index f63b75f..2b77c1b 100644
+index dd166f1..f0a52c4 100644
 --- a/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
 +++ b/src/vs/workbench/electron-sandbox/parts/dialogs/dialogHandler.ts
-@@ -17,2 +17,3 @@ import { IProductService } from 'vs/platform/product/common/productService';
+@@ -14,2 +14,3 @@ import { IProductService } from 'vs/platform/product/common/productService';
  import { process } from 'vs/base/parts/sandbox/electron-sandbox/globals';
 +import { getReleaseString } from 'vs/workbench/common/release';
  
-@@ -166,2 +167,3 @@ export class NativeDialogHandler implements IDialogHandler {
+@@ -77,2 +78,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
  		const osProps = await this.nativeHostService.getOSProperties();
 +		const releaseString = getReleaseString();
  
-@@ -179,3 +181,3 @@ export class NativeDialogHandler implements IDialogHandler {
+@@ -90,3 +92,3 @@ export class NativeDialogHandler extends AbstractDialogHandler {
  				process.sandboxed ? 'Yes' : 'No' // TODO@bpasero remove me once sandbox is final
 -			);
 +			).replace('\n', `\n${releaseString} ${this.productService.release || 'Unknown'}\n`);

patches/custom-gallery.patch

@@ -1,20 +1,21 @@
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index bceda01..174c766 100644
+index ef798fa..5a0550b 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
-@@ -6,3 +6,3 @@
- import { FileAccess } from 'vs/base/common/network';
+@@ -5,3 +5,4 @@
+ 
 -import { globals } from 'vs/base/common/platform';
++import { AppResourcePath, FileAccess } from 'vs/base/common/network';
 +import { globals, isWindows } from 'vs/base/common/platform';
  import { env } from 'vs/base/common/process';
-@@ -11,2 +11,3 @@ import { dirname, joinPath } from 'vs/base/common/resources';
+@@ -9,2 +10,3 @@ import { IProductConfiguration } from 'vs/base/common/product';
  import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';
 +import { getUserDataPath } from 'vs/platform/environment/node/userDataPath';
  
-@@ -35,2 +36,41 @@ else if (typeof require?.__$__nodeRequire === 'function') {
+@@ -29,2 +31,40 @@ else if (globalThis._VSCODE_PRODUCT_JSON && globalThis._VSCODE_PACKAGE_JSON) {
  
 +	// Set user-defined extension gallery
-+	const { serviceUrl, searchUrl, itemUrl, controlUrl, recommendationsUrl } = product.extensionsGallery || {}
++	const { serviceUrl, searchUrl, itemUrl, controlUrl } = product.extensionsGallery || {}
 +
 +	Object.assign(product, {
 +		extensionsGallery: {
@@ -22,7 +23,6 @@ index bceda01..174c766 100644
 +			searchUrl: env['VSCODE_GALLERY_SEARCH_URL'] || searchUrl,
 +			itemUrl: env['VSCODE_GALLERY_ITEM_URL'] || itemUrl,
 +			controlUrl: env['VSCODE_GALLERY_CONTROL_URL'] || controlUrl,
-+			recommendationsUrl: env['VSCODE_GALLERY_RECOMMENDATIONS_URL'] || recommendationsUrl
 +		}
 +	})
 +
@@ -46,7 +46,7 @@ index bceda01..174c766 100644
 +		const userDataPath = getUserDataPath({} as any, product.nameShort);
 +		const userProductPath = isWindows ? `file:///${userDataPath}/product.json` : `file://${userDataPath}/product.json`;
 +
-+		const userProduct = require.__$__nodeRequire(FileAccess.asFileUri(userProductPath, require).fsPath);
++		const userProduct = require.__$__nodeRequire(FileAccess.asFileUri(userProductPath as AppResourcePath).fsPath);
 +
 +		product = merge(product, userProduct);
 +	} catch (ex) {

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 2c18fde..e1031dd 100644
+index 3ef5ca1..a634a9f 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
-@@ -312,2 +312,8 @@ configurationRegistry.registerConfiguration({
+@@ -301,2 +301,8 @@ configurationRegistry.registerConfiguration({
  		},
 +		'workbench.welcomePage.extraAnnouncements': {
 +			scope: ConfigurationScope.MACHINE,
@@ -12,10 +12,10 @@ index 2c18fde..e1031dd 100644
 +		},
  		'workbench.startupEditor': {
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-index 9564618..eb8adfe 100644
+index 46949b2..174e65f 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-@@ -116,4 +116,8 @@ type GettingStartedActionEvent = {
+@@ -118,4 +118,8 @@ type GettingStartedActionEvent = {
  type RecentEntry = (IRecentFolder | IRecentWorkspace) & { id: string };
 +type AnnouncementEntry = { id: string, title: string, url: string };
  
@@ -24,30 +24,26 @@ index 9564618..eb8adfe 100644
 +const BUILTIN_ANNOUNCEMENTS: AnnouncementEntry[] = [/* BUILTIN_ANNOUNCEMENTS */];
 +
  export class GettingStartedPage extends EditorPane {
-@@ -148,2 +152,4 @@ export class GettingStartedPage extends EditorPane {
+@@ -152,2 +156,4 @@ export class GettingStartedPage extends EditorPane {
  	private gettingStartedList?: GettingStartedIndexList<IResolvedWalkthrough>;
 +	private announcementList?: GettingStartedIndexList<AnnouncementEntry>;
 +	private announcementData?: AnnouncementEntry[];
- 
-@@ -760,3 +766,2 @@ export class GettingStartedPage extends EditorPane {
- 
--
- 		const leftColumn = $('.categories-column.categories-column-left', {},);
-@@ -767,2 +772,3 @@ export class GettingStartedPage extends EditorPane {
+ 	private featuredExtensionsList?: GettingStartedIndexList<IFeaturedExtension>;
+@@ -804,2 +810,3 @@ export class GettingStartedPage extends EditorPane {
  		const gettingStartedList = this.buildGettingStartedWalkthroughsList();
 +		const announcementList = await this.buildAnnouncementList();
  
-@@ -777,3 +783,3 @@ export class GettingStartedPage extends EditorPane {
+@@ -815,3 +822,3 @@ export class GettingStartedPage extends EditorPane {
  				this.container.classList.remove('noWalkthroughs');
 -				reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
 +				reset(leftColumn, startList.getDomElement(), recentList.getDomElement(), announcementList.getDomElement());
- 				reset(rightColumn, gettingStartedList.getDomElement());
-@@ -783,3 +789,3 @@ export class GettingStartedPage extends EditorPane {
+ 				reset(rightColumn, featuredExtensionList.getDomElement(), gettingStartedList.getDomElement());
+@@ -820,3 +827,3 @@ export class GettingStartedPage extends EditorPane {
  				this.container.classList.add('noWalkthroughs');
--				reset(leftColumn, startList.getDomElement());
+-				reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
 +				reset(leftColumn, startList.getDomElement(), announcementList.getDomElement());
- 				reset(rightColumn, recentList.getDomElement());
-@@ -930,2 +936,51 @@ export class GettingStartedPage extends EditorPane {
+ 				reset(rightColumn, featuredExtensionList.getDomElement());
+@@ -982,2 +989,55 @@ export class GettingStartedPage extends EditorPane {
  
 +	private async buildAnnouncementList(): Promise<GettingStartedIndexList<AnnouncementEntry>> {
 +		const renderAnnouncement = (announcement: AnnouncementEntry) => {
@@ -79,15 +75,19 @@ index 9564618..eb8adfe 100644
 +
 +			if (showExtras) {
 +				const branch = this.productService.quality === 'insider' ? 'insider' : 'master';
-+				const res = await fetch(`https://raw.githubusercontent.com/VSCodium/vscodium/${branch}/announcements-extra.json`);
++				await fetch(`https://raw.githubusercontent.com/VSCodium/vscodium/${branch}/announcements-extra.json`)
++					.then(async res => {
++						if (res.ok) {
++							var extraAnnouncements = await res.json() as AnnouncementEntry[];
 +
-+				if (res.ok) {
-+					var extraAnnouncements = await res.json() as AnnouncementEntry[];
-+
-+					this.announcementData = [...extraAnnouncements, ...BUILTIN_ANNOUNCEMENTS];
-+				} else {
-+					this.announcementData = BUILTIN_ANNOUNCEMENTS;
-+				}
++							this.announcementData = [...extraAnnouncements, ...BUILTIN_ANNOUNCEMENTS];
++						} else {
++							this.announcementData = BUILTIN_ANNOUNCEMENTS;
++						}
++					})
++					.catch(err => {
++						this.announcementData = BUILTIN_ANNOUNCEMENTS;
++					});
 +			} else {
 +				this.announcementData = BUILTIN_ANNOUNCEMENTS;
 +			}

patches/fix-build-linux.patch

@@ -1,14 +1,14 @@
 diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
-index af20828..f09ba66 100644
+index 0ea6699..c4524de 100644
 --- a/build/linux/dependencies-generator.js
 +++ b/build/linux/dependencies-generator.js
 @@ -22,3 +22,3 @@ const types_2 = require("./rpm/types");
  // are valid, are in dep-lists.ts
 -const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
 +const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
- // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/98.0.4758.109:chrome/installer/linux/BUILD.gn;l=64-80
+ // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/108.0.5359.215:chrome/installer/linux/BUILD.gn;l=64-80
 diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
-index 34573c4..91adb8f 100644
+index c0d8112..3bb0366 100644
 --- a/build/linux/dependencies-generator.ts
 +++ b/build/linux/dependencies-generator.ts
 @@ -23,3 +23,3 @@ import { isRpmArchString, RpmArchString } from './rpm/types';
@@ -17,10 +17,10 @@ index 34573c4..91adb8f 100644
 +const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
  
 diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
-index 61659d2..6331a67 100644
+index 06b8549..a7e3dfb 100644
 --- a/resources/linux/rpm/code.spec.template
 +++ b/resources/linux/rpm/code.spec.template
-@@ -78 +78,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
+@@ -81 +81,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
  %{_datadir}/zsh/site-functions/_%{name}
 +
 +%config(noreplace) /usr/share/%{name}/resources/app/product.json

patches/fix-eol-banner.patch

@@ -0,0 +1,77 @@
+diff --git a/src/vs/workbench/browser/parts/banner/bannerPart.ts b/src/vs/workbench/browser/parts/banner/bannerPart.ts
+index b120c94..1bb2b88 100644
+--- a/src/vs/workbench/browser/parts/banner/bannerPart.ts
++++ b/src/vs/workbench/browser/parts/banner/bannerPart.ts
+@@ -11,3 +11,3 @@ import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/
+ import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
+-import { IStorageService } from 'vs/platform/storage/common/storage';
++import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
+ import { IThemeService } from 'vs/platform/theme/common/themeService';
+@@ -30,2 +30,3 @@ import { widgetClose } from 'vs/platform/theme/common/iconRegistry';
+ import { BannerFocused } from 'vs/workbench/common/contextkeys';
++import { INeverShowAgainOptions, NeverShowAgainScope } from 'vs/platform/notification/common/notification';
+ 
+@@ -67,3 +68,3 @@ export class BannerPart extends Part implements IBannerService {
+ 		@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
+-		@IStorageService storageService: IStorageService,
++		@IStorageService private readonly storageService: IStorageService,
+ 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+@@ -187,2 +188,14 @@ export class BannerPart extends Part implements IBannerService {
+ 
++		if (item.neverShowAgain) {
++			const scope = this.toStorageScope(item.neverShowAgain);
++			const id = item.neverShowAgain.id;
++
++			// If the user already picked to not show the notification
++			// again, we return with a no-op notification here
++			if (this.storageService.getBoolean(id, scope)) {
++				this.close(item);
++				return;
++			}
++		}
++
+ 		// Clear previous item
+@@ -234,2 +247,15 @@ export class BannerPart extends Part implements IBannerService {
+ 
++	private toStorageScope(options: INeverShowAgainOptions): StorageScope {
++		switch (options.scope) {
++			case NeverShowAgainScope.APPLICATION:
++				return StorageScope.APPLICATION;
++			case NeverShowAgainScope.PROFILE:
++				return StorageScope.PROFILE;
++			case NeverShowAgainScope.WORKSPACE:
++				return StorageScope.WORKSPACE;
++			default:
++				return StorageScope.APPLICATION;
++		}
++	}
++
+ 	toJSON(): object {
+diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
+index cf6af9d..108ce8f 100644
+--- a/src/vs/workbench/electron-sandbox/window.ts
++++ b/src/vs/workbench/electron-sandbox/window.ts
+@@ -725,3 +725,4 @@ export class NativeWindow extends Disposable {
+ 					actions,
+-					icon: Codicon.warning
++					icon: Codicon.warning,
++					neverShowAgain: { id: 'windowseol', isSecondary: true, scope: NeverShowAgainScope.APPLICATION }
+ 				});
+@@ -764,3 +765,4 @@ export class NativeWindow extends Disposable {
+ 					actions,
+-					icon: Codicon.warning
++					icon: Codicon.warning,
++					neverShowAgain: { id: 'macoseol', isSecondary: true, scope: NeverShowAgainScope.APPLICATION }
+ 				});
+diff --git a/src/vs/workbench/services/banner/browser/bannerService.ts b/src/vs/workbench/services/banner/browser/bannerService.ts
+index 639b1b2..70e8847 100644
+--- a/src/vs/workbench/services/banner/browser/bannerService.ts
++++ b/src/vs/workbench/services/banner/browser/bannerService.ts
+@@ -10,2 +10,3 @@ import { ILinkDescriptor } from 'vs/platform/opener/browser/link';
+ import { ThemeIcon } from 'vs/base/common/themables';
++import { INeverShowAgainOptions } from 'vs/platform/notification/common/notification';
+ 
+@@ -18,2 +19,3 @@ export interface IBannerItem {
+ 	readonly onClose?: () => void;
++	readonly neverShowAgain?: INeverShowAgainOptions;
+ }

patches/helper/settings.patch

@@ -0,0 +1,23 @@
+diff --git a/.vscode/settings.json b/.vscode/settings.json
+index 7ae8bce..724b9ad 100644
+--- a/.vscode/settings.json
++++ b/.vscode/settings.json
+@@ -9,5 +9,5 @@
+ 		"cli/target": true,
+-		"build/**/*.js": {
+-			"when": "$(basename).ts"
+-		}
++		// "build/**/*.js": {
++		// 	"when": "$(basename).ts"
++		// }
+ 	},
+@@ -81,3 +81,3 @@
+ 	"gulp.autoDetect": "off",
+-	"files.insertFinalNewline": true,
++	// "files.insertFinalNewline": true,
+ 	"[plaintext]": {
+@@ -91,3 +91,3 @@
+ 		"editor.defaultFormatter": "vscode.typescript-language-features",
+-		"editor.formatOnSave": true
++		// "editor.formatOnSave": true
+ 	},

patches/insider/add-remote-url.patch

@@ -0,0 +1,18 @@
+diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
+index ae33cc9..06c2a67 100644
+--- a/build/gulpfile.reh.js
++++ b/build/gulpfile.reh.js
+@@ -251,3 +251,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+ 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
+-			.pipe(json({ commit, date, version, release }));
++			.pipe(json({ commit, date, version, release, serverDownloadUrlTemplate: 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' }));
+ 
+diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
+index 938943d..2d84a15 100644
+--- a/build/gulpfile.vscode.js
++++ b/build/gulpfile.vscode.js
+@@ -245,3 +245,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+ 		const date = new Date().toISOString();
+-		const productJsonUpdate = { commit, date, checksums, version, release };
++		const productJsonUpdate = { commit, date, checksums, version, release, serverDownloadUrlTemplate: 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' };
+ 

patches/insider/disable-sandbox.patch

@@ -1,21 +1,9 @@
 diff --git a/src/vs/platform/windows/electron-main/windowImpl.ts b/src/vs/platform/windows/electron-main/windowImpl.ts
-index c9501cb..a6958ff 100644
+index 3b8a644..71ea0ad 100644
 --- a/src/vs/platform/windows/electron-main/windowImpl.ts
 +++ b/src/vs/platform/windows/electron-main/windowImpl.ts
-@@ -42,7 +42,6 @@ import { Color } from 'vs/base/common/color';
- import { IPolicyService } from 'vs/platform/policy/common/policy';
- import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile';
- import { IStateMainService } from 'vs/platform/state/electron-main/state';
--import product from 'vs/platform/product/common/product';
- import { IUserDataProfilesMainService } from 'vs/platform/userDataProfile/electron-main/userDataProfile';
- 
- export interface IWindowCreationOptions {
-@@ -203,7 +202,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
- 			if (typeof windowSettings?.experimental?.useSandbox === 'boolean') {
- 				useSandbox = windowSettings.experimental.useSandbox;
- 			} else {
--				useSandbox = typeof product.quality === 'string' && product.quality !== 'stable';
-+				useSandbox = false;
+@@ -213,4 +213,2 @@ export class CodeWindow extends Disposable implements ICodeWindow {
+ 				useSandbox = true;
+-			} else {
+-				useSandbox = typeof this.productService.quality === 'string' && this.productService.quality !== 'stable';
  			}
- 
- 			const options: BrowserWindowConstructorOptions & { experimentalDarkMode: boolean } = {

patches/insider/disable-windows-appx.patch

@@ -0,0 +1,15 @@
+diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
+index 0d3abda..9e5143a 100644
+--- a/build/gulpfile.vscode.win32.js
++++ b/build/gulpfile.vscode.win32.js
+@@ -116,6 +116,6 @@ function buildWin32Setup(arch, target) {
+ 
+-		if (quality === 'insider') {
+-			definitions['AppxPackage'] = `code_insiders_explorer_${arch === 'ia32' ? 'x86' : arch}.appx`;
+-			definitions['AppxPackageFullname'] = `Microsoft.${product.win32RegValueName}_1.0.0.0_neutral__8wekyb3d8bbwe`;
+-		}
++		// if (quality === 'insider') {
++		// 	definitions['AppxPackage'] = `code_insiders_explorer_${arch === 'ia32' ? 'x86' : arch}.appx`;
++		// 	definitions['AppxPackageFullname'] = `Microsoft.${product.win32RegValueName}_1.0.0.0_neutral__8wekyb3d8bbwe`;
++		// }
+ 

patches/remove-mangle.patch

@@ -0,0 +1,69 @@
+diff --git a/build/lib/compilation.js b/build/lib/compilation.js
+index 63ddeb2..31d2f35 100644
+--- a/build/lib/compilation.js
++++ b/build/lib/compilation.js
+@@ -21,3 +21,2 @@ const File = require("vinyl");
+ const task = require("./task");
+-const mangleTypeScript_1 = require("./mangleTypeScript");
+ const watch = require('./watch');
+@@ -104,24 +103,3 @@ function compileTask(src, out, build, options = {}) {
+         }
+-        // mangle: TypeScript to TypeScript
+-        let mangleStream = es.through();
+-        if (build && !options.disableMangle) {
+-            let ts2tsMangler = new mangleTypeScript_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data));
+-            const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
+-            mangleStream = es.through(function write(data) {
+-                const tsNormalPath = ts.normalizePath(data.path);
+-                const newContents = newContentsByFileName.get(tsNormalPath);
+-                if (newContents !== undefined) {
+-                    data.contents = Buffer.from(newContents.out);
+-                    data.sourceMap = newContents.sourceMap && JSON.parse(newContents.sourceMap);
+-                }
+-                this.push(data);
+-            }, function end() {
+-                this.push(null);
+-                // free resources
+-                newContentsByFileName.clear();
+-                ts2tsMangler = undefined;
+-            });
+-        }
+         return srcPipe
+-            .pipe(mangleStream)
+             .pipe(generator.stream)
+diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
+index d5cd196..afe16d3 100644
+--- a/build/lib/compilation.ts
++++ b/build/lib/compilation.ts
+@@ -19,4 +19,2 @@ import * as File from 'vinyl';
+ import * as task from './task';
+-import { Mangler } from './mangleTypeScript';
+-import { RawSourceMap } from 'source-map';
+ const watch = require('./watch');
+@@ -123,26 +121,3 @@ export function compileTask(src: string, out: string, build: boolean, options: {
+ 
+-		// mangle: TypeScript to TypeScript
+-		let mangleStream = es.through();
+-		if (build && !options.disableMangle) {
+-			let ts2tsMangler = new Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data));
+-			const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
+-			mangleStream = es.through(function write(data: File & { sourceMap?: RawSourceMap }) {
+-				type TypeScriptExt = typeof ts & { normalizePath(path: string): string };
+-				const tsNormalPath = (<TypeScriptExt>ts).normalizePath(data.path);
+-				const newContents = newContentsByFileName.get(tsNormalPath);
+-				if (newContents !== undefined) {
+-					data.contents = Buffer.from(newContents.out);
+-					data.sourceMap = newContents.sourceMap && JSON.parse(newContents.sourceMap);
+-				}
+-				this.push(data);
+-			}, function end() {
+-				this.push(null);
+-				// free resources
+-				newContentsByFileName.clear();
+-				(<any>ts2tsMangler) = undefined;
+-			});
+-		}
+-
+ 		return srcPipe
+-			.pipe(mangleStream)
+ 			.pipe(generator.stream)

patches/report-issue.patch

@@ -1,13 +1,16 @@
-diff --git a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
-index 33e66be..a7ade0a 100644
---- a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
-+++ b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
-@@ -468,3 +468,3 @@ export class IssueReporter extends Disposable {
+diff --git a/src/vs/code/electron-sandbox/issue/IssueReporterService.ts b/src/vs/code/electron-sandbox/issue/IssueReporterService.ts
+index d0c4789..9e6bfc5 100644
+--- a/src/vs/code/electron-sandbox/issue/IssueReporterService.ts
++++ b/src/vs/code/electron-sandbox/issue/IssueReporterService.ts
+@@ -455,5 +455,5 @@ export class IssueReporter extends Disposable {
+ 
+-	private searchVSCodeIssues(title: string, issueDescription?: string): void {
++	private searchVSCodeIssues(title: string, _issueDescription?: string): void {
  		if (title) {
 -			this.searchDuplicates(title, issueDescription);
 +			this.searchGitHub('VSCodium/vscodium', title);
  		} else {
-@@ -556,33 +556,2 @@ export class IssueReporter extends Disposable {
+@@ -549,33 +549,2 @@ export class IssueReporter extends Disposable {
  
 -	@debounce(300)
 -	private searchDuplicates(title: string, body?: string): void {
@@ -41,13 +44,13 @@ index 33e66be..a7ade0a 100644
 -	}
 -
  	private displaySearchResults(results: SearchResult[]) {
-@@ -674,3 +643,3 @@ export class IssueReporter extends Disposable {
+@@ -667,3 +636,3 @@ export class IssueReporter extends Disposable {
  		sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true));
 -		sourceSelect.append(this.makeOption('vscode', localize('vscode', "Visual Studio Code"), false));
 +		sourceSelect.append(this.makeOption('vscode', localize('vscode', "VSCodium"), false));
  		sourceSelect.append(this.makeOption('extension', localize('extension', "An extension"), false));
 diff --git a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
-index a58acca..1903a0c 100644
+index 98338df..6d2f581 100644
 --- a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
 +++ b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
 @@ -77,3 +77,3 @@ ${this._data.issueDescription}
@@ -56,7 +59,7 @@ index a58acca..1903a0c 100644
 +VSCodium version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
  OS version: ${this._data.versionInfo && this._data.versionInfo.os}
 diff --git a/src/vs/code/electron-sandbox/issue/issueReporterPage.ts b/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
-index 6467d66..d425016 100644
+index 0eedb21..c83e092 100644
 --- a/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
 +++ b/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
 @@ -17,3 +17,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
@@ -70,10 +73,10 @@ index 6467d66..d425016 100644
 +	'Before you report an issue here please <a href="https://github.com/VSCodium/vscodium/wiki/Submitting-Bugs-and-Suggestions" target="_blank">review the guidance we provide</a>.'
  );
 diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
-index 20154ad..bca59b8 100644
+index 87839a6..49727fc 100644
 --- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
 +++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
-@@ -148,3 +148,3 @@ class ReportExtensionSlowAction extends Action {
+@@ -153,3 +153,3 @@ class ReportExtensionSlowAction extends Action {
  - OS Version: \`${osVersion}\`
 -- VS Code version: \`${this._productService.version}\`\n\n${message}`);
 +- VSCodium version: \`${this._productService.version}\`\n\n${message}`);

patches/use-github-pat.patch

@@ -1,27 +1,35 @@
 diff --git a/extensions/github-authentication/src/githubServer.ts b/extensions/github-authentication/src/githubServer.ts
-index 830e698..cd6f27e 100644
+index 3662719..5bf55e0 100644
 --- a/extensions/github-authentication/src/githubServer.ts
 +++ b/extensions/github-authentication/src/githubServer.ts
-@@ -7,4 +7,2 @@ import * as vscode from 'vscode';
- import fetch, { Response } from 'node-fetch';
--import { v4 as uuid } from 'uuid';
+@@ -6,4 +6,2 @@
+ import * as vscode from 'vscode';
+-import * as path from 'path';
 -import { PromiseAdapter, promiseFromEvent } from './common/utils';
- import { ExperimentationTelemetry } from './experimentationService';
-@@ -12,13 +10,4 @@ import { AuthProviderType } from './github';
+ import { ExperimentationTelemetry } from './common/experimentationService';
+@@ -11,10 +9,5 @@ import { AuthProviderType, UriEventHandler } from './github';
  import { Log } from './common/logger';
--import { isSupportedEnvironment } from './common/env';
--import { LoopbackAuthServer } from './authServer';
--import path = require('path');
--
+-import { isSupportedClient, isSupportedTarget } from './common/env';
+-import { LoopbackAuthServer } from './node/authServer';
+-import { crypto } from './node/crypto';
++import { isSupportedTarget } from './common/env';
+ import { fetching } from './node/fetch';
+ 
 -const CLIENT_ID = '01ab8ac9400c4e429b23';
 -const GITHUB_TOKEN_URL = 'https://vscode.dev/codeExchangeProxyEndpoints/github/login/oauth/access_token';
- const NETWORK_ERROR = 'network error';
+-
+ // This is the error message that we throw if the login was cancelled for any reason. Extensions
+@@ -23,3 +16,2 @@ const CANCELLATION_ERROR = 'Cancelled';
+ // These error messages are internal and should not be shown to the user in any way.
+-const TIMED_OUT_ERROR = 'Timed out';
+ const USER_CANCELLATION_ERROR = 'User Cancelled';
+@@ -27,5 +19,2 @@ const NETWORK_ERROR = 'network error';
  
 -const REDIRECT_URL_STABLE = 'https://vscode.dev/redirect';
 -const REDIRECT_URL_INSIDERS = 'https://insiders.vscode.dev/redirect';
 -
- class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.UriHandler {
-@@ -42,9 +31,2 @@ export interface IGitHubServer extends vscode.Disposable {
+ export interface IGitHubServer {
+@@ -37,9 +26,2 @@ export interface IGitHubServer {
  
 -interface IGitHubDeviceCodeResponse {
 -	device_code: string;
@@ -31,130 +39,122 @@ index 830e698..cd6f27e 100644
 -}
 -
  async function getScopes(token: string, serverUri: vscode.Uri, logger: Log): Promise<string[]> {
-@@ -55,3 +37,3 @@ async function getScopes(token: string, serverUri: vscode.Uri, logger: Log): Pro
- 				Authorization: `token ${token}`,
--				'User-Agent': 'Visual-Studio-Code'
-+				'User-Agent': 'VSCodium'
- 			}
-@@ -75,7 +57,4 @@ export class GitHubServer implements IGitHubServer {
+@@ -70,8 +52,4 @@ export class GitHubServer implements IGitHubServer {
+ 
+-	private readonly _pendingNonces = new Map<string, string[]>();
+-	private readonly _codeExchangePromises = new Map<string, { promise: Promise<string>; cancel: vscode.EventEmitter<void> }>();
+ 	private readonly _type: AuthProviderType;
  
--	private _pendingNonces = new Map<string, string[]>();
--	private _codeExchangePromises = new Map<string, { promise: Promise<string>; cancel: vscode.EventEmitter<void> }>();
- 	private _disposable: vscode.Disposable | undefined;
- 	private static _uriHandler: UriEventHandler | undefined;
 -	private _redirectEndpoint: string | undefined;
- 
-@@ -83,2 +62,3 @@ export class GitHubServer implements IGitHubServer {
- 		public readonly type: AuthProviderType,
+-
+ 	constructor(
+@@ -79,3 +57,5 @@ export class GitHubServer implements IGitHubServer {
+ 		private readonly _telemetryReporter: ExperimentationTelemetry,
 +		// @ts-ignore
- 		private readonly _supportDeviceCodeFlow: boolean,
-@@ -102,41 +82,2 @@ export class GitHubServer implements IGitHubServer {
+ 		private readonly _uriHandler: UriEventHandler,
++		// @ts-ignore
+ 		private readonly _extensionKind: vscode.ExtensionKind,
+@@ -94,26 +74,2 @@ export class GitHubServer implements IGitHubServer {
  
 -	private async getRedirectEndpoint(): Promise<string> {
 -		if (this._redirectEndpoint) {
 -			return this._redirectEndpoint;
 -		}
--		if (this.type === AuthProviderType.github) {
+-		if (this._type === AuthProviderType.github) {
 -			const proxyEndpoints = await vscode.commands.executeCommand<{ [providerId: string]: string } | undefined>('workbench.getCodeExchangeProxyEndpoints');
 -			// If we are running in insiders vscode.dev, then ensure we use the redirect route on that.
 -			this._redirectEndpoint = REDIRECT_URL_STABLE;
 -			if (proxyEndpoints?.github && new URL(proxyEndpoints.github).hostname === 'insiders.vscode.dev') {
 -				this._redirectEndpoint = REDIRECT_URL_INSIDERS;
 -			}
--			return this._redirectEndpoint;
 -		} else {
--			// GHES
--			const result = await fetch(this.getServerUri('/meta').toString(true));
--			if (result.ok) {
--				try {
--					const json: { installed_version: string } = await result.json();
--					const [majorStr, minorStr, _patch] = json.installed_version.split('.');
--					const major = Number(majorStr);
--					const minor = Number(minorStr);
--					if (major >= 4 || major === 3 && minor >= 8
--					) {
--						// GHES 3.8 and above used vscode.dev/redirect as the route.
--						// It only supports a single redirect endpoint, so we can't use
--						// insiders.vscode.dev/redirect when we're running in Insiders, unfortunately.
--						this._redirectEndpoint = 'https://vscode.dev/redirect';
--					}
--				} catch (e) {
--					this._logger.error(e);
--				}
--			}
--
--			// TODO in like 1 year change the default vscode.dev/redirect maybe
--			this._redirectEndpoint = 'https://vscode-auth.github.com/';
+-			// GHE only supports a single redirect endpoint, so we can't use
+-			// insiders.vscode.dev/redirect when we're running in Insiders, unfortunately.
+-			// Additionally, we make the assumption that this function will only be used
+-			// in flows that target supported GHE targets, not on-prem GHES. Because of this
+-			// assumption, we can assume that the GHE version used is at least 3.8 which is
+-			// the version that changed the redirect endpoint to this URI from the old
+-			// GitHub maintained server.
+-			this._redirectEndpoint = 'https://vscode.dev/redirect';
 -		}
 -		return this._redirectEndpoint;
 -	}
 -
- 	dispose() {
-@@ -156,58 +97,8 @@ export class GitHubServer implements IGitHubServer {
+ 	// TODO@joaomoreno TODO@TylerLeonhardt
+@@ -129,68 +85,7 @@ export class GitHubServer implements IGitHubServer {
  		let userCancelled: boolean | undefined;
 -		const yes = vscode.l10n.t('Yes');
 -		const no = vscode.l10n.t('No');
--		const promptToContinue = async () => {
+-		const promptToContinue = async (mode: string) => {
 -			if (userCancelled === undefined) {
 -				// We haven't had a failure yet so wait to prompt
 -				return;
 -			}
 -			const message = userCancelled
--				? vscode.l10n.t('Having trouble logging in? Would you like to try a different way?')
--				: vscode.l10n.t('You have not yet finished authorizing this extension to use GitHub. Would you like to keep trying?');
+-				? vscode.l10n.t('Having trouble logging in? Would you like to try a different way? ({0})', mode)
+-				: vscode.l10n.t('You have not yet finished authorizing this extension to use GitHub. Would you like to try a different way? ({0})', mode);
 -			const result = await vscode.window.showWarningMessage(message, yes, no);
 -			if (result !== yes) {
--				throw new Error('Cancelled');
+-				throw new Error(CANCELLATION_ERROR);
 -			}
 -		};
 -
--		const nonce = uuid();
+-		const nonce: string = crypto.getRandomValues(new Uint32Array(2)).reduce((prev, curr) => prev += curr.toString(16), '');
 -		const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/did-authenticate?nonce=${encodeURIComponent(nonce)}`));
- 
--		const supported = isSupportedEnvironment(callbackUri);
--		if (supported) {
+-
+-		const supportedClient = isSupportedClient(callbackUri);
+-		const supportedTarget = isSupportedTarget(this._type, this._ghesUri);
+-		if (supportedClient && supportedTarget) {
 -			try {
 -				return await this.doLoginWithoutLocalServer(scopes, nonce, callbackUri);
 -			} catch (e) {
 -				this._logger.error(e);
--				userCancelled = e.message ?? e === 'User Cancelled';
+-				userCancelled = e.message ?? e === USER_CANCELLATION_ERROR;
 -			}
 -		}
 -
--		// Starting a local server isn't supported in web
--		if (vscode.env.uiKind === vscode.UIKind.Desktop) {
+-		// Starting a local server is only supported if:
+-		// 1. We are in a UI extension because we need to open a port on the machine that has the browser
+-		// 2. We are in a node runtime because we need to open a port on the machine
+-		// 3. code exchange can only be done with a supported target
+-		if (
+-			this._extensionKind === vscode.ExtensionKind.UI &&
+-			typeof navigator === 'undefined' &&
+-			supportedTarget
+-		) {
 -			try {
--				await promptToContinue();
+-				await promptToContinue(vscode.l10n.t('local server'));
 -				return await this.doLoginWithLocalServer(scopes);
 -			} catch (e) {
--				this._logger.error(e);
--				userCancelled = e.message ?? e === 'User Cancelled';
+-				userCancelled = this.processLoginError(e);
 -			}
 -		}
 -
--		if (this._supportDeviceCodeFlow) {
+-		// We only can use the Device Code flow when we have a full node environment because of CORS.
+-		if (typeof navigator === 'undefined') {
 -			try {
--				await promptToContinue();
+-				await promptToContinue(vscode.l10n.t('device code'));
 -				return await this.doLoginDeviceCodeFlow(scopes);
 -			} catch (e) {
--				this._logger.error(e);
--				userCancelled = e.message ?? e === 'User Cancelled';
+-				userCancelled = this.processLoginError(e);
 -			}
--		} else if (!supported) {
+-		}
+ 
+-		// In a supported environment, we can't use PAT auth because we use this auth for Settings Sync and it doesn't support PATs.
+-		// With that said, GitHub Enterprise isn't used by Settings Sync so we can use PATs for that.
+-		if (!supportedClient || this._type === AuthProviderType.githubEnterprise) {
 -			try {
--				await promptToContinue();
+-				await promptToContinue(vscode.l10n.t('personal access token'));
 -				return await this.doLoginWithPat(scopes);
 -			} catch (e) {
--				this._logger.error(e);
--				userCancelled = e.message ?? e === 'User Cancelled';
+-				userCancelled = this.processLoginError(e);
 -			}
 +		try {
 +			return await this.doLoginWithPat(scopes);
 +		} catch (e) {
-+			this._logger.error(e);
-+			userCancelled = e.message ?? e === 'User Cancelled';
++			userCancelled = this.processLoginError(e);
  		}
-@@ -217,136 +108,2 @@ export class GitHubServer implements IGitHubServer {
+@@ -200,136 +95,2 @@ export class GitHubServer implements IGitHubServer {
  
 -	private async doLoginWithoutLocalServer(scopes: string, nonce: string, callbackUri: vscode.Uri): Promise<string> {
 -		this._logger.info(`Trying without local server... (${scopes})`);
@@ -187,15 +187,15 @@ index 830e698..cd6f27e 100644
 -			// before completing it.
 -			let codeExchangePromise = this._codeExchangePromises.get(scopes);
 -			if (!codeExchangePromise) {
--				codeExchangePromise = promiseFromEvent(GitHubServer._uriHandler!.event, this.handleUri(scopes));
+-				codeExchangePromise = promiseFromEvent(this._uriHandler!.event, this.handleUri(scopes));
 -				this._codeExchangePromises.set(scopes, codeExchangePromise);
 -			}
 -
 -			try {
 -				return await Promise.race([
 -					codeExchangePromise.promise,
--					new Promise<string>((_, reject) => setTimeout(() => reject('Timed out'), 300_000)), // 5min timeout
--					promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject('User Cancelled'); }).promise
+-					new Promise<string>((_, reject) => setTimeout(() => reject(TIMED_OUT_ERROR), 300_000)), // 5min timeout
+-					promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject(USER_CANCELLATION_ERROR); }).promise
 -				]);
 -			} finally {
 -				this._pendingNonces.delete(scopes);
@@ -235,8 +235,8 @@ index 830e698..cd6f27e 100644
 -				vscode.env.openExternal(vscode.Uri.parse(`http://127.0.0.1:${port}/signin?nonce=${encodeURIComponent(server.nonce)}`));
 -				const { code } = await Promise.race([
 -					server.waitForOAuthResponse(),
--					new Promise<any>((_, reject) => setTimeout(() => reject('Timed out'), 300_000)), // 5min timeout
--					promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject('User Cancelled'); }).promise
+-					new Promise<any>((_, reject) => setTimeout(() => reject(TIMED_OUT_ERROR), 300_000)), // 5min timeout
+-					promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject(USER_CANCELLATION_ERROR); }).promise
 -				]);
 -				codeToExchange = code;
 -			} finally {
@@ -258,7 +258,7 @@ index 830e698..cd6f27e 100644
 -			path: '/login/device/code',
 -			query: `client_id=${CLIENT_ID}&scope=${scopes}`
 -		});
--		const result = await fetch(uri.toString(true), {
+-		const result = await fetching(uri.toString(true), {
 -			method: 'POST',
 -			headers: {
 -				Accept: 'application/json'
@@ -279,7 +279,7 @@ index 830e698..cd6f27e 100644
 -			}, button);
 -
 -		if (modalResult !== button) {
--			throw new Error('User Cancelled');
+-			throw new Error(USER_CANCELLATION_ERROR);
 -		}
 -
 -		await vscode.env.clipboard.writeText(json.user_code);
@@ -291,7 +291,7 @@ index 830e698..cd6f27e 100644
 -	}
 -
  	private async doLoginWithPat(scopes: string): Promise<string> {
-@@ -374,124 +131,2 @@ export class GitHubServer implements IGitHubServer {
+@@ -373,124 +134,2 @@ export class GitHubServer implements IGitHubServer {
  
 -	private async waitForDeviceCodeAccessToken(
 -		json: IGitHubDeviceCodeResponse,
@@ -318,11 +318,11 @@ index 830e698..cd6f27e 100644
 -			for (let i = 0; i < attempts; i++) {
 -				await new Promise(resolve => setTimeout(resolve, json.interval * 1000));
 -				if (token.isCancellationRequested) {
--					throw new Error('User Cancelled');
+-					throw new Error(USER_CANCELLATION_ERROR);
 -				}
 -				let accessTokenResult;
 -				try {
--					accessTokenResult = await fetch(refreshTokenUri.toString(true), {
+-					accessTokenResult = await fetching(refreshTokenUri.toString(true), {
 -						method: 'POST',
 -						headers: {
 -							Accept: 'application/json'
@@ -349,7 +349,7 @@ index 830e698..cd6f27e 100644
 -				return accessTokenJson.access_token;
 -			}
 -
--			throw new Error('Cancelled');
+-			throw new Error(TIMED_OUT_ERROR);
 -		});
 -	}
 -
@@ -388,11 +388,11 @@ index 830e698..cd6f27e 100644
 -		const endpointUrl = proxyEndpoints?.github ? `${proxyEndpoints.github}login/oauth/access_token` : GITHUB_TOKEN_URL;
 -
 -		const body = new URLSearchParams([['code', code]]);
--		if (this.type === AuthProviderType.githubEnterprise) {
+-		if (this._type === AuthProviderType.githubEnterprise) {
 -			body.append('github_enterprise', this.baseUri.toString(true));
 -			body.append('redirect_uri', await this.getRedirectEndpoint());
 -		}
--		const result = await fetch(endpointUrl, {
+-		const result = await fetching(endpointUrl, {
 -			method: 'POST',
 -			headers: {
 -				Accept: 'application/json',
@@ -417,19 +417,19 @@ index 830e698..cd6f27e 100644
 -
  	private getServerUri(path: string = '') {
 diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
-index ce2a3e8..2a5cf60 100644
+index ce04327..e66a7f5 100644
 --- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
 +++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
-@@ -306,3 +306,3 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
+@@ -355,3 +355,3 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
  
 -		if (providers.length && !menus.length) {
 +		if (!menus.length) {
  			const noAccountsAvailableAction = disposables.add(new Action('noAccountsAvailable', localize('noAccounts', "You are not signed in to any accounts"), undefined, false));
 diff --git a/src/vs/workbench/services/authentication/browser/authenticationService.ts b/src/vs/workbench/services/authentication/browser/authenticationService.ts
-index d5e2b75..a996eb7 100644
+index 5285663..08f9e42 100644
 --- a/src/vs/workbench/services/authentication/browser/authenticationService.ts
 +++ b/src/vs/workbench/services/authentication/browser/authenticationService.ts
-@@ -279,12 +279,2 @@ export class AuthenticationService extends Disposable implements IAuthentication
+@@ -274,12 +274,2 @@ export class AuthenticationService extends Disposable implements IAuthentication
  		}
 -
 -		if (!this._authenticationProviders.size) {

patches/win7.patch

@@ -0,0 +1,9 @@
+diff --git a/build/win32/code.iss b/build/win32/code.iss
+index d365ab1..1a02701 100644
+--- a/build/win32/code.iss
++++ b/build/win32/code.iss
+@@ -28,3 +28,3 @@ ChangesEnvironment=true
+ ChangesAssociations=true
+-MinVersion=6.2
++MinVersion=6.1.7600
+ SourceDir={#SourceDir}

prepare_vscode.sh

@@ -103,6 +103,7 @@ setpath "product" "twitterUrl" "https://go.microsoft.com/fwlink/?LinkID=533687"
 
 if [[ "${DISABLE_UPDATE}" != "yes" ]]; then
   setpath "product" "updateUrl" "https://vscodium.now.sh"
+  setpath "product" "downloadUrl" "https://github.com/VSCodium/vscodium/releases"
 fi
 
 if [[ "${VSCODE_QUALITY}" == "insider" ]]; then

product.json

@@ -48,14 +48,15 @@
   ],
   "extensionEnabledApiProposals": {
     "ms-vscode.vscode-selfhost-test-provider": [
-      "testObserver"
+      "testObserver",
+      "testContinuousRun"
     ],
     "VisualStudioExptTeam.vscodeintellicode-completions": [
-      "inlineCompletionsNew",
       "inlineCompletionsAdditions"
     ],
     "ms-vsliveshare.vsliveshare": [
       "contribMenuBarHome",
+      "contribShareMenu",
       "diffCommand",
       "documentFiltersExclusive",
       "fileSearchProvider",
@@ -70,15 +71,20 @@
       "portsAttributes",
       "findTextInFiles",
       "workspaceTrust",
-      "resolvers",
       "tunnels"
     ],
     "ms-toolsai.vscode-ai-remote": [
       "resolvers"
     ],
     "ms-python.python": [
+      "contribEditorContentMenu",
       "quickPickSortByLabel",
-      "testObserver"
+      "testObserver",
+      "envShellEvent",
+      "quickPickItemTooltip",
+      "terminalDataWriteEvent",
+      "envCollectionWorkspace",
+      "saveEditor"
     ],
     "ms-dotnettools.dotnet-interactive-vscode": [
       "notebookMessaging"
@@ -112,6 +118,7 @@
       "fileSearchProvider",
       "quickPickSortByLabel",
       "workspaceTrust",
+      "scmActionButton",
       "scmSelectedProvider",
       "scmValidation",
       "textSearchProvider",
@@ -119,6 +126,7 @@
     ],
     "ms-vscode-remote.remote-wsl": [
       "resolvers",
+      "contribRemoteHelp",
       "contribViewsRemote",
       "telemetry"
     ],
@@ -126,14 +134,15 @@
       "resolvers",
       "tunnels",
       "terminalDataWriteEvent",
+      "contribRemoteHelp",
       "contribViewsRemote",
       "telemetry"
     ],
     "ms-vscode.remote-server": [
-      "resolvers",
-      "tunnels"
+      "resolvers"
     ],
     "ms-vscode.remote-explorer": [
+      "contribRemoteHelp",
       "contribViewsRemote",
       "extensionsAny"
     ],
@@ -143,31 +152,34 @@
       "tunnels",
       "workspaceTrust",
       "terminalDimensions",
+      "contribRemoteHelp",
       "contribViewsRemote"
     ],
     "ms-vscode.js-debug-nightly": [
       "portsAttributes",
       "findTextInFiles",
       "workspaceTrust",
-      "resolvers",
       "tunnels"
     ],
     "ms-vscode.lsif-browser": [
       "documentFiltersExclusive"
     ],
     "GitHub.vscode-pull-request-github": [
+      "contribCommentThreadAdditionalMenu",
       "tokenInformation",
-      "commentsResolvedState",
       "contribShareMenu",
+      "fileComments",
       "contribCommentPeekContext",
-      "treeItemCheckbox"
+      "treeItemCheckbox",
+      "codiconDecoration",
+      "diffCommand",
+      "contribCommentEditorActionsMenu",
+      "quickDiffProvider"
     ],
     "GitHub.copilot": [
-      "inlineCompletionsNew",
       "inlineCompletionsAdditions"
     ],
     "GitHub.copilot-nightly": [
-      "inlineCompletionsNew",
       "inlineCompletionsAdditions"
     ],
     "GitHub.remotehub": [
@@ -195,7 +207,6 @@
       "contribNotebookStaticPreloads"
     ],
     "ms-toolsai.jupyter": [
-      "notebookControllerKind",
       "notebookDeprecated",
       "notebookMessaging",
       "notebookMime",
@@ -205,13 +216,14 @@
       "notebookKernelSource",
       "interactiveWindow",
       "notebookControllerAffinityHidden",
-      "contribNotebookStaticPreloads"
+      "contribNotebookStaticPreloads",
+      "quickPickItemTooltip",
+      "notebookExecution"
     ],
     "dbaeumer.vscode-eslint": [
       "notebookCellExecutionState"
     ],
     "ms-vscode.azure-sphere-tools-ui": [
-      "resolvers",
       "tunnels"
     ],
     "ms-azuretools.vscode-azureappservice": [
@@ -222,6 +234,19 @@
     ],
     "ms-vscode.cpptools": [
       "terminalDataWriteEvent"
+    ],
+    "redhat.java": [
+      "documentPaste"
+    ],
+    "ms-dotnettools.csdevkit": [
+      "inlineCompletionsAdditions"
+    ],
+    "jeanp413.open-remote-ssh": [
+      "resolvers",
+      "tunnels",
+      "terminalDataWriteEvent",
+      "contribRemoteHelp",
+      "contribViewsRemote"
     ]
   },
   "extensionKind": {

release.sh

@@ -23,7 +23,7 @@ if [[ $( gh release view --repo "${ASSETS_REPOSITORY}" "${RELEASE_VERSION}" 2>&1
     CREATE_OPTIONS="--generate-notes"
   fi
 
-  gh release create "${RELEASE_VERSION}" --repo "${ASSETS_REPOSITORY}" --notes "${NOTES}" ${CREATE_OPTIONS}
+  gh release create "${RELEASE_VERSION}" --repo "${ASSETS_REPOSITORY}" --title "${RELEASE_VERSION}" --notes "${NOTES}" ${CREATE_OPTIONS}
 fi
 
 cd assets