fix: update patches & install optional dependencies (#1115)

* docs: update supported macOS and link to troubleshooting wiki
* docs: add thanks table

.editorconfig

@@ -0,0 +1,25 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+tab_width = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.sh]
+indent_style = space
+indent_size = 2
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
+
+[*.patch]
+trim_trailing_whitespace = false
+insert_final_newline = false
+
+[*.svg]
+insert_final_newline = false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -30,7 +30,7 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. Mac OS, Ubuntu 16.04, etc]
+ - OS: [e.g. Mac OS, Ubuntu 20.04, etc]
  - Architecture [e.g. x64, ia32, arm64]
  - Version [e.g. 1.33.0]
 

.github/workflows/linux.yml

@@ -9,9 +9,9 @@ on:
     branches: [ master ]
 
 jobs:
-  linux:
+  release:
     runs-on: ubuntu-latest
-    container: 
+    container:
       image: ${{ matrix.image }}
       env:
         OS_NAME: 'linux'
@@ -20,7 +20,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        vscode_arch: [x64, arm64, armhf]
         include:
         - vscode_arch: x64
           npm_arch: x64
@@ -33,22 +32,25 @@ 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
 
-      - name: Check PR or cron
-        run: ./check_cron_or_pr.sh
-
       - name: Clone VSCode repo
         run: ./get_repo.sh
 
+      - name: Check PR or cron
+        run: ./check_cron_or_pr.sh
+
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -66,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 }}
@@ -80,36 +82,67 @@ jobs:
         run: ./build.sh
         if: env.SHOULD_BUILD == 'yes'
 
-      - name: Zip release
-        run: |
-          cd VSCode-linux-${VSCODE_ARCH}
-          tar czf ../VSCodium-linux-${VSCODE_ARCH}-${LATEST_MS_TAG}.tar.gz .
+      - name: Prepare artifacts
+        run: ./prepare_artifacts.sh
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
-      - name: Generate shasums
-        run: ./sum.sh
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
-      
       - name: Release
