ci: bump github actions (#1046)

changed hardcoded owner

.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,7 +9,7 @@ on:
     branches: [ master ]
 
 jobs:
-  linux:
+  release:
     runs-on: ubuntu-latest
     container:
       image: ${{ matrix.image }}
@@ -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
 
       - 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 .
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
-
-      - name: Generate shasums
-        run: ./sum.sh
+      - name: Prepare artifacts
+        run: ./prepare_artifacts.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/macos.yml

@@ -10,31 +10,39 @@ on:
 
 jobs:
   build:
-    runs-on: macOS-latest
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - vscode_arch: x64
+            os: macOS-10.15
+          # - vscode_arch: arm64
+          #   os: macOS-11
+
     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
-
       - 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 }}
@@ -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
-        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
+      - name: Prepare artifacts
+        run: ./prepare_artifacts.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'

.github/workflows/windows.yml

@@ -10,7 +10,10 @@ on:
 
 jobs:
   windows:
-    runs-on: windows-2016
+    runs-on: windows-2019
+    defaults:
+      run:
+        shell: bash
     env:
       VSCODE_ARCH: ${{ matrix.vscode_arch }}
       OS_NAME: 'windows'
@@ -20,10 +23,10 @@ jobs:
         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
 
@@ -31,23 +34,20 @@ jobs:
         run: npm install -g yarn
 
       - name: Setup Python 2
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         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 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 +61,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 +74,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
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
-
-      - name: Generate shasums
-        run: ./sum.sh
-        shell: bash
+      - name: Prepare artifacts
+        run: ./prepare_artifacts.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
-            ./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/rtf/Readme (Abridged).txt
+build/windows/rtf/TXT to RTF Converter.exe

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.
 - **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,13 +7,16 @@
 
 <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.**
@@ -28,6 +31,7 @@
   - [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)
@@ -65,7 +69,7 @@ scoop install vscodium
 ```
 
 #### <a id="install-with-snap"></a>Install with snap (GNU/Linux)
-VSCodium is available in the [Snap Store](https://snapcraft.io/) as [Codium](https://snapcraft.io/codium), published by the [Snapcrafters](https://github.com/snapcrafters/codium) community.
+VSCodium is available in the [Snap Store](https://snapcraft.io/) as [Codium](https://snapcraft.io/codium), thanks to the help of the [Snapcrafters](https://github.com/snapcrafters/codium) community.
 If your GNU/Linux distribution has support for [snaps](https://snapcraft.io/docs/installing-snapd):
 ```bash
 snap install codium --classic
@@ -85,6 +89,9 @@ 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.
 
@@ -98,11 +105,13 @@ This repo exists so that you don't have to download+build from source. The build
 
 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
@@ -123,7 +132,7 @@ If you would like to see the commands we run to build `vscode` into VSCodium bin
 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] GNU/Linux x64 (`deb`, `rpm`, `AppImage`, `tar.gz`)

build.sh

@@ -2,10 +2,10 @@
 
 set -ex
 
-if [[ "$SHOULD_BUILD" == "yes" ]]; then
+if [[ "${SHOULD_BUILD}" == "yes" ]]; then
   npm config set scripts-prepend-node-path true
 
-  echo "LATEST_MS_COMMIT: ${LATEST_MS_COMMIT}"
+  echo "MS_COMMIT: ${MS_COMMIT}"
 
   . prepare_vscode.sh
 
@@ -19,22 +19,50 @@ 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
+  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
+    fi
   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
   fi
 

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,6 +1,10 @@
 #!/bin/bash
 
-cd ..
+set -ex
+
+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)
@@ -14,7 +18,11 @@ if [[ "$VSCODE_ARCH" == "x64" ]]; then
   # 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 VSCodium-AppImage-Recipe.yml
+  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

@@ -16,7 +16,7 @@ ingredients:
     - deb http://archive.ubuntu.com/ubuntu/ trusty main universe
   script:
     - pwd
