fixing build for 1.55 (#690)

* Fix patch for builds after 1.55

* Remove no longer needed centos7 patch

* updating patches for 1.55

Co-authored-by: Atesca <2404098-atesca@users.noreply.gitlab.com>

.github/workflows/linux.yml

@@ -0,0 +1,114 @@
+name: linux_build
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  push:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    container: 
+      image: ${{ matrix.image }}
+      env:
+        OS_NAME: 'linux'
+        VSCODE_ARCH: ${{ matrix.vscode_arch }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        vscode_arch: [x64, arm64, armhf]
+        include:
+        - vscode_arch: x64
+          npm_arch: x64
+          image: vscodium/vscodium-linux-build-agent:bionic-x64
+        - vscode_arch: arm64
+          npm_arch: arm64
+          image: vscodium/vscodium-linux-build-agent:stretch-arm64
+        - vscode_arch: armhf
+          npm_arch: armv7l
+          image: vscodium/vscodium-linux-build-agent:stretch-armhf
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.14.1
+
+      - 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 existing VSCodium tags/releases
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./check_tags.sh
+        if: env.SHOULD_DEPLOY == 'yes'
+
+      - name: Compute cache key
+        id: yarnCacheKey
+        run: echo "::set-output name=value::$(node build/azure-pipelines/computeYarnCacheKey.js)"
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Get yarn cache directory path
+        id: yarnCacheDirPath
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Cache yarn directory
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+          key: linux-${{ matrix.npm_arch }}-yarnCacheDir-${{ steps.yarnCacheKey.outputs.value }}
+          restore-keys: linux-${{ matrix.npm_arch }}-yarnCacheDir-
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          npm_config_arch: ${{ matrix.npm_arch }}
+        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 .
+        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
+            ./*.AppImage
+            ./*.AppImage.zsync
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - 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 }}
+

.github/workflows/macos.yml

@@ -0,0 +1,119 @@
+name: macos_build
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  push:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: macOS-latest
+    env:
+      OS_NAME: "osx"
+      VSCODE_ARCH: "x64"
+    steps:
+      - uses: actions/checkout@v2
+        
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.14.1
+          
+      - name: Check PR or cron
+        run: |
+          . check_cron_or_pr.sh
+
+      - name: Clone VSCode repo
+        run: |
+          . get_repo.sh
+
+      - name: Check existing VSCodium tags/releases
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          . check_tags.sh
+        if: env.SHOULD_DEPLOY == 'yes'
+
+      - name: Compute cache key
+        id: yarnCacheKey
+        run: echo "::set-output name=value::$(node build/azure-pipelines/computeYarnCacheKey.js)"
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Get yarn cache directory path
+        id: yarnCacheDirPath
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Cache yarn directory
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+          key: ${{ env.OS_NAME }}-${{ env.VSCODE_ARCH }}-yarnCacheDir-${{ steps.yarnCacheKey.outputs.value }}
+          restore-keys: ${{ env.OS_NAME }}-${{ env.VSCODE_ARCH }}-yarnCacheDir-
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./build.sh
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Sign binary
+        env:
+          CERTIFICATE_OSX_P12: ${{ secrets.CERTIFICATE_OSX_P12 }}
+          CERTIFICATE_OSX_PASSWORD: ${{ secrets.CERTIFICATE_OSX_PASSWORD }}
+          CERTIFICATE_OSX_ID: ${{ secrets.CERTIFICATE_OSX_ID }}
+        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+        run: |
+          if [ -d "VSCode-darwin-${VSCODE_ARCH}" ]; then # just in case the build failed
+            cd "VSCode-darwin-${VSCODE_ARCH}"
+            export CERTIFICATE_P12=VSCodium.p12
+            echo $CERTIFICATE_OSX_P12 | base64 --decode > $CERTIFICATE_P12
+            export KEYCHAIN=build.keychain
+            security create-keychain -p mysecretpassword $KEYCHAIN
+            security default-keychain -s $KEYCHAIN
+            security unlock-keychain -p mysecretpassword $KEYCHAIN
+            security import $CERTIFICATE_P12 -k $KEYCHAIN -P $CERTIFICATE_OSX_PASSWORD -T /usr/bin/codesign
+            security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword $KEYCHAIN
+            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
+        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 }}
+
+      - 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 }}
+

.github/workflows/windows.yml

@@ -0,0 +1,112 @@
+name: windows_build
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+  push:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  windows:
+    runs-on: windows-2016
+    env:
+      VSCODE_ARCH: ${{ matrix.vscode_arch }}
+      OS_NAME: 'windows'
+    strategy:
+      fail-fast: false
+      matrix:
+        vscode_arch: [x64, ia32, arm64]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.18.3
+
+      - name: Install Yarn
+        run: npm install -g yarn
+
+      - name: Setup Python 2
+        uses: actions/setup-python@v2
+        with:
+          python-version: '2.x'
+
+      - name: Check PR or cron
+        run: ./check_cron_or_pr.sh
+        shell: bash
+
+      - name: Clone VSCode repo
+        run: ./get_repo.sh
+        shell: bash
+
+      - 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
+        id: yarnCacheKey
+        run: echo "::set-output name=value::$(node build/azure-pipelines/computeYarnCacheKey.js)"
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Get yarn cache directory path
+        id: yarnCacheDirPath
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Cache yarn directory
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+          key: ${{ env.OS_NAME }}-${{ env.VSCODE_ARCH }}-yarnCacheDir-${{ steps.yarnCacheKey.outputs.value }}
+          restore-keys: ${{ env.OS_NAME }}-${{ env.VSCODE_ARCH }}-yarnCacheDir-
+        if: env.SHOULD_BUILD == 'yes'
+
+      - name: Build
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          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
+        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 }}
+
+      - 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,2 +1,3 @@
 vscode
-VS*/*
+VS*/*
+.DS_Store

.travis.yml

@@ -1,57 +0,0 @@
-matrix:
-  include:
-    - os: linux
-      sudo: required
-      env: BUILDARCH=x64
-      dist: trusty
-    - os: linux
-      sudo: required
-      env: BUILDARCH=arm64
-      dist: trusty
-    - os: linux
-      sudo: required
-      env: BUILDARCH=arm
-      dist: trusty
-    - os: osx
-
-language: node_js
-node_js: "12"
-
-before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - export PATH="$HOME/.yarn/bin:$PATH"
-  - . install_deps.sh
-  - . get_repo.sh
-  - . check_tags.sh
-
-script:
-  - ./build.sh
-
-before_deploy:
-  - ./sign_mac_app.sh
-  - ./create_zip.sh
-  - ./create_dmg.sh
-  - ./sum.sh
-
-deploy:
-  provider: releases
-  skip_cleanup: true
-  overwrite: true
-  name: $LATEST_MS_TAG
-  api_key: $GITHUB_TOKEN
-  file_glob: true
-  file:
-    - ./*.sha256
-    - ./*.zip
-    - ./*.tar.gz
-    - ./*.dmg
-    - ./*.deb
-    - ./*.rpm
-    - ./*.AppImage
-    - ./*.AppImage.zsync
-  on:
-    all_branches: true
-    condition: $SHOULD_BUILD = yes
-
-after_deploy:
-  - ./update_version.sh

DOCS.md

@@ -3,7 +3,11 @@
 ## Table of Contents
 
 - [Getting all the Telemetry Out](#disable-telemetry)
+  - [Replacements to Microsoft Online Services](#replacement-online-services)
 - [Extensions + Marketplace](#extensions-marketplace)
+  - [How to use the VS Code Marketplace](#howto-vscode-marketplace)
+  - [Proprietary Debugging Tools](#proprietary-debugging-tools)
+  - [Proprietary Extensions](#proprietary-extensions)
 - [Migrating from Visual Studio Code to VSCodium](#migrating)
 - [How do I run VSCodium in portable mode?](#portable)
 - [How do I press and hold a key and have it repeat in VSCodium?](#press-and-hold)
@@ -26,27 +30,80 @@ It is also highly recommended that you review all the settings that "use online
 
 These can all be disabled.
 
-__Please note that some extensions send telemetry data to Microsoft as well. We have no control over this and can only recommend removing the extension.__
+__Please note that some extensions send telemetry data to Microsoft as well. We have no control over this and can only recommend removing the extension.__ _(For example, the C# extension `ms-vscode.csharp` sends tracking data to Microsoft.)_
 
-_(For example the C# extension `ms-vscode.csharp` sends tracking data to Microsoft.)_
+### <a id="replacement-online-services"></a>Replacements to Microsoft Online Services
+
+When searching the `@tag:usesOnlineServices` filter, note that while the "Update: Mode" setting description still says "The updates are fetched from a Microsoft online service", VSCodium's build script [sets the `updateUrl` field](https://github.com/VSCodium/vscodium/blob/master/prepare_vscode.sh#L36) in `product.json` to that of VSCodium's own small [update server](https://github.com/VSCodium/update-api), so enabling that setting won't actually result in any calls to Microsoft servers.
+
+Likewise, while the descriptions for "Extensions: Auto Check Updates" and "Extensions: Auto Update" include the same phrase, VSCodium [replaces](https://github.com/VSCodium/vscodium/blob/master/prepare_vscode.sh#L42) the Visual Studio Marketplace with Open VSX, so these settings won't call Microsoft, either.
 
 ## <a id="extensions-marketplace"></a>Extensions + Marketplace
 
-Until something more open comes around, we use the Microsoft Marketplace/Extensions in the `product.json` file. Those links are licensed under MIT as per [the comments on this issue.](https://github.com/Microsoft/vscode/issues/31168#issuecomment-317319063)
+The `product.json` file is set up to use [open-vsx.org](https://open-vsx.org/) as extension gallery, which has an [adapter](https://github.com/eclipse/openvsx/wiki/Using-Open-VSX-in-VS-Code) to the Marketplace API used by VS Code. Since that is a rather new project, you will likely miss some extensions you know from the VS Code Marketplace. You have the following options to obtain such missing extensions:
 
-If you use the [code-settings-sync](https://github.com/shanalikhan/code-settings-sync) extension, you may have [an issue](https://github.com/VSCodium/vscodium/issues/72) installing extensions (via the plugin). Refer to [this workaround](https://github.com/shanalikhan/code-settings-sync/issues/668#issuecomment-462065341) to get it working properly.
+* Ask the extension maintainers to publish to [open-vsx.org](https://open-vsx.org/) in addition to the VS Code Marketplace. The publishing process is documented in the [Open VSX Wiki](https://github.com/eclipse/openvsx/wiki/Publishing-Extensions).
+* Create a pull request to [this repository](https://github.com/open-vsx/publish-extensions) to have the [@open-vsx](https://github.com/open-vsx) service account publish the extensions for you.
+* Download and [install the vsix files](https://code.visualstudio.com/docs/editor/extension-gallery#_install-from-a-vsix).
 
-### Proprietary Debugging Tools
+See [this article](https://www.gitpod.io/blog/open-vsx/) for more information on the motivation behind Open VSX.
+
+### <a id="howto-vscode-marketplace"></a>How to use the VS Code Marketplace
+
+You can switch and use the VS Code marketplace by using the following solutions. However, note that [it is not clear whether this is legal](https://github.com/microsoft/vscode/issues/31168).
+
+With the following environment variables:
+- `VSCODE_GALLERY_SERVICE_URL='https://marketplace.visualstudio.com/_apis/public/gallery'`
+- `VSCODE_GALLERY_CACHE_URL='https://vscode.blob.core.windows.net/gallery/index'`
+- `VSCODE_GALLERY_ITEM_URL='https://marketplace.visualstudio.com/items'`
+- `VSCODE_GALLERY_CONTROL_URL=''`
+- `VSCODE_GALLERY_RECOMMENDATIONS_URL=''`
+
+Or by creating a custom `product.json` at the following location:
+- Windows: `%USER%\AppData\Roaming\VSCodium`
+- macOS: `~/Library/Application Support/VSCodium`
+- Linux: `~/.config/VSCodium`
+
+with the content:
+
+```json
+{
+  "extensionsGallery": {
+    "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
+    "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
+    "itemUrl": "https://marketplace.visualstudio.com/items",
+    "controlUrl": "",
+    "recommendationsUrl": ""
+  }
+}
+```
+
+### <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).
 
 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:
+
+```json
+  "extensionAllowedProposedApi": [
+    // ...
+    "ms-vscode-remote.vscode-remote-extensionpack",
+    "ms-vscode-remote.remote-wsl",
+    // ...
+  ],
+```
+
+In some cases, the above change won't help because the extension is hard-coded to only work with the official Visual Studio Code product.
+
 ## <a id="migrating"></a>Migrating from Visual Studio Code to VSCodium
 
 VSCodium (and a freshly cloned copy of vscode built from source) stores its extension files in `~/.vscode-oss`. So if you currently have Visual Studio Code installed, your extensions won't automatically populate. You can reinstall your extensions from the Marketplace in VSCodium, or copy the `extensions` from `~/.vscode/extensions` to `~/.vscode-oss/extensions`.
 
-Visual Studio Code stores its `keybindings.json` and `settings.json` file in the these locations:
+Visual Studio Code stores its `keybindings.json` and `settings.json` file in these locations:
 
 - __Windows__: `%APPDATA%\Code\User`
 - __macOS__: `$HOME/Library/Application Support/Code/User`

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Peter Squicciarini
+Copyright (c) 2021 Peter Squicciarini
 
 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

@@ -2,16 +2,17 @@
     <br />
     <img src="./src/resources/linux/code.png" alt="VSCodium Logo" width="200"/>
     <h1>VSCodium</h1>
-    <h3>Free/Libre Open Source Software Binaries of VSCode</h3>
+    <h3>Free/Libre Open Source Software Binaries of VS Code</h3>
 </div>
 
 <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)
-[![build status](https://travis-ci.com/VSCodium/vscodium.svg?branch=master)](https://travis-ci.com/VSCodium/vscodium) 
 [![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)
 
 </div>
 
@@ -20,14 +21,16 @@
 ## Table of Contents
 - [Download/Install](#download-install)
   - [Install with Brew](#install-with-brew)
+  - [Install with Windows Package Manager (WinGet)](#install-with-winget)
   - [Install with Chocolatey](#install-with-choco)
   - [Install with Scoop](#install-with-scoop)
+  - [Install with snap](#install-with-snap)
   - [Install with Package Manager](#install-with-package-manager)
   - [Install on Arch Linux](#install-on-arch-linux)
   - [Flatpak Option](#flatpak)
 - [Why Does This Exist](#why)
 - [More Info](#more-info)
-- [Supported OS](#supported-os)
+- [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:
@@ -37,10 +40,16 @@
 #### <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 cask install vscodium
+brew install --cask vscodium
 ```
 
-_Note for Mac OS X 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 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._
+
+#### <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)):
@@ -55,19 +64,31 @@ scoop bucket add extras
 scoop install vscodium
 ```
 
-#### <a id="install-with-package-manager"></a>Install with Package Manager (Linux)
+#### <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.
+If your GNU/Linux distribution has support for [snaps](https://snapcraft.io/docs/installing-snapd):
+```bash
+snap install codium
+```
+
+#### <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. 
 
 #### <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 [@plague-doctor](https://github.com/plague-doctor).
+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 (Linux)
-VSCodium is not available as a Flatpak app, but [@amtlib-dot-dll](https://github.com/amtlib-dot-dll) has done significant work to package up the open source build of Visual Studio Code without telemetry, very similarly to VSCodium. That package is available [here](https://flathub.org/apps/details/com.visualstudio.code.oss) and the build repo is [here](https://github.com/flathub/com.visualstudio.code.oss).
+#### <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
+
+flatpak run com.vscodium.codium
+```
 
 ## <a id="why"></a>Why Does This Exist
-This repository contains build files to generate free release binaries of Microsoft's VSCode. When we speak of "free software", we're talking about freedom, not price.
+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 downloads 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.
 > 
@@ -75,7 +96,7 @@ Microsoft's downloads of Visual Studio Code are licensed under [this not-FLOSS l
 
 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 VSCode.
+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:
 
@@ -91,25 +112,34 @@ Microsoft's build process (which we are running to build the binaries) does down
 ### 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.
 
-### Extension Licensing
+### 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 [`.travis.yml` file](https://github.com/VSCodium/vscodium/blob/master/.travis.yml) (for Linux and OS X builds) and the [`win32-build.yml` file](https://github.com/VSCodium/vscodium/blob/master/win32-build.yml) (for Windows builds). 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).
+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 GNU/Linux and macOS builds) and the `win32-build.yml` file (for Windows builds). 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. To examine the build logs, go [here for Linux / OS X](https://travis-ci.com/VSCodium/vscodium) and [here for Windows](https://dev.azure.com/vscodium/VSCodium/_build?definitionId=1)
+The builds are run every day, but exit early if there isn't a new release from Microsoft. 
 
-## <a id="supported-os"></a>Supported OS
-- [x] OS X (`zip`, `dmg`)
-- [x] Linux x64 (`deb`, `rpm`, `AppImage`, `tar.gz`)
-- [x] Linux x86 (`deb`, `rpm`, `tar.gz`) ([up to v1.35.1](https://code.visualstudio.com/updates/v1_36#_linux-32bit-support-ends))
-- [x] Linux arm64 (`deb`, `tar.gz`)
-- [x] Linux armhf (`deb`, `tar.gz`)
-- [x] Windows x64
-- [x] Windows x86
+## <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).
+- [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] 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`)
+- [x] GNU/Linux armhf (`deb`, `tar.gz`)
+- [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
+
 ## <a id="license"></a>License
-MIT
+[MIT](https://github.com/VSCodium/vscodium/blob/master/LICENSE)

VSCodium-AppImage-Recipe.yml

@@ -20,8 +20,7 @@ ingredients:
     - ls codium_*.deb | cut -d _ -f 2 > VERSION
 
 script:
-  - sed -i -e 's|/usr/share/codium/||g' usr/share/applications/codium.desktop
-  - sed -i -e 's|com.visualstudio.code.oss|vscodium|g' usr/share/applications/codium.desktop
+  - 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 vscodium.png
   - convert vscodium.png -resize 512x512 usr/share/icons/hicolor/512x512/apps/vscodium.png
@@ -30,6 +29,4 @@ script:
   - convert vscodium.png -resize 64x64 usr/share/icons/hicolor/64x64/apps/vscodium.png
   - convert vscodium.png -resize 48x48 usr/share/icons/hicolor/48x48/apps/vscodium.png
   - convert vscodium.png -resize 32x32 usr/share/icons/hicolor/32x32/apps/vscodium.png
-  - convert vscodium.png -resize 24x24 usr/share/icons/hicolor/24x24/apps/vscodium.png
-  - convert vscodium.png -resize 22x22 usr/share/icons/hicolor/22x22/apps/vscodium.png
   - ( cd usr/bin/ ; ln -s ../share/codium/codium  . )

azure-pipelines.yml

@@ -1,16 +0,0 @@
-jobs:
-- job: Windows
-  pool:
-    vmImage: VS2017-Win2016
-  variables:
-    BUILDARCH: x64
-  steps:
-  - template: win32-build.yml
-
-- job: Windows32
-  pool:
-    vmImage: VS2017-Win2016
-  variables:
-    BUILDARCH: ia32
-  steps:
-  - template: win32-build.yml

build.sh

@@ -1,78 +1,41 @@
 #!/bin/bash
 
-function keep_alive_small() {
-  while true; do
-    echo .
-    read -t 60 < /proc/self/fd/1 > /dev/null 2>&1
-  done
-}
-
-function keep_alive() {
-  while true; do
-    date
-    sleep 60
-  done
-}
+set -ex
 
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
-  export BUILD_SOURCEVERSION=$LATEST_MS_COMMIT
+  npm config set scripts-prepend-node-path true
+
   echo "LATEST_MS_COMMIT: ${LATEST_MS_COMMIT}"
-  echo "BUILD_SOURCEVERSION: ${BUILD_SOURCEVERSION}"
 
-  export npm_config_arch="$BUILDARCH"
-  export npm_config_target_arch="$BUILDARCH"
-
-  ./prepare_vscode.sh
+  . prepare_vscode.sh
 
   cd vscode || exit
 
-  export NODE_ENV=production
-
-  # these tasks are very slow, so using a keep alive to keep travis alive
-  if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    keep_alive_small &
-  else
-    keep_alive &
-  fi
-
-  KA_PID=$!
+  yarn monaco-compile-check
+  yarn valid-layers-check
 
   yarn gulp compile-build
   yarn gulp compile-extensions-build
-
   yarn gulp minify-vscode
 
-  yarn gulp minify-vscode-reh
-  yarn gulp minify-vscode-reh-web
-
-  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    npm install --global create-dmg
-    yarn gulp vscode-darwin-min-ci
-    yarn gulp vscode-reh-darwin-min-ci
-    yarn gulp vscode-reh-web-darwin-min-ci
-  elif [[ "$CI_WINDOWS" == "True" ]]; 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
-    yarn gulp "vscode-win32-${BUILDARCH}-min-ci"
-    yarn gulp "vscode-reh-win32-${BUILDARCH}-min-ci"
-    yarn gulp "vscode-reh-web-win32-${BUILDARCH}-min-ci"
-    yarn gulp "vscode-win32-${BUILDARCH}-code-helper"
-    yarn gulp "vscode-win32-${BUILDARCH}-inno-updater"
-    yarn gulp "vscode-win32-${BUILDARCH}-archive"
-    yarn gulp "vscode-win32-${BUILDARCH}-system-setup"
-    yarn gulp "vscode-win32-${BUILDARCH}-user-setup"
+    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"
   else # linux
-    yarn gulp vscode-linux-${BUILDARCH}-min-ci
-    yarn gulp vscode-reh-linux-${BUILDARCH}-min-ci
-    yarn gulp vscode-reh-web-linux-${BUILDARCH}-min-ci
-
-    yarn gulp "vscode-linux-${BUILDARCH}-build-deb"
-    if [[ "$BUILDARCH" == "x64" ]]; then
-      yarn gulp "vscode-linux-${BUILDARCH}-build-rpm"
+    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
     fi
-    . ../create_appimage.sh
   fi
 
-  kill $KA_PID
-
   cd ..
 fi

build/azure-pipelines/computeYarnCacheKey.js

@@ -0,0 +1,24 @@
+const fs = require("fs");
+const crypto = require("crypto");
+const path = require("path");
+const { dirs } = require('../../vscode/build/npm/dirs');
+
+const ROOT = path.join(__dirname, '../../vscode');
+
+const shasum = crypto.createHash('sha1');
+
+shasum.update(fs.readFileSync(path.join(ROOT, '.yarnrc')));
+shasum.update(fs.readFileSync(path.join(ROOT, 'remote/.yarnrc')));
+
+// Add `yarn.lock` files
+for (let dir of dirs) {
+    const yarnLockPath = path.join(ROOT, dir, 'yarn.lock');
+    shasum.update(fs.readFileSync(yarnLockPath));
+}
+
+// Add any other command line arguments
+for (let i = 2; i < process.argv.length; i++) {
+    shasum.update(process.argv[i]);
+}
+
+process.stdout.write(shasum.digest('hex'));

build/build_linux.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+rm -rf VSCode*
+rm -rf vscode
+
+./get_repo.sh
+
+SHOULD_BUILD=yes CI_BUILD=no OS_NAME=linux VSCODE_ARCH=x64 ./build.sh

build/build_macos.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+rm -rf VSCode*
+rm -rf vscode
+
+. get_repo.sh
+
+SHOULD_BUILD=yes CI_BUILD=no OS_NAME=osx VSCODE_ARCH=x64 . build.sh

build/build_windows.ps1

@@ -0,0 +1,14 @@
+# powershell -ExecutionPolicy ByPass -File .\build\build_windows.ps1
+
+$env:Path += ";C:\Program Files\Git\bin"
+
+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

check_cron_or_pr.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+if [[ $GITHUB_EVENT_NAME == "pull_request" ]]; then
+	echo "It's a PR"
+	
+	export SHOULD_BUILD="yes"
+	export SHOULD_DEPLOY="no"
+else
+	echo "It's a cron"
+	
+	export SHOULD_DEPLOY="yes"
+fi
+
+if [[ $GITHUB_ENV ]]; then
+	echo "SHOULD_BUILD=$SHOULD_BUILD" >> $GITHUB_ENV
+	echo "SHOULD_DEPLOY=$SHOULD_DEPLOY" >> $GITHUB_ENV
+fi

check_tags.ps1

@@ -1,38 +0,0 @@
-echo "tag: $env:LATEST_MS_TAG"
-$REPO_URI = [uri]$env:BUILD_REPOSITORY_URI
-$USER_REPO = $REPO_URI."LocalPath"
-echo $USER_REPO
-$GITHUB_RESPONSE = curl.exe -s -H "Authorization: token $env:MAPPED_GITHUB_TOKEN" "https://api.github.com/repos$USER_REPO/releases/tags/$env:LATEST_MS_TAG"
-echo "Github response: ${GITHUB_RESPONSE}"
-$VSCODIUM_ASSETS = $GITHUB_RESPONSE | jq '.assets'
-echo "VSCodium assets: ${VSCODIUM_ASSETS}"
-
-# if we just don't have the github token, get out fast
-if (!$env:MAPPED_GITHUB_TOKEN -or $env:MAPPED_GITHUB_TOKEN -like "*GITHUB_TOKEN*") {
-  echo "This build does not have the GH token"
-  echo $env:MAPPED_GITHUB_TOKEN
-  return
-}
-
-if ($VSCODIUM_ASSETS -eq "null" -or !$VSCODIUM_ASSETS) {
-  echo "Release assets do not exist at all, continuing build"
-  $SHOULD_BUILD = 'yes'
-} else {
-  $WindowsAssets = ($VSCODIUM_ASSETS | ConvertFrom-Json) | Where-Object { $_.name.Contains('exe') }
-  $SYSTEM_SETUP = $WindowsAssets | Where-Object { $_.name.Contains('Setup') }
-  $USER_SETUP = $WindowsAssets | Where-Object { $_.name.Contains('User') }
-  if (!$SYSTEM_SETUP) {
-    echo "Building on Windows because we have no system-setup.exe";
-    $SHOULD_BUILD = 'yes'
-  }
-  elseif (!$USER_SETUP) {
-    echo "Building on Windows because we have no user-setup.exe";
-    $SHOULD_BUILD = 'yes'
-  }
-  else {
-    echo "Already have all the Windows builds"
-  } 
-}
-
-
-Write-Host "##vso[task.setvariable variable=SHOULD_BUILD]$SHOULD_BUILD"

check_tags.sh

@@ -1,84 +1,133 @@
 #!/bin/bash
 
-REPOSITORY=${TRAVIS_REPO_SLUG:-"VSCodium/vscodium"}
+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)
-echo "Github response: ${GITHUB_RESPONSE}"
 VSCODIUM_ASSETS=$(echo $GITHUB_RESPONSE | jq '.assets')
-echo "VSCodium assets: ${VSCODIUM_ASSETS}"
 
 # if we just don't have the github token, get out fast
 if [ "$GITHUB_TOKEN" != "" ]; then
   if [ "$VSCODIUM_ASSETS" != "null" ]; then
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      HAVE_MAC=$(echo $VSCODIUM_ASSETS | jq --arg suffix "darwin-$LATEST_MS_TAG.zip" 'map(.name) | contains([$suffix])')
+    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 [[ $BUILDARCH == "arm64" ]]; then
-      # HAVE_ARM64_RPM=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["arm64.rpm"])')
-      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_RPM" != "true" ]]; then
-      #   echo "Building on Linux arm64 because we have no RPM"
-      #   export SHOULD_BUILD="yes"
-      # fi
-      if [[ "$HAVE_ARM64_DEB" != "true" ]]; then
-        echo "Building on Linux arm64 because we have no DEB"
-        export SHOULD_BUILD="yes"
+    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
-      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 [[ $BUILDARCH == "arm" ]]; then
-      HAVE_ARM_DEB=$(echo $VSCODIUM_ASSETS | jq 'map(.name) | contains(["armhf.deb"])')
-      HAVE_ARM_TAR=$(echo $VSCODIUM_ASSETS | jq --arg suffix "arm-$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
-      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"
+    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 git rev-parse $LATEST_MS_TAG >/dev/null 2>&1
-  then
-    export TRAVIS_TAG=$LATEST_MS_TAG
-  else
-    git config --local user.name "Travis CI"
-    git config --local user.email "builds@travis-ci.com"
-    git tag $LATEST_MS_TAG
-  fi
 fi
 
+echo "SHOULD_BUILD=$SHOULD_BUILD" >> $GITHUB_ENV

create_appimage.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
-if [[ "$BUILDARCH" == "x64" ]]; then
+if [[ "$VSCODE_ARCH" == "x64" ]]; then
   # install a dep needed for this process
   sudo apt-get install desktop-file-utils
 
   cd ..
-  
+  export DOCKER_BUILD=1
   bash -e src/resources/linux/appimage/pkg2appimage VSCodium-AppImage-Recipe.yml
 fi

create_dmg.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-if [[ "$SHOULD_BUILD" == "yes" ]]; then
-  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    cd VSCode-darwin
-    create-dmg VSCodium.app ..
-  fi
-  cd ..
-fi

create_zip.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [[ "$SHOULD_BUILD" == "yes" ]]; then
-  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    cd VSCode-darwin
-    zip -r -X -y ../VSCodium-darwin-${LATEST_MS_TAG}.zip ./*.app
-  else
-    cd VSCode-linux-${BUILDARCH}
-    tar czf ../VSCodium-linux-${BUILDARCH}-${LATEST_MS_TAG}.tar.gz .
-  fi
-
-  cd ..
-fi

get_repo.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 
-if [ -d vscode ]; then
-  cd vscode 
-  git fetch --all
-else
-  git clone https://github.com/Microsoft/vscode.git
-  cd vscode
-fi
-
-export LATEST_MS_COMMIT=$(git rev-list --tags --max-count=1)
-export LATEST_MS_TAG=$(git describe --tags ${LATEST_MS_COMMIT})
+# 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}"
-git checkout $LATEST_MS_TAG
-cd ..
+
+git clone https://github.com/Microsoft/vscode.git --branch $LATEST_MS_TAG --depth 1
+
+# 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
+fi

icons/build_icons.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+check_programs() {
+    for arg in "$@"
+    do
+        if ! command -v $arg >/dev/null 2>&1
+		then
+			echo "$arg could not be found"
+			exit
+		fi
+    done
+}
+
+check_programs "icns2png" "composite" "convert" "png2icns" "icotool"
+
+for file in vscode/resources/darwin/*
+do
+	if [ -f "$file" ]; then
+		name=$(basename $file '.icns')
+
+		if [[ $name != 'code' ]] && [ ! -f "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"
+
+			convert "$name.png" -resize 256x256 "${name}_256.png"
+
+			png2icns "src/resources/darwin/$name.icns" "$name.png" "${name}_256.png"
+
+			rm "${name}_512x512x32.png" "$name.png" "${name}_256.png"
+		fi
+	fi
+done
+
+for file in vscode/resources/win32/*.ico
+do
+	if [ -f "$file" ]; then
+		name=$(basename $file '.ico')
+
+		if [[ $name != 'code' ]] && [ ! -f "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/resources/win32/$name.ico"
+
+			rm "${name}_9_256x256x32.png" "${name}.png"
+		fi
+	fi
+done
+
+if [ ! -f "src/resources/win32/code.ico" ]; then
+	convert "src/resources/linux/code.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "src/resources/win32/code.ico"
+fi

install_deps.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-  brew update
-  brew install jq zip
-else
-  sudo apt-get update
-  sudo apt-get install -y fakeroot jq
-  triplet=
-  case $BUILDARCH in
-  arm)
-    arch=armhf
-    triplet=arm-linux-gnueabihf
-    ;;
-
-  arm64)
-    arch=arm64
-    triplet=aarch64-linux-gnu
-    ;;
-  esac
-
-  if [[ -n "$triplet" ]]; then
-    sed 's/^deb /deb [arch=amd64] '/g -i /etc/apt/sources.list
-    echo "deb [arch=$arch] http://ports.ubuntu.com/ubuntu-ports/ trusty main" | sudo tee -a /etc/apt/sources.list.d/$arch.list >/dev/null
-    sudo dpkg --add-architecture $arch
-    sudo apt-get update
-    sudo apt-get install libc6-dev-$arch-cross gcc-$triplet g++-$triplet `apt-cache search x11proto | grep ^x11proto | cut -f 1 -d ' '` xz-utils pkg-config
-    mkdir -p dl
-    cd dl
-    apt-get download libx11-dev:$arch libx11-6:$arch libxkbfile-dev:$arch libxkbfile1:$arch libxau-dev:$arch libxdmcp-dev:$arch libxcb1-dev:$arch libsecret-1-dev:$arch libsecret-1-0:$arch libpthread-stubs0-dev:$arch libglib2.0-dev:$arch libglib2.0-0:$arch libffi-dev:$arch libffi6:$arch zlib1g:$arch libpcre3-dev:$arch libpcre3:$arch
-    for i in *.deb; do ar x $i; sudo tar -C / -xf data.tar.*; rm -f data.tar.*; done
-    cd ..
-    export CC=/usr/bin/$triplet-gcc
-    export CXX=/usr/bin/$triplet-g++
-    export CC_host=/usr/bin/gcc
-    export CXX_host=/usr/bin/g++
-    export PKG_CONFIG_LIBDIR=/usr/lib/$triplet/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
-  else
-    sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev rpm
-  fi
-fi

patches/binary-name.patch

@@ -0,0 +1,45 @@
+diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
+index 6d3a369..57009d4 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: '.' }));
+ 		} else if (platform === 'darwin') {
+ 			const shortcut = gulp.src('resources/darwin/bin/code.sh')
+-				.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 50c4460..bf73260 100644
+--- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
++++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
+@@ -431,4 +431,4 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
+ 		// macOS
+ 		if (this.environmentMainService.isBuilt) {
+-			return join(this.environmentMainService.appRoot, 'bin', 'code');
++			return join(this.environmentMainService.appRoot, 'bin', `${this.productService.applicationName}`);
+ 		}
+diff --git a/src/vs/workbench/contrib/cli/node/cli.contribution.ts b/src/vs/workbench/contrib/cli/node/cli.contribution.ts
+index 30972a4..0a9435c 100644
+--- a/src/vs/workbench/contrib/cli/node/cli.contribution.ts
++++ b/src/vs/workbench/contrib/cli/node/cli.contribution.ts
+@@ -29,7 +29,7 @@ let _source: string | null = null;
+ function getSource(): string {
+ 	if (!_source) {
+ 		const root = FileAccess.asFileUri('', require).fsPath;
+-		_source = path.resolve(root, '..', 'bin', 'code');
++		_source = path.resolve(root, '..', 'bin', product.applicationName);
+ 	}
+ 	return _source;
+ }

patches/custom-gallery.patch

@@ -0,0 +1,74 @@
+diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
+index 251ed36..8065c6f 100644
+--- a/src/vs/platform/product/common/product.ts
++++ b/src/vs/platform/product/common/product.ts
+@@ -8,6 +8,7 @@ import { isWeb } from 'vs/base/common/platform';
+ import { env } from 'vs/base/common/process';
+ import { dirname, joinPath } from 'vs/base/common/resources';
+ import { IProductConfiguration } from 'vs/platform/product/common/productService';
++import { getUserDataPath } from 'vs/platform/environment/node/userDataPath';
+ 
+ let product: IProductConfiguration;
+ 
+@@ -49,6 +50,29 @@ else {
+ 	product = require.__$__nodeRequire(joinPath(rootPath, 'product.json').fsPath);
+ 	const pkg = require.__$__nodeRequire(joinPath(rootPath, 'package.json').fsPath) as { version: string; };
+ 
++	// Merge user-customized product.json
++	try {
++		const merge = (...objects: any[]) =>
++			objects.reduce((result, current) => {
++				Object.keys(current).forEach((key) => {
++					if (Array.isArray(result[key]) && Array.isArray(current[key])) {
++						result[key] = current[key];
++					} else if (typeof result[key] === 'object' && typeof current[key] === 'object') {
++						result[key] = merge(result[key], current[key]);
++					} else {
++						result[key] = current[key];
++					}
++				});
++
++				return result;
++			}, {}) as any;
++
++		const userProduct = require.__$__nodeRequire(joinPath(FileAccess.asFileUri(getUserDataPath({} as any), require), 'product.json').fsPath);
++
++		product = merge(product, userProduct)
++	} catch (ex) {
++	}
++
+ 	// Running out of sources
+ 	if (env['VSCODE_DEV']) {
+ 		Object.assign(product, {
+@@ -58,6 +82,19 @@ else {
+ 		});
+ 	}
+ 
++	// Set user-defined extension gallery
++	const { serviceUrl, cacheUrl, itemUrl, controlUrl, recommendationsUrl } = product.extensionsGallery || {}
++
++	Object.assign(product, {
++		extensionsGallery: {
++			serviceUrl: env['VSCODE_GALLERY_SERVICE_URL'] || serviceUrl,
++			cacheUrl: env['VSCODE_GALLERY_CACHE_URL'] || cacheUrl,
++			itemUrl: env['VSCODE_GALLERY_ITEM_URL'] || itemUrl,
++			controlUrl: env['VSCODE_GALLERY_CONTROL_URL'] || controlUrl,
++			recommendationsUrl: env['VSCODE_GALLERY_RECOMMENDATIONS_URL'] || recommendationsUrl
++		}
++	})
++
+ 	Object.assign(product, {
+ 		version: pkg.version
+ 	});
+diff --git a/src/vs/platform/product/common/productService.ts b/src/vs/platform/product/common/productService.ts
+index 34acc14..d3a2764 100644
+--- a/src/vs/platform/product/common/productService.ts
++++ b/src/vs/platform/product/common/productService.ts
+@@ -67,6 +67,7 @@ export interface IProductConfiguration {
+ 
+ 	readonly extensionsGallery?: {
+ 		readonly serviceUrl: string;
++		readonly cacheUrl?: string;
+ 		readonly itemUrl: string;
+ 		readonly controlUrl: string;
+ 		readonly recommendationsUrl: string;

patches/fix-rpm-spec.patch

@@ -0,0 +1,8 @@
+--- 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/update-cache-path.patch

@@ -1,11 +1,11 @@
---- vscode/src/vs/platform/update/electron-main/updateService.win32.ts	2019-12-08 15:09:44.000000000 -0800
-+++ src/src/vs/platform/update/electron-main/updateService.win32.ts	2019-12-08 15:12:56.000000000 -0800
-@@ -55,7 +55,7 @@
+--- a/src/vs/platform/update/electron-main/updateService.win32.ts
++++ b/src/vs/platform/update/electron-main/updateService.win32.ts
+@@ -55,7 +55,7 @@ export class Win32UpdateService extends AbstractUpdateService {
  
  	@memoize
  	get cachePath(): Promise<string> {
--		const result = path.join(tmpdir(), `vscode-update-${product.target}-${process.arch}`);
-+		const result = path.join(tmpdir(), `vscodium-update-${product.target}-${process.arch}`);
- 		return pfs.mkdirp(result, undefined).then(() => result);
+-		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}`);
+ 		return fs.promises.mkdir(result, { recursive: true }).then(() => result);
  	}
  

prepare_vscode.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-export npm_config_arch="$BUILDARCH"
-export npm_config_target_arch="$BUILDARCH"
+set -e
 
 cp -rp src/* vscode/
 cd vscode || exit
@@ -10,12 +9,21 @@ cd vscode || exit
 
 # 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
+
+if [[ "$OS_NAME" == "osx" ]]; then
+  CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional
+  npm_config_argv='{"original":["--ignore-optional"]}' yarn postinstall
+else
+  CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+fi
 
-yarn --frozen-lockfile
-yarn postinstall
 mv product.json product.json.bak
 
 # set fields in product.json
+checksumFailMoreInfoUrl='setpath(["checksumFailMoreInfoUrl"]; "https://go.microsoft.com/fwlink/?LinkId=828886")'
 tipsAndTricksUrl='setpath(["tipsAndTricksUrl"]; "https://go.microsoft.com/fwlink/?linkid=852118")'
 twitterUrl='setpath(["twitterUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533687")'
 requestFeatureUrl='setpath(["requestFeatureUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533482")'
@@ -28,7 +36,8 @@ keyboardShortcutsUrlMac='setpath(["keyboardShortcutsUrlMac"]; "https://go.micros
 keyboardShortcutsUrlLinux='setpath(["keyboardShortcutsUrlLinux"]; "https://go.microsoft.com/fwlink/?linkid=832144")'
 keyboardShortcutsUrlWin='setpath(["keyboardShortcutsUrlWin"]; "https://go.microsoft.com/fwlink/?linkid=832145")'
 quality='setpath(["quality"]; "stable")'
-extensionsGallery='setpath(["extensionsGallery"]; {"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", "itemUrl": "https://marketplace.visualstudio.com/items"})'
+extensionsGallery='setpath(["extensionsGallery"]; {"serviceUrl": "https://open-vsx.org/vscode/gallery", "itemUrl": "https://open-vsx.org/vscode/item"})'
+linkProtectionTrustedDomains='setpath(["linkProtectionTrustedDomains"]; ["https://open-vsx.org"])'
 nameShort='setpath(["nameShort"]; "VSCodium")'
 nameLong='setpath(["nameLong"]; "VSCodium")'
 linuxIconName='setpath(["linuxIconName"]; "vscodium")'
@@ -41,18 +50,44 @@ 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-vsliveshare.vsliveshare"])'
+extensionAllowedProposedApi='setpath(["extensionAllowedProposedApi"]; getpath(["extensionAllowedProposedApi"]) + ["ms-vsliveshare.vsliveshare", "ms-vscode-remote.remote-ssh", "ms-vscode.cpptools", "ms-azuretools.vscode-docker", "visualstudioexptteam.vscodeintellicode", "ms-python.python"])'
+serverDataFolderName='setpath(["serverDataFolderName"]; ".vscode-server-oss")'
 
-product_json_changes="${tipsAndTricksUrl} | ${twitterUrl} | ${requestFeatureUrl} | ${documentationUrl} | ${introductoryVideosUrl} | ${extensionAllowedBadgeProviders} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${nameShort} | ${nameLong} | ${linuxIconName} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${extensionAllowedProposedApi}"
+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 [[ "$TRAVIS_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
   # we need to edit a line in the post install template
   sed -i "s/code-oss/codium/" resources/linux/debian/postinst.template
+  
+  # fix the packages metadata
+  # code.appdata.xml
+  sed -i 's|Visual Studio Code|VSCodium|g' resources/linux/code.appdata.xml
+  sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/code.appdata.xml
+  sed -i 's|https://code.visualstudio.com/home/home-screenshot-linux-lg.png|https://vscodium.com/img/vscodium.png|' resources/linux/code.appdata.xml
+  sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/code.appdata.xml
+  
+  # control.template
+  sed -i 's|Microsoft Corporation <vscode-linux@microsoft.com>|VSCodium Team https://github.com/VSCodium/vscodium/graphs/contributors|'  resources/linux/debian/control.template
+  sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/debian/control.template
+  sed -i 's|Visual Studio Code|VSCodium|g' resources/linux/debian/control.template
+  sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/debian/control.template
+  
+  # code.spec.template
+  sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/rpm/code.spec.template
+  sed -i 's|Microsoft Corporation|VSCodium Team|' resources/linux/rpm/code.spec.template
+  sed -i 's|Visual Studio Code Team <vscode-linux@microsoft.com>|VSCodium Team https://github.com/VSCodium/vscodium/graphs/contributors|' resources/linux/rpm/code.spec.template
+  sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/rpm/code.spec.template
+  sed -i 's|Visual Studio Code|VSCodium|' resources/linux/rpm/code.spec.template
+  
+  # snapcraft.yaml
+  sed -i 's|Visual Studio Code|VSCodium|'  resources/linux/rpm/code.spec.template
 fi
+
+cd ..

sign_mac_app.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# thanks to https://www.jviotti.com/2016/03/16/how-to-code-sign-os-x-electron-apps-in-travis-ci.html
-# for the helpful instructions
-if [[ "$SHOULD_BUILD" == "yes" ]]; then
-  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    if [ -d "VSCode-darwin" ]; then # just in case the build failed
-      cd VSCode-darwin
-      export CERTIFICATE_P12=VSCodium.p12
-      echo $CERTIFICATE_OSX_P12 | base64 --decode > $CERTIFICATE_P12
-      export KEYCHAIN=build.keychain
-      security create-keychain -p mysecretpassword $KEYCHAIN
-      security default-keychain -s $KEYCHAIN
-      security unlock-keychain -p mysecretpassword $KEYCHAIN
-      security import $CERTIFICATE_P12 -k $KEYCHAIN -P $CERTIFICATE_OSX_PASSWORD -T /usr/bin/codesign
-      
-      # https://docs.travis-ci.com/user/common-build-problems/
-      security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword $KEYCHAIN
-      
-      codesign --deep --force --verbose --sign "$CERTIFICATE_OSX_ID" VSCodium.app
-    fi
-  fi
-fi

src/resources/linux/appimage/functions.sh

@@ -187,7 +187,7 @@ generate_appimage()
   mkdir -p ../out || true
   rm ../out/$APP"-"$VERSION".glibc"$GLIBC_NEEDED"-"$ARCH".AppImage" 2>/dev/null || true
   GLIBC_NEEDED=$(glibc_needed)
-  ./AppImageAssistant ./$APP.AppDir/ ../out/$APP"-"$VERSION".glibc"$GLIBC_NEEDED"-"$ARCH".AppImage"
+  ./AppImageAssistant --appimage-extract-and-run ./$APP.AppDir/ ../out/$APP"-"$VERSION".glibc"$GLIBC_NEEDED"-"$ARCH".AppImage"
 }
 
 # Generate AppImage type 2

src/resources/linux/appimage/pkg2appimage

@@ -163,7 +163,7 @@ fi
 # and ingredients of that architecture. Debian packages
 # should be available for most architectures, e.g., oldstable
 # has "armhf"
-if [ ! -z $ARCH] ; then
+if [ ! -z $ARCH ] ; then
   OPTIONS="$OPTIONS -o APT::Architecture=$ARCH"
 fi
 
@@ -467,6 +467,5 @@ fi
 # Go out of AppImage
 cd ..
 
-export UPDATE_INFORMATION="gh-releases-zsync|VSCodium|vscodium|latest|*.AppImage.zsync"
-generate_type2_appimage
+generate_type2_appimage -u "gh-releases-zsync|VSCodium|vscodium|latest|*.AppImage.zsync"
 ls -lh ../out/*.AppImage*

sum.sh

@@ -1,33 +1,24 @@
 #!/bin/bash
 
-# shasum blows up in Azure, so using this
-# node package which has similar syntax and identical output
-if [[ "$CI_WINDOWS" == "True" ]]; then
-  npm i -g checksum
-fi
+npm install -g checksum
 
 sum_file () {
   if [[ -f "$1" ]]; then
-    if [[ "$CI_WINDOWS" == "True" ]]; then
-      checksum -a sha256 "$1" > "$1".sha256
-      checksum -a sha1 "$1" > "$1".sha1
-    else
-      shasum -a 256 "$1" > "$1".sha256
-      shasum "$1" > "$1".sha1
-    fi
+    checksum -a sha256 "$1" > "$1".sha256
+    checksum "$1" > "$1".sha1
   fi
 }
 
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
-  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+  if [[ "$OS_NAME" == "osx" ]]; then
     sum_file VSCodium-darwin-*.zip
     sum_file VSCodium*.dmg
-  elif [[ "$CI_WINDOWS" == "True" ]]; then
+  elif [[ "$OS_NAME" == "windows" ]]; then
     sum_file VSCodiumSetup-*.exe
     sum_file VSCodiumUserSetup-*.exe
     sum_file VSCodium-win32-*.zip
   else # linux
-    cp out/*.AppImage .
+    cp out/*.AppImage* .
     cp vscode/.build/linux/deb/*/deb/*.deb .
     cp vscode/.build/linux/rpm/*/*.rpm .
 

undo_telemetry.sh

@@ -3,7 +3,7 @@
 TELEMETRY_URLS="(dc\.services\.visualstudio\.com)|(vortex\.data\.microsoft\.com)"
 REPLACEMENT="s/$TELEMETRY_URLS/0\.0\.0\.0/g"
 
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+if [[ "$OS_NAME" == "osx" ]]; 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

update_settings.sh

@@ -5,7 +5,7 @@ TELEMETRY_CRASH_REPORTER="'telemetry.enableCrashReporter':"
 
 replace () {
   echo $1
-  if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+  if [[ "$OS_NAME" == "osx" ]]; then
     sed -i '' -E "$1" $2
   else
     sed -i -E "$1" $2
@@ -46,4 +46,4 @@ update_setting () {
 }
 
 update_setting "$TELEMETRY_ENABLE" src/vs/platform/telemetry/common/telemetryService.ts
-update_setting "$TELEMETRY_CRASH_REPORTER" src/vs/workbench/electron-browser/desktop.contribution.ts
+update_setting "$TELEMETRY_CRASH_REPORTER" src/vs/workbench/electron-sandbox/desktop.contribution.ts

update_version.sh

@@ -27,15 +27,8 @@ fi
 URL_BASE=https://github.com/VSCodium/vscodium/releases/download/${LATEST_MS_TAG}
 
 # to make testing on forks easier
-if [[ "$CI_WINDOWS" == "True" ]]; then
-  # BUILD_REPOSITORY_URI = e.g. https://github.com/VSCodium/vscodium
-  VERSIONS_REPO=$(echo ${BUILD_REPOSITORY_URI} | awk -F"/" '{ print $4 }')/versions
-
-  git config --global core.autocrlf true
-else
-  # TRAVIS_REPO_SLUG = e.g. VSCodium/vscodium
-  VERSIONS_REPO=$(echo ${TRAVIS_REPO_SLUG} | awk -F"/" '{ print $1 }')/versions
-fi
+VERSIONS_REPO="${GITHUB_USERNAME}/versions"
+echo "Versions repo:" $VERSIONS_REPO
 
 # generateJson <assetName>
 # e.g. generateJson VSCodium-darwin-1.33.0.zip
@@ -98,36 +91,36 @@ git remote rm origin
 git remote add origin https://${GITHUB_USERNAME}:${GITHUB_TOKEN}@github.com/${VERSIONS_REPO}.git > /dev/null 2>&1
 cd ..
 
-if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+if [[ "$OS_NAME" == "osx" ]]; then
   # zip, sha1, and sha256 files are all at top level dir
-  ASSET_NAME=VSCodium-darwin-${LATEST_MS_TAG}.zip
-  VERSION_PATH="darwin"
+  ASSET_NAME=VSCodium-darwin-${VSCODE_ARCH}-${LATEST_MS_TAG}.zip
+  VERSION_PATH="darwin/${VSCODE_ARCH}"
   JSON="$(generateJson ${ASSET_NAME})"
   updateLatestVersion "$VERSION_PATH" "$JSON"
-elif [[ "$CI_WINDOWS" == "True" ]]; then
+elif [[ "$OS_NAME" == "windows" ]]; then
   # system installer
-  ASSET_NAME=VSCodiumSetup-${BUILDARCH}-${LATEST_MS_TAG}.exe
-  VERSION_PATH="win32/${BUILDARCH}/system"
+  ASSET_NAME=VSCodiumSetup-${VSCODE_ARCH}-${LATEST_MS_TAG}.exe
+  VERSION_PATH="win32/${VSCODE_ARCH}/system"
   JSON="$(generateJson ${ASSET_NAME})"
   updateLatestVersion "$VERSION_PATH" "$JSON"
 
   # user installer
-  ASSET_NAME=VSCodiumUserSetup-${BUILDARCH}-${LATEST_MS_TAG}.exe
-  VERSION_PATH="win32/${BUILDARCH}/user"
+  ASSET_NAME=VSCodiumUserSetup-${VSCODE_ARCH}-${LATEST_MS_TAG}.exe
+  VERSION_PATH="win32/${VSCODE_ARCH}/user"
   JSON="$(generateJson ${ASSET_NAME})"
   updateLatestVersion "$VERSION_PATH" "$JSON"
 
   # windows archive
-  ASSET_NAME=VSCodium-win32-${BUILDARCH}-${LATEST_MS_TAG}.zip
-  VERSION_PATH="win32/${BUILDARCH}/archive"
+  ASSET_NAME=VSCodium-win32-${VSCODE_ARCH}-${LATEST_MS_TAG}.zip
+  VERSION_PATH="win32/${VSCODE_ARCH}/archive"
   JSON="$(generateJson ${ASSET_NAME})"
   updateLatestVersion "$VERSION_PATH" "$JSON"
 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-${BUILDARCH}-${LATEST_MS_TAG}.tar.gz
-  VERSION_PATH="linux/${BUILDARCH}"
+  ASSET_NAME=VSCodium-linux-${VSCODE_ARCH}-${LATEST_MS_TAG}.tar.gz
+  VERSION_PATH="linux/${VSCODE_ARCH}"
   JSON="$(generateJson ${ASSET_NAME})"
   updateLatestVersion "$VERSION_PATH" "$JSON"
 fi
@@ -137,7 +130,7 @@ cd versions
 git pull origin master # in case another build just pushed
 git add .
 dateAndMonth=`date "+%D %T"`
-git commit -m "Travis update: $dateAndMonth (Build $TRAVIS_BUILD_NUMBER)"
+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

win32-build.yml

@@ -1,69 +0,0 @@
-steps:
-- task: NodeTool@0 
-  inputs:
-    versionSpec: "12.13.0"
-- script: |
-    choco install jq 
-  displayName: 'install jq from choco'
-- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-  displayName: 'Install Yarn'
-- task: UsePythonVersion@0
-  displayName: 'Use Python 2.x'
-  inputs:
-    versionSpec: 2.x
-- task: ShellScript@2
-  displayName: 'get VSCode sources'
-  inputs: 
-    scriptPath: get_repo.sh
-- powershell: |
-    $LATEST_MS_COMMIT="$(git -C vscode rev-list --tags --max-count=1)"
-    $LATEST_MS_TAG="$(git -C vscode describe --tags)"
-    Write-Host "##vso[task.setvariable variable=LATEST_MS_TAG]$LATEST_MS_TAG"
-    Write-Host "##vso[task.setvariable variable=LATEST_MS_COMMIT]$LATEST_MS_COMMIT"
-    Write-Host "##vso[task.setvariable variable=BUILD_SOURCEVERSION]$LATEST_MS_COMMIT"
-  displayName: 'set env LATEST_MS_TAG, LATEST_MS_COMMIT'
-- task: PowerShell@2
-  inputs:
-    filePath: 'check_tags.ps1'
-  env:
-    MAPPED_GITHUB_TOKEN: $(GITHUB_TOKEN)
-- script: |
-    git -C vscode status
-  displayName: 'vscode status'
-- powershell: |
-    bash ./build.sh
-  displayName: 'go build it!'
-- bash: |
-    if [[ "$SHOULD_BUILD" == "yes" ]]; then mv vscode\\.build\\win32-$(BUILDARCH)\\system-setup\\VSCodeSetup.exe VSCodiumSetup-$(BUILDARCH)-${LATEST_MS_TAG}.exe; fi
-  displayName: 'move the system setup'
-- bash: |
-    if [[ "$SHOULD_BUILD" == "yes" ]]; then mv vscode\\.build\\win32-$(BUILDARCH)\\user-setup\\VSCodeSetup.exe VSCodiumUserSetup-$(BUILDARCH)-${LATEST_MS_TAG}.exe; fi
-  displayName: 'move the user setup'
-- bash: |
-    if [[ "$SHOULD_BUILD" == "yes" ]]; then mv vscode\\.build\\win32-$(BUILDARCH)\\archive\\VSCode-win32-$(BUILDARCH).zip VSCodium-win32-$(BUILDARCH)-${LATEST_MS_TAG}.zip; fi
-  displayName: 'move the zip folder'
-- powershell: |
-    bash ./sum.sh
-  condition: eq(variables['SHOULD_BUILD'], 'yes')
-  displayName: 'compute sums'
-- task: CopyFiles@2
-  inputs:
-    contents: |
-      VSCodium*.zip
-      VSCodiumUserSetup*.exe
-      VSCodiumSetup*.exe
-      *.sha256
-    targetFolder: $(Build.ArtifactStagingDirectory)
-  condition: eq(variables['SHOULD_BUILD'], 'yes')
-  displayName: 'copy artifacts to staging directory'
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish artifacts'
-  condition: eq(variables['SHOULD_BUILD'], 'yes')
-  inputs:
-    PathtoPublish: $(Build.ArtifactStagingDirectory)
-    ArtifactName: 'everything'
-- bash: ./update_version.sh
-  displayName: 'update version json'
-  env:
-    GITHUB_TOKEN: $(GITHUB_TOKEN)
-    GITHUB_USERNAME: $(GITHUB_USERNAME)