Merge branch 'master' into insider

.github/workflows/insider-macos.yml

@@ -74,27 +74,11 @@ jobs:
         run: ./build.sh
         if: env.SHOULD_BUILD == 'yes'
 
-      - name: Sign binary
+      - name: Prepare artifacts
         env:
           CERTIFICATE_OSX_P12: ${{ secrets.CERTIFICATE_OSX_P12 }}
           CERTIFICATE_OSX_PASSWORD: ${{ secrets.CERTIFICATE_OSX_PASSWORD }}
           CERTIFICATE_OSX_ID: ${{ secrets.CERTIFICATE_OSX_ID }}
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
-        run: |
-          if [ -d "VSCode-darwin-${VSCODE_ARCH}" ]; then # just in case the build failed
-            cd "VSCode-darwin-${VSCODE_ARCH}"
-            export CERTIFICATE_P12=VSCodium.p12
-            echo $CERTIFICATE_OSX_P12 | base64 --decode > $CERTIFICATE_P12
-            export KEYCHAIN=$RUNNER_TEMP/build.keychain
-            security create-keychain -p mysecretpassword $KEYCHAIN
-            security default-keychain -s $KEYCHAIN
-            security unlock-keychain -p mysecretpassword $KEYCHAIN
-            security import $CERTIFICATE_P12 -k $KEYCHAIN -P $CERTIFICATE_OSX_PASSWORD -T /usr/bin/codesign
-            security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword $KEYCHAIN
-            codesign --deep --force --verbose --sign "$CERTIFICATE_OSX_ID" VSCodium.app
-          fi
-
-      - name: Prepare artifacts
         run: ./prepare_artifacts.sh
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 

.github/workflows/stable-macos.yml

@@ -77,27 +77,11 @@ jobs:
         run: ./build.sh
         if: env.SHOULD_BUILD == 'yes'
 
-      - name: Sign binary
+      - name: Prepare artifacts
         env:
           CERTIFICATE_OSX_P12: ${{ secrets.CERTIFICATE_OSX_P12 }}
           CERTIFICATE_OSX_PASSWORD: ${{ secrets.CERTIFICATE_OSX_PASSWORD }}
           CERTIFICATE_OSX_ID: ${{ secrets.CERTIFICATE_OSX_ID }}
-        if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
-        run: |
-          if [ -d "VSCode-darwin-${VSCODE_ARCH}" ]; then # just in case the build failed
-            cd "VSCode-darwin-${VSCODE_ARCH}"
-            export CERTIFICATE_P12=VSCodium.p12
-            echo $CERTIFICATE_OSX_P12 | base64 --decode > $CERTIFICATE_P12
-            export KEYCHAIN=$RUNNER_TEMP/build.keychain
-            security create-keychain -p mysecretpassword $KEYCHAIN
-            security default-keychain -s $KEYCHAIN
-            security unlock-keychain -p mysecretpassword $KEYCHAIN
-            security import $CERTIFICATE_P12 -k $KEYCHAIN -P $CERTIFICATE_OSX_PASSWORD -T /usr/bin/codesign
-            security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword $KEYCHAIN
-            codesign --deep --force --verbose --sign "$CERTIFICATE_OSX_ID" VSCodium.app
-          fi
-
-      - name: Prepare artifacts
         run: ./prepare_artifacts.sh
         if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
 

.gitignore