-    - cp ../vscode/.build/linux/deb/amd64/deb/*.deb .
+    - cp ../../../../vscode/.build/linux/deb/amd64/deb/*.deb .
     - ls codium_*.deb | cut -d _ -f 2 > VERSION
 
 script:
@@ -30,11 +30,13 @@ script:
   - /usr/bin/convert vscodium.png -resize 48x48 usr/share/icons/hicolor/48x48/apps/vscodium.png
   - /usr/bin/convert vscodium.png -resize 32x32 usr/share/icons/hicolor/32x32/apps/vscodium.png
   - ( cd usr/bin/ ; ln -s ../share/codium/codium  . )
+  - rm -rf usr/lib/x86_64-linux-gnu
+  - rm -f lib/x86_64-linux-gnu/libglib*
   - cat > AppRun <<\EOF
   - #!/bin/sh
   - HERE="$(dirname "$(readlink -f "${0}")")"
   - export PATH="${HERE}"/usr/bin/:"${HERE}"/usr/sbin/:"${HERE}"/usr/games/:"${HERE}"/bin/:"${HERE}"/sbin/:"${PATH}"
-  - export LD_LIBRARY_PATH="${HERE}"/usr/lib/:"${HERE}"/usr/lib/i386-linux-gnu/:"${HERE}"/usr/lib/x86_64-linux-gnu/:"${HERE}"/usr/lib32/:"${HERE}"/usr/lib64/:"${HERE}"/lib/:"${HERE}"/lib/i386-linux-gnu/:"${HERE}"/lib/x86_64-linux-gnu/:"${HERE}"/lib32/:"${HERE}"/lib64/:"${LD_LIBRARY_PATH}"
+  - export LD_LIBRARY_PATH="${HERE}"/usr/lib/:"${HERE}"/usr/lib32/:"${HERE}"/usr/lib64/:"${HERE}"/lib/:"${HERE}"/lib/i386-linux-gnu/:"${HERE}"/lib/x86_64-linux-gnu/:"${HERE}"/lib32/:"${HERE}"/lib64/:"${LD_LIBRARY_PATH}"
   - export XDG_DATA_DIRS="${HERE}"/usr/share/:"${XDG_DATA_DIRS}"
   - export PERLLIB="${HERE}"/usr/share/perl5/:"${HERE}"/usr/lib/perl5/:"${PERLLIB}"
   - export GSETTINGS_SCHEMA_DIR="${HERE}"/usr/share/glib-2.0/schemas/:"${GSETTINGS_SCHEMA_DIR}"

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

@@ -5,6 +5,11 @@ set -e
 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

check_tags.sh

@@ -2,132 +2,259 @@
 
 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 "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 [[ "${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 "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
+
+      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 "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 [[ "${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 "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 [[ "${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 "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
+
+      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 "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
+
+      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 "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 [[ "${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_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

@@ -14,9 +14,13 @@
 - node 14
 - yarn
 - jq
+- git
 
 ### <a id="dependencies-linux"></a>Linux
 
+- GCC
+- make
+- pkg-config
 - libx11-dev
 - libxkbfile-dev
 - libsecret-1-dev
@@ -24,21 +28,27 @@
 - 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/)
+- python2
+- '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

get_repo.sh

@@ -1,26 +1,44 @@
 #!/bin/bash
 
+mkdir -p vscode
+cd vscode
+
+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)
+  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
-	UPDATE_INFO=$(curl https://update.code.visualstudio.com/api/update/darwin/stable/lol)
-fi
-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} version: ${LATEST_MS_COMMIT}"
+  reference=$( git ls-remote --tags | grep -x ".*refs\/tags\/${MS_TAG}" | head -1 )
 
-if [ "$INSIDER" == "1" ]; then
-	mkdir -p vscode; cd vscode
-	git init ; git remote add origin https://github.com/Microsoft/vscode.git
-	git fetch --depth 1 origin $LATEST_MS_COMMIT; git checkout FETCH_HEAD
-	cd ..
-else
-	git clone https://github.com/Microsoft/vscode.git --branch $LATEST_MS_TAG --depth 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
+  echo "MS_TAG=$MS_TAG" >> $GITHUB_ENV
+  echo "MS_COMMIT=$MS_COMMIT" >> $GITHUB_ENV
 fi

icons/build_icons.sh

@@ -134,6 +134,14 @@ 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" ];

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,8 +1,8 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index 6d3a369..57009d4 100644
+index 2f5a931..ac3d7e6 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -276,7 +276,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+@@ -290,7 +290,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }));
  		} else if (platform === 'darwin') {
  			const shortcut = gulp.src('resources/darwin/bin/code.sh')
@@ -11,29 +11,20 @@ index 6d3a369..57009d4 100644
  
  			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 3bd0c57..d921c60 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
+@@ -353,7 +353,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
  	}
  
- 	private async getShellCommandLink(): Promise<{ readonly source: string, readonly target: string }> {
+ 	private async getShellCommandLink(): Promise<{ readonly source: string; readonly target: string }> {
 -		const target = resolve(this.environmentMainService.appRoot, 'bin', 'code');
 +		const target = resolve(this.environmentMainService.appRoot, 'bin', this.productService.applicationName);
  		const source = `/usr/local/bin/${this.productService.applicationName}`;
  
  		// Ensure source exists
-@@ -551,7 +551,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
+@@ -563,7 +563,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/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 1edc76f..4c0bf98 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
-@@ -68,6 +68,7 @@ export interface IProductConfiguration {
+@@ -69,6 +69,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 resourceUrlTemplate: string;
+ 		readonly controlUrl: string;
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index d79c8a3..8b4153f 100644
+index e22b33e..98cec93 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
 @@ -4,11 +4,12 @@
   *--------------------------------------------------------------------------------------------*/
  
  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-cors.patch

