feat(macos): build script is detecting arch (#1085 )

docs: improve macOS troubleshooting and add thanks table (#1083 )
* docs: update supported macOS and link to troubleshooting wiki * docs: add thanks table
2026-04-12 00:37:19 +10:00 · 2022-05-16 01:35:17 +02:00 · 2022-05-14 20:16:15 +02:00 · 2022-05-14 18:44:59 +02:00 · 2022-05-07 17:29:18 +02:00 · 2022-05-07 17:18:14 +02:00
32 changed files with 1383 additions and 310 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -20,3 +20,6 @@ indent_size = 2
 [*.patch]
 trim_trailing_whitespace = false
 insert_final_newline = false
+
+[*.svg]
+insert_final_newline = false
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -9,7 +9,7 @@ on:
    branches: [ master ]

 jobs:
-  linux:
+  release:
    runs-on: ubuntu-latest
    container:
      image: ${{ matrix.image }}
@@ -32,15 +32,15 @@ jobs:
          image: vscodium/vscodium-linux-build-agent:stretch-armhf

    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3

      - name: Install GH
        run: ./install_gh.sh

      - name: Setup Node.js environment
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
        with:
-          node-version: 14
+          node-version: 16

      - name: Install Yarn
        run: npm install -g yarn
@@ -68,7 +68,7 @@ jobs:
        if: env.SHOULD_BUILD == 'yes'

      - name: Cache yarn directory
-        uses: actions/cache@v2
+        uses: actions/cache@v3
        with:
          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
          key: linux-${{ matrix.npm_arch }}-yarnCacheDir-${{ steps.yarnCacheKey.outputs.value }}
@@ -93,9 +93,56 @@ jobs:
        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'

      - name: Update versions repo
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
        run: ./update_version.sh
        env:
          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
          GITHUB_USERNAME: ${{ github.repository_owner }}
+        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'

+  snap:
+    needs: release
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+        - amd64
+        # - arm64
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Check version
+        run: ./stores/snapcraft/check_version.sh
+        env:
+          ARCHITECTURE: ${{ matrix.platform }}
+          SNAP_STORE_LOGIN: ${{ secrets.SNAP_STORE_LOGIN }}
+
+      # - uses: docker/setup-qemu-action@v1
+      #   if: env.SHOULD_DEPLOY == 'yes'
+
+      # - uses: diddlesnaps/snapcraft-multiarch-action@v1
+      #   with:
+      #     path: stores/snapcraft
+      #     architecture: ${{ matrix.platform }}
+      #   id: build
+      #   if: env.SHOULD_DEPLOY == 'yes'
+
+      # - uses: diddlesnaps/snapcraft-review-action@v1
+      #   with:
+      #     snap: ${{ steps.build.outputs.snap }}
+      #     isClassic: 'true'
+      #   if: env.SHOULD_DEPLOY == 'yes'
+      - uses: snapcore/action-build@v1
+        with:
+          path: stores/snapcraft
+        id: build
+        if: env.SHOULD_DEPLOY == 'yes'
+
+
+      - uses: snapcore/action-publish@v1
+        with:
+          store_login: ${{ secrets.SNAP_STORE_LOGIN }}
+          snap: ${{ steps.build.outputs.snap }}
+          release: stable
+        if: env.SHOULD_DEPLOY == 'yes'
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -10,28 +10,28 @@ on:

 jobs:
  build:
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.runner }}

    strategy:
      fail-fast: false
      matrix:
        include:
-          - vscode_arch: x64
-            os: macOS-10.15
-          # - vscode_arch: arm64
-          #   os: macOS-11
+          - runner: macOS-10.15
+            vscode_arch: x64
+          - runner: [self-hosted, macOS, ARM64]
+            vscode_arch: arm64

    env:
      OS_NAME: "osx"
      VSCODE_ARCH: ${{ matrix.vscode_arch }}

    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3

      - name: Setup Node.js environment
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
        with:
-          node-version: 14
+          node-version: 16

      - name: Clone VSCode repo
        run: . get_repo.sh
@@ -56,7 +56,7 @@ jobs:
        if: env.SHOULD_BUILD == 'yes'

      - name: Cache yarn directory
-        uses: actions/cache@v2
+        uses: actions/cache@v3
        with:
          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
          key: ${{ env.OS_NAME }}-${{ env.VSCODE_ARCH }}-yarnCacheDir-${{ steps.yarnCacheKey.outputs.value }}
@@ -80,7 +80,7 @@ jobs:
            cd "VSCode-darwin-${VSCODE_ARCH}"
            export CERTIFICATE_P12=VSCodium.p12
            echo $CERTIFICATE_OSX_P12 | base64 --decode > $CERTIFICATE_P12
-            export KEYCHAIN=build.keychain
+            export KEYCHAIN=$RUNNER_TEMP/build.keychain
            security create-keychain -p mysecretpassword $KEYCHAIN
            security default-keychain -s $KEYCHAIN
            security unlock-keychain -p mysecretpassword $KEYCHAIN
@@ -106,3 +106,12 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
          GITHUB_USERNAME: ${{ github.repository_owner }}

+      - name: Clean up keychain
+        if: always()
+        run: |
+          KEYCHAIN=$RUNNER_TEMP/build.keychain
+
+          if [ -f "$KEYCHAIN" ];
+          then
+            security delete-keychain $KEYCHAIN
+          fi
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -10,7 +10,7 @@ on:

 jobs:
  windows:
-    runs-on: windows-2016
+    runs-on: windows-2019
    defaults:
      run:
        shell: bash
@@ -20,23 +20,26 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        vscode_arch: [x64, ia32, arm64]
+        vscode_arch:
+          - x64
+          - ia32
+          - arm64

    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3

      - name: Setup Node.js environment
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
        with:
-          node-version: 14
+          node-version: 16

      - name: Install Yarn
        run: npm install -g yarn

-      - name: Setup Python 2
-        uses: actions/setup-python@v2
+      - name: Setup Python 3
+        uses: actions/setup-python@v3
        with:
-          python-version: '2.x'
+          python-version: '3.x'

      - name: Clone VSCode repo
        run: ./get_repo.sh
@@ -61,7 +64,7 @@ jobs:
        if: env.SHOULD_BUILD == 'yes'

      - name: Cache yarn directory