@@ -3,6 +3,7 @@ VS*/*
 VSCode*
 VSCodium*
 .DS_Store
+artifacts/
 build/linux/appimage/out
 build/linux/appimage/pkg2appimage.AppDir
 build/linux/appimage/pkg2appimage-*.AppImage

build.sh

@@ -30,29 +30,8 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
     . ../build/windows/rtf/make.sh
 
     yarn gulp "vscode-win32-${VSCODE_ARCH}-min-ci"
-    yarn gulp "vscode-win32-${VSCODE_ARCH}-inno-updater"
 
-    if [[ "${SHOULD_BUILD_ZIP}" != "no" ]]; then
+    if [[ "${VSCODE_ARCH}" != "ia32" && "${VSCODE_ARCH}" != "x64" ]]; then
-      yarn gulp "vscode-win32-${VSCODE_ARCH}-archive"
-    fi
-
-    if [[ "${SHOULD_BUILD_EXE_SYS}" != "no" ]]; then
-      yarn gulp "vscode-win32-${VSCODE_ARCH}-system-setup"
-    fi
-
-    if [[ "${SHOULD_BUILD_EXE_USR}" != "no" ]]; then
-      yarn gulp "vscode-win32-${VSCODE_ARCH}-user-setup"
-    fi
-
-    if [[ "${VSCODE_ARCH}" == "ia32" || "${VSCODE_ARCH}" == "x64" ]]; then
-      if [[ "${SHOULD_BUILD_MSI}" != "no" ]]; then
-        . ../build/windows/msi/build.sh
-      fi
-
-      if [[ "${SHOULD_BUILD_MSI_NOUP}" != "no" ]]; then
-        . ../build/windows/msi/build-updates-disabled.sh
-      fi
-    else
       SHOULD_BUILD_REH="no"
     fi
 
@@ -62,20 +41,6 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
 
     find "../VSCode-linux-${VSCODE_ARCH}" -exec touch {} \;
 
-    if [[ "${SKIP_LINUX_PACKAGES}" != "True" ]]; then
-      if [[ "${SHOULD_BUILD_DEB}" != "no" || "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then
-        yarn gulp "vscode-linux-${VSCODE_ARCH}-build-deb"
-      fi
-
-      if [[ "${SHOULD_BUILD_RPM}" != "no" ]]; then
-        yarn gulp "vscode-linux-${VSCODE_ARCH}-build-rpm"
-      fi
-
-      if [[ "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then
-        . ../build/linux/appimage/build.sh
-      fi
-    fi
-
     VSCODE_PLATFORM="linux"
   fi
 

build/build.sh

@@ -4,10 +4,13 @@
 # to run with Bash: "C:\Program Files\Git\bin\bash.exe" ./build/build.sh
 ###
 
+export CI_BUILD="no"
+export SHOULD_BUILD="yes"
+export SKIP_PACKAGES="yes"
 export VSCODE_LATEST="no"
 export VSCODE_QUALITY="stable"
 
-while getopts ":il" opt; do
+while getopts ":ilp" opt; do
   case "$opt" in
     i)
       export VSCODE_QUALITY="insider"
@@ -15,6 +18,9 @@ while getopts ":il" opt; do
     l)
       export VSCODE_LATEST="yes"
       ;;
+    p)
+      export SKIP_PACKAGES="no"
+      ;;
   esac
 done
 
@@ -39,16 +45,20 @@ else
 fi
 
 echo "OS_NAME: ${OS_NAME}"
+echo "SKIP_PACKAGES: ${SKIP_PACKAGES}"
 echo "VSCODE_ARCH: ${VSCODE_ARCH}"
 echo "VSCODE_LATEST: ${VSCODE_LATEST}"
 echo "VSCODE_QUALITY: ${VSCODE_QUALITY}"
 
 rm -rf vscode* VSCode*
 
-if [[ "${OS_NAME}" == "windows" ]]; then
-  rm -rf build/windows/msi/releasedir
-fi
-
 . get_repo.sh
+. build.sh
 
-SHOULD_BUILD=yes CI_BUILD=no . build.sh
+if [[ "${SKIP_PACKAGES}" == "no" ]]; then
+  if [[ "${OS_NAME}" == "windows" ]]; then
+    rm -rf build/windows/msi/releasedir
+  fi
+
+  . prepare_artifacts.sh
+fi

build/build_docker.sh

@@ -2,8 +2,26 @@
 
 exists() { type -t "$1" > /dev/null 2>&1; }
 
-rm -rf VSCode*
+export CI_BUILD="no"
-rm -rf vscode*
+export OS_NAME="linux"
+export SHOULD_BUILD="yes"
+export SKIP_PACKAGES="yes"
+export VSCODE_LATEST="no"
+export VSCODE_QUALITY="stable"
+
+while getopts ":ilp" opt; do
+  case "$opt" in
+    i)
+      export VSCODE_QUALITY="insider"
+      ;;
+    l)
+      export VSCODE_LATEST="yes"
+      ;;
+    p)
+      export SKIP_PACKAGES="no"
+      ;;
+  esac
+done
 
 if ! exists yarn; then
   curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -
@@ -22,8 +40,17 @@ else
   export VSCODE_ARCH="armhf"
 fi
 
-echo "-- VSCODE_ARCH: ${VSCODE_ARCH}"
+echo "OS_NAME: ${OS_NAME}"
+echo "SKIP_PACKAGES: ${SKIP_PACKAGES}"
+echo "VSCODE_ARCH: ${VSCODE_ARCH}"
+echo "VSCODE_LATEST: ${VSCODE_LATEST}"
+echo "VSCODE_QUALITY: ${VSCODE_QUALITY}"
+
+rm -rf vscode* VSCode*
 
 . get_repo.sh
+. build.sh
 
-SHOULD_BUILD=yes CI_BUILD=no OS_NAME=linux . build.sh
+if [[ "${SKIP_PACKAGES}" == "no" ]]; then
+  . prepare_artifacts.sh
+fi

build/linux/appimage/build.sh

@@ -32,7 +32,7 @@ if [[ "${VSCODE_ARCH}" == "x64" ]]; then
 
   rm -f pkg2appimage-*.AppImage
   rm -rf pkg2appimage.AppDir
-  rm -rf VSCodium
+  rm -rf VSCodium*
 fi
 
 cd "${CALLER_DIR}"

build/windows/msi/build.sh

@@ -43,6 +43,8 @@ else
    export PLATFORM="${VSCODE_ARCH}"
 fi
 
+sed -i "s|@@PRODUCT_NAME@@|${PRODUCT_NAME}|g" .\\i18n\\*.wsl
+
 BuildSetupTranslationTransform() {
 	local CULTURE=${1}
 	local LANGID=${2}
@@ -67,7 +69,7 @@ BuildSetupTranslationTransform() {
 
 "${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="${RELEASE_VERSION%-insider}" -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
+"${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\\vscodium.${CULTURE}.wxl" -cultures:"${CULTURE}" -sice:ICE60 -sice:ICE69
 
 BuildSetupTranslationTransform de-de 1031
 BuildSetupTranslationTransform es-es 3082

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

@@ -1,25 +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="ProductName">@@PRODUCT_NAME@@</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="PackageDescription">Paket mit @@PRODUCT_NAME@@</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="FeatureFileTypeAssociationsDescription">@@PRODUCT_NAME@@ 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="FeatureAddContextMenuFilesDescription">Aktion "Mit @@PRODUCT_NAME@@ ö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="FeatureAddContextMenuFoldersDescription">Aktion "Mit @@PRODUCT_NAME@@ ö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="FeatureEnvironmentDescription">@@PRODUCT_NAME@@ zur PATH Variable hinzufügen. Nach dem Neustart verfügbar.</String>
-  <String Id="LaunchApplication">VSCodium ausführen</String>
+  <String Id="LaunchApplication">@@PRODUCT_NAME@@ ausführen</String>
-  <String Id="NewerVersionInstalled">Eine neuere Version von VSCodium ist bereits installiert.</String>
+  <String Id="NewerVersionInstalled">Eine neuere Version von @@PRODUCT_NAME@@ 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

@@ -1,25 +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="ProductName">@@PRODUCT_NAME@@</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="PackageDescription">Package with @@PRODUCT_NAME@@</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="FeatureFileTypeAssociationsDescription">Register @@PRODUCT_NAME@@ 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="FeatureAddContextMenuFilesDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureAddContextMenuFoldersDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureEnvironmentDescription">Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart.</String>
-  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="LaunchApplication">Launch @@PRODUCT_NAME@@</String>
-  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="NewerVersionInstalled">Newer version of @@PRODUCT_NAME@@ 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

@@ -1,25 +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="ProductName">@@PRODUCT_NAME@@</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="PackageDescription">Package with @@PRODUCT_NAME@@</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="FeatureFileTypeAssociationsDescription">Register @@PRODUCT_NAME@@ 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="FeatureAddContextMenuFilesDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureAddContextMenuFoldersDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureEnvironmentDescription">Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart.</String>
-  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="LaunchApplication">Launch @@PRODUCT_NAME@@</String>
-  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="NewerVersionInstalled">Newer version of @@PRODUCT_NAME@@ 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

@@ -1,25 +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="ProductName">@@PRODUCT_NAME@@</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="PackageDescription">Package with @@PRODUCT_NAME@@</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="FeatureFileTypeAssociationsDescription">Register @@PRODUCT_NAME@@ 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="FeatureAddContextMenuFilesDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureAddContextMenuFoldersDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureEnvironmentDescription">Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart.</String>
-  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="LaunchApplication">Launch @@PRODUCT_NAME@@</String>
-  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="NewerVersionInstalled">Newer version of @@PRODUCT_NAME@@ 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

@@ -1,25 +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="ProductName">@@PRODUCT_NAME@@</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="PackageDescription">Package with @@PRODUCT_NAME@@</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="FeatureFileTypeAssociationsDescription">Register @@PRODUCT_NAME@@ 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="FeatureAddContextMenuFilesDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureAddContextMenuFoldersDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureEnvironmentDescription">Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart.</String>
-  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="LaunchApplication">Launch @@PRODUCT_NAME@@</String>
-  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="NewerVersionInstalled">Newer version of @@PRODUCT_NAME@@ 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

@@ -1,25 +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="ProductName">@@PRODUCT_NAME@@</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="PackageDescription">Package with @@PRODUCT_NAME@@</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="FeatureFileTypeAssociationsDescription">Register @@PRODUCT_NAME@@ 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="FeatureAddContextMenuFilesDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureAddContextMenuFoldersDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureEnvironmentDescription">Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart.</String>
-  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="LaunchApplication">Launch @@PRODUCT_NAME@@</String>
-  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="NewerVersionInstalled">Newer version of @@PRODUCT_NAME@@ 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

@@ -1,25 +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="ProductName">@@PRODUCT_NAME@@</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="PackageDescription">Package with @@PRODUCT_NAME@@</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="FeatureFileTypeAssociationsDescription">Register @@PRODUCT_NAME@@ 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="FeatureAddContextMenuFilesDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureAddContextMenuFoldersDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureEnvironmentDescription">Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart.</String>
-  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="LaunchApplication">Launch @@PRODUCT_NAME@@</String>
-  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="NewerVersionInstalled">Newer version of @@PRODUCT_NAME@@ 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

@@ -1,25 +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="ProductName">@@PRODUCT_NAME@@</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="PackageDescription">Package with @@PRODUCT_NAME@@</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="FeatureFileTypeAssociationsDescription">Register @@PRODUCT_NAME@@ 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="FeatureAddContextMenuFilesDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureAddContextMenuFoldersDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureEnvironmentDescription">Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart.</String>
-  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="LaunchApplication">Launch @@PRODUCT_NAME@@</String>
-  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="NewerVersionInstalled">Newer version of @@PRODUCT_NAME@@ 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

@@ -1,25 +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="ProductName">@@PRODUCT_NAME@@</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="PackageDescription">Package with @@PRODUCT_NAME@@</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="FeatureFileTypeAssociationsDescription">Register @@PRODUCT_NAME@@ 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="FeatureAddContextMenuFilesDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureAddContextMenuFoldersDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureEnvironmentDescription">Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart.</String>
-  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="LaunchApplication">Launch @@PRODUCT_NAME@@</String>
-  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="NewerVersionInstalled">Newer version of @@PRODUCT_NAME@@ 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

@@ -1,25 +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="ProductName">@@PRODUCT_NAME@@</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="PackageDescription">Package with @@PRODUCT_NAME@@</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="FeatureFileTypeAssociationsDescription">Register @@PRODUCT_NAME@@ 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="FeatureAddContextMenuFilesDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureAddContextMenuFoldersDescription">Add "Open with @@PRODUCT_NAME@@" 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="FeatureEnvironmentDescription">Add @@PRODUCT_NAME@@ to PATH environment variable. Available after restart.</String>
-  <String Id="LaunchApplication">Launch VSCodium</String>
+  <String Id="LaunchApplication">Launch @@PRODUCT_NAME@@</String>
-  <String Id="NewerVersionInstalled">Newer version of VSCodium is already installed.</String>
+  <String Id="NewerVersionInstalled">Newer version of @@PRODUCT_NAME@@ 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>

prepare_artifacts.sh

@@ -12,9 +12,31 @@ sum_file() {
   fi
 }
 
-mkdir artifacts
+mkdir -p artifacts
 
 if [[ "${OS_NAME}" == "osx" ]]; then
+  if [[ "${CI_BUILD}" != "no" ]]; then
+    cd "VSCode-darwin-${VSCODE_ARCH}"
+
+    CERTIFICATE_P12=VSCodium.p12
+    KEYCHAIN="${RUNNER_TEMP}/build.keychain"
+
+    echo "${CERTIFICATE_OSX_P12}" | base64 --decode > "${CERTIFICATE_P12}"
+    security create-keychain -p mysecretpassword "${KEYCHAIN}"
+    security default-keychain -s "${KEYCHAIN}"
+    security unlock-keychain -p mysecretpassword "${KEYCHAIN}"
+    security import "${CERTIFICATE_P12}" -k "${KEYCHAIN}" -P "${CERTIFICATE_OSX_PASSWORD}" -T /usr/bin/codesign
+    security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword "${KEYCHAIN}"
+
+    if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
+      codesign --deep --force --verbose --sign "${CERTIFICATE_OSX_ID}" "VSCodium - Insiders.app"
+    else
+      codesign --deep --force --verbose --sign "${CERTIFICATE_OSX_ID}" "VSCodium.app"
+    fi
+
+    cd ..
+  fi
+
   if [[ "${SHOULD_BUILD_ZIP}" != "no" ]]; then
     echo "Building and moving ZIP"
     cd "VSCode-darwin-${VSCODE_ARCH}"
@@ -25,13 +47,41 @@ if [[ "${OS_NAME}" == "osx" ]]; then
   if [[ "${SHOULD_BUILD_DMG}" != "no" ]]; then
     echo "Building and moving DMG"
     pushd "VSCode-darwin-${VSCODE_ARCH}"
-    npx create-dmg VSCodium.app ..
+    npx create-dmg ./*.app ..
-    mv "../VSCodium ${MS_TAG}.dmg" "../artifacts/VSCodium.${VSCODE_ARCH}.${RELEASE_VERSION}.dmg"
+    mv ../*.dmg "../artifacts/VSCodium.${VSCODE_ARCH}.${RELEASE_VERSION}.dmg"
     popd
   fi
 
   VSCODE_PLATFORM="darwin"
 elif [[ "${OS_NAME}" == "windows" ]]; then
+  cd vscode || { echo "'vscode' dir not found"; exit 1; }
+
+  yarn gulp "vscode-win32-${VSCODE_ARCH}-inno-updater"
+
+  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
+
+  cd ..
+
   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}-${RELEASE_VERSION}.zip"
@@ -61,6 +111,22 @@ elif [[ "${OS_NAME}" == "windows" ]]; then
 
   VSCODE_PLATFORM="win32"
 else
+  cd vscode || { echo "'vscode' dir not found"; exit 1; }
+
+  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
+
+  cd ..
+
   if [[ "${SHOULD_BUILD_TAR}" != "no" ]]; then
     echo "Building and moving TAR"
     cd "VSCode-linux-${VSCODE_ARCH}"
@@ -81,6 +147,8 @@ else
   if [[ "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then
     echo "Moving AppImage"
     mv build/linux/appimage/out/*.AppImage* artifacts/
+
+    rename '_-_' '-' artifacts/*.AppImage
   fi
 
   VSCODE_PLATFORM="linux"