-        uses: softprops/action-gh-release@v1
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
-        with:
-          tag_name: ${{ env.LATEST_MS_TAG }}
-          files: |
-            ./*.sha256
-            ./*.zip
-            ./*.tar.gz
-            ./*.deb
-            ./*.rpm
-            ./VSCodium-*.AppImage
-            ./VSCodium-*.AppImage.zsync
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./release.sh
+        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'

.github/workflows/lock.yml

@@ -0,0 +1,15 @@
+name: Lock Threads
+
+on:
+  schedule:
+    - cron: '0 0 * * Mon'
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v3
+        with:
+          github-token: ${{ github.token }}
+          issue-inactive-days: '90'
+          pr-inactive-days: '90'

.github/workflows/macos.yml

@@ -10,31 +10,39 @@ on:
 
 jobs:
   build:
-    runs-on: macOS-latest
+    runs-on: ${{ matrix.runner }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - runner: macOS-10.15
+            vscode_arch: x64
+          - runner: [self-hosted, macOS, ARM64]
+            vscode_arch: arm64
+
     env:
       OS_NAME: "osx"
-      VSCODE_ARCH: "x64"
+      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
-          
-      - name: Check PR or cron
-        run: |
-          . check_cron_or_pr.sh
+          node-version: 16
 
       - name: Clone VSCode repo
-        run: |
-          . get_repo.sh
+        run: . get_repo.sh
+
+      - name: Check PR or cron
+        run: . check_cron_or_pr.sh
 
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          . check_tags.sh
+        run: . check_tags.sh
         if: env.SHOULD_DEPLOY == 'yes'
 
       - name: Compute cache key
@@ -48,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 }}
@@ -72,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
@@ -81,35 +89,15 @@ jobs:
             codesign --deep --force --verbose --sign "$CERTIFICATE_OSX_ID" VSCodium.app
           fi
 
-      - name: Zip release
-        run: |
-          cd "VSCode-darwin-${VSCODE_ARCH}"
-          zip -r -X -y ../VSCodium-darwin-${VSCODE_ARCH}-${LATEST_MS_TAG}.zip ./*.app
+      - name: Prepare artifacts
+        run: ./prepare_artifacts.sh
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
-      - name: DMG the release
-        run: |
-          pushd "VSCode-darwin-${VSCODE_ARCH}"
-          npx create-dmg VSCodium.app ..
-          mv "../VSCodium ${LATEST_MS_TAG}.dmg" "../VSCodium.${VSCODE_ARCH}.${LATEST_MS_TAG}.dmg"
-          popd
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
-
-      - name: Generate shasums
-        run: ./sum.sh
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
-      
       - name: Release
-        uses: softprops/action-gh-release@v1
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
-        with:
-          tag_name: ${{ env.LATEST_MS_TAG }}
-          files: |
-            ./*.zip
-            ./*.dmg
-            ./*.sha256
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./release.sh
+        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
       - name: Update versions repo
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
@@ -118,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

.github/workflows/windows.yml

@@ -10,44 +10,47 @@ on:
 
 jobs:
   windows:
-    runs-on: windows-2016
+    runs-on: windows-2019
+    defaults:
+      run:
+        shell: bash
     env:
       VSCODE_ARCH: ${{ matrix.vscode_arch }}
       OS_NAME: 'windows'
     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'
-
-      - name: Check PR or cron
-        run: ./check_cron_or_pr.sh
-        shell: bash
+          python-version: '3.x'
 
       - name: Clone VSCode repo
         run: ./get_repo.sh
-        shell: bash
+
+      - name: Check PR or cron
+        run: ./check_cron_or_pr.sh
 
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./check_tags.sh
-        shell: bash
         if: env.SHOULD_DEPLOY == 'yes'
 
       - name: Compute cache key
@@ -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 }}
@@ -74,39 +77,21 @@ jobs:
           npm_config_arch: ${{ matrix.vscode_arch }}
           npm_config_target_arch: ${{ matrix.vscode_arch }}
         run: ./build.sh
-        shell: bash
         if: env.SHOULD_BUILD == 'yes'
 
-      - name: Move/rename build artifacts
-        run: |
-          mv vscode\\.build\\win32-${VSCODE_ARCH}\\system-setup\\VSCodeSetup.exe VSCodiumSetup-${VSCODE_ARCH}-${LATEST_MS_TAG}.exe
-          mv vscode\\.build\\win32-${VSCODE_ARCH}\\user-setup\\VSCodeSetup.exe VSCodiumUserSetup-${VSCODE_ARCH}-${LATEST_MS_TAG}.exe
-          mv vscode\\.build\\win32-${VSCODE_ARCH}\\archive\\VSCode-win32-${VSCODE_ARCH}.zip VSCodium-win32-${VSCODE_ARCH}-${LATEST_MS_TAG}.zip
-        shell: bash
+      - name: Prepare artifacts
+        run: ./prepare_artifacts.sh
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 
-      - name: Generate shasums
-        run: ./sum.sh
-        shell: bash
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
-      
       - name: Release
-        uses: softprops/action-gh-release@v1
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
-        with:
-          tag_name: ${{ env.LATEST_MS_TAG }}
-          files: |
-            ./*.sha256
-            ./VSCodium*.zip
-            ./VSCodiumUserSetup*.exe
-            ./VSCodiumSetup*.exe
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./release.sh
+        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
-        shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}

.gitignore

@@ -1,3 +1,11 @@
 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/msi/Files*.wxs
+build/windows/msi/Files*.wixobj

.nvmrc

@@ -0,0 +1 @@
+v16.14.2

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

DOCS.md

@@ -9,7 +9,9 @@
   - [Proprietary Debugging Tools](#proprietary-debugging-tools)
   - [Proprietary Extensions](#proprietary-extensions)
 - [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)
@@ -81,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": [
@@ -122,11 +124,38 @@ To copy your settings manually:
 - Click the three dots `...` and choose 'Open settings.json'
 - Copy the contents of settings.json into the same place in VSCodium
 
+## <a id="signin-github"></a>Sign in with GitHub
+
+In VSCodium, `Sign in with GitHub` is using a Personal Access Token.<br />
+Follow the documentation https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token to create your token.<br />
+Select the scopes dependending of the extension which need access to GitHub. (GitLens requires the `repo` scope.)
+
+### Linux
+
+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.

LICENSE

@@ -1,6 +1,8 @@
 MIT License
 
-Copyright (c) 2021 Peter Squicciarini
+Copyright (c) 2018-present The VSCodium contributors
+Copyright (c) 2018-present Peter Squicciarini
+Copyright (c) 2015-present Microsoft Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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
+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/workflow` 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. 
+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.
 
 ## <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)

VSCodium-AppImage-Recipe.yml

@@ -1,32 +0,0 @@
-# Based on
-# https://github.com/AppImage/pkg2appimage/blob/master/recipes/VSCode.yml
-#
-# On a Debian/Ubuntu system:
-# wget -c "https://github.com/AppImage/pkg2appimage/raw/master/pkg2appimage"
-# bash -ex pkg2appimage VSCodium
-
-app: VSCodium
-
-ingredients:
-  packages:
-    - code
-    - libgconf2-4
-  dist: trusty
-  sources:
-    - deb http://archive.ubuntu.com/ubuntu/ trusty main universe
-  script:
-    - pwd
-    - cp ../vscode/.build/linux/deb/amd64/deb/*.deb .
-    - ls codium_*.deb | cut -d _ -f 2 > VERSION
-
-script:
-  - sed -i -e 's|/usr/share/pixmaps/||g' usr/share/applications/codium.desktop
-  - cp usr/share/applications/codium.desktop .
-  - cp usr/share/pixmaps/vscodium.png .
-  - /usr/bin/convert vscodium.png -resize 512x512 usr/share/icons/hicolor/512x512/apps/vscodium.png
-  - /usr/bin/convert vscodium.png -resize 256x256 usr/share/icons/hicolor/256x256/apps/vscodium.png
-  - /usr/bin/convert vscodium.png -resize 128x128 usr/share/icons/hicolor/128x128/apps/vscodium.png
-  - /usr/bin/convert vscodium.png -resize 64x64 usr/share/icons/hicolor/64x64/apps/vscodium.png
-  - /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  . )

build.sh

@@ -2,14 +2,15 @@
 
 set -ex
 
-if [[ "$SHOULD_BUILD" == "yes" ]]; then
+if [[ "${SHOULD_BUILD}" == "yes" ]]; then
   npm config set scripts-prepend-node-path true
+  npm config set node_gyp
 
-  echo "LATEST_MS_COMMIT: ${LATEST_MS_COMMIT}"
+  echo "MS_COMMIT: ${MS_COMMIT}"
 
   . prepare_vscode.sh
 
-  cd vscode || exit
+  cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
   yarn monaco-compile-check
   yarn valid-layers-check
@@ -19,23 +20,63 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   yarn gulp compile-extensions-build
   yarn gulp minify-vscode
 
-  if [[ "$OS_NAME" == "osx" ]]; then
+  if [[ "${OS_NAME}" == "osx" ]]; then
     yarn gulp "vscode-darwin-${VSCODE_ARCH}-min-ci"
-  elif [[ "$OS_NAME" == "windows" ]]; then
-    cp LICENSE.txt LICENSE.rtf # windows build expects rtf license
+
+    VSCODE_PLATFORM="darwin"
+  elif [[ "${OS_NAME}" == "windows" ]]; then
+    . ../build/windows/rtf/make.sh
+
     yarn gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
-    yarn gulp "vscode-win32-${VSCODE_ARCH}-code-helper"
     yarn gulp "vscode-win32-${VSCODE_ARCH}-inno-updater"
-    yarn gulp "vscode-win32-${VSCODE_ARCH}-archive"
-    yarn gulp "vscode-win32-${VSCODE_ARCH}-system-setup"
-    yarn gulp "vscode-win32-${VSCODE_ARCH}-user-setup"
+
+    if [[ "${SHOULD_BUILD_ZIP}" != "no" ]]; then
+      yarn gulp "vscode-win32-${VSCODE_ARCH}-archive"
+    fi
+
+    if [[ "${SHOULD_BUILD_EXE_SYS}" != "no" ]]; then
+      yarn gulp "vscode-win32-${VSCODE_ARCH}-system-setup"
+    fi
+
+    if [[ "${SHOULD_BUILD_EXE_USR}" != "no" ]]; then
+      yarn gulp "vscode-win32-${VSCODE_ARCH}-user-setup"
+    fi
+
+    if [[ "${VSCODE_ARCH}" == "ia32" || "${VSCODE_ARCH}" == "x64" ]]; then
+      if [[ "${SHOULD_BUILD_MSI}" != "no" ]]; then
+        . ../build/windows/msi/build.sh
+      fi
+
+      if [[ "${SHOULD_BUILD_MSI_NOUP}" != "no" ]]; then
+        . ../build/windows/msi/build-updates-disabled.sh
+      fi
+    else
+      SHOULD_BUILD_REH="no"
+    fi
+
+    VSCODE_PLATFORM="win32"
   else # linux
     yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
-    if [[ "$SKIP_LINUX_PACKAGES" != "True" ]]; then
-      yarn gulp "vscode-linux-${VSCODE_ARCH}-build-deb"
-      yarn gulp "vscode-linux-${VSCODE_ARCH}-build-rpm"
-      . ../create_appimage.sh
+
+    if [[ "${SKIP_LINUX_PACKAGES}" != "True" ]]; then
+      if [[ "${SHOULD_BUILD_DEB}" != "no" || "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then
+        yarn gulp "vscode-linux-${VSCODE_ARCH}-build-deb"
+      fi
+
+      if [[ "${SHOULD_BUILD_RPM}" != "no" ]]; then
+        yarn gulp "vscode-linux-${VSCODE_ARCH}-build-rpm"
+      fi
+
+      if [[ "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then
+        . ../build/linux/appimage/build.sh
+      fi
     fi
+
+    VSCODE_PLATFORM="linux"
+  fi
+
+  if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
+    yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
   fi
 
   cd ..

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

build/build_windows.ps1

@@ -1,14 +1,6 @@
 # powershell -ExecutionPolicy ByPass -File .\build\build_windows.ps1
 
-$env:Path += ";C:\Program Files\Git\bin"
+# first so `bash` is the one installed with `git`, avoid conflict with WSL
+$env:Path = "C:\Program Files\Git\bin;" + $env:Path
 
-Remove-Item -Recurse -Force VSCode*
-
-bash ./get_repo.sh
-
-$Env:SHOULD_BUILD = 'yes'
-$Env:CI_BUILD = 'no'
-$Env:OS_NAME = 'windows'
-$Env:VSCODE_ARCH = 'x64'
-
-bash ./build.sh
+bash ./build/build_windows.sh

build/build_windows.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# to run with Bash: "C:\Program Files\Git\bin\bash.exe" ./build/build_windows.sh
+
+rm -rf VSCode*
+rm -rf vscode
+rm -rf build/windows/msi/releasedir
+
+. get_repo.sh
+
+SHOULD_BUILD=yes CI_BUILD=no OS_NAME=windows VSCODE_ARCH=x64 . build.sh

build/linux/appimage/build.sh

@@ -1,19 +1,28 @@
 #!/bin/bash
 
-cd ..
+set -ex
 
-if [[ "$VSCODE_ARCH" == "x64" ]]; then
-  # install a dep needed for this process
-  sudo apt-get install desktop-file-utils
+CALLER_DIR=$( pwd )
 
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+
+if [[ "${VSCODE_ARCH}" == "x64" ]]; then
   wget -c https://github.com/$(wget -q https://github.com/AppImage/pkg2appimage/releases -O - | grep "pkg2appimage-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)
   chmod +x ./pkg2appimage-*.AppImage
 
   ./pkg2appimage-*.AppImage --appimage-extract && mv ./squashfs-root ./pkg2appimage.AppDir
-  
+
+  # add update's url
   sed -i 's/generate_type2_appimage/generate_type2_appimage -u "gh-releases-zsync|VSCodium|vscodium|latest|*.AppImage.zsync"/' pkg2appimage.AppDir/AppRun
 
-  bash -ex pkg2appimage.AppDir/AppRun VSCodium-AppImage-Recipe.yml
+  # remove check so build in docker can succeed
+  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 vscode
+cd "${CALLER_DIR}"

build/linux/appimage/recipe.yml

@@ -0,0 +1,46 @@
+# Based on
+# https://github.com/AppImage/pkg2appimage/blob/master/recipes/VSCode.yml
+#
+# On a Debian/Ubuntu system:
+# wget -c "https://github.com/AppImage/pkg2appimage/raw/master/pkg2appimage"
+# bash -ex pkg2appimage VSCodium
+
+app: VSCodium
+
+ingredients:
+  packages:
+    - code
+    - libgconf2-4
+  dist: trusty
+  sources:
+    - deb http://archive.ubuntu.com/ubuntu/ trusty main universe
+  script:
+    - pwd
+    - cp ../../../../vscode/.build/linux/deb/amd64/deb/*.deb .
+    - ls codium_*.deb | cut -d _ -f 2 > VERSION
+
+script:
+  - sed -i -e 's|/usr/share/pixmaps/||g' usr/share/applications/codium.desktop
+  - cp usr/share/applications/codium.desktop .
+  - cp usr/share/pixmaps/vscodium.png .
+  - /usr/bin/convert vscodium.png -resize 512x512 usr/share/icons/hicolor/512x512/apps/vscodium.png
+  - /usr/bin/convert vscodium.png -resize 256x256 usr/share/icons/hicolor/256x256/apps/vscodium.png
+  - /usr/bin/convert vscodium.png -resize 128x128 usr/share/icons/hicolor/128x128/apps/vscodium.png
+  - /usr/bin/convert vscodium.png -resize 64x64 usr/share/icons/hicolor/64x64/apps/vscodium.png
+  - /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/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}"
+  - export QT_PLUGIN_PATH="${HERE}"/usr/lib/qt4/plugins/:"${HERE}"/usr/lib/i386-linux-gnu/qt4/plugins/:"${HERE}"/usr/lib/x86_64-linux-gnu/qt4/plugins/:"${HERE}"/usr/lib32/qt4/plugins/:"${HERE}"/usr/lib64/qt4/plugins/:"${HERE}"/usr/lib/qt5/plugins/:"${HERE}"/usr/lib/i386-linux-gnu/qt5/plugins/:"${HERE}"/usr/lib/x86_64-linux-gnu/qt5/plugins/:"${HERE}"/usr/lib32/qt5/plugins/:"${HERE}"/usr/lib64/qt5/plugins/:"${QT_PLUGIN_PATH}"
+  - EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2- | sed -e 's|%.||g')
+  - exec ${EXEC} "$@"
+  - EOF

build/windows/msi/build-updates-disabled.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -ex
+
+CALLER_DIR=$( pwd )
+
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+
+SCRIPT_DIR=$( pwd )
+
+cd "../../../VSCode-win32-${VSCODE_ARCH}/resources/app"
+
+cp product.json product.json.bak
+cat product.json.bak | jq "del(.updateUrl)" > product.json
+rm -f product.json.bak
+
+cd "${SCRIPT_DIR}"
+
+./build.sh "updates-disabled"
+
+cd "${CALLER_DIR}"

build/windows/msi/build.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+
+set -ex
+
+CALLER_DIR=$( pwd )
+
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+
+WIN_SDK_MAJOR_VERSION="10"
+WIN_SDK_FULL_VERSION="10.0.17763.0"
+
+PRODUCT_NAME="VSCodium"
+PRODUCT_SKU="vscodium"
+PRODUCT_ID=$( powershell.exe -command "[guid]::NewGuid().ToString().ToUpper()" )
+PRODUCT_ID="${PRODUCT_ID%%[[:cntrl:]]}"
+
+CULTURE="en-us"
+LANGIDS="1033"
+
+SETUP_RELEASE_DIR=".\\releasedir"
+SETUP_RESOURCES_DIR=".\\resources"
+BINARY_DIR="..\\..\\..\\VSCode-win32-${VSCODE_ARCH}"
+ICON_DIR="..\\..\\..\\src\\resources\\win32"
+LICENSE_DIR="..\\..\\..\\vscode"
+PROGRAM_FILES_86=$( env | sed -n 's/^ProgramFiles(x86)=//p' )
+
+if [[ -z "${1}" ]]; then
+	OUTPUT_BASE_FILENAME="${PRODUCT_NAME}-${VSCODE_ARCH}-${MS_TAG}"
+else
+	OUTPUT_BASE_FILENAME="${PRODUCT_NAME}-${VSCODE_ARCH}-${1}-${MS_TAG}"
+fi
+
+if [[ "${VSCODE_ARCH}" == "ia32" ]]; then
+   export PLATFORM="x86"
+else
+   export PLATFORM="${VSCODE_ARCH}"
+fi
+
+
+BuildSetupTranslationTransform() {
+	local CULTURE=${1}
+	local LANGID=${2}
+
+	LANGIDS="${LANGIDS},${LANGID}"
+
+	echo "Building setup translation for culture \"${CULTURE}\" with LangID \"${LANGID}\"..."
+	
+	"${WIX}bin\\light.exe" vscodium.wixobj "Files-${OUTPUT_BASE_FILENAME}.wixobj" -ext WixUIExtension -ext WixUtilExtension -ext WixNetFxExtension -spdb -cc "${TEMP}\\vscodium-cab-cache\\${PLATFORM}" -reusecab -out "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.msi" -loc "i18n\\${PRODUCT_SKU}.${CULTURE}.wxl" -cultures:"${CULTURE}" -sice:ICE60 -sice:ICE69
+	
+	cscript "${PROGRAM_FILES_86}\\Windows Kits\\${WIN_SDK_MAJOR_VERSION}\\bin\\${WIN_SDK_FULL_VERSION}\\${PLATFORM}\\WiLangId.vbs" "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.msi" Product "${LANGID}"
+	
+	"${PROGRAM_FILES_86}\\Windows Kits\\${WIN_SDK_MAJOR_VERSION}\\bin\\${WIN_SDK_FULL_VERSION}\\x86\\msitran" -g "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.msi" "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.msi" "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.mst"
+	
+	cscript "${PROGRAM_FILES_86}\\Windows Kits\\${WIN_SDK_MAJOR_VERSION}\\bin\\${WIN_SDK_FULL_VERSION}\\${PLATFORM}\\wisubstg.vbs" "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.msi" "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.mst" "${LANGID}"
+	
+	cscript "${PROGRAM_FILES_86}\\Windows Kits\\${WIN_SDK_MAJOR_VERSION}\\bin\\${WIN_SDK_FULL_VERSION}\\${PLATFORM}\\wisubstg.vbs" "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.msi"
+
+	rm -f "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.msi"
+	rm -f "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.mst"
+}
+
+"${WIX}bin\\heat.exe" dir "${BINARY_DIR}" -out "Files-${OUTPUT_BASE_FILENAME}.wxs" -t vscodium.xsl -gg -sfrag -scom -sreg -srd -ke -cg "AppFiles" -var var.AppName -var var.ProductVersion -var var.IconDir -var var.LicenseDir -var var.BinaryDir -dr APPLICATIONFOLDER -platform "${PLATFORM}"
+"${WIX}bin\\candle.exe" -arch "${PLATFORM}" vscodium.wxs "Files-${OUTPUT_BASE_FILENAME}.wxs" -ext WixUIExtension -ext WixUtilExtension -ext WixNetFxExtension -dAppName=${PRODUCT_NAME} -dProductVersion="${MS_TAG}" -dProductId="${PRODUCT_ID}" -dBinaryDir="${BINARY_DIR}" -dIconDir="${ICON_DIR}" -dLicenseDir="${LICENSE_DIR}" -dSetupResourcesDir="${SETUP_RESOURCES_DIR}" -dCulture="${CULTURE}"
+"${WIX}bin\\light.exe" vscodium.wixobj "Files-${OUTPUT_BASE_FILENAME}.wixobj" -ext WixUIExtension -ext WixUtilExtension -ext WixNetFxExtension -spdb -cc "${TEMP}\\vscodium-cab-cache\\${PLATFORM}" -out "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.msi" -loc "i18n\\${PRODUCT_SKU}.${CULTURE}.wxl" -cultures:"${CULTURE}" -sice:ICE60 -sice:ICE69
+
+BuildSetupTranslationTransform de-de 1031
+BuildSetupTranslationTransform es-es 3082
+BuildSetupTranslationTransform fr-fr 1036
+BuildSetupTranslationTransform it-it 1040
+# WixUI_Advanced bug: https://github.com/wixtoolset/issues/issues/5909
+# BuildSetupTranslationTransform ja-jp 1041
+BuildSetupTranslationTransform ko-kr 1042
+BuildSetupTranslationTransform ru-ru 1049
+BuildSetupTranslationTransform zh-cn 2052
+BuildSetupTranslationTransform zh-tw 1028
+
+# Add all supported languages to MSI Package attribute
+cscript "${PROGRAM_FILES_86}\\Windows Kits\\${WIN_SDK_MAJOR_VERSION}\\bin\\${WIN_SDK_FULL_VERSION}\\${PLATFORM}\\WiLangId.vbs" "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.msi" Package "${LANGIDS}"
+
+# Remove files we do not need any longer.
+rm -rf "${TEMP}\\vscodium-cab-cache"
+rm -f "Files-${OUTPUT_BASE_FILENAME}.wxs"
+rm -f "Files-${OUTPUT_BASE_FILENAME}.wixobj"
+rm -f "vscodium.wixobj"
+
+cd "${CALLER_DIR}"

build/windows/msi/i18n/vscodium.de-de.wxl

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="de-de" Codepage="1252" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="ProductLanguage">1031</String>
+  <String Id="ProductName">VSCodium</String>
+  <String Id="ProductHelpLink">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlInfoAbout">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlUpdateInfo">https://github.com/VSCodium/vscodium</String>
+  <String Id="PackageDescription">Paket mit VSCodium</String>
+  <String Id="FeatureStartMenuShortcutTitle">Startmenü-Verknüpfung</String>
+  <String Id="FeatureStartMenuShortcutDescription">Startmenü-Symbol erstellen.</String>
+  <String Id="FeatureDesktopShortcutTitle">Desktop-Verknüpfung</String>
+  <String Id="FeatureDesktopShortcutDescription">Desktop-Symbol erstellen.</String>
+  <String Id="FeatureFileTypeAssociationsTitle">Dateizuordnungen</String>
+  <String Id="FeatureFileTypeAssociationsDescription">VSCodium als Editor für unterstützte Dateitypen registrieren.</String>
+  <String Id="FeatureAddContextMenuFilesTitle">Dateikontextmenü</String>
+  <String Id="FeatureAddContextMenuFilesDescription">Aktion "Mit VSCodium öffnen" dem Dateikontextmenü von Windows-Explorer hinzufügen.</String>
+  <String Id="FeatureAddContextMenuFoldersTitle">Verzeichniskontextmenü</String>
+  <String Id="FeatureAddContextMenuFoldersDescription">Aktion "Mit VSCodium öffnen" dem Verzeichniskontextmenü von Windows-Explorer hinzufügen.</String>
+  <String Id="FeatureEnvironmentTitle">Zu PATH hinzufügen</String>
+  <String Id="FeatureEnvironmentDescription">VSCodium zur PATH Variable hinzufügen. Nach dem Neustart verfügbar.</String>
+  <String Id="LaunchApplication">VSCodium ausführen</String>
+  <String Id="NewerVersionInstalled">Eine neuere Version von VSCodium ist bereits installiert.</String>
+  <String Id="MinimumNetFramworkRequired">Diese Anwendung erfordert .NET Framework 4.5.2 oder höher. Bitte installieren Sie .NET Framework und führen Sie dieses Installationsprogramm erneut aus.</String>
+  <String Id="OSVersionRequired">Windows 7 oder neuer ist erforderlich.</String>
+</WixLocalization>

build/windows/msi/i18n/vscodium.en-us.wxl

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="en-us" Codepage="1252" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="ProductLanguage">1033</String>
+  <String Id="ProductName">VSCodium</String>
+  <String Id="ProductHelpLink">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlInfoAbout">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlUpdateInfo">https://github.com/VSCodium/vscodium</String>
+  <String Id="PackageDescription">Package with VSCodium</String>
+  <String Id="FeatureStartMenuShortcutTitle">Start Menu shortcut</String>
+  <String Id="FeatureStartMenuShortcutDescription">Create a start menu icon.</String>
+  <String Id="FeatureDesktopShortcutTitle">Desktop shortcut</String>
+  <String Id="FeatureDesktopShortcutDescription">Create a desktop icon.</String>
+  <String Id="FeatureFileTypeAssociationsTitle">File Associations</String>
+  <String Id="FeatureFileTypeAssociationsDescription">Register VSCodium as an editor for supported file types.</String>
+  <String Id="FeatureAddContextMenuFilesTitle">Files context menu</String>
+  <String Id="FeatureAddContextMenuFilesDescription">Add "Open with VSCodium" action to Windows Explorer file contect menu.</String>
+  <String Id="FeatureAddContextMenuFoldersTitle">Directory context menu</String>
+  <String Id="FeatureAddContextMenuFoldersDescription">Add "Open with VSCodium" action to Windows Explorer directory contect menu.</String>
+  <String Id="FeatureEnvironmentTitle">Add to PATH</String>
+  <String Id="FeatureEnvironmentDescription">Add VSCodium to PATH environment variable. Available after restart.</String>
+  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="MinimumNetFramworkRequired">This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again.</String>
+  <String Id="OSVersionRequired">Windows 7 or later is required.</String>
+</WixLocalization>

build/windows/msi/i18n/vscodium.es-es.wxl

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="es-es" Codepage="1252" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="ProductLanguage">3082</String>
+  <String Id="ProductName">VSCodium</String>
+  <String Id="ProductHelpLink">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlInfoAbout">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlUpdateInfo">https://github.com/VSCodium/vscodium</String>
+  <String Id="PackageDescription">Package with VSCodium</String>
+  <String Id="FeatureStartMenuShortcutTitle">Start Menu shortcut</String>
+  <String Id="FeatureStartMenuShortcutDescription">Create a start menu icon.</String>
+  <String Id="FeatureDesktopShortcutTitle">Desktop shortcut</String>
+  <String Id="FeatureDesktopShortcutDescription">Create a desktop icon.</String>
+  <String Id="FeatureFileTypeAssociationsTitle">File Associations</String>
+  <String Id="FeatureFileTypeAssociationsDescription">Register VSCodium as an editor for supported file types.</String>
+  <String Id="FeatureAddContextMenuFilesTitle">Files context menu</String>
+  <String Id="FeatureAddContextMenuFilesDescription">Add "Open with VSCodium" action to Windows Explorer file contect menu.</String>
+  <String Id="FeatureAddContextMenuFoldersTitle">Directory context menu</String>
+  <String Id="FeatureAddContextMenuFoldersDescription">Add "Open with VSCodium" action to Windows Explorer directory contect menu.</String>
+  <String Id="FeatureEnvironmentTitle">Add to PATH</String>
+  <String Id="FeatureEnvironmentDescription">Add VSCodium to PATH environment variable. Available after restart.</String>
+  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="MinimumNetFramworkRequired">This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again.</String>
+  <String Id="OSVersionRequired">Windows 7 or later is required.</String>
+</WixLocalization>

build/windows/msi/i18n/vscodium.fr-fr.wxl

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="fr-fr" Codepage="1252" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="ProductLanguage">1036</String>
+  <String Id="ProductName">VSCodium</String>
+  <String Id="ProductHelpLink">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlInfoAbout">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlUpdateInfo">https://github.com/VSCodium/vscodium</String>
+  <String Id="PackageDescription">Package with VSCodium</String>
+  <String Id="FeatureStartMenuShortcutTitle">Start Menu shortcut</String>
+  <String Id="FeatureStartMenuShortcutDescription">Create a start menu icon.</String>
+  <String Id="FeatureDesktopShortcutTitle">Desktop shortcut</String>
+  <String Id="FeatureDesktopShortcutDescription">Create a desktop icon.</String>
+  <String Id="FeatureFileTypeAssociationsTitle">File Associations</String>
+  <String Id="FeatureFileTypeAssociationsDescription">Register VSCodium as an editor for supported file types.</String>
+  <String Id="FeatureAddContextMenuFilesTitle">Files context menu</String>
+  <String Id="FeatureAddContextMenuFilesDescription">Add "Open with VSCodium" action to Windows Explorer file contect menu.</String>
+  <String Id="FeatureAddContextMenuFoldersTitle">Directory context menu</String>
+  <String Id="FeatureAddContextMenuFoldersDescription">Add "Open with VSCodium" action to Windows Explorer directory contect menu.</String>
+  <String Id="FeatureEnvironmentTitle">Add to PATH</String>
+  <String Id="FeatureEnvironmentDescription">Add VSCodium to PATH environment variable. Available after restart.</String>
+  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="MinimumNetFramworkRequired">This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again.</String>
+  <String Id="OSVersionRequired">Windows 7 or later is required.</String>
+</WixLocalization>

build/windows/msi/i18n/vscodium.it-it.wxl

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="it-it" Codepage="1252" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="ProductLanguage">1040</String>
+  <String Id="ProductName">VSCodium</String>
+  <String Id="ProductHelpLink">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlInfoAbout">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlUpdateInfo">https://github.com/VSCodium/vscodium</String>
+  <String Id="PackageDescription">Package with VSCodium</String>
+  <String Id="FeatureStartMenuShortcutTitle">Start Menu shortcut</String>
+  <String Id="FeatureStartMenuShortcutDescription">Create a start menu icon.</String>
+  <String Id="FeatureDesktopShortcutTitle">Desktop shortcut</String>
+  <String Id="FeatureDesktopShortcutDescription">Create a desktop icon.</String>
+  <String Id="FeatureFileTypeAssociationsTitle">File Associations</String>
+  <String Id="FeatureFileTypeAssociationsDescription">Register VSCodium as an editor for supported file types.</String>
+  <String Id="FeatureAddContextMenuFilesTitle">Files context menu</String>
+  <String Id="FeatureAddContextMenuFilesDescription">Add "Open with VSCodium" action to Windows Explorer file contect menu.</String>
+  <String Id="FeatureAddContextMenuFoldersTitle">Directory context menu</String>
+  <String Id="FeatureAddContextMenuFoldersDescription">Add "Open with VSCodium" action to Windows Explorer directory contect menu.</String>
+  <String Id="FeatureEnvironmentTitle">Add to PATH</String>
+  <String Id="FeatureEnvironmentDescription">Add VSCodium to PATH environment variable. Available after restart.</String>
+  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="MinimumNetFramworkRequired">This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again.</String>
+  <String Id="OSVersionRequired">Windows 7 or later is required.</String>
+</WixLocalization>

build/windows/msi/i18n/vscodium.ja-jp.wxl

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="ja-jp" Codepage="932" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="ProductLanguage">1041</String>
+  <String Id="ProductName">VSCodium</String>
+  <String Id="ProductHelpLink">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlInfoAbout">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlUpdateInfo">https://github.com/VSCodium/vscodium</String>
+  <String Id="PackageDescription">Package with VSCodium</String>
+  <String Id="FeatureStartMenuShortcutTitle">Start Menu shortcut</String>
+  <String Id="FeatureStartMenuShortcutDescription">Create a start menu icon.</String>
+  <String Id="FeatureDesktopShortcutTitle">Desktop shortcut</String>
+  <String Id="FeatureDesktopShortcutDescription">Create a desktop icon.</String>
+  <String Id="FeatureFileTypeAssociationsTitle">File Associations</String>
+  <String Id="FeatureFileTypeAssociationsDescription">Register VSCodium as an editor for supported file types.</String>
+  <String Id="FeatureAddContextMenuFilesTitle">Files context menu</String>
+  <String Id="FeatureAddContextMenuFilesDescription">Add "Open with VSCodium" action to Windows Explorer file contect menu.</String>
+  <String Id="FeatureAddContextMenuFoldersTitle">Directory context menu</String>
+  <String Id="FeatureAddContextMenuFoldersDescription">Add "Open with VSCodium" action to Windows Explorer directory contect menu.</String>
+  <String Id="FeatureEnvironmentTitle">Add to PATH</String>
+  <String Id="FeatureEnvironmentDescription">Add VSCodium to PATH environment variable. Available after restart.</String>
+  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="MinimumNetFramworkRequired">This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again.</String>
+  <String Id="OSVersionRequired">Windows 7 or later is required.</String>
+</WixLocalization>

build/windows/msi/i18n/vscodium.ko-kr.wxl

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="ko-kr" Codepage="949" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="ProductLanguage">1042</String>
+  <String Id="ProductName">VSCodium</String>
+  <String Id="ProductHelpLink">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlInfoAbout">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlUpdateInfo">https://github.com/VSCodium/vscodium</String>
+  <String Id="PackageDescription">Package with VSCodium</String>
+  <String Id="FeatureStartMenuShortcutTitle">Start Menu shortcut</String>
+  <String Id="FeatureStartMenuShortcutDescription">Create a start menu icon.</String>
+  <String Id="FeatureDesktopShortcutTitle">Desktop shortcut</String>
+  <String Id="FeatureDesktopShortcutDescription">Create a desktop icon.</String>
+  <String Id="FeatureFileTypeAssociationsTitle">File Associations</String>
+  <String Id="FeatureFileTypeAssociationsDescription">Register VSCodium as an editor for supported file types.</String>
+  <String Id="FeatureAddContextMenuFilesTitle">Files context menu</String>
+  <String Id="FeatureAddContextMenuFilesDescription">Add "Open with VSCodium" action to Windows Explorer file contect menu.</String>
+  <String Id="FeatureAddContextMenuFoldersTitle">Directory context menu</String>
+  <String Id="FeatureAddContextMenuFoldersDescription">Add "Open with VSCodium" action to Windows Explorer directory contect menu.</String>
+  <String Id="FeatureEnvironmentTitle">Add to PATH</String>
+  <String Id="FeatureEnvironmentDescription">Add VSCodium to PATH environment variable. Available after restart.</String>
+  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="MinimumNetFramworkRequired">This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again.</String>
+  <String Id="OSVersionRequired">Windows 7 or later is required.</String>
+</WixLocalization>

build/windows/msi/i18n/vscodium.ru-ru.wxl

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="ru-ru" Codepage="1251" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="ProductLanguage">1049</String>
+  <String Id="ProductName">VSCodium</String>
+  <String Id="ProductHelpLink">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlInfoAbout">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlUpdateInfo">https://github.com/VSCodium/vscodium</String>
+  <String Id="PackageDescription">Package with VSCodium</String>
+  <String Id="FeatureStartMenuShortcutTitle">Start Menu shortcut</String>
+  <String Id="FeatureStartMenuShortcutDescription">Create a start menu icon.</String>
+  <String Id="FeatureDesktopShortcutTitle">Desktop shortcut</String>
+  <String Id="FeatureDesktopShortcutDescription">Create a desktop icon.</String>
+  <String Id="FeatureFileTypeAssociationsTitle">File Associations</String>
+  <String Id="FeatureFileTypeAssociationsDescription">Register VSCodium as an editor for supported file types.</String>
+  <String Id="FeatureAddContextMenuFilesTitle">Files context menu</String>
+  <String Id="FeatureAddContextMenuFilesDescription">Add "Open with VSCodium" action to Windows Explorer file contect menu.</String>
+  <String Id="FeatureAddContextMenuFoldersTitle">Directory context menu</String>
+  <String Id="FeatureAddContextMenuFoldersDescription">Add "Open with VSCodium" action to Windows Explorer directory contect menu.</String>
+  <String Id="FeatureEnvironmentTitle">Add to PATH</String>
+  <String Id="FeatureEnvironmentDescription">Add VSCodium to PATH environment variable. Available after restart.</String>
+  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="MinimumNetFramworkRequired">This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again.</String>
+  <String Id="OSVersionRequired">Windows 7 or later is required.</String>
+</WixLocalization>

build/windows/msi/i18n/vscodium.zh-cn.wxl

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="zh-cn" Codepage="936" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="ProductLanguage">2052</String>
+  <String Id="ProductName">VSCodium</String>
+  <String Id="ProductHelpLink">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlInfoAbout">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlUpdateInfo">https://github.com/VSCodium/vscodium</String>
+  <String Id="PackageDescription">Package with VSCodium</String>
+  <String Id="FeatureStartMenuShortcutTitle">Start Menu shortcut</String>
+  <String Id="FeatureStartMenuShortcutDescription">Create a start menu icon.</String>
+  <String Id="FeatureDesktopShortcutTitle">Desktop shortcut</String>
+  <String Id="FeatureDesktopShortcutDescription">Create a desktop icon.</String>
+  <String Id="FeatureFileTypeAssociationsTitle">File Associations</String>
+  <String Id="FeatureFileTypeAssociationsDescription">Register VSCodium as an editor for supported file types.</String>
+  <String Id="FeatureAddContextMenuFilesTitle">Files context menu</String>
+  <String Id="FeatureAddContextMenuFilesDescription">Add "Open with VSCodium" action to Windows Explorer file contect menu.</String>
+  <String Id="FeatureAddContextMenuFoldersTitle">Directory context menu</String>
+  <String Id="FeatureAddContextMenuFoldersDescription">Add "Open with VSCodium" action to Windows Explorer directory contect menu.</String>
+  <String Id="FeatureEnvironmentTitle">Add to PATH</String>
+  <String Id="FeatureEnvironmentDescription">Add VSCodium to PATH environment variable. Available after restart.</String>
+  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="MinimumNetFramworkRequired">This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again.</String>
+  <String Id="OSVersionRequired">Windows 7 or later is required.</String>
+</WixLocalization>

build/windows/msi/i18n/vscodium.zh-tw.wxl

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="zh-tw" Codepage="950" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="ProductLanguage">1028</String>
+  <String Id="ProductName">VSCodium</String>
+  <String Id="ProductHelpLink">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlInfoAbout">https://github.com/VSCodium/vscodium</String>
+  <String Id="ProductUrlUpdateInfo">https://github.com/VSCodium/vscodium</String>
+  <String Id="PackageDescription">Package with VSCodium</String>
+  <String Id="FeatureStartMenuShortcutTitle">Start Menu shortcut</String>
+  <String Id="FeatureStartMenuShortcutDescription">Create a start menu icon.</String>
+  <String Id="FeatureDesktopShortcutTitle">Desktop shortcut</String>
+  <String Id="FeatureDesktopShortcutDescription">Create a desktop icon.</String>
+  <String Id="FeatureFileTypeAssociationsTitle">File Associations</String>
+  <String Id="FeatureFileTypeAssociationsDescription">Register VSCodium as an editor for supported file types.</String>
+  <String Id="FeatureAddContextMenuFilesTitle">Files context menu</String>
+  <String Id="FeatureAddContextMenuFilesDescription">Add "Open with VSCodium" action to Windows Explorer file contect menu.</String>
+  <String Id="FeatureAddContextMenuFoldersTitle">Directory context menu</String>
+  <String Id="FeatureAddContextMenuFoldersDescription">Add "Open with VSCodium" action to Windows Explorer directory contect menu.</String>
+  <String Id="FeatureEnvironmentTitle">Add to PATH</String>
+  <String Id="FeatureEnvironmentDescription">Add VSCodium to PATH environment variable. Available after restart.</String>
+  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="MinimumNetFramworkRequired">This application requires .NET Framework 4.5.2 or later. Please install the .NET Framework then run this installer again.</String>
+  <String Id="OSVersionRequired">Windows 7 or later is required.</String>
+</WixLocalization>

build/windows/msi/includes/vscodium-variables.wxi

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+  <!-- Setup UI strings. -->
+  <?if $(env.Platform)=x86?>
+    <?define ProgramFilesFolder="ProgramFilesFolder" ?>
+    <?define Win64="no" ?>
+    <?define Arch="(x86)" ?>
+  <?else?>
+    <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
+    <?define Win64="yes" ?>
+    <?define Arch="(x64)" ?>
+  <?endif?>
+
+  <!-- <?define ProductVersion="$(var.ProductVersion)" ?> -->
+  <?define ProductName="!(loc.ProductName)" ?>
+  <?define ProductNameWithVersion="!(loc.ProductName) $(var.ProductVersion) $(var.Arch)" ?>
+  <?define ProductLanguage="!(loc.ProductLanguage)" ?>
+  <?define AppCodeName="$(var.AppName)" ?>
+  <!-- <?define AppName="$(var.AppName)" ?> -->
+  <?define AppFolderName="$(var.AppName)" ?>
+  <?define ProductManufacturerShort="$(var.AppName)" ?>
+  <?define ProductManufacturerLong="$(var.AppName)" ?>
+
+  <!-- Static settings, DO NOT TOUCH or upgrades will break! -->
+  <?define ProductUpgradeCode="{965370CD-253C-4720-82FC-2E6B02A53808}" ?>
+  <?define RTMProductVersion="0.0.1" ?>
+</Include>

build/windows/msi/vscodium.xsl

@@ -0,0 +1,468 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:wi="http://schemas.microsoft.com/wix/2006/wi">
+
+  <xsl:strip-space elements="*"/>
+ 
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()" />
+    </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId1ToReplace" match="wi:Component[wi:File[contains(@Source,'VSCodium.exe')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId1ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">VSCODIUM.EXE</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'VSCodium.exe')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">VSCODIUM.EXE</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId2ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\bower.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId2ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">BOWER.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\bower.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">BOWER.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId3ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\c.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId3ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">C.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\c.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">C.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId4ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\config.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId4ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">CONFIG.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\config.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">CONFIG.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId5ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\cpp.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId5ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">CPP.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\cpp.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">CPP.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId7ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\csharp.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId7ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">CSHARP.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\csharp.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">CSHARP.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId8ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\css.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId8ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">CSS.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\css.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">CSS.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId9ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\default.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId9ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">DEFAULT.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\default.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">DEFAULT.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId10ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\go.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId10ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">GO.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\go.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">GO.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId11ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\html.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId11ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">HTML.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\html.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">HTML.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId12ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\jade.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId12ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">JADE.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\jade.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">JADE.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId13ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\java.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId13ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">JAVA.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\java.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">JAVA.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId14ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\javascript.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId14ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">JAVASCRIPT.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\javascript.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">JAVASCRIPT.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId15ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\json.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId15ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">JSON.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\json.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">JSON.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId16ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\less.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId16ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">LESS.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\less.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">LESS.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId17ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\markdown.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId17ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">MARKDOWN.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\markdown.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">MARKDOWN.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId18ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\php.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId18ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">PHP.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\php.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">PHP.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId19ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\powershell.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId19ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">POWERSHELL.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\powershell.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">POWERSHELL.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId20ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\python.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId20ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">PYTHON.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\python.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">PYTHON.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId21ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\react.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId21ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">REACT.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\react.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">REACT.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId22ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\ruby.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId22ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">RUBY.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\ruby.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">RUBY.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId23ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\sass.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId23ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">SASS.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\sass.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">SASS.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId24ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\shell.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId24ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">SHELL.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\shell.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">SHELL.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId25ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\sql.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId25ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">SQL.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\sql.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">SQL.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId26ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\typescript.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId26ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">TYPESCRIPT.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\typescript.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">TYPESCRIPT.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId27ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\vue.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId27ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">VUE.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\vue.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">VUE.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId28ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\xml.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId28ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">XML.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\xml.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">XML.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <xsl:key name="vId29ToReplace" match="wi:Component[wi:File[contains(@Source,'resources\app\resources\win32\yaml.ico')]]" use="@Id"/>
+  <xsl:template match="node()[key('vId29ToReplace', @Id)]">
+    <xsl:copy>
+      <xsl:attribute name="Id">YAML.ICO</xsl:attribute>
+      <xsl:copy-of select="@*[name()!='Id']"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="wi:Component/wi:File[contains(@Source,'resources\app\resources\win32\yaml.ico')]">
+     <xsl:copy>
+        <xsl:attribute name="Id">YAML.ICO</xsl:attribute>
+        <xsl:copy-of select="@*[name()!='Id']"/>
+        <xsl:apply-templates />
+     </xsl:copy>
+  </xsl:template>
+
+  <!-- Remove conflicting non-MSI updater -->
+  <xsl:key name="FileToRemove" match="wi:Component[wi:File[contains(@Source,'tools\inno_updater.exe')]]" use="@Id" />
+  <xsl:template match="*[self::wi:Component or self::wi:ComponentRef][key('FileToRemove', @Id)]" />
+
+  <xsl:key name="FileToRemove" match="wi:Component[wi:File[contains(@Source,'tools\vcruntime140.dll')]]" use="@Id" />
+  <xsl:template match="*[self::wi:Component or self::wi:ComponentRef][key('FileToRemove', @Id)]" />
+</xsl:stylesheet>

build/windows/rtf/make.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+cd "$( dirname "${BASH_SOURCE[0]}" )"/../../../vscode || { echo "'vscode' dir not found"; exit 1; }
+
+input=LICENSE.txt
+target=LICENSE.rtf
+
+cat - >$target <<_EOF
+{\rtf1\ansi\deff0{\fonttbl{\f0\fnil\fcharset0 Consolas;}}
+\viewkind4\uc1\pard\lang1033\f0\fs22
+
+_EOF
+
+sed -zE -e 's/([A-Za-z,])\r?\n([A-Za-z])/\1 \2/g' -e 's/\r?\n\r?\n/\\par\n\n/g' -e 's/(\\par\n)/\\line\1/g' -e 's/\s*(Copyright)/\\line\n\1/g' -e 's/(\\par)\\line/\1\n/g' $input >> $target
+
+
+cat - >>$target <<_EOF
+\par
+}
+_EOF

check_cron_or_pr.sh

@@ -2,9 +2,14 @@
 
 set -e
 
-if [[ $GITHUB_EVENT_NAME == "pull_request" ]]; then
+if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
 	echo "It's a PR"
 	
+	export SHOULD_BUILD="yes"
+	export SHOULD_DEPLOY="no"
+elif [[ "${GITHUB_EVENT_NAME}" == "push" ]]; then
+	echo "It's a Push"
+	
 	export SHOULD_BUILD="yes"
 	export SHOULD_DEPLOY="no"
 else
@@ -13,7 +18,7 @@ else
 	export SHOULD_DEPLOY="yes"
 fi
 
-if [[ $GITHUB_ENV ]]; then
-	echo "SHOULD_BUILD=$SHOULD_BUILD" >> $GITHUB_ENV
-	echo "SHOULD_DEPLOY=$SHOULD_DEPLOY" >> $GITHUB_ENV
+if [[ "${GITHUB_ENV}" ]]; then
+	echo "SHOULD_BUILD=${SHOULD_BUILD}" >> "${GITHUB_ENV}"
+	echo "SHOULD_DEPLOY=${SHOULD_DEPLOY}" >> "${GITHUB_ENV}"
 fi

check_tags.sh

@@ -2,132 +2,304 @@
 
 set -e
 
-REPOSITORY=${GITHUB_REPOSITORY:-"VSCodium/vscodium"}
-GITHUB_RESPONSE=$(curl -s -H "Authorization: token $GITHUB_TOKEN" https://api.github.com/repos/$REPOSITORY/releases/tags/$LATEST_MS_TAG)
-VSCODIUM_ASSETS=$(echo $GITHUB_RESPONSE | jq '.assets')
-
-# if we just don't have the github token, get out fast
-if [ "$GITHUB_TOKEN" != "" ]; then
-  if [ "$VSCODIUM_ASSETS" != "null" ]; then
-    if [[ "$OS_NAME" == "osx" ]]; then
-      HAVE_MAC=$(echo $VSCODIUM_ASSETS | jq --arg suffix "darwin-$VSCODE_ARCH-$LATEST_MS_TAG.zip" 'map(.name) | contains([$suffix])')
-      if [[ "$HAVE_MAC" != "true" ]]; then
-        echo "Building on Mac because we have no ZIP"
-        export SHOULD_BUILD="yes"
-      fi
-    elif [[ "$OS_NAME" == "windows" ]]; then
-      if [[ $VSCODE_ARCH == "arm64" ]]; then
-        HAVE_ARM64_SYS=$(echo $VSCODIUM_ASSETS | jq --arg suffix "VSCodiumSetup-$VSCODE_ARCH-$LATEST_MS_TAG.exe" 'map(.name) | contains([$suffix])')
-        HAVE_ARM64_USR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "UserSetup-$VSCODE_ARCH-$LATEST_MS_TAG.exe" 'map(.name) | contains([$suffix])')
-        HAVE_ARM64_ZIP=$(echo $VSCODIUM_ASSETS | jq --arg suffix "win32-$VSCODE_ARCH-$LATEST_MS_TAG.zip" 'map(.name) | contains([$suffix])')
-        if [[ "$HAVE_ARM64_SYS" != "true" ]]; then
-          echo "Building on Windows arm64 because we have no system setup"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$HAVE_ARM64_USR" != "true" ]]; then
-          echo "Building on Windows arm64 because we have no user setup"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$HAVE_ARM64_ZIP" != "true" ]]; then
-          echo "Building on Windows arm64 because we have no zip"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$SHOULD_BUILD" != "yes" ]]; then
-          echo "Already have all the Windows arm64 builds"
-        fi
-      elif [[ $VSCODE_ARCH == "ia32" ]]; then
-        HAVE_IA32_SYS=$(echo $VSCODIUM_ASSETS | jq --arg suffix "VSCodiumSetup-$VSCODE_ARCH-$LATEST_MS_TAG.exe" 'map(.name) | contains([$suffix])')
-        HAVE_IA32_USR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "UserSetup-$VSCODE_ARCH-$LATEST_MS_TAG.exe" 'map(.name) | contains([$suffix])')
-        HAVE_IA32_ZIP=$(echo $VSCODIUM_ASSETS | jq --arg suffix "win32-$VSCODE_ARCH-$LATEST_MS_TAG.zip" 'map(.name) | contains([$suffix])')
-        if [[ "$HAVE_IA32_SYS" != "true" ]]; then
-          echo "Building on Windows ia32 because we have no system setup"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$HAVE_IA32_USR" != "true" ]]; then
-          echo "Building on Windows ia32 because we have no user setup"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$HAVE_IA32_ZIP" != "true" ]]; then
-          echo "Building on Windows ia32 because we have no zip"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$SHOULD_BUILD" != "yes" ]]; then
-          echo "Already have all the Windows ia32 builds"
-        fi
-      else # Windows x64
-        HAVE_X64_SYS=$(echo $VSCODIUM_ASSETS | jq --arg suffix "VSCodiumSetup-$VSCODE_ARCH-$LATEST_MS_TAG.exe" 'map(.name) | contains([$suffix])')
-        HAVE_X64_USR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "UserSetup-$VSCODE_ARCH-$LATEST_MS_TAG.exe" 'map(.name) | contains([$suffix])')
-        HAVE_X64_ZIP=$(echo $VSCODIUM_ASSETS | jq --arg suffix "win32-$VSCODE_ARCH-$LATEST_MS_TAG.zip" 'map(.name) | contains([$suffix])')
-        if [[ "$HAVE_X64_SYS" != "true" ]]; then
-          echo "Building on Windows x64 because we have no system setup"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$HAVE_X64_USR" != "true" ]]; then
-          echo "Building on Windows x64 because we have no user setup"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$HAVE_X64_ZIP" != "true" ]]; then
-          echo "Building on Windows x64 because we have no zip"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$SHOULD_BUILD" != "yes" ]]; then
-          echo "Already have all the Windows x64 builds"
-        fi
-      fi
-    elif [[ "$OS_NAME" == "linux" ]]; then
-      if [[ $VSCODE_ARCH == "arm64" ]]; then
-        HAVE_ARM64_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["arm64.deb"])')
-        HAVE_ARM64_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "arm64-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
-        if [[ "$HAVE_ARM64_DEB" != "true" ]]; then
-          echo "Building on Linux arm64 because we have no DEB"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$HAVE_ARM64_TAR" != "true" ]]; then
-          echo "Building on Linux arm64 because we have no TAR"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$SHOULD_BUILD" != "yes" ]]; then
-          echo "Already have all the Linux arm64 builds"
-        fi
-      elif [[ $VSCODE_ARCH == "armhf" ]]; then
-        HAVE_ARM_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["armhf.deb"])')
-        HAVE_ARM_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "armhf-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
-        if [[ "$HAVE_ARM_DEB" != "true" ]]; then
-          echo "Building on Linux arm because we have no DEB"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$HAVE_ARM_TAR" != "true" ]]; then
-          echo "Building on Linux arm because we have no TAR"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$SHOULD_BUILD" != "yes" ]]; then
-          echo "Already have all the Linux arm builds"
-        fi
-      else # Linux x64
-        HAVE_64_RPM=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["x86_64.rpm"])')
-        HAVE_64_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["amd64.deb"])')
-        HAVE_64_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "x64-$LATEST_MS_TAG.tar.gz" 'map(.name) | contains([$suffix])')
-        if [[ "$HAVE_64_RPM" != "true" ]]; then
-          echo "Building on Linux x64 because we have no RPM"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$HAVE_64_DEB" != "true" ]]; then
-          echo "Building on Linux x64 because we have no DEB"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$HAVE_64_TAR" != "true" ]]; then
-          echo "Building on Linux x64 because we have no TAR"
-          export SHOULD_BUILD="yes"
-        fi
-        if [[ "$SHOULD_BUILD" != "yes" ]]; then
-          echo "Already have all the Linux x64 builds"
-        fi
-      fi
-    fi
-  else
-    echo "Release assets do not exist at all, continuing build"
-    export SHOULD_BUILD="yes"
-  fi
+if [[ -z "${GITHUB_TOKEN}" ]]; then
+  echo "Will not build because no GITHUB_TOKEN defined"
+  exit
 fi
 
-echo "SHOULD_BUILD=$SHOULD_BUILD" >> $GITHUB_ENV
+REPOSITORY="${GITHUB_REPOSITORY:-"VSCodium/vscodium"}"
+GITHUB_RESPONSE=$( curl -s -H "Authorization: token ${GITHUB_TOKEN}" "https://api.github.com/repos/${REPOSITORY}/releases/tags/${MS_TAG}")
+VSCODIUM_ASSETS=$( echo "${GITHUB_RESPONSE}" | jq -c '.assets | map(.name)?' )
+
+contains() {
+  # add " to match the end of a string so any hashs won't be matched by mistake
+  echo "${VSCODIUM_ASSETS}" | grep "${1}\""
+}
+
+if [ "${VSCODIUM_ASSETS}" != "null" ]; then
+  # macos
+  if [[ "${OS_NAME}" == "osx" ]]; then
+    if [[ -z $( contains "VSCodium-darwin-${VSCODE_ARCH}-${MS_TAG}.zip" ) ]]; then
+      echo "Building on MacOS because we have no ZIP"
+      export SHOULD_BUILD="yes"
+    else
+      export SHOULD_BUILD_ZIP="no"
+    fi
+
+    if [[ -z $( contains ".${VSCODE_ARCH}.${MS_TAG}.dmg" ) ]]; then
+      echo "Building on MacOS because we have no DMG"
+      export SHOULD_BUILD="yes"
+    else
+      export SHOULD_BUILD_DMG="no"
+    fi
+
+    if [[ -z $( contains "vscodium-reh-darwin-${VSCODE_ARCH}-${MS_TAG}.tar.gz" ) ]]; then
+      echo "Building on MacOS because we have no REH archive"
+      export SHOULD_BUILD="yes"
+    else
+      export SHOULD_BUILD_REH="no"
+    fi
+
+    if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+      echo "Already have all the MacOS builds"
+    fi
+  elif [[ "${OS_NAME}" == "windows" ]]; then
+
+    # windows-arm64
+    if [[ ${VSCODE_ARCH} == "arm64" ]]; then
+      if [[ -z $( contains "VSCodiumSetup-${VSCODE_ARCH}-${MS_TAG}.exe" ) ]]; then
+        echo "Building on Windows arm64 because we have no system setup"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_EXE_SYS="no"
+      fi
+
+      if [[ -z $( contains "UserSetup-${VSCODE_ARCH}-${MS_TAG}.exe" ) ]]; then
+        echo "Building on Windows arm64 because we have no user setup"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_EXE_USR="no"
+      fi
+
+      if [[ -z $( contains "VSCodium-win32-${VSCODE_ARCH}-${MS_TAG}.zip" ) ]]; then
+        echo "Building on Windows arm64 because we have no zip"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_ZIP="no"
+      fi
+
+      export SHOULD_BUILD_REH="no"
+
+      if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+        echo "Already have all the Windows arm64 builds"
+      fi
+
+    # windows-ia32
+    elif [[ ${VSCODE_ARCH} == "ia32" ]]; then
+      if [[ -z $( contains "VSCodiumSetup-${VSCODE_ARCH}-${MS_TAG}.exe" ) ]]; then
+        echo "Building on Windows ia32 because we have no system setup"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_EXE_SYS="no"
+      fi
+
+      if [[ -z $( contains "UserSetup-${VSCODE_ARCH}-${MS_TAG}.exe" ) ]]; then
+        echo "Building on Windows ia32 because we have no user setup"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_EXE_USR="no"
+      fi
+
+      if [[ -z $( contains "VSCodium-win32-${VSCODE_ARCH}-${MS_TAG}.zip" ) ]]; then
+        echo "Building on Windows ia32 because we have no zip"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_ZIP="no"
+      fi
+
+      if [[ -z $( contains "VSCodium-${VSCODE_ARCH}-${MS_TAG}.msi" ) ]]; then
+        echo "Building on Windows ia32 because we have no msi"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_MSI="no"
+      fi
+
+      if [[ -z $( contains "VSCodium-${VSCODE_ARCH}-updates-disabled-${MS_TAG}.msi" ) ]]; then
+        echo "Building on Windows ia32 because we have no updates-disabled msi"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_MSI_NOUP="no"
+      fi
+
+      if [[ -z $( contains "vscodium-reh-win32-${VSCODE_ARCH}-${MS_TAG}.tar.gz" ) ]]; then
+        echo "Building on Windows ia32 because we have no REH archive"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_REH="no"
+      fi
+
+      if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+        echo "Already have all the Windows ia32 builds"
+      fi
+
+    # windows-x64
+    else
+      if [[ -z $( contains "VSCodiumSetup-${VSCODE_ARCH}-${MS_TAG}.exe" ) ]]; then
+        echo "Building on Windows x64 because we have no system setup"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_EXE_SYS="no"
+      fi
+
+      if [[ -z $( contains "UserSetup-${VSCODE_ARCH}-${MS_TAG}.exe" ) ]]; then
+        echo "Building on Windows x64 because we have no user setup"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_EXE_USR="no"
+      fi
+
+      if [[ -z $( contains "VSCodium-win32-${VSCODE_ARCH}-${MS_TAG}.zip" ) ]]; then
+        echo "Building on Windows x64 because we have no zip"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_ZIP="no"
+      fi
+
+      if [[ -z $( contains "VSCodium-${VSCODE_ARCH}-${MS_TAG}.msi" ) ]]; then
+        echo "Building on Windows x64 because we have no msi"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_MSI="no"
+      fi
+
+      if [[ -z $( contains "VSCodium-${VSCODE_ARCH}-updates-disabled-${MS_TAG}.msi" ) ]]; then
+        echo "Building on Windows x64 because we have no updates-disabled msi"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_MSI_NOUP="no"
+      fi
+
+      if [[ -z $( contains "vscodium-reh-win32-${VSCODE_ARCH}-${MS_TAG}.tar.gz" ) ]]; then
+        echo "Building on Windows x64 because we have no REH archive"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_REH="no"
+      fi
+
+      if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+        echo "Already have all the Windows x64 builds"
+      fi
+    fi
+  elif [[ "${OS_NAME}" == "linux" ]]; then
+
+    # linux-arm64
+    if [[ ${VSCODE_ARCH} == "arm64" ]]; then
+      if [[ -z $( contains "arm64.deb" ) ]]; then
+        echo "Building on Linux arm64 because we have no DEB"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_DEB="no"
+      fi
+
+      if [[ -z $( contains "aarch64.rpm" ) ]]; then
+        echo "Building on Linux arm64 because we have no RPM"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_RPM="no"
+      fi
+
+      if [[ -z $( contains "VSCodium-linux-arm64-${MS_TAG}.tar.gz" ) ]]; then
+        echo "Building on Linux arm64 because we have no TAR"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_TAR="no"
+      fi
+
+      if [[ -z $( contains "vscodium-reh-linux-arm64-${VSCODE_ARCH}-${MS_TAG}.tar.gz" ) ]]; then
+        echo "Building on Linux x64 because we have no REH archive"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_REH="no"
+      fi
+
+      export SHOULD_BUILD_APPIMAGE="no"
+
+      if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+        echo "Already have all the Linux arm64 builds"
+      fi
+
+    # linux-armhf
+    elif [[ ${VSCODE_ARCH} == "armhf" ]]; then
+      if [[ -z $( contains "armhf.deb" ) ]]; then
+        echo "Building on Linux arm because we have no DEB"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_DEB="no"
+      fi
+
+      if [[ -z $( contains "armv7hl.rpm" ) ]]; then
+        echo "Building on Linux arm because we have no RPM"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_RPM="no"
+      fi
+
+      if [[ -z $( contains "VSCodium-linux-armhf-${MS_TAG}.tar.gz" ) ]]; then
+        echo "Building on Linux arm because we have no TAR"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_TAR="no"
+      fi
+
+      if [[ -z $( contains "vscodium-reh-linux-armhf-${VSCODE_ARCH}-${MS_TAG}.tar.gz" ) ]]; then
+        echo "Building on Linux arm because we have no REH archive"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_REH="no"
+      fi
+
+      export SHOULD_BUILD_APPIMAGE="no"
+
+      if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+        echo "Already have all the Linux arm builds"
+      fi
+
+    # linux-x64
+    else
+      if [[ -z $( contains "amd64.deb" ) ]]; then
+        echo "Building on Linux x64 because we have no DEB"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_DEB="no"
+      fi
+
+      if [[ -z $( contains "x86_64.rpm" ) ]]; then
+        echo "Building on Linux x64 because we have no RPM"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_RPM="no"
+      fi
+
+      if [[ -z $( contains "VSCodium-linux-x64-${MS_TAG}.tar.gz" ) ]]; then
+        echo "Building on Linux x64 because we have no TAR"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_TAR="no"
+      fi
+
+      if [[ -z $( contains "x86_64.AppImage" ) ]]; then
+        echo "Building on Linux x64 because we have no AppImage"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_APPIMAGE="no"
+      fi
+
+      if [[ -z $( contains "vscodium-reh-linux-x64-${VSCODE_ARCH}-${MS_TAG}.tar.gz" ) ]]; then
+        echo "Building on Linux x64 because we have no REH archive"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_REH="no"
+      fi
+
+      if [[ "${SHOULD_BUILD}" != "yes" ]]; then
+        echo "Already have all the Linux x64 builds"
+      fi
+    fi
+  fi
+else
+  echo "Release assets do not exist at all, continuing build"
+  export SHOULD_BUILD="yes"
+fi
+
+echo "SHOULD_BUILD=${SHOULD_BUILD}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_APPIMAGE=${SHOULD_BUILD_APPIMAGE}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_DEB=${SHOULD_BUILD_DEB}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_DMG=${SHOULD_BUILD_DMG}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_EXE_SYS=${SHOULD_BUILD_EXE_SYS}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_EXE_USR=${SHOULD_BUILD_EXE_USR}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_MSI=${SHOULD_BUILD_MSI}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_MSI_NOUP=${SHOULD_BUILD_MSI_NOUP}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_REH=${SHOULD_BUILD_REH}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_RPM=${SHOULD_BUILD_RPM}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_TAR=${SHOULD_BUILD_TAR}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_ZIP=${SHOULD_BUILD_ZIP}" >> "${GITHUB_ENV}"

docs/build.md

@@ -11,38 +11,52 @@
 
 ## <a id="dependencies"></a>Dependencies
 
-- node 12
+- node 16
 - yarn
 - jq
+- git
 
 ### <a id="dependencies-linux"></a>Linux
 
+- GCC
+- make
+- pkg-config
 - libx11-dev
 - libxkbfile-dev
 - libsecret-1-dev
 - fakeroot
 - rpm
+- rpmbuild
+- dpkg
+- python3
+- libsecret-1-dev
+- imagemagick (for AppImage)
 
 ### <a id="dependencies-macos"></a>MacOS
 
 ### <a id="dependencies-windows"></a>Windows
 
 - powershell
-- git
 - sed
+- 7z
+- [WiX Toolset](http://wixtoolset.org/releases/)
+- python3
+- 'Tools for Native Modules' from official Node.js installer
 
 ## <a id="build-scripts"></a>Build Scripts
 
 Each platform has its build helper script in the directory `build`.
 
 - Linux: `./build/build_linux.sh`
-- MacOS: `./build/build_macos_.sh`
+- MacOS: `./build/build_macos.sh`
 - Windows: `powershell -ExecutionPolicy ByPass -File .\build\build_windows.ps1`
 
 ## <a id="build-docker"></a>Build in Docker
 
 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
@@ -50,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_12.x | sudo -E bash -
-sudo apt-get install -y nodejs
+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
 
@@ -66,4 +78,29 @@ export OS_NAME=linux
 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
+```

get_repo.sh

@@ -1,15 +1,44 @@
 #!/bin/bash
 
-# figure out latest tag by calling MS update API
-UPDATE_INFO=$(curl https://update.code.visualstudio.com/api/update/darwin/stable/lol)
-export LATEST_MS_COMMIT=$(echo $UPDATE_INFO | jq -r '.version')
-export LATEST_MS_TAG=$(echo $UPDATE_INFO | jq -r '.name')
-echo "Got the latest MS tag: ${LATEST_MS_TAG}"
+mkdir -p vscode
+cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
-git clone https://github.com/Microsoft/vscode.git --branch $LATEST_MS_TAG --depth 1
+git init -q
+git remote add origin https://github.com/Microsoft/vscode.git
+
+# figure out latest tag by calling MS update API
+if [ "${INSIDER}" == "1" ]; then
+  UPDATE_INFO=$(curl https://update.code.visualstudio.com/api/update/darwin/insider/lol)
+  export MS_COMMIT=$(echo "${UPDATE_INFO}" | jq -r '.version')
+  export MS_TAG=$(echo "${UPDATE_INFO}" | jq -r '.name')
+elif [[ -z "${MS_TAG}" ]]; then
+  UPDATE_INFO=$(curl https://update.code.visualstudio.com/api/update/darwin/stable/lol)
+  export MS_COMMIT=$(echo "${UPDATE_INFO}" | jq -r '.version')
+  export MS_TAG=$(echo "${UPDATE_INFO}" | jq -r '.name')
+else
+  reference=$( git ls-remote --tags | grep -x ".*refs\/tags\/${MS_TAG}" | head -1 )
+
+  if [[ -z "${reference}" ]]; then
+    echo "The following tag can't be found: ${MS_TAG}"
+    exit 1
+  elif [[ "${reference}" =~ ^([[:alnum:]]+)[[:space:]]+refs\/tags\/([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
+    export MS_COMMIT="${BASH_REMATCH[1]}"
+    export MS_TAG="${BASH_REMATCH[2]}"
+  else
+    echo "The following reference can't be parsed: ${reference}"
+    exit 1
+  fi
+fi
+
+echo "Got the MS tag: ${MS_TAG} version: ${MS_COMMIT}"
+
+git fetch --depth 1 origin "${MS_COMMIT}"
+git checkout FETCH_HEAD
+
+cd ..
 
 # for GH actions
-if [[ $GITHUB_ENV ]]; then
-	echo "LATEST_MS_COMMIT=$LATEST_MS_COMMIT" >> $GITHUB_ENV
-	echo "LATEST_MS_TAG=$LATEST_MS_TAG" >> $GITHUB_ENV
+if [[ ${GITHUB_ENV} ]]; then
+  echo "MS_TAG=${MS_TAG}" >> "${GITHUB_ENV}"
+  echo "MS_COMMIT=${MS_COMMIT}" >> "${GITHUB_ENV}"
 fi

icons/build_icons.sh

@@ -8,9 +8,9 @@ set -e
 check_programs() {
   for arg in "$@"
   do
-    if ! command -v $arg >/dev/null 2>&1
+    if ! command -v "${arg}" >/dev/null 2>&1
     then
-      echo "$arg could not be found"
+      echo "${arg} could not be found"
       exit
     fi
   done
@@ -22,22 +22,22 @@ SRC_PREFIX=""
 VSCODE_PREFIX=""
 
 build_darwin_types() {
-  for file in ${VSCODE_PREFIX}vscode/resources/darwin/*
+  for file in "${VSCODE_PREFIX}"vscode/resources/darwin/*
   do
-    if [ -f "$file" ]; then
-      name=$(basename $file '.icns')
+    if [ -f "${file}" ]; then
+      name=$(basename "${file}" '.icns')
 
-      if [[ $name != 'code' ]] && [ ! -f "${SRC_PREFIX}src/resources/darwin/$name.icns" ]; then
-        icns2png -x -s 512x512 $file -o .
+      if [[ ${name} != 'code' ]] && [ ! -f "${SRC_PREFIX}src/resources/darwin/${name}.icns" ]; then
+        icns2png -x -s 512x512 "${file}" -o .
 
-        composite -blend 100% -geometry +323+365 icons/corner_512.png "${name}_512x512x32.png" "$name.png"
-        composite icons/code_darwin.png "$name.png" "$name.png"
+        composite -blend 100% -geometry +323+365 icons/corner_512.png "${name}_512x512x32.png" "${name}.png"
+        composite icons/code_darwin.png "${name}.png" "${name}.png"
 
-        convert "$name.png" -resize 256x256 "${name}_256.png"
+        convert "${name}.png" -resize 256x256 "${name}_256.png"
 
-        png2icns "${SRC_PREFIX}src/resources/darwin/$name.icns" "$name.png" "${name}_256.png"
+        png2icns "${SRC_PREFIX}src/resources/darwin/${name}.icns" "${name}.png" "${name}_256.png"
 
-        rm "${name}_512x512x32.png" "$name.png" "${name}_256.png"
+        rm "${name}_512x512x32.png" "${name}.png" "${name}_256.png"
       fi
     fi
   done
@@ -56,17 +56,17 @@ build_darwin_main() {
 }
 
 build_win32() {
-  for file in ${VSCODE_PREFIX}vscode/resources/win32/*.ico
+  for file in "${VSCODE_PREFIX}"vscode/resources/win32/*.ico
   do
-    if [ -f "$file" ]; then
-      name=$(basename $file '.ico')
+    if [ -f "${file}" ]; then
+      name=$(basename "${file}" '.ico')
 
-      if [[ $name != 'code' ]] && [ ! -f "${SRC_PREFIX}src/resources/win32/$name.ico" ]; then
-        icotool -x -w 256 $file
+      if [[ ${name} != 'code' ]] && [ ! -f "${SRC_PREFIX}src/resources/win32/${name}.ico" ]; then
+        icotool -x -w 256 "${file}"
 
         composite -geometry +150+185 icons/code_64.png "${name}_9_256x256x32.png" "${name}.png"
 
-        convert "${name}.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "${SRC_PREFIX}src/resources/win32/$name.ico"
+        convert "${name}.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "${SRC_PREFIX}src/resources/win32/${name}.ico"
 
         rm "${name}_9_256x256x32.png" "${name}.png"
       fi
@@ -134,9 +134,17 @@ build_win32() {
     convert -size 138x140 xc:white "${SRC_PREFIX}src/resources/win32/inno-small-250.bmp"
     composite -size 116x -gravity center icons/codium_only.svg "${SRC_PREFIX}src/resources/win32/inno-small-250.bmp" "${SRC_PREFIX}src/resources/win32/inno-small-250.bmp"
   fi
+  if [ ! -f "${SRC_PREFIX}build/windows/msi/resources/wix-banner.bmp" ]; then
+    convert -size 493x58 xc:white "${SRC_PREFIX}build/windows/msi/resources/wix-banner.bmp"
+    composite -geometry +438+6 \( icons/codium_only.svg -resize 50x50 \) "${SRC_PREFIX}build/windows/msi/resources/wix-banner.bmp" "${SRC_PREFIX}build/windows/msi/resources/wix-banner.bmp"
+  fi
+  if [ ! -f "${SRC_PREFIX}build/windows/msi/resources/wix-dialog.bmp" ]; then
+    convert -size 493x312 xc:white "${SRC_PREFIX}build/windows/msi/resources/wix-dialog.bmp"
+    composite -geometry +22+152 \( icons/codium_only.svg -resize 120x90 \) "${SRC_PREFIX}build/windows/msi/resources/wix-dialog.bmp" "${SRC_PREFIX}build/windows/msi/resources/wix-dialog.bmp"
+  fi
 }
 
-if [ "$0" == "$BASH_SOURCE" ];
+if [ "${0}" == "${BASH_SOURCE}" ];
 then
   build_darwin_types
   build_win32

install_gh.sh

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

patches/binary-name.patch

@@ -1,39 +1,30 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index 6d3a369..57009d4 100644
+index 2686509..4fedec2 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -276,7 +276,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
- 			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }));
+@@ -289,7 +289,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  		} else if (platform === 'darwin') {
  			const shortcut = gulp.src('resources/darwin/bin/code.sh')
+ 				.pipe(replace('@@APPNAME@@', product.applicationName))
 -				.pipe(rename('bin/code'));
 +				.pipe(rename('bin/' + product.applicationName));
  
  			all = es.merge(all, shortcut);
  		}
-@@ -483,7 +483,7 @@ const generateVSCodeConfigurationTask = task.define('generate-vscode-configurati
- 		const arch = process.env['VSCODE_ARCH'];
- 		const appRoot = path.join(buildDir, `VSCode-darwin-${arch}`);
- 		const appName = process.env.VSCODE_QUALITY === 'insider' ? 'Visual\\ Studio\\ Code\\ -\\ Insiders.app' : 'Visual\\ Studio\\ Code.app';
--		const appPath = path.join(appRoot, appName, 'Contents', 'Resources', 'app', 'bin', 'code');
-+		const appPath = path.join(appRoot, appName, 'Contents', 'Resources', 'app', 'bin', product.applicationName);
- 		const codeProc = cp.exec(
- 			`${appPath} --export-default-configuration='${allConfigDetailsPath}' --wait --user-data-dir='${userDataDir}' --extensions-dir='${extensionsDir}'`,
- 			(err, stdout, stderr) => {
 diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
-index 692db1d..cd173bc 100644
+index f7bd477..a489ae4 100644
 --- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
 +++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
-@@ -341,7 +341,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
+@@ -351,7 +351,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
-@@ -551,7 +551,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
+@@ -545,7 +545,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
  
  		// macOS
  		if (this.environmentMainService.isBuilt) {
@@ -42,4 +33,3 @@ index 692db1d..cd173bc 100644
  		}
  
  		return join(this.environmentMainService.appRoot, 'scripts', 'code-cli.sh');
-

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)

patches/crash-reporter.patch

@@ -0,0 +1,13 @@
+diff --git a/src/main.js b/src/main.js
+index 19dde20..d9611f2 100644
+--- a/src/main.js
++++ b/src/main.js
+@@ -409,6 +409,8 @@ function configureCrashReporter() {
+ 					argv.splice(endOfArgsMarkerIndex, 0, '--crash-reporter-id', crashReporterId);
+ 				}
+ 			}
++		} else {
++			return;
+ 		}
+ 	}
+ 

patches/custom-gallery.patch

@@ -1,36 +1,36 @@
 diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
-index 129b8de..fadb99a 100644
+index f822373..30a0a66 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
-@@ -68,6 +68,7 @@ export interface IProductConfiguration {
+@@ -70,6 +70,7 @@ export interface IProductConfiguration {
  
-        readonly extensionsGallery?: {
-        readonly serviceUrl: string;
-+       readonly cacheUrl?: string;
-        readonly itemUrl: string;
-        readonly resourceUrlTemplate: string;
-        readonly controlUrl: string;
+ 	readonly extensionsGallery?: {
+ 		readonly serviceUrl: string;
++		readonly cacheUrl?: string;
+ 		readonly itemUrl: string;
+ 		readonly publisherUrl: string;
+ 		readonly resourceUrlTemplate: string;
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index d79c8a3..8b4153f 100644
+index 7e63a16..3bfeab8 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
 @@ -4,11 +4,12 @@
   *--------------------------------------------------------------------------------------------*/
  
  import { FileAccess } from 'vs/base/common/network';