-        uses: actions/cache@v2
+        uses: actions/cache@v3
        with:
          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
          key: ${{ env.OS_NAME }}-${{ env.VSCODE_ARCH }}-yarnCacheDir-${{ steps.yarnCacheKey.outputs.value }}
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,10 @@ vscode
 VS*/*
 .DS_Store
 build/linux/appimage/out
+build/linux/appimage/pkg2appimage.AppDir
+build/linux/appimage/pkg2appimage-*.AppImage
+build/linux/appimage/squashfs-root
+build/linux/appimage/VSCodium
 build/windows/msi/releasedir
 build/windows/rtf/Readme (Abridged).txt
 build/windows/rtf/TXT to RTF Converter.exe
--- a/.nvmrc
+++ b/.nvmrc
@@ -0,0 +1 @@
+v16.14.2
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -2,45 +2,122 @@

 ## Our Pledge

-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.

 ## Our Standards

-Examples of behavior that contributes to creating a positive environment include:
+Examples of behavior that contributes to a positive environment for our
+community include:

-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community

-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:

-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting

-## Our Responsibilities
+## Enforcement Responsibilities

-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.

-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.

 ## Scope

-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.

 ## Enforcement

-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at vscodium@protonmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+vscodium@protonmail.com.
+All complaints will be reviewed and investigated promptly and fairly.

-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.

 ## Attribution

-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].

-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
--- a/DOCS.md
+++ b/DOCS.md
@@ -11,6 +11,7 @@
 - [Migrating from Visual Studio Code to VSCodium](#migrating)
 - [Sign in with GitHub](#signin-github)
 - [How do I run VSCodium in portable mode?](#portable)
+- [How do I fix the default file manager?](#file-manager)
 - [How do I press and hold a key and have it repeat in VSCodium?](#press-and-hold)
 - [How do I open VSCodium from the terminal?](#terminal-support)
  - [From Linux .tar.gz](#from-linux-targz)
@@ -82,13 +83,13 @@ with the content:

 ### <a id="proprietary-debugging-tools"></a>Proprietary Debugging Tools

-The debugger provided with Microsoft's [C# extension](https://github.com/OmniSharp/omnisharp-vscode) as well as the (Windows) debugger provided with their [C++ extension](https://github.com/Microsoft/vscode-cpptools) are very restrictively licensed to only work with the offical Visual Studio Code build. See [this comment in the C# extension repo](https://github.com/OmniSharp/omnisharp-vscode/issues/2491#issuecomment-418811364) and [this comment in the C++ extension repo](https://github.com/Microsoft/vscode-cpptools/issues/21#issuecomment-248349017).
+The debugger provided with Microsoft's [C# extension](https://github.com/OmniSharp/omnisharp-vscode) as well as the (Windows) debugger provided with their [C++ extension](https://github.com/Microsoft/vscode-cpptools) are very restrictively licensed to only work with the official Visual Studio Code build. See [this comment in the C# extension repo](https://github.com/OmniSharp/omnisharp-vscode/issues/2491#issuecomment-418811364) and [this comment in the C++ extension repo](https://github.com/Microsoft/vscode-cpptools/issues/21#issuecomment-248349017).

 A workaround exists to get debugging working in C# projects, by using Samsung's opensource [netcoredbg](https://github.com/Samsung/netcoredbg) package. See [this comment](https://github.com/VSCodium/vscodium/issues/82#issue-409806641) for instructions on how to set that up.

 ### <a id="proprietary-extensions"></a>Proprietary Extensions

-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 offical 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:
+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
  "extensionAllowedProposedApi": [
@@ -134,10 +135,27 @@ Select the scopes dependending of the extension which need access to GitHub. (Gi
 If you are getting the error `Writing login information to the keychain failed with error 'The name org.freedesktop.secrets was not provided by any .service files'.`, you need to install the package `gnome-keyring`.

 ## <a id="portable"></a>How do I run VSCodium in portable mode?
-You can follow the [Portable Mode instructions](https://code.visualstudio.com/docs/editor/portable) from the Visual Studio Code website. 
+You can follow the [Portable Mode instructions](https://code.visualstudio.com/docs/editor/portable) from the Visual Studio Code website.
 - **Windows** / **Linux** : the instructions can be followed as written.
 - **macOS** : portable mode is enabled by the existence of a specially named folder. For Visual Studio Code that folder name is `code-portable-data`. For VSCodium, that folder name is `codium-portable-data`. So to enable portable mode for VSCodium on Mac OS, follow the instructions outlined in the [link above](https://code.visualstudio.com/docs/editor/portable), but create a folder named `codium-portable-data` instead of `code-portable-data`.

+## <a id="file-manager"></a>How do I fix the default file manager (Linux)?
+
+In some case, VSCodium becomes the file manager used to open directories (instead of apps like Dolphin or Nautilus).<br />
+It's due to that no application was defined as the default file manager and so the system is using the latest capable application.
+
+To set the default app, create the file `~/.config/mimeapps.list` with the content like:
+```
+[Default Applications]
+inode/directory=org.gnome.Nautilus.desktop;
+```
+
+You can find your regular file manager with the command:
+```
+> grep directory /usr/share/applications/mimeinfo.cache
+inode/directory=codium.desktop;org.gnome.Nautilus.desktop;
+```
+
 ## <a id="press-and-hold"></a>How do I press and hold a key and have it repeat in VSCodium (Mac)?

 This is a common question for Visual Studio Code and the procedure is slightly different in VSCodium because the `defaults` path is different.
--- a/README.md
+++ b/README.md
@@ -7,18 +7,22 @@

 <div id="badges" align="center">

-  [![current release](https://img.shields.io/github/release/vscodium/vscodium.svg)](https://github.com/vscodium/vscodium/releases)
-[![windows_build_status](https://dev.azure.com/vscodium/VSCodium/_apis/build/status/VSCodium.vscodium?branchName=master)](https://dev.azure.com/vscodium/VSCodium/_build?definitionId=1)
+[![current release](https://img.shields.io/github/release/vscodium/vscodium.svg)](https://github.com/vscodium/vscodium/releases)
 [![license](https://img.shields.io/github/license/VSCodium/vscodium.svg)](https://github.com/VSCodium/vscodium/blob/master/LICENSE)
 [![Gitter](https://img.shields.io/gitter/room/vscodium/vscodium.svg)](https://gitter.im/VSCodium/Lobby)
 [![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)
+
 </div>

 **This is not a fork. This is a repository of scripts to automatically build Microsoft's `vscode` repository into freely-licensed binaries with a community-driven default configuration.**

 ## Table of Contents
+
 - [Download/Install](#download-install)
  - [Install with Brew](#install-with-brew)
  - [Install with Windows Package Manager (WinGet)](#install-with-winget)
@@ -28,36 +32,42 @@
  - [Install with Package Manager](#install-with-package-manager)
  - [Install on Arch Linux](#install-on-arch-linux)
  - [Flatpak Option](#flatpak)
+- [Build](#build)
 - [Why Does This Exist](#why)
 - [More Info](#more-info)
 - [Supported Platforms](#supported-platforms)

 ## <a id="download-install"></a>Download/Install
+
 :tada: :tada: [Download latest release here](https://github.com/VSCodium/vscodium/releases) :tada: :tada:

 [More info / helpful tips are here.](https://github.com/VSCodium/vscodium/blob/master/DOCS.md)

 #### <a id="install-with-brew"></a>Install with Brew (Mac)
+
 If you are on a Mac and have [Homebrew](https://brew.sh/) installed:
 ```bash
 brew install --cask vscodium
 ```

-_Note for Mac macOS Mojave users: if you see "App can't be opened because Apple cannot check it for malicious software" when opening VSCodium the first time, you can right-click the application and choose Open. This should only be required the first time opening on Mojave._
+*Note for macOS users: if you can't open the App, please read [the following troubleshooting](https://github.com/VSCodium/vscodium/wiki/Troubleshooting#macos).*

 #### <a id="install-with-winget"></a>Install with Windows Package Manager (WinGet)
+
 If you use Windows and have [Windows Package Manager](https://github.com/microsoft/winget-cli) installed:
 ```bash
 winget install vscodium
 ```

 #### <a id="install-with-choco"></a>Install with Chocolatey (Windows)
+
 If you use Windows and have [Chocolatey](https://chocolatey.org) installed (thanks to [@Thilas](https://github.com/Thilas)):
 ```bash
 choco install vscodium
 ```

 #### <a id="install-with-scoop"></a>Install with Scoop (Windows)
+
 If you use Windows and have [Scoop](https://scoop.sh) installed:
 ```bash
 scoop bucket add extras
@@ -65,19 +75,23 @@ scoop install vscodium
 ```

 #### <a id="install-with-snap"></a>Install with snap (GNU/Linux)
-VSCodium is available in the [Snap Store](https://snapcraft.io/) as [Codium](https://snapcraft.io/codium), published by the [Snapcrafters](https://github.com/snapcrafters/codium) community.
+
+VSCodium is available in the [Snap Store](https://snapcraft.io/) as [Codium](https://snapcraft.io/codium), thanks to the help of the [Snapcrafters](https://github.com/snapcrafters/codium) community.
 If your GNU/Linux distribution has support for [snaps](https://snapcraft.io/docs/installing-snapd):
 ```bash
 snap install codium --classic
 ```

 #### <a id="install-with-package-manager"></a>Install with Package Manager (GNU/Linux)
-You can always install using the downloads (deb, rpm, tar) on the [releases page](https://github.com/VSCodium/vscodium/releases), but you can also install using your favorite package manager and get automatic updates. [@paulcarroty](https://github.com/paulcarroty) has set up a repository with instructions [here](https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo). Any issues installing VSCodium using your package manager should be directed to that repository's issue tracker. 
+
+You can always install using the downloads (deb, rpm, tar) on the [releases page](https://github.com/VSCodium/vscodium/releases), but you can also install using your favorite package manager and get automatic updates. [@paulcarroty](https://github.com/paulcarroty) has set up a repository with instructions [here](https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo). Any issues installing VSCodium using your package manager should be directed to that repository's issue tracker.

 #### <a id="install-on-arch-linux"></a>Install on Arch Linux
+
 VSCodium is available in [AUR](https://wiki.archlinux.org/index.php/Arch_User_Repository) as package [vscodium-bin](https://aur.archlinux.org/packages/vscodium-bin/), maintained by [@binex-dsk](https://github.com/binex-dsk). An alternative package [vscodium-git](https://aur.archlinux.org/packages/vscodium-git/), maintained by [@cedricroijakkers](https://github.com/cedricroijakkers), is also available should you wish to compile from source yourself.

 #### <a id="flatpak"></a>Flatpak Option (GNU/Linux)
+
 VSCodium is (unofficially) available as a Flatpak app [here](https://flathub.org/apps/details/com.vscodium.codium) and the build repo is [here](https://github.com/flathub/com.vscodium.codium). If your distribution has support for [flatpak](https://flathub.org), and you have enabled the [flathub repo](https://flatpak.org/setup/):
 ```bash
 flatpak install flathub com.vscodium.codium
@@ -85,24 +99,31 @@ flatpak install flathub com.vscodium.codium
 flatpak run com.vscodium.codium
 ```

+## <a id="build"></a>Build
+
+Build instructions can be found [here](https://github.com/VSCodium/vscodium/blob/master/docs/build.md)
+
 ## <a id="why"></a>Why Does This Exist
+
 This repository contains build files to generate free release binaries of Microsoft's VS Code. When we speak of "free software", we're talking about freedom, not price.

-Microsoft's releases of Visual Studio Code are licensed under [this not-FLOSS license](https://code.visualstudio.com/license) and contain telemetry/tracking. According to [this comment](https://github.com/Microsoft/vscode/issues/60#issuecomment-161792005) from a Visual Studio Code maintainer: 
+Microsoft's releases of Visual Studio Code are licensed under [this not-FLOSS license](https://code.visualstudio.com/license) and contain telemetry/tracking. According to [this comment](https://github.com/Microsoft/vscode/issues/60#issuecomment-161792005) from a Visual Studio Code maintainer:

 > When we [Microsoft] build Visual Studio Code, we do exactly this. We clone the vscode repository, we lay down a customized product.json that has Microsoft specific functionality (telemetry, gallery, logo, etc.), and then produce a build that we release under our license.
-> 
+>
 > When you clone and build from the vscode repo, none of these endpoints are configured in the default product.json. Therefore, you generate a "clean" build, without the Microsoft customizations, which is by default licensed under the MIT license

 This repo exists so that you don't have to download+build from source. The build scripts in this repo clone Microsoft's vscode repo, run the build commands, and upload the resulting binaries to [GitHub releases](https://github.com/VSCodium/vscodium/releases). __These binaries are licensed under the MIT license. Telemetry is disabled.__

 If you want to build from source yourself, head over to [Microsoft's vscode repo](https://github.com/Microsoft/vscode) and follow their [instructions](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#build-and-run). This repo exists to make it easier to get the latest version of MIT-licensed VS Code.

-Microsoft's build process (which we are running to build the binaries) does download additional files. This was brought up in [Microsoft/vscode#49159](https://github.com/Microsoft/vscode/issues/49159) and [Microsoft/vscode#45978](https://github.com/Microsoft/vscode/issues/45978). These are the packages downloaded during build:
+Microsoft's build process (which we are running to build the binaries) does download additional files. This was brought up in [Microsoft/vscode#141340](https://github.com/Microsoft/vscode/issues/141340) and [Microsoft/vscode#45978](https://github.com/Microsoft/vscode/issues/45978). These are the packages downloaded during build:

 - Extensions from the Microsoft Marketplace:
-  - [ms-vscode.node-debug2](https://marketplace.visualstudio.com/items?itemName=ms-vscode.node-debug2)
-  - [ms-vscode.node-debug](https://marketplace.visualstudio.com/items?itemName=ms-vscode.node-debug)
+  - [ms-vscode.references-view](https://marketplace.visualstudio.com/items?itemName=ms-vscode.references-view)
+  - [ms-vscode.js-debug-companion](https://marketplace.visualstudio.com/items?itemName=ms-vscode.js-debug-companion)
+  - [ms-vscode.js-debug](https://marketplace.visualstudio.com/items?itemName=ms-vscode.js-debug)
+  - [ms-vscode.vscode-js-profile-table](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-js-profile-table)
 - From [Electron releases](https://github.com/electron/electron/releases) (using [gulp-atom-electron](https://github.com/joaomoreno/gulp-atom-electron))
  - electron
  - ffmpeg
@@ -110,22 +131,26 @@ Microsoft's build process (which we are running to build the binaries) does down
 ## <a id="more-info"></a>More Info

 ### Documentation
+
 For more information on getting all the telemetry disabled and tips for migrating from Visual Studio Code to VSCodium, have a look at this [Docs](https://github.com/VSCodium/vscodium/blob/master/DOCS.md) page.

 ### Extensions and the Marketplace
+
 According to the VS Code Marketplace [Terms of Use](https://aka.ms/vsmarketplace-ToU), _you may only install and use Marketplace Offerings with Visual Studio Products and Services._ For this reason, VSCodium uses [open-vsx.org](https://open-vsx.org/), an open source registry for VS Code extensions. See the [Extensions + Marketplace](https://github.com/VSCodium/vscodium/blob/master/DOCS.md#extensions-marketplace) section on the Docs page for more details.

 Please note that some Visual Studio Code extensions have licenses that restrict their use to the official Visual Studio Code builds and therefore do not work with VSCodium. See [this note](https://github.com/VSCodium/vscodium/blob/master/DOCS.md#proprietary-debugging-tools) on the Docs page for what's been found so far and possible workarounds.

 ### How are the VSCodium binaries built?
+
 If you would like to see the commands we run to build `vscode` into VSCodium binaries, have a look at the workflow files in `.github/workflows` for Windows, GNU/Linux and macOS. These build files call all the other scripts in the repo. If you find something that doesn't make sense, feel free to ask about it [on Gitter](https://gitter.im/VSCodium/Lobby).

-The builds are run every day, but exit early if there isn't a new release from Microsoft. 
+The builds are run every day, but exit early if there isn't a new release from Microsoft.

 ## <a id="supported-platforms"></a>Supported Platforms
-The minimal version is limitted by the core component Electron, you may want to check its [supported platform list](https://www.electronjs.org/docs/tutorial/support#supported-platforms).
+
+The minimal version is limited by the core component Electron, you may want to check its [supported platform list](https://www.electronjs.org/docs/tutorial/support#supported-platforms).
 - [x] macOS (`zip`, `dmg`) OS X 10.10 or newer x64
- [x] macOS (`zip`, `dmg`) macOS 11.0 or newer arm64 via x64 emulation, see [status issue](https://github.com/VSCodium/vscodium/issues/597)
+- [x] macOS (`zip`, `dmg`) macOS 11.0 or newer arm64
 - [x] GNU/Linux x64 (`deb`, `rpm`, `AppImage`, `tar.gz`)
 - [x] GNU/Linux x86 (`deb`, `rpm`, `tar.gz`) ([up to v1.35.1](https://code.visualstudio.com/updates/v1_36#_linux-32bit-support-ends))
 - [x] GNU/Linux arm64 (`deb`, `tar.gz`)
@@ -133,13 +158,32 @@ The minimal version is limitted by the core component Electron, you may want to
 - [x] Windows 7 or newer x64
 - [x] Windows 7 or newer x86
 - [x] Windows 10 arm64
-  
+
 ## <a id="donate"></a>Donate
+
 If you would like to support the development of VSCodium, feel free to send BTC to `3PgjE95yzBDTrSPxPiqoxSgZFuKPPAix1N`.

 Special thanks to:
- @estatra for the latest logo
- @jaredreich for the previous logo
+
+<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>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/PalinuroSec" target="_blank">@PalinuroSec</a></td>
+    <td>for CDN and domain name</td>
+  </tr>
+  <tr>
+    <td><a href="https://www.macstadium.com" target="_blank"><img src="https://images.prismic.io/macstadium/66fbce64-707e-41f3-b547-241908884716_MacStadium_Logo.png?w=128&q=75" width="128" height="49" alt="MacStadium logo" /></a></td>
+    <td>for providing a Mac mini M1</td>
+  </tr>
+</table>

 ## <a id="license"></a>License
+
 [MIT](https://github.com/VSCodium/vscodium/blob/master/LICENSE)
--- a/build.sh
+++ b/build.sh
@@ -4,6 +4,7 @@ set -ex

 if [[ "${SHOULD_BUILD}" == "yes" ]]; then
  npm config set scripts-prepend-node-path true
+  npm config set node_gyp

  echo "MS_COMMIT: ${MS_COMMIT}"

--- a/build/build_macos.sh
+++ b/build/build_macos.sh
@@ -3,6 +3,16 @@
 rm -rf VSCode*
 rm -rf vscode

+UNAME_ARCH=$( uname -m )
+
+if [[ "${UNAME_ARCH}" == "arm64" ]]; then
+    export VSCODE_ARCH="arm64"
+else
+    export VSCODE_ARCH="x64"
+fi
+
+echo "-- VSCODE_ARCH: ${VSCODE_ARCH}"
+
 . get_repo.sh

-SHOULD_BUILD=yes CI_BUILD=no OS_NAME=osx VSCODE_ARCH=x64 . build.sh
+SHOULD_BUILD=yes CI_BUILD=no OS_NAME=osx . build.sh
--- a/build/linux/appimage/build.sh
+++ b/build/linux/appimage/build.sh
@@ -19,10 +19,10 @@ if [[ "$VSCODE_ARCH" == "x64" ]]; then
  sed -i 's/grep docker/# grep docker/' pkg2appimage.AppDir/usr/share/pkg2appimage/functions.sh

  bash -ex pkg2appimage.AppDir/AppRun recipe.yml
-  
+
  rm -f pkg2appimage-*.AppImage
  rm -rf pkg2appimage.AppDir
  rm -rf VSCodium
 fi

-cd "${CALLER_DIR}"
+cd "${CALLER_DIR}"
--- a/build/linux/appimage/recipe.yml
+++ b/build/linux/appimage/recipe.yml
@@ -30,11 +30,13 @@ script:
  - /usr/bin/convert vscodium.png -resize 48x48 usr/share/icons/hicolor/48x48/apps/vscodium.png
  - /usr/bin/convert vscodium.png -resize 32x32 usr/share/icons/hicolor/32x32/apps/vscodium.png
  - ( cd usr/bin/ ; ln -s ../share/codium/codium  . )
+  - rm -rf usr/lib/x86_64-linux-gnu
+  - rm -f lib/x86_64-linux-gnu/libglib*
  - cat > AppRun <<\EOF
  - #!/bin/sh
  - HERE="$(dirname "$(readlink -f "${0}")")"
  - export PATH="${HERE}"/usr/bin/:"${HERE}"/usr/sbin/:"${HERE}"/usr/games/:"${HERE}"/bin/:"${HERE}"/sbin/:"${PATH}"
-  - export LD_LIBRARY_PATH="${HERE}"/usr/lib/:"${HERE}"/usr/lib/i386-linux-gnu/:"${HERE}"/usr/lib/x86_64-linux-gnu/:"${HERE}"/usr/lib32/:"${HERE}"/usr/lib64/:"${HERE}"/lib/:"${HERE}"/lib/i386-linux-gnu/:"${HERE}"/lib/x86_64-linux-gnu/:"${HERE}"/lib32/:"${HERE}"/lib64/:"${LD_LIBRARY_PATH}"
+  - export LD_LIBRARY_PATH="${HERE}"/usr/lib/:"${HERE}"/usr/lib32/:"${HERE}"/usr/lib64/:"${HERE}"/lib/:"${HERE}"/lib/i386-linux-gnu/:"${HERE}"/lib/x86_64-linux-gnu/:"${HERE}"/lib32/:"${HERE}"/lib64/:"${LD_LIBRARY_PATH}"
  - export XDG_DATA_DIRS="${HERE}"/usr/share/:"${XDG_DATA_DIRS}"
  - export PERLLIB="${HERE}"/usr/share/perl5/:"${HERE}"/usr/lib/perl5/:"${PERLLIB}"
  - export GSETTINGS_SCHEMA_DIR="${HERE}"/usr/share/glib-2.0/schemas/:"${GSETTINGS_SCHEMA_DIR}"
--- a/docs/build.md
+++ b/docs/build.md
@@ -11,7 +11,7 @@

 ## <a id="dependencies"></a>Dependencies

- node 14
+- node 16
 - yarn
 - jq
 - git
@@ -40,7 +40,7 @@
 - sed
 - 7z
 - [WiX Toolset](http://wixtoolset.org/releases/)
- python2
+- python3
 - 'Tools for Native Modules' from official Node.js installer

 ## <a id="build-scripts"></a>Build Scripts
@@ -55,6 +55,8 @@ Each platform has its build helper script in the directory `build`.

 To build for Linux, you can alternatively build VSCodium in docker

+### X64
+
 Firstly, create the container with:
 ```
 docker run -ti --volume=<local vscodium source>:/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-x64 bash
@@ -62,14 +64,12 @@ docker run -ti --volume=<local vscodium source>:/root/vscodium --name=vscodium-b

 When inside the container, you can use the following commands to build:
 ```
-curl -fsSL https://deb.nodesource.com/setup_14.x | sudo -E bash -
+curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -
 sudo apt-get install -y nodejs desktop-file-utils

 npm install -g yarn

-git clone https://github.com/VSCodium/vscodium.git
-
-cd vscodium
+cd /root/vscodium

 ./get_repo.sh

@@ -79,3 +79,28 @@ export VSCODE_ARCH=x64

 ./build.sh
 ```
+
+### ARM 32bits
+
+Firstly, create the container with:
+```
+docker run -ti --volume=<local vscodium source>:/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:stretch-armhf bash
+```
+
+When inside the container, you can use the following commands to build:
+```
+curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -
+sudo apt-get install -y nodejs desktop-file-utils
+
+cd /root/vscodium
+
+./get_repo.sh
+
+export SHOULD_BUILD=yes
+export OS_NAME=linux
+export VSCODE_ARCH=armhf
+export npm_config_arch=armv7l
+export npm_config_force_process_config="true"
+
+./build.sh
+```
--- a/patches/binary-name.patch
+++ b/patches/binary-name.patch
@@ -1,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index df089a6..7aeb54b 100644
+index 2f5a931..ac3d7e6 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -286,7 +286,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -290,7 +290,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
 			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }));
 		} else if (platform === 'darwin') {
 			const shortcut = gulp.src('resources/darwin/bin/code.sh')
@@ -12,19 +12,19 @@ index df089a6..7aeb54b 100644
 			all = es.merge(all, shortcut);
 		}
 diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
-index bd4dc01..02cbbc2 100644
+index 3bd0c57..d921c60 100644
 --- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
 +++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
-@@ -355,7 +355,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
+@@ -353,7 +353,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 	}
 
- 	private async getShellCommandLink(): Promise<{ readonly source: string, readonly target: string }> {
+ 	private async getShellCommandLink(): Promise<{ readonly source: string; readonly target: string }> {
 -		const target = resolve(this.environmentMainService.appRoot, 'bin', 'code');
 +		const target = resolve(this.environmentMainService.appRoot, 'bin', this.productService.applicationName);
 		const source = `/usr/local/bin/${this.productService.applicationName}`;
 
 		// Ensure source exists
-@@ -565,7 +565,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
+@@ -563,7 +563,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 		// macOS
 		if (this.environmentMainService.isBuilt) {
--- a/patches/cleanup-archive.patch
+++ b/patches/cleanup-archive.patch
@@ -0,0 +1,13 @@
+diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
+index 81ba509..59041e2 100644
+--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
+@@ -137,7 +137,7 @@ defineWin32SetupTasks('arm64', 'user');
+  */
+ function archiveWin32Setup(arch) {
+ 	return cb => {
+-		const args = ['a', '-tzip', zipPath(arch), '-x!CodeSignSummary*.md', '.', '-r'];
+		const args = ['a', '-tzip', zipPath(arch), '-x!CodeSignSummary*.md', '-x!tools', '.', '-r'];
+ 
+ 		cp.spawn(_7z, args, { stdio: 'inherit', cwd: buildPath(arch) })
+ 			.on('error', cb)
--- a/patches/custom-gallery.patch
+++ b/patches/custom-gallery.patch
@@ -1,8 +1,8 @@
 diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
-index 657b9c9..9b9b12e 100644
+index 1edc76f..4c0bf98 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
-@@ -70,6 +70,7 @@ export interface IProductConfiguration {
+@@ -69,6 +69,7 @@ export interface IProductConfiguration {
 
 	readonly extensionsGallery?: {
 		readonly serviceUrl: string;
@@ -11,7 +11,7 @@ index 657b9c9..9b9b12e 100644
 		readonly resourceUrlTemplate: string;
 		readonly controlUrl: string;
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index 5e38d35..12bb161 100644
+index e22b33e..98cec93 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
@@ -4,11 +4,12 @@
@@ -30,7 +30,7 @@ index 5e38d35..12bb161 100644
  * @deprecated You MUST use `IProductService` if possible.
@@ -34,6 +35,32 @@ else if (typeof require?.__$__nodeRequire === 'function') {
 	product = require.__$__nodeRequire(joinPath(rootPath, 'product.json').fsPath);
- 	const pkg = require.__$__nodeRequire(joinPath(rootPath, 'package.json').fsPath) as { version: string; };
+ 	const pkg = require.__$__nodeRequire(joinPath(rootPath, 'package.json').fsPath) as { version: string };
 
 +	// Merge user-customized product.json
 +	try {
@@ -61,7 +61,7 @@ index 5e38d35..12bb161 100644
 	// Running out of sources
 	if (env['VSCODE_DEV']) {
 		Object.assign(product, {
-@@ -43,6 +70,19 @@ else if (typeof require?.__$__nodeRequire === 'function') {
+@@ -44,6 +71,19 @@ else if (typeof require?.__$__nodeRequire === 'function') {
 		});
 	}
 
--- a/patches/fix-build-rpm.patch
+++ b/patches/fix-build-rpm.patch
@@ -0,0 +1,36 @@
+diff --git a/build/linux/rpm/dependencies-generator.js b/build/linux/rpm/dependencies-generator.js
+index 1d91eb8..ed6b775 100644
+--- a/build/linux/rpm/dependencies-generator.js
+++ b/build/linux/rpm/dependencies-generator.js
+@@ -16,7 +16,7 @@ const dep_lists_1 = require("./dep-lists");
+ // If true, we fail the build if there are new dependencies found during that task.
+ // The reference dependencies, which one has to update when the new dependencies
+ // are valid, are in dep-lists.ts
+-const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
+const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
+ function getDependencies(buildDir, applicationName, arch) {
+     // Get the files for which we want to find dependencies.
+     const nativeModulesPath = path.join(buildDir, 'resources', 'app', 'node_modules.asar.unpacked');
+diff --git a/build/linux/rpm/dependencies-generator.ts b/build/linux/rpm/dependencies-generator.ts
+index 95953ec..f5ffc2e 100644
+--- a/build/linux/rpm/dependencies-generator.ts
+++ b/build/linux/rpm/dependencies-generator.ts
+@@ -18,7 +18,7 @@ import { ArchString } from './types';
+ // If true, we fail the build if there are new dependencies found during that task.
+ // The reference dependencies, which one has to update when the new dependencies
+ // are valid, are in dep-lists.ts
+-const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true;
+const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
+ 
+ export function getDependencies(buildDir: string, applicationName: string, arch: ArchString): string[] {
+ 	// Get the files for which we want to find dependencies.
+diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
+index 5b7eadb..87c914d 100644
+--- a/resources/linux/rpm/code.spec.template
+++ b/resources/linux/rpm/code.spec.template
+@@ -74,3 +74,5 @@ update-mime-database /usr/share/mime &> /dev/null || :
+ /usr/share/pixmaps/@@ICON@@.png
+ /usr/share/bash-completion/completions/@@NAME@@
+ /usr/share/zsh/site-functions/_@@NAME@@
+
+%config(noreplace) /usr/share/@@NAME@@/resources/app/product.json
--- a/patches/fix-rpm-spec.patch
+++ b/patches/fix-rpm-spec.patch
@@ -1,8 +0,0 @@
--- vscode/resources/linux/rpm/code.spec.template	2021-03-02 19:26:53.000000000 +0100
-+++ vscode/resources/linux/rpm/code.spec.template.new	2021-03-02 19:28:12.000000000 +0100
-@@ -69,3 +69,5 @@
- /usr/share/pixmaps/@@ICON@@.png
- /usr/share/bash-completion/completions/@@NAME@@
- /usr/share/zsh/site-functions/_@@NAME@@
-+
-+%config(noreplace) /usr/share/@@NAME@@/resources/app/product.json
--- a/patches/use-github-pat.patch
+++ b/patches/use-github-pat.patch
@@ -1,9 +1,12 @@
 diff --git a/extensions/github-authentication/src/githubServer.ts b/extensions/github-authentication/src/githubServer.ts
-index fe0fbfd..656d8bb 100644
+index c366ff3..75f32da 100644
 --- a/extensions/github-authentication/src/githubServer.ts
 +++ b/extensions/github-authentication/src/githubServer.ts
-@@ -6,8 +6,6 @@
- import * as nls from 'vscode-nls';
+@@ -3,27 +3,13 @@
+  *  Licensed under the MIT License. See License.txt in the project root for license information.
+  *--------------------------------------------------------------------------------------------*/
+ 
+-import * as nls from 'vscode-nls';
 import * as vscode from 'vscode';
 import fetch, { Response } from 'node-fetch';
 -import { v4 as uuid } from 'uuid';
@@ -11,237 +14,400 @@ index fe0fbfd..656d8bb 100644
 import { ExperimentationTelemetry } from './experimentationService';
 import { AuthProviderType } from './github';
 import { Log } from './common/logger';
-@@ -15,8 +13,6 @@ import { Log } from './common/logger';
- const localize = nls.loadMessageBundle();
+-import { isSupportedEnvironment } from './common/env';
+-import { LoopbackAuthServer } from './authServer';
+-import path = require('path');
+-
+-const localize = nls.loadMessageBundle();
+-const CLIENT_ID = '01ab8ac9400c4e429b23';
+-const GITHUB_AUTHORIZE_URL = 'https://github.com/login/oauth/authorize';
+-// TODO: change to stable when that happens
+-const GITHUB_TOKEN_URL = 'https://vscode.dev/codeExchangeProxyEndpoints/github/login/oauth/access_token';
+-const NETWORK_ERROR = 'network error';
 
- const NETWORK_ERROR = 'network error';
-const AUTH_RELAY_SERVER = 'vscode-auth.github.com';
-// const AUTH_RELAY_STAGING_SERVER = 'client-auth-staging-14a768b.herokuapp.com';
+-const REDIRECT_URL_STABLE = 'https://vscode.dev/redirect';
+-const REDIRECT_URL_INSIDERS = 'https://insiders.vscode.dev/redirect';
+const NETWORK_ERROR = 'network error';
 
 class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.UriHandler {
 	constructor(private readonly Logger: Log) {
-@@ -29,14 +25,6 @@ class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.
- 	}
+@@ -43,14 +29,6 @@ export interface IGitHubServer extends vscode.Disposable {
+ 	friendlyName: string;
+ 	type: AuthProviderType;
 }
- 
-function parseQuery(uri: vscode.Uri) {
-	return uri.query.split('&').reduce((prev: any, current) => {
-		const queryString = current.split('=');
-		prev[queryString[0]] = queryString[1];
-		return prev;
-	}, {});
+-
+-interface IGitHubDeviceCodeResponse {
+-	device_code: string;
+-	user_code: string;
+-	verification_uri: string;
+-	interval: number;
 -}
 -
- export interface IGitHubServer extends vscode.Disposable {
- 	login(scopes: string): Promise<string>;
- 	getUserInfo(token: string): Promise<{ id: string, accountName: string }>;
-@@ -96,11 +84,7 @@ async function getUserInfo(token: string, serverUri: vscode.Uri, logger: Log): P
- export class GitHubServer implements IGitHubServer {
+ async function getScopes(token: string, serverUri: vscode.Uri, logger: Log): Promise<string[]> {
+ 	try {
+ 		logger.info('Getting token scopes...');
+@@ -118,23 +96,11 @@ export class GitHubServer implements IGitHubServer {
 	friendlyName = 'GitHub';
 	type = AuthProviderType.github;
-	private _statusBarItem: vscode.StatusBarItem | undefined;
-	private _onDidManuallyProvideToken = new vscode.EventEmitter<string | undefined>();
 
-	private _pendingStates = new Map<string, string[]>();
-	private _codeExchangePromises = new Map<string, { promise: Promise<string>, cancel: vscode.EventEmitter<void> }>();
- 	private _statusBarCommandId = `${this.type}.provide-manually`;
+-	private _pendingNonces = new Map<string, string[]>();
+-	private _codeExchangePromises = new Map<string, { promise: Promise<string>; cancel: vscode.EventEmitter<void> }>();
 	private _disposable: vscode.Disposable;
 	private _uriHandler = new UriEventHandler(this._logger);
-@@ -115,137 +99,35 @@ export class GitHubServer implements IGitHubServer {
- 		this._disposable.dispose();
+-	private readonly getRedirectEndpoint: Thenable<string>;
+ 
+-	constructor(private readonly _supportDeviceCodeFlow: boolean, private readonly _logger: Log, private readonly _telemetryReporter: ExperimentationTelemetry) {
+	constructor(_supportDeviceCodeFlow: boolean, private readonly _logger: Log, private readonly _telemetryReporter: ExperimentationTelemetry) {
+ 		this._disposable = vscode.window.registerUriHandler(this._uriHandler);
+-
+-		this.getRedirectEndpoint = vscode.commands.executeCommand<{ [providerId: string]: string } | undefined>('workbench.getCodeExchangeProxyEndpoints').then((proxyEndpoints) => {
+-			// If we are running in insiders vscode.dev, then ensure we use the redirect route on that.
+-			let redirectUri = REDIRECT_URL_STABLE;
+-			if (proxyEndpoints?.github && new URL(proxyEndpoints.github).hostname === 'insiders.vscode.dev') {
+-				redirectUri = REDIRECT_URL_INSIDERS;
+-			}
+-			return redirectUri;
+-		});
 	}
 
-	private isTestEnvironment(url: vscode.Uri): boolean {
-		return /\.azurewebsites\.net$/.test(url.authority) || url.authority.startsWith('localhost:');
-	}
-
-	// TODO@joaomoreno TODO@TylerLeonhardt
-	private async isNoCorsEnvironment(): Promise<boolean> {
-		const uri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/dummy`));
-		return (uri.scheme === 'https' && /^((insiders\.)?vscode|github)\./.test(uri.authority)) || (uri.scheme === 'http' && /^localhost/.test(uri.authority));
-	}
-
- 	public async login(scopes: string): Promise<string> {
- 		this._logger.info(`Logging in for the following scopes: ${scopes}`);
+ 	dispose() {
+@@ -152,181 +118,17 @@ export class GitHubServer implements IGitHubServer {
 
-		const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/did-authenticate`));
+ 		// Used for showing a friendlier message to the user when the explicitly cancel a flow.
+ 		let userCancelled: boolean | undefined;
+-		const yes = localize('yes', "Yes");
+-		const no = localize('no', "No");
+-		const promptToContinue = async () => {
+-			if (userCancelled === undefined) {
+-				// We haven't had a failure yet so wait to prompt
+-				return;
+-			}
+-			const message = userCancelled
+-				? localize('userCancelledMessage', "Having trouble logging in? Would you like to try a different way?")
+-				: localize('otherReasonMessage', "You have not yet finished authorizing this extension to use GitHub. Would you like to keep trying?");
+-			const result = await vscode.window.showWarningMessage(message, yes, no);
+-			if (result !== yes) {
+-				throw new Error('Cancelled');
+-			}
+-		};
 -
-		if (this.isTestEnvironment(callbackUri)) {
-			const token = await vscode.window.showInputBox({ prompt: 'GitHub Personal Access Token', ignoreFocusOut: true });
-			if (!token) { throw new Error('Sign in failed: No token provided'); }
+-		const nonce = uuid();
+-		const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/did-authenticate?nonce=${encodeURIComponent(nonce)}`));
 -
-			const tokenScopes = await getScopes(token, this.getServerUri('/'), this._logger); // Example: ['repo', 'user']
-			const scopesList = scopes.split(' '); // Example: 'read:user repo user:email'
-			if (!scopesList.every(scope => {
-				const included = tokenScopes.includes(scope);
-				if (included || !scope.includes(':')) {
-					return included;
-				}
-+		const token = await vscode.window.showInputBox({ prompt: 'GitHub Personal Access Token', ignoreFocusOut: true });
-+		if (!token) { throw new Error('Sign in failed: No token provided'); }
- 
-				return scope.split(':').some(splitScopes => {
-					return tokenScopes.includes(splitScopes);
-				});
-			})) {
-				throw new Error(`The provided token does not match the requested scopes: ${scopes}`);
-+		const tokenScopes = await getScopes(token, this.getServerUri('/'), this._logger); // Example: ['repo', 'user']
-+		const scopesList = scopes.split(' '); // Example: 'read:user repo user:email'
-+		if (!scopesList.every(scope => {
-+			const included = tokenScopes.includes(scope);
-+			if (included || !scope.includes(':')) {
-+				return included;
- 			}
- 
-			return token;
+-		const supported = isSupportedEnvironment(callbackUri);
+-		if (supported) {
+-			try {
+-				return await this.doLoginWithoutLocalServer(scopes, nonce, callbackUri);
+-			} catch (e) {
+-				this._logger.error(e);
+-				userCancelled = e.message ?? e === 'User Cancelled';
+-			}
 -		}
 -
-		this.updateStatusBarItem(true);
-
-		const state = uuid();
-		const existingStates = this._pendingStates.get(scopes) || [];
-		this._pendingStates.set(scopes, [...existingStates, state]);
-
-		const uri = vscode.Uri.parse(`https://${AUTH_RELAY_SERVER}/authorize/?callbackUri=${encodeURIComponent(callbackUri.toString())}&scope=${scopes}&state=${state}&responseType=code&authServer=https://github.com`);
-		await vscode.env.openExternal(uri);
-
-		// Register a single listener for the URI callback, in case the user starts the login process multiple times
-		// before completing it.
-		let codeExchangePromise = this._codeExchangePromises.get(scopes);
-		if (!codeExchangePromise) {
-			codeExchangePromise = promiseFromEvent(this._uriHandler.event, this.exchangeCodeForToken(scopes));
-			this._codeExchangePromises.set(scopes, codeExchangePromise);
-+			return scope.split(':').some(splitScopes => {
-+				return tokenScopes.includes(splitScopes);
-+			});
-+		})) {
-+			throw new Error(`The provided token does not match the requested scopes: ${scopes}`);
+-		// Starting a local server isn't supported in web
+-		if (vscode.env.uiKind === vscode.UIKind.Desktop) {
+-			try {
+-				await promptToContinue();
+-				return await this.doLoginWithLocalServer(scopes);
+-			} catch (e) {
+-				this._logger.error(e);
+-				userCancelled = e.message ?? e === 'User Cancelled';
+-			}
+-		}
+ 
+-		if (this._supportDeviceCodeFlow) {
+-			try {
+-				await promptToContinue();
+-				return await this.doLoginDeviceCodeFlow(scopes);
+-			} catch (e) {
+-				this._logger.error(e);
+-				userCancelled = e.message ?? e === 'User Cancelled';
+-			}
+-		} else if (!supported) {
+-			try {
+-				await promptToContinue();
+-				return await this.doLoginWithPat(scopes);
+-			} catch (e) {
+-				this._logger.error(e);
+-				userCancelled = e.message ?? e === 'User Cancelled';
+-			}
+		try {
+			return await this.doLoginWithPat(scopes);
+		} catch (e) {
+			this._logger.error(e);
+			userCancelled = e.message ?? e === 'User Cancelled';
 		}
 
-		return Promise.race([
-			codeExchangePromise.promise,
-			promiseFromEvent<string | undefined, string>(this._onDidManuallyProvideToken.event, (token: string | undefined, resolve, reject): void => {
-				if (!token) {
-					reject('Cancelled');
-				} else {
-					resolve(token);
-				}
-			}).promise,
-			new Promise<string>((_, reject) => setTimeout(() => reject('Cancelled'), 60000))
-		]).finally(() => {
-			this._pendingStates.delete(scopes);
-			codeExchangePromise?.cancel.fire();
-			this._codeExchangePromises.delete(scopes);
-			this.updateStatusBarItem(false);
-		});
-+		return token;
+ 		throw new Error(userCancelled ? 'Cancelled' : 'No auth flow succeeded.');
 	}
 
-	private exchangeCodeForToken: (scopes: string) => PromiseAdapter<vscode.Uri, string> =
-		(scopes) => async (uri, resolve, reject) => {
-			const query = parseQuery(uri);
-			const code = query.code;
+-	private async doLoginWithoutLocalServer(scopes: string, nonce: string, callbackUri: vscode.Uri): Promise<string> {
+-		this._logger.info(`Trying without local server... (${scopes})`);
+-		return await vscode.window.withProgress<string>({
+-			location: vscode.ProgressLocation.Notification,
+-			title: localize('signingIn', "Signing in to github.com..."),
+-			cancellable: true
+-		}, async (_, token) => {
+-			const existingNonces = this._pendingNonces.get(scopes) || [];
+-			this._pendingNonces.set(scopes, [...existingNonces, nonce]);
+-			const redirectUri = await this.getRedirectEndpoint;
+-			const searchParams = new URLSearchParams([
+-				['client_id', CLIENT_ID],
+-				['redirect_uri', redirectUri],
+-				['scope', scopes],
+-				['state', encodeURIComponent(callbackUri.toString(true))]
+-			]);
+-			const uri = vscode.Uri.parse(`${GITHUB_AUTHORIZE_URL}?${searchParams.toString()}`);
+-			await vscode.env.openExternal(uri);
 -
-			const acceptedStates = this._pendingStates.get(scopes) || [];
-			if (!acceptedStates.includes(query.state)) {
+-			// Register a single listener for the URI callback, in case the user starts the login process multiple times
+-			// before completing it.
+-			let codeExchangePromise = this._codeExchangePromises.get(scopes);
+-			if (!codeExchangePromise) {
+-				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('Cancelled'), 60000)),
+-					promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject('User Cancelled'); }).promise
+-				]);
+-			} finally {
+-				this._pendingNonces.delete(scopes);
+-				codeExchangePromise?.cancel.fire();
+-				this._codeExchangePromises.delete(scopes);
+-			}
+-		});
+-	}
+-
+-	private async doLoginWithLocalServer(scopes: string): Promise<string> {
+-		this._logger.info(`Trying with local server... (${scopes})`);
+-		return await vscode.window.withProgress<string>({
+-			location: vscode.ProgressLocation.Notification,
+-			title: localize('signingInAnotherWay', "Signing in to github.com..."),
+-			cancellable: true
+-		}, async (_, token) => {
+-			const redirectUri = await this.getRedirectEndpoint;
+-			const searchParams = new URLSearchParams([
+-				['client_id', CLIENT_ID],
+-				['redirect_uri', redirectUri],
+-				['scope', scopes],
+-			]);
+-			const loginUrl = `${GITHUB_AUTHORIZE_URL}?${searchParams.toString()}`;
+-			const server = new LoopbackAuthServer(path.join(__dirname, '../media'), loginUrl);
+-			const port = await server.start();
+-
+-			let codeToExchange;
+-			try {
+-				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('Cancelled'), 60000)),
+-					promiseFromEvent<any, any>(token.onCancellationRequested, (_, __, reject) => { reject('User Cancelled'); }).promise
+-				]);
+-				codeToExchange = code;
+-			} finally {
+-				setTimeout(() => {
+-					void server.stop();
+-				}, 5000);
+-			}
+-
+-			const accessToken = await this.exchangeCodeForToken(codeToExchange);
+-			return accessToken;
+-		});
+-	}
+-
+-	private async doLoginDeviceCodeFlow(scopes: string): Promise<string> {
+-		this._logger.info(`Trying device code flow... (${scopes})`);
+-
+-		// Get initial device code
+-		const uri = `https://github.com/login/device/code?client_id=${CLIENT_ID}&scope=${scopes}`;
+-		const result = await fetch(uri, {
+-			method: 'POST',
+-			headers: {
+-				Accept: 'application/json'
+-			}
+-		});
+-		if (!result.ok) {
+-			throw new Error(`Failed to get one-time code: ${await result.text()}`);
+-		}
+-
+-		const json = await result.json() as IGitHubDeviceCodeResponse;
+-
+-
+-		const modalResult = await vscode.window.showInformationMessage(
+-			localize('code.title', "Your Code: {0}", json.user_code),
+-			{
+-				modal: true,
+-				detail: localize('code.detail', "To finish authenticating, navigate to GitHub and paste in the above one-time code.")
+-			}, 'Copy & Continue to GitHub');
+-
+-		if (modalResult !== 'Copy & Continue to GitHub') {
+-			throw new Error('User Cancelled');
+-		}
+-
+-		await vscode.env.clipboard.writeText(json.user_code);
+-
+-		const uriToOpen = await vscode.env.asExternalUri(vscode.Uri.parse(json.verification_uri));
+-		await vscode.env.openExternal(uriToOpen);
+-
+-		return await this.waitForDeviceCodeAccessToken(json);
+-	}
+ 
+ 	private async doLoginWithPat(scopes: string): Promise<string> {
+ 		this._logger.info(`Trying to retrieve PAT... (${scopes})`);
+@@ -351,118 +153,6 @@ export class GitHubServer implements IGitHubServer {
+ 		return token;
+ 	}
+ 
+-	private async waitForDeviceCodeAccessToken(
+-		json: IGitHubDeviceCodeResponse,
+-	): Promise<string> {
+-		return await vscode.window.withProgress<string>({
+-			location: vscode.ProgressLocation.Notification,
+-			cancellable: true,
+-			title: localize(
+-				'progress',
+-				"Open [{0}]({0}) in a new tab and paste your one-time code: {1}",
+-				json.verification_uri,
+-				json.user_code)
+-		}, async (_, token) => {
+-			const refreshTokenUri = `https://github.com/login/oauth/access_token?client_id=${CLIENT_ID}&device_code=${json.device_code}&grant_type=urn:ietf:params:oauth:grant-type:device_code`;
+-
+-			// Try for 2 minutes
+-			const attempts = 120 / json.interval;
+-			for (let i = 0; i < attempts; i++) {
+-				await new Promise(resolve => setTimeout(resolve, json.interval * 1000));
+-				if (token.isCancellationRequested) {
+-					throw new Error('User Cancelled');
+-				}
+-				let accessTokenResult;
+-				try {
+-					accessTokenResult = await fetch(refreshTokenUri, {
+-						method: 'POST',
+-						headers: {
+-							Accept: 'application/json'
+-						}
+-					});
+-				} catch {
+-					continue;
+-				}
+-
+-				if (!accessTokenResult.ok) {
+-					continue;
+-				}
+-
+-				const accessTokenJson = await accessTokenResult.json();
+-
+-				if (accessTokenJson.error === 'authorization_pending') {
+-					continue;
+-				}
+-
+-				if (accessTokenJson.error) {
+-					throw new Error(accessTokenJson.error_description);
+-				}
+-
+-				return accessTokenJson.access_token;
+-			}
+-
+-			throw new Error('Cancelled');
+-		});
+-	}
+-
+-	private handleUri: (scopes: string) => PromiseAdapter<vscode.Uri, string> =
+-		(scopes) => (uri, resolve, reject) => {
+-			const query = new URLSearchParams(uri.query);
+-			const code = query.get('code');
+-			const nonce = query.get('nonce');
+-			if (!code) {
+-				reject(new Error('No code'));
+-				return;
+-			}
+-			if (!nonce) {
+-				reject(new Error('No nonce'));
+-				return;
+-			}
+-
+-			const acceptedNonces = this._pendingNonces.get(scopes) || [];
+-			if (!acceptedNonces.includes(nonce)) {
 -				// A common scenario of this happening is if you:
 -				// 1. Trigger a sign in with one set of scopes
 -				// 2. Before finishing 1, you trigger a sign in with a different set of scopes
 -				// In this scenario we should just return and wait for the next UriHandler event
 -				// to run as we are probably still waiting on the user to hit 'Continue'
-				this._logger.info('State not found in accepted state. Skipping this execution...');
+-				this._logger.info('Nonce not found in accepted nonces. Skipping this execution...');
 -				return;
 -			}
 -
-			const url = `https://${AUTH_RELAY_SERVER}/token?code=${code}&state=${query.state}`;
-			this._logger.info('Exchanging code for token...');
-
-			try {
-				const result = await fetch(url, {
-					method: 'POST',
-					headers: {
-						Accept: 'application/json'
-					}
-				});
-
-				if (result.ok) {
-					const json = await result.json();
-					this._logger.info('Token exchange success!');
-					resolve(json.access_token);
-				} else {
-					reject(result.statusText);
-				}
-			} catch (ex) {
-				reject(ex);
-			}
+-			resolve(this.exchangeCodeForToken(code));
 -		};
+-
+-	private async exchangeCodeForToken(code: string): Promise<string> {
+-		this._logger.info('Exchanging code for token...');
+-
+-		const proxyEndpoints: { [providerId: string]: string } | undefined = await vscode.commands.executeCommand('workbench.getCodeExchangeProxyEndpoints');
+-		const endpointUrl = proxyEndpoints?.github ? `${proxyEndpoints.github}login/oauth/access_token` : GITHUB_TOKEN_URL;
+-
+-		const body = `code=${code}`;
+-		const result = await fetch(endpointUrl, {
+-			method: 'POST',
+-			headers: {
+-				Accept: 'application/json',
+-				'Content-Type': 'application/x-www-form-urlencoded',
+-				'Content-Length': body.toString()
+-
+-			},
+-			body
+-		});
+-
+-		if (result.ok) {
+-			const json = await result.json();
+-			this._logger.info('Token exchange success!');
+-			return json.access_token;
+-		} else {
+-			const text = await result.text();
+-			const error = new Error(text);
+-			error.name = 'GitHubTokenExchangeError';
+-			throw error;
+-		}
+-	}
 -
 	private getServerUri(path: string = '') {
 		const apiUri = vscode.Uri.parse('https://api.github.com');
 		return vscode.Uri.parse(`${apiUri.scheme}://${apiUri.authority}${path}`);
- 	}
+diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
+index 36647e6..55e722b 100644
+--- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
+++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts
+@@ -271,7 +271,7 @@ export class AccountsActivityActionViewItem extends MenuActivityActionViewItem {
+ 			}
+ 		});
 
-	private updateStatusBarItem(isStart?: boolean) {
-		if (isStart && !this._statusBarItem) {
-			this._statusBarItem = vscode.window.createStatusBarItem('status.git.signIn', vscode.StatusBarAlignment.Left);
-			this._statusBarItem.name = localize('status.git.signIn.name', "GitHub Sign-in");
-			this._statusBarItem.text = localize('signingIn', "$(mark-github) Signing in to github.com...");
-			this._statusBarItem.command = this._statusBarCommandId;
-			this._statusBarItem.show();
-		}
+-		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));
+ 			menus.push(noAccountsAvailableAction);
+ 		}
+diff --git a/src/vs/workbench/services/authentication/browser/authenticationService.ts b/src/vs/workbench/services/authentication/browser/authenticationService.ts
+index f543021..ad40bc3 100644
+--- a/src/vs/workbench/services/authentication/browser/authenticationService.ts
+++ b/src/vs/workbench/services/authentication/browser/authenticationService.ts
+@@ -272,16 +272,6 @@ export class AuthenticationService extends Disposable implements IAuthentication
+ 				this.removeAccessRequest(id, extensionId);
+ 			});
+ 		}
 -
-		if (!isStart && this._statusBarItem) {
-			this._statusBarItem.dispose();
-			this._statusBarItem = undefined;
-		}
-	}
-
- 	private async manuallyProvideUri() {
- 		const uri = await vscode.window.showInputBox({
- 			prompt: 'Uri',
-@@ -277,44 +159,7 @@ export class GitHubServer implements IGitHubServer {
- 		return getUserInfo(token, this.getServerUri('/user'), this._logger);
- 	}
- 
-	public async sendAdditionalTelemetryInfo(token: string): Promise<void> {
-		if (!vscode.env.isTelemetryEnabled) {
-			return;
-		}
-		const nocors = await this.isNoCorsEnvironment();
-
-		if (nocors) {
-			return;
-		}
-
-		try {
-			const result = await fetch('https://education.github.com/api/user', {
-				headers: {
-					Authorization: `token ${token}`,
-					'faculty-check-preview': 'true',
-					'User-Agent': 'Visual-Studio-Code'
-				}
+-		if (!this._authenticationProviders.size) {
+-			this._placeholderMenuItem = MenuRegistry.appendMenuItem(MenuId.AccountsContext, {
+-				command: {
+-					id: 'noAuthenticationProviders',
+-					title: nls.localize('loading', "Loading..."),
+-					precondition: ContextKeyExpr.false()
+-				},
 -			});
-
-			if (result.ok) {
-				const json: { student: boolean, faculty: boolean } = await result.json();
-
-				/* __GDPR__
-					"session" : {
-						"isEdu": { "classification": "NonIdentifiableDemographicInfo", "purpose": "FeatureInsight" }
-					}
-				*/
-				this._telemetryReporter.sendTelemetryEvent('session', {
-					isEdu: json.student
-						? 'student'
-						: json.faculty
-							? 'faculty'
-							: 'none'
-				});
-			}
-		} catch (e) {
-			// No-op
 -		}
-+	public async sendAdditionalTelemetryInfo(_token: string): Promise<void> {
 	}
 
- 	public async checkEnterpriseVersion(token: string): Promise<void> {
+ 	async sessionsUpdate(id: string, event: AuthenticationSessionsChangeEvent): Promise<void> {
--- a/prepare_vscode.sh
+++ b/prepare_vscode.sh
@@ -34,9 +34,19 @@ done

 set -x

-if [[ "$OS_NAME" == "osx" ]]; then
+if [[ "${OS_NAME}" == "osx" ]]; then
  CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional
  npm_config_argv='{"original":["--ignore-optional"]}' yarn postinstall
+elif [[ "${npm_config_arch}" == "armv7l" || "${npm_config_arch}" == "ia32" ]]; then
+  # node-gyp@9.0.0 shipped with node@16.15.0 starts using config.gypi
+  # from the custom headers path if dist-url option was set instead of
+  # using the config value from the process. Electron builds with pointer compression
+  # enabled for x64 and arm64, but incorrectly ships a single copy of config.gypi
+  # with v8_enable_pointer_compression option always set for all target architectures.
+  # We use the force_process_config option to use the config.gypi from the
+  # nodejs process executing npm for 32-bit architectures.
+  export npm_config_force_process_config="true"
+  CHILD_CONCURRENCY=1 yarn --frozen-lockfile
 else
  CHILD_CONCURRENCY=1 yarn --frozen-lockfile
 fi
@@ -50,7 +60,6 @@ twitterUrl='setpath(["twitterUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533
 requestFeatureUrl='setpath(["requestFeatureUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533482")'
 documentationUrl='setpath(["documentationUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533484#vscode")'
 introductoryVideosUrl='setpath(["introductoryVideosUrl"]; "https://go.microsoft.com/fwlink/?linkid=832146")'
-extensionAllowedBadgeProviders='setpath(["extensionAllowedBadgeProviders"]; ["api.bintray.com", "api.travis-ci.com", "api.travis-ci.org", "app.fossa.io", "badge.fury.io", "badge.waffle.io", "badgen.net", "badges.frapsoft.com", "badges.gitter.im", "badges.greenkeeper.io", "cdn.travis-ci.com", "cdn.travis-ci.org", "ci.appveyor.com", "circleci.com", "cla.opensource.microsoft.com", "codacy.com", "codeclimate.com", "codecov.io", "coveralls.io", "david-dm.org", "deepscan.io", "dev.azure.com", "flat.badgen.net", "gemnasium.com", "githost.io", "gitlab.com", "godoc.org", "goreportcard.com", "img.shields.io", "isitmaintained.com", "marketplace.visualstudio.com", "nodesecurity.io", "opencollective.com", "snyk.io", "travis-ci.com", "travis-ci.org", "visualstudio.com", "vsmarketplacebadge.apphb.com", "www.bithound.io", "www.versioneye.com"])'
 updateUrl='setpath(["updateUrl"]; "https://vscodium.now.sh")'
 releaseNotesUrl='setpath(["releaseNotesUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533483#vscode")'
 keyboardShortcutsUrlMac='setpath(["keyboardShortcutsUrlMac"]; "https://go.microsoft.com/fwlink/?linkid=832143")'
@@ -71,13 +80,16 @@ win32AppUserModelId='setpath(["win32AppUserModelId"]; "Microsoft.VSCodium")'
 win32ShellNameShort='setpath(["win32ShellNameShort"]; "VSCodium")'
 win32x64UserAppId='setpath (["win32x64UserAppId"]; "{{2E1F05D1-C245-4562-81EE-28188DB6FD17}")'
 urlProtocol='setpath(["urlProtocol"]; "vscodium")'
-extensionAllowedProposedApi='setpath(["extensionAllowedProposedApi"]; getpath(["extensionAllowedProposedApi"]) + ["ms-vscode.cpptools", "ms-azuretools.vscode-docker", "visualstudioexptteam.vscodeintellicode", "GitHub.codespaces", "GitHub.vscode-pull-request-github-insiders", "GitHub.vscode-pull-request-github", "Microsoft.vscode-nmake-tools", "ms-ai-tools.notebook-renderers", "ms-dotnettools.dotnet-interactive-vscode", "ms-python.gather", "ms-python.python", "ms-toolsai.jupyter", "ms-toolsai.vscode-ai", "ms-toolsai.vscode-ai-remote", "ms-vscode-remote.remote-containers-nightly", "ms-vscode-remote.remote-containers", "ms-vscode-remote.remote-ssh-edit-nightly", "ms-vscode-remote.remote-ssh-edit", "ms-vscode-remote.remote-ssh-nightly", "ms-vscode-remote.remote-ssh", "ms-vscode-remote.remote-wsl-nightly", "ms-vscode-remote.remote-wsl", "ms-vscode-remote.remote-wsl-recommender", "ms-vscode-remote.vscode-remote-extensionpack-nightly", "ms-vscode-remote.vscode-remote-extensionpack", "ms-vscode.azure-account", "ms-vscode.azure-sphere-tools-ui", "ms-vscode.azure-sphere-tools", "ms-vscode.github-browser", "ms-vscode.github-richnav", "ms-vscode.js-debug-nightly", "ms-vscode.js-debug", "ms-vscode.lsif-browser", "ms-vscode.vscode-js-profile-flame", "ms-vscode.vscode-js-profile-table", "ms-vscode.vscode-selfhost-test-provider", "ms-vsliveshare.cloudenv-explorer", "ms-vsliveshare.cloudenv", "ms-vsliveshare.vsliveshare", "ms-vsonline.vsonline", "dbaeumer.vscode-eslint"])'
 serverDataFolderName='setpath(["serverDataFolderName"]; ".vscode-server-oss")'
-reportIssueUrl='setpath(["reportIssueUrl"]; "https://github.com/VSCodium/vscodium/issues/new/choose")'
+reportIssueUrl='setpath(["reportIssueUrl"]; "https://github.com/VSCodium/vscodium/issues/new")'
 licenseUrl='setpath(["licenseUrl"]; "https://github.com/VSCodium/vscodium/blob/master/LICENSE")'

-product_json_changes="${checksumFailMoreInfoUrl} | ${tipsAndTricksUrl} | ${twitterUrl} | ${requestFeatureUrl} | ${documentationUrl} | ${introductoryVideosUrl} | ${extensionAllowedBadgeProviders} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${linkProtectionTrustedDomains} | ${nameShort} | ${nameLong} | ${linuxIconName} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${extensionAllowedProposedApi} | ${serverDataFolderName} | ${reportIssueUrl} | ${licenseUrl}"
-cat product.json.bak | jq "${product_json_changes}" > product.json
+product_json_changes="${checksumFailMoreInfoUrl} | ${tipsAndTricksUrl} | ${twitterUrl} | ${requestFeatureUrl} | ${documentationUrl} | ${introductoryVideosUrl} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${linkProtectionTrustedDomains} | ${nameShort} | ${nameLong} | ${linuxIconName} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${serverDataFolderName} | ${reportIssueUrl} | ${licenseUrl}"
+cat product.json.bak | jq "${product_json_changes}" > product.json.tmp
+
+jq -s '.[0] * .[1]' product.json.tmp ../product.json > product.json
+rm -f product.json.tmp
+
 cat product.json

 ../undo_telemetry.sh
--- a/product.json
+++ b/product.json
@@ -0,0 +1,427 @@
+{
+  "extensionAllowedBadgeProviders": [
+    "api.bintray.com",
+    "api.travis-ci.com",
+    "api.travis-ci.org",
+    "app.fossa.io",
+    "badge.buildkite.com",
+    "badge.fury.io",
+    "badge.waffle.io",
+    "badgen.net",
+    "badges.frapsoft.com",
+    "badges.gitter.im",
+    "badges.greenkeeper.io",
+    "cdn.travis-ci.com",
+    "cdn.travis-ci.org",
+    "ci.appveyor.com",
+    "circleci.com",
+    "cla.opensource.microsoft.com",
+    "codacy.com",
+    "codeclimate.com",
+    "codecov.io",
+    "coveralls.io",
+    "david-dm.org",
+    "deepscan.io",
+    "dev.azure.com",
+    "docs.rs",
+    "flat.badgen.net",
+    "gemnasium.com",
+    "githost.io",
+    "gitlab.com",
+    "godoc.org",
+    "goreportcard.com",
+    "img.shields.io",
+    "isitmaintained.com",
+    "marketplace.visualstudio.com",
+    "nodesecurity.io",
+    "opencollective.com",
+    "snyk.io",
+    "travis-ci.com",
+    "travis-ci.org",
+    "visualstudio.com",
+    "vsmarketplacebadge.apphb.com",
+    "www.bithound.io",
+    "www.versioneye.com"
+  ],
+  "extensionAllowedBadgeProvidersRegex": [
+    "^https:\\/\\/github\\.com\\/[^/]+\\/[^/]+\\/(actions\\/)?workflows\\/.*badge\\.svg"
+  ],
+  "extensionEnabledApiProposals": {
+    "ms-vscode.vscode-selfhost-test-provider": [
+      "testObserver"
+    ],
+    "VisualStudioExptTeam.vscodeintellicode-completions": [
+      "inlineCompletions"
+    ],
+    "ms-vsliveshare.vsliveshare": [
+      "contribMenuBarHome",
+      "diffCommand",
+      "documentFiltersExclusive",
+      "fileSearchProvider",
+      "findTextInFiles",
+      "notebookCellExecutionState",
+      "notebookContentProvider",
+      "notebookDocumentEvents",
+      "notebookEditor",
+      "notebookEditorEdit",
+      "notebookLiveShare",
+      "terminalDimensions",
+      "terminalDataWriteEvent",
+      "textDocumentNotebook",
+      "textSearchProvider"
+    ],
+    "ms-vscode.js-debug": [
+      "portsAttributes",
+      "findTextInFiles",
+      "workspaceTrust",
+      "resolvers"
+    ],
+    "ms-toolsai.vscode-ai-remote": [
+      "resolvers",
+      "notebookEditor"
+    ],
+    "ms-python.python": [
+      "quickPickSortByLabel",
+      "testObserver",
+      "notebookEditor"
+    ],
+    "ms-dotnettools.dotnet-interactive-vscode": [
+      "notebookConcatTextDocument",
+      "notebookContentProvider",
+      "notebookCellExecutionState",
+      "notebookControllerKind",
+      "notebookDebugOptions",
+      "notebookDeprecated",
+      "notebookEditor",
+      "notebookEditorDecorationType",
+      "notebookEditorEdit",
+      "notebookLiveShare",
+      "notebookMessaging",
+      "notebookMime",
+      "textDocumentNotebook"
+    ],
+    "GitHub.codespaces": [
+      "contribMenuBarHome",
+      "contribRemoteHelp",
+      "contribViewsRemote",
+      "notebookEditor",
+      "resolvers",
+      "terminalDataWriteEvent",
+      "treeViewReveal"
+    ],
+    "ms-vscode.azure-repos": [
+      "extensionRuntime",
+      "fileSearchProvider",
+      "resolvers",
+      "textSearchProvider"
+    ],
+    "ms-vscode.remote-repositories": [
+      "contribRemoteHelp",
+      "contribMenuBarHome",
+      "contribViewsRemote",
+      "contribViewsWelcome",
+      "documentFiltersExclusive",
+      "extensionRuntime",
+      "fileSearchProvider",
+      "quickPickSortByLabel",
+      "workspaceTrust",
+      "scmSelectedProvider",
+      "scmValidation",
+      "textSearchProvider",
+      "timeline",
+      "notebookEditor"
+    ],
+    "ms-vscode.vscode-github-issue-notebooks": [
+      "notebookEditor"
+    ],
+    "tanhakabir.rest-book": [
+      "notebookEditor"
+    ],
+    "ms-vscode-remote.remote-wsl": [
+      "resolvers",
+      "contribViewsRemote",
+      "telemetry"
+    ],
+    "ms-vscode-remote.remote-ssh": [
+      "resolvers",
+      "terminalDataWriteEvent",
+      "contribViewsRemote",
+      "telemetry"
+    ],
+    "ms-vscode-remote.remote-containers": [
+      "resolvers",
+      "workspaceTrust",
+      "terminalDimensions",
+      "contribViewsRemote"
+    ],
+    "ms-vscode.js-debug-nightly": [
+      "portsAttributes",
+      "findTextInFiles",
+      "workspaceTrust",
+      "resolvers"
+    ],
+    "ms-vscode.lsif-browser": [
+      "documentFiltersExclusive"
+    ],
+    "GitHub.vscode-pull-request-github": [
+      "tokenInformation"
+    ],
+    "GitHub.copilot": [
+      "inlineCompletions",
+      "textDocumentNotebook"
+    ],
+    "GitHub.copilot-nightly": [
+      "inlineCompletions",
+      "textDocumentNotebook"
+    ],
+    "GitHub.remotehub": [
+      "contribRemoteHelp",
+      "contribMenuBarHome",
+      "contribViewsRemote",
+      "contribViewsWelcome",
+      "documentFiltersExclusive",
+      "extensionRuntime",
+      "fileSearchProvider",
+      "quickPickSortByLabel",
+      "workspaceTrust",
+      "resolvers",
+      "scmSelectedProvider",
+      "scmValidation",
+      "textSearchProvider",
+      "timeline",
+      "notebookEditor"
+    ],
+    "GitHub.remotehub-insiders": [
+      "contribRemoteHelp",
+      "contribMenuBarHome",
+      "contribViewsRemote",
+      "contribViewsWelcome",
+      "documentFiltersExclusive",
+      "extensionRuntime",
+      "fileSearchProvider",
+      "quickPickSortByLabel",
+      "workspaceTrust",
+      "resolvers",
+      "scmSelectedProvider",
+      "scmValidation",
+      "textSearchProvider",
+      "timeline",
+      "notebookEditor"
+    ],
+    "ms-python.gather": [
+      "notebookEditor",
+      "notebookCellExecutionState"
+    ],
+    "ms-python.vscode-pylance": [
+      "notebookDocumentEvents",
+      "notebookEditor",
+      "notebookCellExecutionState"
+    ],
+    "ms-toolsai.jupyter": [
+      "notebookConcatTextDocument",
+      "notebookControllerKind",
+      "notebookDebugOptions",
+      "notebookDeprecated",
+      "notebookEditor",
+      "notebookDocumentEvents",
+      "notebookEditorDecorationType",
+      "notebookEditorEdit",
+      "notebookMessaging",
+      "notebookMime",
+      "notebookCellExecutionState",
+      "portsAttributes",
+      "textDocumentNotebook",
+      "quickPickSortByLabel"
+    ],
+    "dbaeumer.vscode-eslint": [
+      "tabs",
+      "notebookDocumentEvents",
+      "notebookEditor",
+      "notebookCellExecutionState"
+    ],
+    "ms-vscode.azure-sphere-tools-ui": [
+      "resolvers"
+    ],
+    "ms-azuretools.vscode-azureappservice": [
+      "terminalDataWriteEvent"
+    ]
+  },
+  "extensionKind": {
+    "Shan.code-settings-sync": [
+      "ui"
+    ],
+    "shalldie.background": [
+      "ui"
+    ],
+    "techer.open-in-browser": [
+      "ui"
+    ],
+    "CoenraadS.bracket-pair-colorizer-2": [
+      "ui"
+    ],
+    "CoenraadS.bracket-pair-colorizer": [
+      "ui",
+      "workspace"
+    ],
+    "hiro-sun.vscode-emacs": [
+      "ui",
+      "workspace"
+    ],
+    "hnw.vscode-auto-open-markdown-preview": [
+      "ui",
+      "workspace"
+    ],
+    "wayou.vscode-todo-highlight": [
+      "ui",
+      "workspace"
+    ],
+    "aaron-bond.better-comments": [
+      "ui",
+      "workspace"
+    ],
+    "vscodevim.vim": [
+      "ui"
+    ],
+    "ollyhayes.colmak-vim": [
+      "ui"
+    ]
+  },
+  "extensionPointExtensionKind": {
+    "typescriptServerPlugins": [
+      "workspace"
+    ]
+  },
+  "extensionSyncedKeys": {
+    "ritwickdey.liveserver": [
+      "liveServer.setup.version"
+    ]
+  },
+  "extensionVirtualWorkspacesSupport": {
+    "esbenp.prettier-vscode": {
+      "default": false
+    },
+    "msjsdiag.debugger-for-chrome": {
+      "default": false
+    },
+    "redhat.java": {
+      "default": false
+    },
+    "HookyQR.beautify": {
+      "default": false
+    },
+    "ritwickdey.LiveServer": {
+      "default": false
+    },
+    "VisualStudioExptTeam.vscodeintellicode": {
+      "default": false
+    },
+    "octref.vetur": {
+      "default": false
+    },
+    "formulahendry.code-runner": {
+      "default": false
+    },
+    "xdebug.php-debug": {
+      "default": false
+    },
+    "ms-mssql.mssql": {
+      "default": false
+    },
+    "christian-kohler.path-intellisense": {
+      "default": false
+    },
+    "eg2.tslint": {
+      "default": false
+    },
+    "eg2.vscode-npm-script": {
+      "default": false
+    },
+    "donjayamanne.githistory": {
+      "default": false
+    },
+    "Zignd.html-css-class-completion": {
+      "default": false
+    },
+    "christian-kohler.npm-intellisense": {
+      "default": false
+    },
+    "EditorConfig.EditorConfig": {
+      "default": false
+    },
+    "austin.code-gnu-global": {
+      "default": false
+    },
+    "johnpapa.Angular2": {
+      "default": false
+    },
+    "ms-vscode.vscode-typescript-tslint-plugin": {
+      "default": false
+    },
+    "DotJoshJohnson.xml": {
+      "default": false
+    },
+    "techer.open-in-browser": {
+      "default": false
+    },
+    "tht13.python": {
+      "default": false
+    },
+    "bmewburn.vscode-intelephense-client": {
+      "default": false
+    },
+    "Angular.ng-template": {
+      "default": false
+    },
+    "xdebug.php-pack": {
+      "default": false
+    },
+    "dbaeumer.jshint": {
+      "default": false
+    },
+    "yzhang.markdown-all-in-one": {
+      "default": false
+    },
+    "Dart-Code.flutter": {
+      "default": false
+    },
+    "streetsidesoftware.code-spell-checker": {
+      "default": false
+    },
+    "rebornix.Ruby": {
+      "default": false
+    },
+    "ms-vscode.sublime-keybindings": {
+      "default": false
+    },
+    "mitaki28.vscode-clang": {
+      "default": false
+    },
+    "steoates.autoimport": {
+      "default": false
+    },
+    "donjayamanne.python-extension-pack": {
+      "default": false
+    },
+    "shd101wyy.markdown-preview-enhanced": {
+      "default": false
+    },
+    "mikestead.dotenv": {
+      "default": false
+    },
+    "pranaygp.vscode-css-peek": {
+      "default": false
+    },
+    "ikappas.phpcs": {
+      "default": false
+    },
+    "platformio.platformio-ide": {
+      "default": false
+    },
+    "jchannon.csharpextensions": {
+      "default": false
+    },
+    "gruntfuggly.todo-tree": {
+      "default": false
+    }
+  }
+}
--- a/release.sh
+++ b/release.sh
@@ -18,6 +18,14 @@ cd artifacts

 set +e

+OWNER="${GITHUB_REPOSITORY_OWNER:-"VSCodium"}"
+REPO_NAME="${GITHUB_REPOSITORY:(${#OWNER}+1)}"
+REPOSITORY="${REPO_NAME:-"vscodium"}"
+
+# git workaround
+git config --global --add safe.directory /__w/vscodium/vscodium
+
+
 for FILE in *
 do
  if [[ -f "${FILE}" ]] && [[ "${FILE}" != *.sha1 ]] && [[ "${FILE}" != *.sha256 ]]; then
@@ -30,7 +38,7 @@ do
    if (( $EXIT_STATUS )); then
      for (( i=0; i<10; i++ ))
      do
-        github-release delete --owner VSCodium --repo vscodium --tag "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"
+        github-release delete --owner "${OWNER}" --repo "${REPOSITORY}" --tag "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"

        sleep $(( 15 * (i + 1)))

@@ -49,7 +57,7 @@ do
      if (( $EXIT_STATUS )); then
        echo "'${FILE}' hasn't been uploaded!"

-        github-release delete --owner VSCodium --repo vscodium --tag "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"
+        github-release delete --owner "${OWNER}" --repo "${REPOSITORY}" --tag "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"

        exit 1
      fi
--- a/src/src/vs/workbench/browser/parts/editor/media/letterpress-dark.svg
+++ b/src/src/vs/workbench/browser/parts/editor/media/letterpress-dark.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="1024px" height="1024px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="40" height="40" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <!-- Generator: Sketch 55 (78076) - https://sketchapp.com -->
    <title>codium_grey_dark_letterpress</title>
    <desc>Created with Sketch.</desc>
--- a/src/src/vs/workbench/browser/parts/editor/media/letterpress-hcDark.svg
+++ b/src/src/vs/workbench/browser/parts/editor/media/letterpress-hcDark.svg
--- a/src/src/vs/workbench/browser/parts/editor/media/letterpress-hcLight.svg
+++ b/src/src/vs/workbench/browser/parts/editor/media/letterpress-hcLight.svg
--- a/src/src/vs/workbench/browser/parts/editor/media/letterpress-light.svg
+++ b/src/src/vs/workbench/browser/parts/editor/media/letterpress-light.svg
--- a/stores/snapcraft/check_version.sh
+++ b/stores/snapcraft/check_version.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+set -e
+
+if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
+	echo "It's a PR"
+
+	export SHOULD_DEPLOY="no"
+elif [[ "${GITHUB_EVENT_NAME}" == "push" ]]; then
+	echo "It's a Push"
+
+	export SHOULD_DEPLOY="no"
+else
+	echo "It's a cron"
+
+  sudo snap install --channel stable --classic snapcraft
+
+  echo "$SNAP_STORE_LOGIN" | snapcraft login --with -
+
+  echo "Architecture: ${ARCHITECTURE}"
+
+  SNAP_VERSION=$(snapcraft list-revisions codium | grep -F stable* | grep ${ARCHITECTURE} | tr -s ' ' | cut -d ' ' -f 4)
+  echo "Snap version: ${SNAP_VERSION}"
+
+  wget --quiet https://api.github.com/repos/VSCodium/vscodium/releases -O gh_latest.json
+  GH_VERSION=$(jq -r 'sort_by(.tag_name)|last.tag_name' gh_latest.json)
+  echo "GH version: ${GH_VERSION}"
+
+  rm -f gh_latest.json
+
+  if [[ "${SNAP_VERSION}" == "${GH_VERSION}" ]]; then
+    export SHOULD_DEPLOY="no"
+  else
+	  export SHOULD_DEPLOY="yes"
+
+    snap version
+    snap info codium
+  fi
+fi
+
+if [[ $GITHUB_ENV ]]; then
+	echo "SHOULD_DEPLOY=$SHOULD_DEPLOY" >> $GITHUB_ENV
+fi
--- a/stores/snapcraft/snap/local/bin/electron-launch
+++ b/stores/snapcraft/snap/local/bin/electron-launch
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+# On Fedora $SNAP is under /var and there is some magic to map it to /snap.
+# We need to handle that case and reset $SNAP
+SNAP=$(echo "$SNAP" | sed -e "s|/var/lib/snapd||g")
+
+if [ "$SNAP_ARCH" == "amd64" ]; then
+  ARCH="x86_64-linux-gnu"
+elif [ "$SNAP_ARCH" == "armhf" ]; then
+  ARCH="arm-linux-gnueabihf"
+elif [ "$SNAP_ARCH" == "arm64" ]; then
+  ARCH="aarch64-linux-gnu"
+else
+  ARCH="$SNAP_ARCH-linux-gnu"
+fi
+
+GDK_CACHE_DIR="$SNAP_USER_COMMON/.cache"
+if [[ -d "$SNAP_USER_DATA/.cache" && ! -e "$GDK_CACHE_DIR" ]]; then
+  # the .cache directory used to be stored under $SNAP_USER_DATA, migrate it
+  mv "$SNAP_USER_DATA/.cache" "$SNAP_USER_COMMON/"
+fi
+[ ! -d "$GDK_CACHE_DIR" ] && mkdir -p "$GDK_CACHE_DIR"
+
+# Gdk-pixbuf loaders
+export GDK_PIXBUF_MODULE_FILE="$GDK_CACHE_DIR/gdk-pixbuf-loaders.cache"
+export GDK_PIXBUF_MODULEDIR="$SNAP/usr/lib/$ARCH/gdk-pixbuf-2.0/2.10.0/loaders"
+if [ -f "$SNAP/usr/lib/$ARCH/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" ]; then
+  "$SNAP/usr/lib/$ARCH/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" > "$GDK_PIXBUF_MODULE_FILE"
+fi
+
+# Create $XDG_RUNTIME_DIR if not exists (to be removed when https://pad.lv/1656340 is fixed)
+[ -n "$XDG_RUNTIME_DIR" ] && mkdir -p "$XDG_RUNTIME_DIR" -m 700
+
+exec "$@"
--- a/stores/snapcraft/snap/snapcraft.yaml
+++ b/stores/snapcraft/snap/snapcraft.yaml
@@ -0,0 +1,91 @@
+name: codium
+adopt-info: codium
+summary: Code editing. Redefined.
+description: |
+  Binary releases of Code without branding/telemetry/licensing
+
+base: core18
+grade: stable
+confinement: classic
+compression: lzo
+# architectures:
+#   - build-on: amd64
+#   - build-on: arm64
+
+parts:
+  codium:
+    plugin: nil
+    override-build: |
+      set -eu
+      ARCHITECTURE=$(dpkg --print-architecture)
+      # Get GitHub releases
+      wget --quiet https://api.github.com/repos/VSCodium/vscodium/releases -O latest.json
+      VERSION=$(jq -r 'sort_by(.tag_name)|last.tag_name' latest.json)
+      DEB_URL=$(jq -r 'map(select(.tag_name == "'"$VERSION"'"))|first.assets[].browser_download_url|select(endswith("'"_$ARCHITECTURE.deb"'"))' latest.json)
+      DEB=$(basename "${DEB_URL}")
+      # Downloading .deb"
+      wget "${DEB_URL}" -O "${SNAPCRAFT_PART_INSTALL}/${DEB}"
+      # Unpacking .deb"
+      dpkg -x "${SNAPCRAFT_PART_INSTALL}/${DEB}" ${SNAPCRAFT_PART_INSTALL}
+      rm -f latest.json
+      rm -f "${SNAPCRAFT_PART_INSTALL}/${DEB}"
+      # Set version
+      snapcraftctl set-version "$VERSION"
+      # Correct path to icon.
+      sed -i 's|Icon=vscodium|Icon=${SNAP}/usr/share/pixmaps/vscodium.png|g' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/codium.desktop
+      sed -i 's|Exec=/usr/share/codium/codium|Exec=codium|g' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/codium.desktop
+      sed -i 's|Icon=vscodium|Icon=/usr/share/pixmaps/vscodium.png|g' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/codium-url-handler.desktop
+    build-packages:
+      - wget
+      - jq
+    stage-packages:
+      - fcitx-frontend-gtk3
+      - gvfs-libs
+      - libasound2
+      - libgconf-2-4
+      - libglib2.0-bin
+      - libgnome-keyring0
+      - libgtk-3-0
+      - libnotify4
+      - libnspr4
+      - libnss3
+      - libpcre3
+      - libpulse0
+      - libsecret-1-0
+      - libxshmfence1
+      - libxss1
+      - libxtst6
+      - zlib1g
+      - libx11-xcb1
+      - libxkbfile1
+      - libdrm2
+      - libgbm1
+      - libxcb-dri3-0
+    prime:
+      - -usr/share/doc
+      - -usr/share/fonts
+      - -usr/share/icons
+      - -usr/share/lintian
+      - -usr/share/man
+      - -usr/share/codium/chrome-sandbox
+
+  electron-launch:
+    after:
+      - codium
+    plugin: dump
+    source: snap/local
+
+apps:
+  codium:
+    command: electron-launch $SNAP/usr/share/codium/bin/codium --no-sandbox
+    desktop: usr/share/applications/codium.desktop
+    environment:
+      DISABLE_WAYLAND: 1
+      GSETTINGS_SCHEMA_DIR: $SNAP/usr/share/glib-2.0/schemas
+
+  url-handler:
+    command: electron-launch $SNAP/usr/share/codium/bin/codium --open-url --no-sandbox
+    desktop: usr/share/applications/codium-url-handler.desktop
+    environment:
+      DISABLE_WAYLAND: 1
+      GSETTINGS_SCHEMA_DIR: $SNAP/usr/share/glib-2.0/schemas
--- a/undo_telemetry.sh
+++ b/undo_telemetry.sh
@@ -1,6 +1,6 @@
-# dc.services.visualstudio.com
+# mobile.events.data.microsoft.com
 # vortex.data.microsoft.com
-TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)"
+TELEMETRY_URLS="[^/]+\.data\.microsoft\.com"
 REPLACEMENT="s/$TELEMETRY_URLS/0\.0\.0\.0/g"

 #include common functions
--- a/update_settings.sh
+++ b/update_settings.sh
@@ -2,7 +2,6 @@ DEFAULT_TRUE="'default': true"
 DEFAULT_FALSE="'default': false"
 DEFAULT_ON="'default': TelemetryConfiguration.ON"
 DEFAULT_OFF="'default': TelemetryConfiguration.OFF"
-TELEMETRY_ENABLE="'telemetry.enableTelemetry':"
 TELEMETRY_CRASH_REPORTER="'telemetry.enableCrashReporter':"
 TELEMETRY_CONFIGURATION=" TelemetryConfiguration.ON"

@@ -39,13 +38,12 @@ update_setting () {
  # construct line-aware replacement string
  if [[ $line == *"$DEFAULT_TRUE"* ]]; then
    local DEFAULT_TRUE_TO_FALSE="${LINE_NUM}s/${DEFAULT_TRUE}/${DEFAULT_FALSE}/"
-  else 
+  else
    local DEFAULT_TRUE_TO_FALSE="${LINE_NUM}s/${DEFAULT_ON}/${DEFAULT_OFF}/"
  fi
-  
+
  replace "$DEFAULT_TRUE_TO_FALSE" $FILENAME
 }

-update_setting "$TELEMETRY_ENABLE" src/vs/platform/telemetry/common/telemetryService.ts
 update_setting "$TELEMETRY_CRASH_REPORTER" src/vs/workbench/electron-sandbox/desktop.contribution.ts
 update_setting "$TELEMETRY_CONFIGURATION" src/vs/platform/telemetry/common/telemetryService.ts
Author	SHA1	Message	Date
Baptiste Augrain	c3debb387d	feat(macos): build script is detecting arch (#1085 )	2022-05-16 01:35:17 +02:00
Baptiste Augrain	c53a88ee51	docs: improve macOS troubleshooting and add thanks table (#1083 ) * docs: update supported macOS and link to troubleshooting wiki * docs: add thanks table	2022-05-14 20:16:15 +02:00
Baptiste Augrain	c2469ff520	fix: re-enable 32bits builds with `npm_config_force_process_config` env variable (#1082 )	2022-05-14 18:44:59 +02:00
Baptiste Augrain	70082e0f0f	fix(macos): correctly clean up keychain (#1075 )	2022-05-07 17:29:18 +02:00
Baptiste Augrain	e9ea41fcfa	fix(macos): clean up keychain (#1074 )	2022-05-07 17:18:14 +02:00
Baptiste Augrain	014d9a339d	fix(macos): delete keychain to avoid conflict on next release (#1071 )	2022-05-07 14:02:20 +02:00
Pavlo Rudy	4855694fd6	fix: add git workaround for release upload (#1069 )	2022-05-07 13:51:07 +02:00
Maikel	e480df5b1f	fix: update 'Report Issue' GitHub url. (#1068 )	2022-05-07 09:51:33 +02:00
Baptiste Augrain	0932463dfb	fix(1.67): update patches (#1066 )	2022-05-07 09:50:30 +02:00
Baptiste Augrain	65e376786f	ci: add macos arm64 (#1063 )	2022-04-27 17:58:03 +02:00
Baptiste Augrain	afe72aba83	fix: disable updating the builtin extensions (#1062 )	2022-04-27 17:20:47 +02:00
Pineapples	bff2e71e55	docs: update `CODE_OF_CONDUCT.md` from v1.4 to v2.1 (#1056 )	2022-04-20 06:09:35 +02:00
Baptiste Augrain	966ae12699	build: use node v16 (#1054 )	2022-04-19 22:55:02 +02:00
GeopJr	843ef66728	fix: letterpress icons names (#1042 )	2022-04-19 20:35:22 +02:00
PF4Public	8336a4c7ad	fix: update telemetry domains (#1047 )	2022-04-14 23:28:22 +02:00
Frazer Smith	1eff01d6f0	ci: bump github actions (#1046 )	2022-04-11 14:37:54 +02:00
Baptiste Augrain	db8d1e7a8d	fix: add missing extensionEnabledApiProposals and more (#1040 )	2022-04-07 23:15:32 +02:00
Baptiste Augrain	c741ae3347	refactor: remove deprecated `telemetry.enableTelemetry` (#1039 )	2022-04-07 20:30:38 +02:00
Baptiste Augrain	becd52f518	ci: fully disable snap for arm64 (#1028 )	2022-03-31 12:20:26 +02:00
Baptiste Augrain	7ee4f2f735	fix(1.66): update patches & linux workflow (#1027 )	2022-03-31 10:46:32 +02:00
Baptiste Augrain	3208188249	build: use windows 2019 since 2016 is deprecated (#1017 )	2022-03-16 09:02:30 +01:00
Baptiste Augrain	be445bcba6	docs: update CI shields in README.md (#1016 )	2022-03-16 08:06:03 +01:00
Baptiste Augrain	3277bd4fa1	fix: try to fix snap (#1009 )	2022-03-07 11:18:37 +01:00
Baptiste Augrain	08b0b1b3e5	fix(snap): add debug infos (#1008 )	2022-03-04 15:08:21 +01:00
Baptiste Augrain	c46abc14ee	fix(appimage): remove unnecessary glib (#1007 )	2022-03-04 15:02:49 +01:00
Baptiste Augrain	5bd755a9cc	fix(1.65): update patches (#1001 )	2022-03-04 09:47:45 +01:00
Baptiste Augrain	1cbc6e55bf	enhance: move variables outside loop (#1002 )	2022-03-04 09:16:49 +01:00
Simon Sobisch	351460f992	Merge pull request #997 from dsm/master changed hardcoded owner	2022-03-04 08:33:58 +01:00
Muhammet Şükrü Demir	f7e1c11ea7	owner and repository pre-calculated added OWNER and REPOSITORY var using github env vars and if not available fallback option is available.	2022-03-04 10:30:33 +03:00
Muhammet Şükrü Demir	50197bbeef	changed hardcoded owner	2022-02-15 15:03:01 +03:00
Baptiste Augrain	b319b178ea	fix: update size of letterpress images (#992 )	2022-02-06 16:05:53 +01:00
Baptiste Augrain	2dab7cfcdf	fix(1.64): update patch (#988 )	2022-02-03 21:46:31 +01:00
Baptiste Augrain	6a86200d38	docs: how to fix default file manager on linux (#983 )	2022-01-30 14:12:54 +01:00
Rui Ming (Max) Xiong	c803059121	docs: update built-in package names (#982 )	2022-01-28 08:16:44 +01:00
Pavlo Rudy	d529fd3c20	Merge pull request #978 from myersg86/master Fix typos in DOCS.md and README.md	2022-01-22 19:53:53 +02:00
myersg86	f817226abd	Fix typos in DOCS.md and README.md DOCS.md:85,91: offical -> official README.md:130: limitted -> limited	2022-01-22 10:50:18 -07:00
Baptiste Augrain	353c002605	fix(appimage): remove extraneous libs (#944 )	2022-01-20 20:04:34 +01:00
Baptiste Augrain	3f00a255b1	build(win): remove superfluous files from archive (#967 )	2021-12-26 10:34:08 +01:00
Baptiste Augrain	23152cf50f	fix(snap): review snap only when needed (#959 )	2021-12-18 16:08:51 +01:00
Bruno Cabral	1f31a1c27b	indicate build documentation (#890 )	2021-12-18 15:44:29 +01:00
Baptiste Augrain	49eb715333	fix(snap): publish snap as stable (#958 )	2021-12-18 15:42:43 +01:00
Baptiste Augrain	bbcdc2be11	fix(snap): add missing icons and add review before publish (#957 )	2021-12-18 10:24:44 +01:00
Baptiste Augrain	dfd7ebbf85	fix: updating snapcraft.yaml to latest version (#956 )	2021-12-18 05:17:12 +01:00
Baptiste Augrain	e087f00ff1	fix: specify image for arm64 (#954 )	2021-12-18 04:30:42 +01:00
Baptiste Augrain	79bc275386	fix: update acl (#953 )	2021-12-18 04:03:23 +01:00
Baptiste Augrain	851b5f2659	fix: pass platform and correctly release (#952 )	2021-12-18 03:28:34 +01:00
Baptiste Augrain	e5de9c3096	fix: install snapcraft to check version (#951 )	2021-12-18 03:09:27 +01:00
Baptiste Augrain	3b6954231f	fix: detect version based on the architecture (#950 )	2021-12-18 02:58:54 +01:00
Baptiste Augrain	99840540ac	fix: use diddlesnaps/snapcraft-multiarch-action to generate arm64 snap (#949 )	2021-12-18 02:25:18 +01:00
Baptiste Augrain	3103c80234	fix: correct jobs' runs-on (#948 )	2021-12-18 01:41:21 +01:00
Baptiste Augrain	6a4668040b	fix: use ubuntu-18.04 (#947 )	2021-12-18 01:35:10 +01:00
Baptiste Augrain	02755e7599	fix: build differently so arm64 can be generated (#946 )	2021-12-18 01:24:22 +01:00
Baptiste Augrain	36b06dd66b	fix: correct script to get latest snap version (#945 )	2021-12-18 00:37:49 +01:00
Baptiste Augrain	33a6670cad	feat: publish snap (#942 )	2021-12-17 23:21:31 +01:00