@@ -1,13 +0,0 @@
-diff --git a/src/main.js b/src/main.js
-index f91f7b7..0ec4b6f 100644
---- a/src/main.js
-+++ b/src/main.js
-@@ -174,7 +174,7 @@ function configureCommandlineSwitchesSync(cliArgs) {
- 	// Read argv config
- 	const argvConfig = readArgvConfigSync();
- 
--	let browserCodeLoadingStrategy = typeof codeCachePath === 'string' ? 'bypassHeatCheck' : 'none';
-+	let browserCodeLoadingStrategy = undefined;
- 
- 	Object.keys(argvConfig).forEach(argvKey => {
- 		const argvValue = argvConfig[argvKey];

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/use-github-pat.patch

@@ -0,0 +1,303 @@
+diff --git a/extensions/github-authentication/src/githubServer.ts b/extensions/github-authentication/src/githubServer.ts
+index 49a523b..d68588e 100644
+--- a/extensions/github-authentication/src/githubServer.ts
++++ b/extensions/github-authentication/src/githubServer.ts
+@@ -6,23 +6,14 @@
+ 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';
+ 
+ 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';
+-
+ class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.UriHandler {
+ 	constructor(private readonly Logger: Log) {
+ 		super();
+@@ -110,10 +101,7 @@ async function getUserInfo(token: string, serverUri: vscode.Uri, logger: Log): P
+ export class GitHubServer implements IGitHubServer {
+ 	friendlyName = 'GitHub';
+ 	type = AuthProviderType.github;
+-	private _onDidManuallyProvideToken = new vscode.EventEmitter<string | undefined>();
+ 
+-	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);
+ 
+@@ -125,87 +113,31 @@ export class GitHubServer implements IGitHubServer {
+ 		this._disposable.dispose();
+ 	}
+ 
+-	// TODO@joaomoreno TODO@TylerLeonhardt
+-	private async isNoCorsEnvironment(): Promise<boolean> {
+-		const uri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/dummy`));
+-		return (uri.scheme === 'https' && /^((insiders\.)?vscode|github)\./.test(uri.authority)) || (uri.scheme === 'http' && /^localhost/.test(uri.authority));
+-	}
+-
+ 	public async login(scopes: string): Promise<string> {
+ 		this._logger.info(`Logging in for the following scopes: ${scopes}`);
+ 
+-		const nonce = uuid();
+-		const callbackUri = await vscode.env.asExternalUri(vscode.Uri.parse(`${vscode.env.uriScheme}://vscode.github-authentication/did-authenticate?nonce=${encodeURIComponent(nonce)}`));
+-
+-		if (!isSupportedEnvironment(callbackUri)) {
+-			const token = this._supportDeviceCodeFlow
+-				? await this.doDeviceCodeFlow(scopes)
+-				: await vscode.window.showInputBox({ prompt: 'GitHub Personal Access Token', ignoreFocusOut: true });
++		const token = this._supportDeviceCodeFlow
++			? await this.doDeviceCodeFlow(scopes)
++			: await vscode.window.showInputBox({ prompt: 'GitHub Personal Access Token', ignoreFocusOut: true });
+ 
+-			if (!token) { throw new Error('No token provided'); }
++		if (!token) { throw new Error('No token provided'); }
+ 
+-			const tokenScopes = await getScopes(token, this.getServerUri('/'), this._logger); // Example: ['repo', 'user']
+-			const scopesList = scopes.split(' '); // Example: 'read:user repo user:email'
+-			if (!scopesList.every(scope => {
+-				const included = tokenScopes.includes(scope);
+-				if (included || !scope.includes(':')) {
+-					return included;
+-				}
+-
+-				return scope.split(':').some(splitScopes => {
+-					return tokenScopes.includes(splitScopes);
+-				});
+-			})) {
+-				throw new Error(`The provided token does not match the requested scopes: ${scopes}`);
++		const tokenScopes = await getScopes(token, this.getServerUri('/'), this._logger); // Example: ['repo', 'user']
++		const scopesList = scopes.split(' '); // Example: 'read:user repo user:email'
++		if (!scopesList.every(scope => {
++			const included = tokenScopes.includes(scope);
++			if (included || !scope.includes(':')) {
++				return included;
+ 			}
+ 
+-			return token;
++			return scope.split(':').some(splitScopes => {
++				return tokenScopes.includes(splitScopes);
++			});
++		})) {
++			throw new Error(`The provided token does not match the requested scopes: ${scopes}`);
+ 		}
+ 
+-		const existingNonces = this._pendingNonces.get(scopes) || [];
+-		this._pendingNonces.set(scopes, [...existingNonces, nonce]);
+-
+-		const proxyEndpoints: { [providerId: string]: string } | undefined = await vscode.commands.executeCommand('workbench.getCodeExchangeProxyEndpoints');
+-		// If we are running in insiders vscode.dev, then ensure we use the redirect route on that.
+-		const redirectUri = proxyEndpoints?.github?.includes('https://insiders.vscode.dev') ? REDIRECT_URL_INSIDERS : REDIRECT_URL_STABLE;
+-		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()}`);
+-
+-		return vscode.window.withProgress({
+-			location: vscode.ProgressLocation.Window,
+-			title: localize('signingIn', " $(mark-github) Signing in to github.com..."),
+-		}, async () => {
+-			await vscode.env.openExternal(uri);
+-
+-			// Register a single listener for the URI callback, in case the user starts the login process multiple times
+-			// before completing it.
+-			let codeExchangePromise = this._codeExchangePromises.get(scopes);
+-			if (!codeExchangePromise) {
+-				codeExchangePromise = promiseFromEvent(this._uriHandler.event, this.exchangeCodeForToken(scopes));
+-				this._codeExchangePromises.set(scopes, codeExchangePromise);
+-			}
+-
+-			return Promise.race([
+-				codeExchangePromise.promise,
+-				promiseFromEvent<string | undefined, string>(this._onDidManuallyProvideToken.event, (token: string | undefined, resolve, reject): void => {
+-					if (!token) {
+-						reject('Cancelled');
+-					} else {
+-						resolve(token);
+-					}
+-				}).promise,
+-				new Promise<string>((_, reject) => setTimeout(() => reject('Cancelled'), 60000))
+-			]).finally(() => {
+-				this._pendingNonces.delete(scopes);
+-				codeExchangePromise?.cancel.fire();
+-				this._codeExchangePromises.delete(scopes);
+-			});
+-		});
++		return token;
+ 	}
+ 
+ 	private async doDeviceCodeFlow(scopes: string): Promise<string> {
+@@ -299,57 +231,6 @@ export class GitHubServer implements IGitHubServer {
+ 		throw new Error('Cancelled');
+ 	}
+ 
+-	private exchangeCodeForToken: (scopes: string) => PromiseAdapter<vscode.Uri, string> =
+-		(scopes) => async (uri, resolve, reject) => {
+-			const query = new URLSearchParams(uri.query);
+-			const code = query.get('code');
+-
+-			const acceptedNonces = this._pendingNonces.get(scopes) || [];
+-			const nonce = query.get('nonce');
+-			if (!nonce) {
+-				this._logger.error('No nonce in response.');
+-				return;
+-			}
+-			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;
+-			}
+-
+-			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;
+-
+-			try {
+-				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!');
+-					resolve(json.access_token);
+-				} else {
+-					reject(result.statusText);
+-				}
+-			} catch (ex) {
+-				reject(ex);
+-			}
+-		};
+-
+ 	private getServerUri(path: string = '') {
+ 		const apiUri = vscode.Uri.parse('https://api.github.com');
+ 		return vscode.Uri.parse(`${apiUri.scheme}://${apiUri.authority}${path}`);
+@@ -359,44 +240,7 @@ export class GitHubServer implements IGitHubServer {
+ 		return getUserInfo(token, this.getServerUri('/user'), this._logger);
+ 	}
+ 
+-	public async sendAdditionalTelemetryInfo(token: string): Promise<void> {
+-		if (!vscode.env.isTelemetryEnabled) {
+-			return;
+-		}
+-		const nocors = await this.isNoCorsEnvironment();
+-
+-		if (nocors) {
+-			return;
+-		}
+-
+-		try {
+-			const result = await fetch('https://education.github.com/api/user', {
+-				headers: {
+-					Authorization: `token ${token}`,
+-					'faculty-check-preview': 'true',
+-					'User-Agent': 'Visual-Studio-Code'
+-				}
+-			});
+-
+-			if (result.ok) {
+-				const json: { student: boolean; faculty: boolean } = await result.json();
+-
+-				/* __GDPR__
+-					"session" : {
+-						"isEdu": { "classification": "NonIdentifiableDemographicInfo", "purpose": "FeatureInsight" }
+-					}
+-				*/
+-				this._telemetryReporter.sendTelemetryEvent('session', {
+-					isEdu: json.student
+-						? 'student'
+-						: json.faculty
+-							? 'faculty'
+-							: 'none'
+-				});
+-			}
+-		} catch (e) {
+-			// No-op
+-		}
++	public async sendAdditionalTelemetryInfo(_: string): Promise<void> {
+ 	}
+ 
+ 	public async checkEnterpriseVersion(token: string): Promise<void> {
+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 5f7431d..278cd3d 100644
+--- a/src/vs/workbench/services/authentication/browser/authenticationService.ts
++++ b/src/vs/workbench/services/authentication/browser/authenticationService.ts
+@@ -13,7 +13,6 @@ import { isString } from 'vs/base/common/types';
+ import * as nls from 'vs/nls';
+ import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
+ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+-import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
+ import { ICredentialsService } from 'vs/platform/credentials/common/credentials';
+ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
+ import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
+@@ -197,13 +196,6 @@ export class AuthenticationService extends Disposable implements IAuthentication
+ 		@IQuickInputService private readonly quickInputService: IQuickInputService
+ 	) {
+ 		super();
+-		this._placeholderMenuItem = MenuRegistry.appendMenuItem(MenuId.AccountsContext, {
+-			command: {
+-				id: 'noAuthenticationProviders',
+-				title: nls.localize('loading', "Loading..."),
+-				precondition: ContextKeyExpr.false()
+-			},
+-		});
+ 
+ 		authenticationExtPoint.setHandler((extensions, { added, removed }) => {
+ 			added.forEach(point => {
+@@ -272,16 +264,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,92 @@
+#!/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
+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
+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
+fi
+
+cd artifacts
+
+for FILE in *
+do
+  if [[ -f "${FILE}" ]]; then
+    sum_file "${FILE}"
+  fi
+done
+
+cd ..

prepare_vscode.sh

@@ -3,11 +3,15 @@
 set -e
 
 cp -rp src/* vscode/
+cp -f LICENSE vscode/LICENSE.txt
+
 cd vscode || exit
 
 ../update_settings.sh
 
 # apply patches
+{ set +x; } 2>/dev/null
+
 for file in ../patches/*.patch; do
   if [ -f "$file" ]; then
     echo applying patch: $file;
@@ -28,6 +32,8 @@ for file in ../patches/user/*.patch; do
   fi
 done
 
+set -x
+
 if [[ "$OS_NAME" == "osx" ]]; then
   CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional
   npm_config_argv='{"original":["--ignore-optional"]}' yarn postinstall
@@ -44,7 +50,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")'
@@ -65,11 +70,16 @@ win32AppUserModelId='setpath(["win32AppUserModelId"]; "Microsoft.VSCodium")'
 win32ShellNameShort='setpath(["win32ShellNameShort"]; "VSCodium")'
 win32x64UserAppId='setpath (["win32x64UserAppId"]; "{{2E1F05D1-C245-4562-81EE-28188DB6FD17}")'
 urlProtocol='setpath(["urlProtocol"]; "vscodium")'
-extensionAllowedProposedApi='setpath(["extensionAllowedProposedApi"]; getpath(["extensionAllowedProposedApi"]) + ["ms-vscode.cpptools", "ms-azuretools.vscode-docker", "visualstudioexptteam.vscodeintellicode", "GitHub.codespaces", "GitHub.vscode-pull-request-github-insiders", "GitHub.vscode-pull-request-github", "Microsoft.vscode-nmake-tools", "ms-ai-tools.notebook-renderers", "ms-dotnettools.dotnet-interactive-vscode", "ms-python.gather", "ms-python.python", "ms-toolsai.jupyter", "ms-toolsai.vscode-ai", "ms-toolsai.vscode-ai-remote", "ms-vscode-remote.remote-containers-nightly", "ms-vscode-remote.remote-containers", "ms-vscode-remote.remote-ssh-edit-nightly", "ms-vscode-remote.remote-ssh-edit", "ms-vscode-remote.remote-ssh-nightly", "ms-vscode-remote.remote-ssh", "ms-vscode-remote.remote-wsl-nightly", "ms-vscode-remote.remote-wsl", "ms-vscode-remote.remote-wsl-recommender", "ms-vscode-remote.vscode-remote-extensionpack-nightly", "ms-vscode-remote.vscode-remote-extensionpack", "ms-vscode.azure-account", "ms-vscode.azure-sphere-tools-ui", "ms-vscode.azure-sphere-tools", "ms-vscode.github-browser", "ms-vscode.github-richnav", "ms-vscode.js-debug-nightly", "ms-vscode.js-debug", "ms-vscode.lsif-browser", "ms-vscode.vscode-js-profile-flame", "ms-vscode.vscode-js-profile-table", "ms-vscode.vscode-selfhost-test-provider", "ms-vsliveshare.cloudenv-explorer", "ms-vsliveshare.cloudenv", "ms-vsliveshare.vsliveshare", "ms-vsonline.vsonline", "dbaeumer.vscode-eslint"])'
 serverDataFolderName='setpath(["serverDataFolderName"]; ".vscode-server-oss")'
+reportIssueUrl='setpath(["reportIssueUrl"]; "https://github.com/VSCodium/vscodium/issues/new/choose")'
+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} | ${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

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,66 @@
+#!/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"}"
+
+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>

src/src/vs/workbench/browser/parts/editor/media/letterpress-hc.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_hc_letterpress</title>
     <desc>Created with Sketch.</desc>

src/src/vs/workbench/browser/parts/editor/media/letterpress.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_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

update_settings.sh

@@ -1,7 +1,9 @@
 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"
 
 #include common functions
 . ../utils.sh
@@ -22,7 +24,7 @@ update_setting () {
     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
@@ -34,10 +36,14 @@ update_setting () {
   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
 }
 
-update_setting "$TELEMETRY_ENABLE" src/vs/platform/telemetry/common/telemetryService.ts
 update_setting "$TELEMETRY_CRASH_REPORTER" src/vs/workbench/electron-sandbox/desktop.contribution.ts
+update_setting "$TELEMETRY_CONFIGURATION" src/vs/platform/telemetry/common/telemetryService.ts

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 ..