--import { isWeb, globals } from 'vs/base/common/platform';
-+import { isWeb, isWindows, globals } from 'vs/base/common/platform';
+-import { globals } from 'vs/base/common/platform';
++import { globals, isWindows } from 'vs/base/common/platform';
  import { env } from 'vs/base/common/process';
- import { dirname, joinPath } from 'vs/base/common/resources';
  import { IProductConfiguration } from 'vs/base/common/product';
+ import { dirname, joinPath } from 'vs/base/common/resources';
  import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';
 +import { getUserDataPath } from 'vs/platform/environment/node/userDataPath';
  
- let product: IProductConfiguration;
- 
-@@ -31,6 +32,32 @@ else if (typeof require?.__$__nodeRequire === 'function') {
+ /**
+  * @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 d79c8a3..8b4153f 100644
  	// Running out of sources
  	if (env['VSCODE_DEV']) {
  		Object.assign(product, {
-@@ -40,6 +67,19 @@ else if (typeof require?.__$__nodeRequire === 'function') {
+@@ -44,6 +71,19 @@ else if (typeof require?.__$__nodeRequire === 'function') {
  		});
  	}
  

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

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

patches/report-issue.patch

@@ -0,0 +1,48 @@
+diff --git a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
+index fcd4485..8d97e5a 100644
+--- a/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
++++ b/src/vs/code/electron-sandbox/issue/issueReporterMain.ts
+@@ -682,7 +682,7 @@ export class IssueReporter extends Disposable {
+ 
+ 		sourceSelect.innerText = '';
+ 		sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true));
+-		sourceSelect.append(this.makeOption('vscode', localize('vscode', "Visual Studio Code"), false));
++		sourceSelect.append(this.makeOption('vscode', localize('vscode', "VSCodium"), false));
+ 		sourceSelect.append(this.makeOption('extension', localize('extension', "An extension"), false));
+ 		if (this.configuration.product.reportMarketplaceIssueUrl) {
+ 			sourceSelect.append(this.makeOption('marketplace', localize('marketplace', "Extensions marketplace"), false));
+diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
+index 0c5855b..654f9a4 100644
+--- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
++++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
+@@ -144,7 +144,7 @@ class ReportExtensionSlowAction extends Action {
+ - Extension Name: \`${this.extension.name}\`
+ - Extension Version: \`${this.extension.version}\`
+ - OS Version: \`${osVersion}\`
+-- VS Code version: \`${this._productService.version}\`\n\n${message}`);
++- VSCodium version: \`${this._productService.version}\`\n\n${message}`);
+ 
+ 		const url = `${this.repoInfo.base}/${this.repoInfo.owner}/${this.repoInfo.repo}/issues/new/?body=${body}&title=${title}`;
+ 		this._openerService.open(URI.parse(url));
+diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/reportExtensionIssueAction.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/reportExtensionIssueAction.ts
+index f1755db..e77be21 100644
+--- a/src/vs/workbench/contrib/extensions/electron-sandbox/reportExtensionIssueAction.ts
++++ b/src/vs/workbench/contrib/extensions/electron-sandbox/reportExtensionIssueAction.ts
+@@ -14,7 +14,7 @@ import { ExtensionType, IExtensionDescription } from 'vs/platform/extensions/com
+ import { IOpenerService } from 'vs/platform/opener/common/opener';
+ import { URI } from 'vs/base/common/uri';
+ 
+-const builtinExtensionIssueUrl = 'https://github.com/microsoft/vscode';
++const builtinExtensionIssueUrl = 'https://github.com/VSCodium/vscodium';
+ 
+ export class ReportExtensionIssueAction extends Action {
+ 
+@@ -76,7 +76,7 @@ export class ReportExtensionIssueAction extends Action {
+ - Extension Name: \`${extension.description.name}\`
+ - Extension Version: \`${extension.description.version}\`
+ - OS Version: \`${osVersion}\`
+-- VS Code version: \`${this.productService.version}\`\n\n${message}`
++- VSCodium version: \`${this.productService.version}\`\n\n${message}`
+ 		);
+ 
+ 		return `${baseUrl}${queryStringPrefix}body=${body}&title=${encodeURIComponent(title)}`;

patches/update-cache-path.patch

@@ -7,7 +7,7 @@ index 93424ca..133657e 100644
  	@memoize
  	get cachePath(): Promise<string> {
 -		const result = path.join(tmpdir(), `vscode-update-${this.productService.target}-${process.arch}`);
-+		const result = path.join(tmpdir(), `${this.productService.nameShort.toLowerCase()}-update-${this.productService.target}-${process.arch}`);
++		const result = path.join(tmpdir(), `${this.productService.applicationName}-update-${this.productService.target}-${process.arch}`);
  		return pfs.Promises.mkdir(result, { recursive: true }).then(() => result);
  	}
  

patches/use-github-pat.patch

@@ -0,0 +1,413 @@
+diff --git a/extensions/github-authentication/src/githubServer.ts b/extensions/github-authentication/src/githubServer.ts
+index c366ff3..75f32da 100644
+--- a/extensions/github-authentication/src/githubServer.ts
++++ b/extensions/github-authentication/src/githubServer.ts
+@@ -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';
+-import { PromiseAdapter, promiseFromEvent } from './common/utils';
+ import { ExperimentationTelemetry } from './experimentationService';
+ import { AuthProviderType } from './github';
+ import { Log } from './common/logger';
+-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 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) {
+@@ -43,14 +29,6 @@ export interface IGitHubServer extends vscode.Disposable {
+ 	friendlyName: string;
+ 	type: AuthProviderType;
+ }
+-
+-interface IGitHubDeviceCodeResponse {
+-	device_code: string;
+-	user_code: string;
+-	verification_uri: string;
+-	interval: number;
+-}
+-
+ 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 _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);
+-	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;
+-		});
+ 	}
+ 
+ 	dispose() {
+@@ -152,181 +118,17 @@ export class GitHubServer implements IGitHubServer {
+ 
+ 		// 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');
+-			}
+-		};
+-
+-		const nonce = uuid();
+-		const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/did-authenticate?nonce=${encodeURIComponent(nonce)}`));
+-
+-		const supported = isSupportedEnvironment(callbackUri);
+-		if (supported) {
+-			try {
+-				return await this.doLoginWithoutLocalServer(scopes, nonce, callbackUri);
+-			} catch (e) {
+-				this._logger.error(e);
+-				userCancelled = e.message ?? e === 'User Cancelled';
+-			}
+-		}
+-
+-		// 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';
+ 		}
+ 
+ 		throw new Error(userCancelled ? 'Cancelled' : 'No auth flow succeeded.');
+ 	}
+ 
+-	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);
+-
+-			// 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('Nonce not found in accepted nonces. Skipping this execution...');
+-				return;
+-			}
+-
+-			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 {
+ 			}
+ 		});
+ 
+-		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 (!this._authenticationProviders.size) {
+-			this._placeholderMenuItem = MenuRegistry.appendMenuItem(MenuId.AccountsContext, {
+-				command: {
+-					id: 'noAuthenticationProviders',
+-					title: nls.localize('loading', "Loading..."),
+-					precondition: ContextKeyExpr.false()
+-				},
+-			});
+-		}
+ 	}
+ 
+ 	async sessionsUpdate(id: string, event: AuthenticationSessionsChangeEvent): Promise<void> {

prepare_artifacts.sh

@@ -0,0 +1,105 @@
+#!/bin/bash
+
+set -e
+
+npm install -g checksum
+
+sum_file() {
+  if [[ -f "${1}" ]]; then
+    echo "Calcuating checksum for ${1}"
+    checksum -a sha256 "${1}" > "${1}".sha256
+    checksum "${1}" > "${1}".sha1
+  fi
+}
+
+mkdir artifacts
+
+if [[ "${OS_NAME}" == "osx" ]]; then
+  if [[ "${SHOULD_BUILD_ZIP}" != "no" ]]; then
+    echo "Building and moving ZIP"
+    cd "VSCode-darwin-${VSCODE_ARCH}"
+    zip -r -X -y "../artifacts/VSCodium-darwin-${VSCODE_ARCH}-${MS_TAG}.zip" ./*.app
+    cd ..
+  fi
+
+  if [[ "${SHOULD_BUILD_DMG}" != "no" ]]; then
+    echo "Building and moving DMG"
+    pushd "VSCode-darwin-${VSCODE_ARCH}"
+    npx create-dmg VSCodium.app ..
+    mv "../VSCodium ${MS_TAG}.dmg" "../artifacts/VSCodium.${VSCODE_ARCH}.${MS_TAG}.dmg"
+    popd
+  fi
+
+  VSCODE_PLATFORM="darwin"
+elif [[ "${OS_NAME}" == "windows" ]]; then
+  if [[ "${SHOULD_BUILD_ZIP}" != "no" ]]; then
+    echo "Moving ZIP"
+    mv "vscode\\.build\\win32-${VSCODE_ARCH}\\archive\\VSCode-win32-${VSCODE_ARCH}.zip" "artifacts\\VSCodium-win32-${VSCODE_ARCH}-${MS_TAG}.zip"
+  fi
+
+  if [[ "${SHOULD_BUILD_EXE_SYS}" != "no" ]]; then
+    echo "Moving System EXE"
+    mv "vscode\\.build\\win32-${VSCODE_ARCH}\\system-setup\\VSCodeSetup.exe" "artifacts\\VSCodiumSetup-${VSCODE_ARCH}-${MS_TAG}.exe"
+  fi
+
+  if [[ "${SHOULD_BUILD_EXE_USR}" != "no" ]]; then
+    echo "Moving User EXE"
+    mv "vscode\\.build\\win32-${VSCODE_ARCH}\\user-setup\\VSCodeSetup.exe" "artifacts\\VSCodiumUserSetup-${VSCODE_ARCH}-${MS_TAG}.exe"
+  fi
+
+  if [[ "${VSCODE_ARCH}" == "ia32" || "${VSCODE_ARCH}" == "x64" ]]; then
+    if [[ "${SHOULD_BUILD_MSI}" != "no" ]]; then
+      echo "Moving MSI"
+      mv "build\\windows\\msi\\releasedir\\VSCodium-${VSCODE_ARCH}-${MS_TAG}.msi" artifacts/
+    fi
+
+    if [[ "${SHOULD_BUILD_MSI_NOUP}" != "no" ]]; then
+      echo "Moving MSI with disabled updates"
+      mv "build\\windows\\msi\\releasedir\\VSCodium-${VSCODE_ARCH}-updates-disabled-${MS_TAG}.msi" artifacts/
+    fi
+  fi
+
+  VSCODE_PLATFORM="win32"
+else
+  if [[ "${SHOULD_BUILD_TAR}" != "no" ]]; then
+    echo "Building and moving TAR"
+    cd "VSCode-linux-${VSCODE_ARCH}"
+    tar czf "../artifacts/VSCodium-linux-${VSCODE_ARCH}-${MS_TAG}.tar.gz" .
+    cd ..
+  fi
+
+  if [[ "${SHOULD_BUILD_DEB}" != "no" ]]; then
+    echo "Moving DEB"
+    mv vscode/.build/linux/deb/*/deb/*.deb artifacts/
+  fi
+
+  if [[ "${SHOULD_BUILD_RPM}" != "no" ]]; then
+    echo "Moving RPM"
+    mv vscode/.build/linux/rpm/*/*.rpm artifacts/
+  fi
+
+  if [[ "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then
+    echo "Moving AppImage"
+    mv build/linux/appimage/out/*.AppImage* artifacts/
+  fi
+
+  VSCODE_PLATFORM="linux"
+fi
+
+if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
+  echo "Building and moving REH"
+  cd "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}"
+  tar czf "../artifacts/vscodium-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${MS_TAG}.tar.gz" .
+  cd ..
+fi
+
+cd artifacts
+
+for FILE in *
+do
+  if [[ -f "${FILE}" ]]; then
+    sum_file "${FILE}"
+  fi
+done
+
+cd ..

prepare_vscode.sh

@@ -3,27 +3,50 @@
 set -e
 
 cp -rp src/* vscode/
-cd vscode || exit
+cp -f LICENSE vscode/LICENSE.txt
+
+cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
 ../update_settings.sh
 
 # apply patches
-patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patches/update-cache-path.patch
-patch -u resources/linux/rpm/code.spec.template -i ../patches/fix-rpm-spec.patch
-git apply --ignore-whitespace ../patches/binary-name.patch
-git apply --ignore-whitespace ../patches/custom-gallery.patch
-for file in ../patches/user/*.patch; do
-  if [ -f "$file" ]; then
-    echo applying user patch: $file;
-    if ! git apply --ignore-whitespace $file; then
-      echo failed to apply patch $file 1>&2
+{ set +x; } 2>/dev/null
+
+for file in ../patches/*.patch; do
+  if [ -f "${file}" ]; then
+    echo applying patch: "${file}";
+    git apply --ignore-whitespace "${file}"
+    if [ $? -ne 0 ]; then
+      echo failed to apply patch "${file}" 1>&2
     fi
   fi
 done
 
-if [[ "$OS_NAME" == "osx" ]]; then
-  CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional
-  npm_config_argv='{"original":["--ignore-optional"]}' yarn postinstall
+for file in ../patches/user/*.patch; do
+  if [ -f "${file}" ]; then
+    echo applying user patch: "${file}";
+    git apply --ignore-whitespace "${file}"
+    if [ $? -ne 0 ]; then
+      echo failed to apply patch "${file}" 1>&2
+    fi
+  fi
+done
+
+set -x
+
+if [[ "${OS_NAME}" == "osx" ]]; then
+  CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+  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
@@ -37,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")'
@@ -58,16 +80,22 @@ 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")'
+serverApplicationName='setpath(["serverApplicationName"]; "codium-server")'
+serverDataFolderName='setpath(["serverDataFolderName"]; ".vscodium-server")'
+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} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${linkProtectionTrustedDomains} | ${nameShort} | ${nameLong} | ${linuxIconName} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${serverApplicationName} | ${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
 
-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}"
-cat product.json.bak | jq "${product_json_changes}" > product.json
 cat product.json
 
 ../undo_telemetry.sh
 
-if [[ "$OS_NAME" == "linux" ]]; then
+if [[ "${OS_NAME}" == "linux" ]]; then
   # microsoft adds their apt repo to sources
   # unless the app name is code-oss
   # as we are renaming the application to vscodium

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
+    }
+  }
+}

release.sh

@@ -0,0 +1,70 @@
+#!/bin/bash
+
+set -e
+
+if [[ -z "${GITHUB_TOKEN}" ]]; then
+  echo "Will not release because no GITHUB_TOKEN defined"
+  exit
+fi
+
+npm install -g github-release-cli
+
+if [[ $( gh release view "${MS_TAG}" 2>&1 ) =~ "release not found" ]]; then
+  echo "Creating release '${MS_TAG}'"
+  gh release create "${MS_TAG}"
+fi
+
+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
+    echo "::group::Uploading '${FILE}' at $( date "+%T" )"
+    gh release upload "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"
+
+    EXIT_STATUS=$?
+    echo "exit: ${EXIT_STATUS}"
+
+    if (( "${EXIT_STATUS}" )); then
+      for (( i=0; i<10; i++ ))
+      do
+        github-release delete --owner "${OWNER}" --repo "${REPOSITORY}" --tag "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"
+
+        sleep $(( 15 * (i + 1)))
+
+        echo "RE-Uploading '${FILE}' at $( date "+%T" )"
+        gh release upload "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"
+
+        EXIT_STATUS=$?
+        echo "exit: ${EXIT_STATUS}"
+
+        if ! (( "${EXIT_STATUS}" )); then
+          break
+        fi
+      done
+      echo "exit: ${EXIT_STATUS}"
+
+      if (( "${EXIT_STATUS}" )); then
+        echo "'${FILE}' hasn't been uploaded!"
+
+        github-release delete --owner "${OWNER}" --repo "${REPOSITORY}" --tag "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"
+
+        exit 1
+      fi
+    fi
+
+    echo "::endgroup::"
+  fi
+done
+
+cd ..

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>

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

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 "$@"

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

sum.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-npm install -g checksum
-
-sum_file () {
-  if [[ -f "$1" ]]; then
-    checksum -a sha256 "$1" > "$1".sha256
-    checksum "$1" > "$1".sha1
-  fi
-}
-
-if [[ "$SHOULD_BUILD" == "yes" ]]; then
-  if [[ "$OS_NAME" == "osx" ]]; then
-    sum_file VSCodium-darwin-*.zip
-    sum_file VSCodium*.dmg
-  elif [[ "$OS_NAME" == "windows" ]]; then
-    sum_file VSCodiumSetup-*.exe
-    sum_file VSCodiumUserSetup-*.exe
-    sum_file VSCodium-win32-*.zip
-  else # linux
-    cp out/*.AppImage* .
-    cp vscode/.build/linux/deb/*/deb/*.deb .
-    cp vscode/.build/linux/rpm/*/*.rpm .
-
-    sum_file VSCodium-*.AppImage
-    sum_file VSCodium-linux*.tar.gz
-    sum_file *.deb
-    sum_file *.rpm
-  fi
-fi

undo_telemetry.sh

@@ -1,10 +1,17 @@
-# dc.services.visualstudio.com
+# mobile.events.data.microsoft.com
 # vortex.data.microsoft.com
-TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)"
-REPLACEMENT="s/$TELEMETRY_URLS/0\.0\.0\.0/g"
+TELEMETRY_URLS="[^/]+\.data\.microsoft\.com"
+REPLACEMENT="s/${TELEMETRY_URLS}/0\.0\.0\.0/g"
 
-if [[ "$OS_NAME" == "osx" ]]; then
-  grep -rl --exclude-dir=.git -E $TELEMETRY_URLS . | xargs sed -i '' -E $REPLACEMENT
+#include common functions
+. ../utils.sh
+
+if [[ "${OS_NAME}" == "osx" ]]; then
+  if is_gnu_sed; then
+    grep -rl --exclude-dir=.git -E "${TELEMETRY_URLS}" . | xargs sed -i -E "${REPLACEMENT}"
+  else
+    grep -rl --exclude-dir=.git -E "${TELEMETRY_URLS}" . | xargs sed -i '' -E "${REPLACEMENT}"
+  fi
 else
-  grep -rl --exclude-dir=.git -E $TELEMETRY_URLS . | xargs sed -i -E $REPLACEMENT
+  grep -rl --exclude-dir=.git -E "${TELEMETRY_URLS}" . | xargs sed -i -E "${REPLACEMENT}"
 fi

update_settings.sh

@@ -1,53 +1,49 @@
 DEFAULT_TRUE="'default': true"
 DEFAULT_FALSE="'default': false"
-TELEMETRY_ENABLE="'telemetry.enableTelemetry':"
+DEFAULT_ON="'default': TelemetryConfiguration.ON"
+DEFAULT_OFF="'default': TelemetryConfiguration.OFF"
 TELEMETRY_CRASH_REPORTER="'telemetry.enableCrashReporter':"
+TELEMETRY_CONFIGURATION=" TelemetryConfiguration.ON"
 
-is_gnu_sed () {
-  sed --version >/dev/null 2>&1
-}
-
-replace () {
-  echo $1
-  if is_gnu_sed; then
-    sed -i -E "$1" $2
-  else
-    sed -i '' -E "$1" $2
-  fi
-}
+#include common functions
+. ../utils.sh
 
 update_setting () {
-  local FILENAME="$2"
+  local FILENAME="${2}"
   # check that the file exists
-  if [ ! -f $FILENAME ]; then
+  if [ ! -f "${FILENAME}" ]; then
     echo "File to update setting in does not exist ${FILENAME}"
     return
   fi
 
   # go through lines of file, looking for block that contains setting
-  local SETTING="$1"
+  local SETTING="${1}"
   local LINE_NUM=0
   while read -r line; do
     local LINE_NUM=$(( $LINE_NUM + 1 ))
-    if [[ $line == *"$SETTING"* ]]; then
+    if [[ "${line}" == *"${SETTING}"* ]]; then
       local IN_SETTING=1
     fi
-    if [[ $line == *"$DEFAULT_TRUE"* && "$IN_SETTING" == "1" ]]; then
+    if [[ ("${line}" == *"${DEFAULT_TRUE}"* || "${line}" == *"${DEFAULT_ON}"*) && "${IN_SETTING}" == "1" ]]; then
       local FOUND=1
       break
     fi
-  done < $FILENAME
+  done < "${FILENAME}"
 
-  if [[ "$FOUND" != "1" ]]; then
-    echo "$DEFAULT_TRUE not found for setting $SETTING in file $FILENAME"
+  if [[ "${FOUND}" != "1" ]]; then
+    echo "${DEFAULT_TRUE} not found for setting ${SETTING} in file ${FILENAME}"
     return
   fi
 
   # construct line-aware replacement string
-  local DEFAULT_TRUE_TO_FALSE="${LINE_NUM}s/${DEFAULT_TRUE}/${DEFAULT_FALSE}/"
+  if [[ "${line}" == *"${DEFAULT_TRUE}"* ]]; then
+    local DEFAULT_TRUE_TO_FALSE="${LINE_NUM}s/${DEFAULT_TRUE}/${DEFAULT_FALSE}/"
+  else
+    local DEFAULT_TRUE_TO_FALSE="${LINE_NUM}s/${DEFAULT_ON}/${DEFAULT_OFF}/"
+  fi
 
-  replace "$DEFAULT_TRUE_TO_FALSE" $FILENAME
+  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_CRASH_REPORTER}" src/vs/workbench/electron-sandbox/desktop.contribution.ts
+update_setting "${TELEMETRY_CONFIGURATION}" src/vs/platform/telemetry/common/telemetryService.ts

update_version.sh

@@ -1,10 +1,17 @@
 #!/bin/bash
 
-if [[ "$SHOULD_BUILD" != "yes" ]]; then
+set -e
+
+if [[ "${SHOULD_BUILD}" != "yes" ]]; then
   echo "Will not update version JSON because we did not build"
   exit
 fi
 
+if [[ -z "${GITHUB_TOKEN}" ]]; then
+  echo "Will not update version JSON because no GITHUB_TOKEN defined"
+  exit
+fi
+
 #  {
 #    "url": "https://az764295.vo.msecnd.net/stable/51b0b28134d51361cf996d2f0a1c698247aeabd8/VSCode-darwin-stable.zip",
 #    "name": "1.33.1",
@@ -16,45 +23,48 @@ fi
 #  }
 
 # `url` is URL_BASE + filename of asset e.g.
-#    darwin: https://github.com/VSCodium/vscodium/releases/download/${LATEST_MS_TAG}/VSCodium-darwin-${LATEST_MS_TAG}.zip
-# `name` is $LATEST_MS_TAG
-# `version` is $LATEST_MS_COMMIT
-# `productVersion` is $LATEST_MS_TAG
+#    darwin: https://github.com/VSCodium/vscodium/releases/download/${MS_TAG}/VSCodium-darwin-${MS_TAG}.zip
+# `name` is $MS_TAG
+# `version` is $MS_COMMIT
+# `productVersion` is $MS_TAG
 # `hash` in <filename>.sha1
 # `timestamp` is $(node -e 'console.log(Date.now())')
 # `sha256hash` in <filename>.sha256
 
-URL_BASE=https://github.com/VSCodium/vscodium/releases/download/${LATEST_MS_TAG}
+URL_BASE="https://github.com/VSCodium/vscodium/releases/download/${MS_TAG}"
 
 # to make testing on forks easier
 VERSIONS_REPO="${GITHUB_USERNAME}/versions"
-echo "Versions repo:" $VERSIONS_REPO
+echo "Versions repo: ${VERSIONS_REPO}"
 
-# generateJson <assetName>
-# e.g. generateJson VSCodium-darwin-1.33.0.zip
 generateJson() {
-  local assetName=$1
+  JSON_DATA="{}"
 
   # generate parts
-  local url=${URL_BASE}/${assetName}
-  local name=$LATEST_MS_TAG
-  local version=$LATEST_MS_COMMIT
-  local productVersion=$LATEST_MS_TAG
+  local url="${URL_BASE}/${ASSET_NAME}"
+  local name="${MS_TAG}"
+  local version="${MS_COMMIT}"
+  local productVersion="${MS_TAG}"
   local timestamp=$(node -e 'console.log(Date.now())')
 
-  local sha1hash=$(cat ${assetName}.sha1 | awk '{ print $1 }')
-  local sha256hash=$(cat ${assetName}.sha256 | awk '{ print $1 }')
+  if [[ ! -f "artifacts/${ASSET_NAME}" ]]; then
+    echo "Downloading artifact '${ASSET_NAME}'"
+    gh release download "${MS_TAG}" --dir "artifacts" --pattern "${ASSET_NAME}*"
+  fi
+
+  local sha1hash=$(cat "artifacts/${ASSET_NAME}.sha1" | awk '{ print $1 }')
+  local sha256hash=$(cat "artifacts/${ASSET_NAME}.sha256" | awk '{ print $1 }')
 
   # check that nothing is blank (blank indicates something awry with build)
   for key in url name version productVersion sha1hash timestamp sha256hash; do
-    if [[ "${!key}" == "" ]]; then
-      echo "Missing data for version update; exiting..."
+    if [[ -z "${key}" ]]; then
+      echo "Variable '${key}' is empty; exiting..."
       exit 1
     fi
   done
 
   # generate json
-  local json=$(jq \
+  JSON_DATA=$(jq \
     --arg url             "${url}" \
     --arg name            "${name}" \
     --arg version         "${version}" \
@@ -64,76 +74,86 @@ generateJson() {
     --arg sha256hash      "${sha256hash}" \
     '. | .url=$url | .name=$name | .version=$version | .productVersion=$productVersion | .hash=$hash | .timestamp=$timestamp | .sha256hash=$sha256hash' \
     <<<'{}')
-
-  echo "$json"
 }
 
 updateLatestVersion() {
+  echo "Generating ${VERSION_PATH}/latest.json"
+
+  generateJson
+
   cd versions
 
-  local versionPath=$1
-  local json=$2
-
   # create/update the latest.json file in the correct location
-  mkdir -p $versionPath
-  echo $json > $versionPath/latest.json
+  mkdir -p "${VERSION_PATH}"
+  echo "${JSON_DATA}" > "${VERSION_PATH}/latest.json"
 
   cd ..
 }
 
 # init versions repo for later commiting + pushing the json file to it
 # thank you https://www.vinaygopinath.me/blog/tech/commit-to-master-branch-on-github-using-travis-ci/
-git clone https://github.com/${VERSIONS_REPO}.git
+git clone "https://github.com/${VERSIONS_REPO}.git"
 cd versions
 git config user.email "vscodium-ci@not-real.com"
 git config user.name "VSCodium CI"
 git remote rm origin
-git remote add origin https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com/${VERSIONS_REPO}.git > /dev/null 2>&1
+git remote add origin "https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com/${VERSIONS_REPO}.git" > /dev/null 2>&1
 cd ..
 
-if [[ "$OS_NAME" == "osx" ]]; then
-  # zip, sha1, and sha256 files are all at top level dir
-  ASSET_NAME=VSCodium-darwin-${VSCODE_ARCH}-${LATEST_MS_TAG}.zip
+if [[ "${OS_NAME}" == "osx" ]]; then
+  ASSET_NAME=VSCodium-darwin-${VSCODE_ARCH}-${MS_TAG}.zip
   VERSION_PATH="darwin/${VSCODE_ARCH}"
-  JSON="$(generateJson ${ASSET_NAME})"
-  updateLatestVersion "$VERSION_PATH" "$JSON"
-elif [[ "$OS_NAME" == "windows" ]]; then
+  updateLatestVersion
+elif [[ "${OS_NAME}" == "windows" ]]; then
   # system installer
-  ASSET_NAME=VSCodiumSetup-${VSCODE_ARCH}-${LATEST_MS_TAG}.exe
+  ASSET_NAME=VSCodiumSetup-${VSCODE_ARCH}-${MS_TAG}.exe
   VERSION_PATH="win32/${VSCODE_ARCH}/system"
-  JSON="$(generateJson ${ASSET_NAME})"
-  updateLatestVersion "$VERSION_PATH" "$JSON"
+  updateLatestVersion
 
   # user installer
-  ASSET_NAME=VSCodiumUserSetup-${VSCODE_ARCH}-${LATEST_MS_TAG}.exe
+  ASSET_NAME=VSCodiumUserSetup-${VSCODE_ARCH}-${MS_TAG}.exe
   VERSION_PATH="win32/${VSCODE_ARCH}/user"
-  JSON="$(generateJson ${ASSET_NAME})"
-  updateLatestVersion "$VERSION_PATH" "$JSON"
+  updateLatestVersion
 
   # windows archive
-  ASSET_NAME=VSCodium-win32-${VSCODE_ARCH}-${LATEST_MS_TAG}.zip
+  ASSET_NAME=VSCodium-win32-${VSCODE_ARCH}-${MS_TAG}.zip
   VERSION_PATH="win32/${VSCODE_ARCH}/archive"
-  JSON="$(generateJson ${ASSET_NAME})"
-  updateLatestVersion "$VERSION_PATH" "$JSON"
+  updateLatestVersion
+
+  if [[ "${VSCODE_ARCH}" == "ia32" || "${VSCODE_ARCH}" == "x64" ]]; then
+    # msi
+    ASSET_NAME=VSCodium-${VSCODE_ARCH}-${MS_TAG}.msi
+    VERSION_PATH="win32/${VSCODE_ARCH}/msi"
+    updateLatestVersion
+
+    # updates-disabled msi
+    ASSET_NAME=VSCodium-${VSCODE_ARCH}-updates-disabled-${MS_TAG}.msi
+    VERSION_PATH="win32/${VSCODE_ARCH}/msi-updates-disabled"
+    updateLatestVersion
+  fi
 else # linux
   # update service links to tar.gz file
   # see https://update.code.visualstudio.com/api/update/linux-x64/stable/VERSION
   # as examples
-  ASSET_NAME=VSCodium-linux-${VSCODE_ARCH}-${LATEST_MS_TAG}.tar.gz
+  ASSET_NAME=VSCodium-linux-${VSCODE_ARCH}-${MS_TAG}.tar.gz
   VERSION_PATH="linux/${VSCODE_ARCH}"
-  JSON="$(generateJson ${ASSET_NAME})"
-  updateLatestVersion "$VERSION_PATH" "$JSON"
+  updateLatestVersion
 fi
 
 cd versions
 
 git pull origin master # in case another build just pushed
 git add .
-dateAndMonth=`date "+%D %T"`
-git commit -m "CI update: $dateAndMonth (Build $GITHUB_RUN_NUMBER)"
-if ! git push origin master --quiet; then
-  git pull origin master
-  git push origin master --quiet
+
+CHANGES=$( git status --porcelain )
+
+if [[ ! -z "${CHANGES}" ]]; then
+  dateAndMonth=$( date "+%D %T" )
+  git commit -m "CI update: ${dateAndMonth} (Build ${GITHUB_RUN_NUMBER})"
+  if ! git push origin master --quiet; then
+    git pull origin master
+    git push origin master --quiet
+  fi
 fi
 
 cd ..

utils.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+#All common functions can be added to this file
+
+is_gnu_sed () {
+  sed --version >/dev/null 2>&1
+}
+
+replace () {
+  echo "${1}"
+  if is_gnu_sed; then
+    sed -i -E "${1}" "${2}"
+  else
+    sed -i '' -E "${1}" "${2}"
+  fi
+}