From dfa09d149e37cb1ec9f1aa6571e575b8aab34fb0 Mon Sep 17 00:00:00 2001
From: Pavan Agrawal <pavanagrawal@outlook.com>
Date: Sun, 2 Dec 2018 23:02:24 -0600
Subject: [PATCH 01/17] Update Readme to show Windows builds are ready

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3657274b6de..ac6a85528f9 100644
--- a/README.md
+++ b/README.md
@@ -58,8 +58,7 @@ For more information on getting all the telemetry disabled and tips for migratin
 - [x] OSX x64 (zipped app file)
 - [x] Linux x64 (`.deb`, `.rpm`, and `.tar.gz` files)
 - [x] Linux x86 (`.deb`, `.rpm`, and `.tar.gz` files)
-- [ ] Windows
-  - The plan is to build the Windows executable with [AppVeyor](https://appveyor.com). PRs are welcome :blue_heart:
+- [X] Windows
   
 The ARM architecture is not currently supported but is actively being worked on.
 

From 83cfe077eef42d2a50cc46a03204b711e3c995c3 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Mon, 3 Dec 2018 14:16:48 -0500
Subject: [PATCH 02/17] Cleanup Windows build process (#62)

---
 azure-pipelines.yml | 20 +++++++-------------
 check_tags.ps1      |  6 +++---
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 075c262e29c..b81c5aee5ea 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,8 +1,3 @@
-# Node.js with Grunt
-# Build a Node.js project using the Grunt task runner.
-# Add steps that analyze code, save build artifacts, deploy, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
-
 pool:
   vmImage: 'vs2017-win2016'
 
@@ -20,10 +15,6 @@ steps:
   displayName: 'get VSCode sources'
   inputs: 
     scriptPath: get_repo.sh
-    #args: '' # Optional
-    #disableAutoCwd: false # Optional
-    #cwd: '' # Optional
-    #failOnStandardError: false
 - powershell: |
     $LATEST_MS_TAG="$(git -C vscode describe --tags)"
     Write-Host "##vso[task.setvariable variable=LATEST_MS_TAG]$LATEST_MS_TAG"
@@ -32,7 +23,7 @@ steps:
   inputs:
     filePath: 'check_tags.ps1'
   env:
-    GITHUB_TOKEN: $(GITHUB_TOKEN)
+    MAPPED_GITHUB_TOKEN: $(GITHUB_TOKEN)
 - script: |
     git -C vscode status
   displayName: 'vscode status'
@@ -40,26 +31,29 @@ steps:
     bash ./build.sh
   displayName: 'go build it!'
 - bash: |
-    mv vscode\\.build\\win32-x64\\system-setup\\VSCodeSetup.exe VSCodiumSetup-x64-${LATEST_MS_TAG}.exe
+    if [[ "$SHOULD_BUILD" == "yes" ]]; then mv vscode\\.build\\win32-x64\\system-setup\\VSCodeSetup.exe VSCodiumSetup-x64-${LATEST_MS_TAG}.exe; fi
   displayName: 'move the system setup'
 - bash: |
-    mv vscode\\.build\\win32-x64\\user-setup\\VSCodeSetup.exe VSCodiumUserSetup-x64-${LATEST_MS_TAG}.exe
+    if [[ "$SHOULD_BUILD" == "yes" ]]; then mv vscode\\.build\\win32-x64\\user-setup\\VSCodeSetup.exe VSCodiumUserSetup-x64-${LATEST_MS_TAG}.exe; fi
   displayName: 'move the user setup'
 - bash: |
-    mv vscode\\.build\\win32-x64\\archive\\VSCode-win32-x64.zip VSCodium-win32-x64-${LATEST_MS_TAG}.zip
+    if [[ "$SHOULD_BUILD" == "yes" ]]; then mv vscode\\.build\\win32-x64\\archive\\VSCode-win32-x64.zip VSCodium-win32-x64-${LATEST_MS_TAG}.zip; fi
   displayName: 'move the zip folder'
 - task: PublishBuildArtifacts@1
   displayName: 'Publish artifacts: system-setup'
+  condition: eq(variables['SHOULD_BUILD'], 'yes')
   inputs:
     PathtoPublish: 'VSCodiumSetup-x64-$(LATEST_MS_TAG).exe'
     ArtifactName: 'system_setup'
 - task: PublishBuildArtifacts@1
   displayName: 'Publish artifacts: user-setup'
+  condition: eq(variables['SHOULD_BUILD'], 'yes')
   inputs:
     PathtoPublish: 'VSCodiumUserSetup-x64-$(LATEST_MS_TAG).exe'
     ArtifactName: 'user_setup'
 - task: PublishBuildArtifacts@1
   displayName: 'Publish artifacts: archive'
+  condition: eq(variables['SHOULD_BUILD'], 'yes')
   inputs:
     PathtoPublish: 'VSCodium-win32-x64-$(LATEST_MS_TAG).zip'
     ArtifactName: 'archive'
diff --git a/check_tags.ps1 b/check_tags.ps1
index 5613f7b74cb..8ef30273356 100644
--- a/check_tags.ps1
+++ b/check_tags.ps1
@@ -1,14 +1,14 @@
-echo "token: $env:GITHUB_TOKEN"
 echo "tag: $env:LATEST_MS_TAG"
-$GITHUB_RESPONSE = curl.exe -s -H "Authorization: token $env:GITHUB_TOKEN" "https://api.github.com/repos/vscodium/vscodium/releases/tags/$env:LATEST_MS_TAG"
+$GITHUB_RESPONSE = curl.exe -s -H "Authorization: token $env:MAPPED_GITHUB_TOKEN" "https://api.github.com/repos/vscodium/vscodium/releases/tags/$env:LATEST_MS_TAG"
 echo "Github response: ${GITHUB_RESPONSE}"
 $VSCODIUM_ASSETS= $GITHUB_RESPONSE | jq '.assets'
 echo "VSCodium assets: ${VSCODIUM_ASSETS}"
 
 # if we just don't have the github token, get out fast
-if (!$env:GITHUB_TOKEN) {
+if (!$env:MAPPED_GITHUB_TOKEN.length -le 15) {
   return
 }
+
 if (!$VSCODIUM_ASSETS) {
   echo "Release assets do not exist at all, continuing build"
   $SHOULD_BUILD = 'yes'

From c1dd804250506cc89ebf587c56b842d92dc584c4 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Mon, 3 Dec 2018 14:39:06 -0500
Subject: [PATCH 03/17] Add Azure badge

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ac6a85528f9..fa4526a2f7b 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
 # VSCodium
 
 ### Free/Libre Open Source Software Binaries of VSCode
-[![build status](https://travis-ci.com/VSCodium/vscodium.svg?branch=master)](https://travis-ci.com/VSCodium/vscodium) 
 [![current release](https://img.shields.io/github/release/vscodium/vscodium.svg)](https://github.com/vscodium/vscodium/releases)
+[![windows_build_status](https://dev.azure.com/vscodium/VSCodium/_apis/build/status/VSCodium.vscodium?branchName=master)](https://dev.azure.com/vscodium/VSCodium/_build?definitionId=1)
+[![build status](https://travis-ci.com/VSCodium/vscodium.svg?branch=master)](https://travis-ci.com/VSCodium/vscodium) 
 [![license](https://img.shields.io/github/license/VSCodium/vscodium.svg)](https://github.com/VSCodium/vscodium/blob/master/LICENSE)
 [![Gitter](https://img.shields.io/gitter/room/vscodium/vscodium.svg)](https://gitter.im/VSCodium/Lobby)
 

From 576145f38e6507f5e889048edb0d37fa856fc712 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Sun, 9 Dec 2018 20:03:10 -0500
Subject: [PATCH 04/17] Update README.md

---
 README.md | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index fa4526a2f7b..97cc13f3be9 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,17 @@
-# VSCodium
-
-### Free/Libre Open Source Software Binaries of VSCode
-[![current release](https://img.shields.io/github/release/vscodium/vscodium.svg)](https://github.com/vscodium/vscodium/releases)
-[![windows_build_status](https://dev.azure.com/vscodium/VSCodium/_apis/build/status/VSCodium.vscodium?branchName=master)](https://dev.azure.com/vscodium/VSCodium/_build?definitionId=1)
-[![build status](https://travis-ci.com/VSCodium/vscodium.svg?branch=master)](https://travis-ci.com/VSCodium/vscodium) 
-[![license](https://img.shields.io/github/license/VSCodium/vscodium.svg)](https://github.com/VSCodium/vscodium/blob/master/LICENSE)
-[![Gitter](https://img.shields.io/gitter/room/vscodium/vscodium.svg)](https://gitter.im/VSCodium/Lobby)
-
+<br/>
+<div id="vscodium-logo" align="center">
+    <br />
+    <img src="./src/resources/linux/code.png" alt="VSCodium Logo" width="200"/>
+    <h3>Free/Libre Open Source Software Binaries of VSCode</h3>
+</div>
+
+<div id="badges" align="center">
+  [![current release](https://img.shields.io/github/release/vscodium/vscodium.svg)](https://github.com/vscodium/vscodium/releases)
+  [![windows_build_status](https://dev.azure.com/vscodium/VSCodium/_apis/build/status/VSCodium.vscodium?branchName=master)](https://dev.azure.com/vscodium/VSCodium/_build?definitionId=1)
+  [![build status](https://travis-ci.com/VSCodium/vscodium.svg?branch=master)](https://travis-ci.com/VSCodium/vscodium) 
+  [![license](https://img.shields.io/github/license/VSCodium/vscodium.svg)](https://github.com/VSCodium/vscodium/blob/master/LICENSE)
+  [![Gitter](https://img.shields.io/gitter/room/vscodium/vscodium.svg)](https://gitter.im/VSCodium/Lobby)
+</div>
 
 ## Table of Contents
 - [Download/Install](#download-install)

From 833fcec1e89eac2a641602d7e1e41205e7eceddc Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Sun, 9 Dec 2018 20:04:18 -0500
Subject: [PATCH 05/17] Fix badges

---
 README.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 97cc13f3be9..f43da649a3b 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,13 @@
 </div>
 
 <div id="badges" align="center">
+
   [![current release](https://img.shields.io/github/release/vscodium/vscodium.svg)](https://github.com/vscodium/vscodium/releases)
-  [![windows_build_status](https://dev.azure.com/vscodium/VSCodium/_apis/build/status/VSCodium.vscodium?branchName=master)](https://dev.azure.com/vscodium/VSCodium/_build?definitionId=1)
-  [![build status](https://travis-ci.com/VSCodium/vscodium.svg?branch=master)](https://travis-ci.com/VSCodium/vscodium) 
-  [![license](https://img.shields.io/github/license/VSCodium/vscodium.svg)](https://github.com/VSCodium/vscodium/blob/master/LICENSE)
-  [![Gitter](https://img.shields.io/gitter/room/vscodium/vscodium.svg)](https://gitter.im/VSCodium/Lobby)
+[![windows_build_status](https://dev.azure.com/vscodium/VSCodium/_apis/build/status/VSCodium.vscodium?branchName=master)](https://dev.azure.com/vscodium/VSCodium/_build?definitionId=1)
+[![build status](https://travis-ci.com/VSCodium/vscodium.svg?branch=master)](https://travis-ci.com/VSCodium/vscodium) 
+[![license](https://img.shields.io/github/license/VSCodium/vscodium.svg)](https://github.com/VSCodium/vscodium/blob/master/LICENSE)
+[![Gitter](https://img.shields.io/gitter/room/vscodium/vscodium.svg)](https://gitter.im/VSCodium/Lobby)
+
 </div>
 
 ## Table of Contents

From 7391746c6b3be4804f19e17ed94e4310842836c1 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Sun, 9 Dec 2018 20:05:15 -0500
Subject: [PATCH 06/17] Add title

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f43da649a3b..44bfd17e2f1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-<br/>
 <div id="vscodium-logo" align="center">
     <br />
     <img src="./src/resources/linux/code.png" alt="VSCodium Logo" width="200"/>
+    <h1>VSCodium</h1>
     <h3>Free/Libre Open Source Software Binaries of VSCode</h3>
 </div>
 

From b5df7d5af84f768ecbaf46ce00824cca45f4f484 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Sat, 22 Dec 2018 17:03:27 -0500
Subject: [PATCH 07/17] Add logging when GH token doesn't exist in Windows
 build

---
 check_tags.ps1 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/check_tags.ps1 b/check_tags.ps1
index 8ef30273356..1b334a4b6e6 100644
--- a/check_tags.ps1
+++ b/check_tags.ps1
@@ -6,6 +6,8 @@ echo "VSCodium assets: ${VSCODIUM_ASSETS}"
 
 # if we just don't have the github token, get out fast
 if (!$env:MAPPED_GITHUB_TOKEN.length -le 15) {
+  echo "This build does not have the GH token"
+  echo $env:MAPPED_GITHUB_TOKEN
   return
 }
 

From 2564115929d2268edc57795b7bb6cbec3495fbf5 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Sat, 22 Dec 2018 17:09:36 -0500
Subject: [PATCH 08/17] Correct GH token logic

---
 check_tags.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/check_tags.ps1 b/check_tags.ps1
index 1b334a4b6e6..02930543162 100644
--- a/check_tags.ps1
+++ b/check_tags.ps1
@@ -5,7 +5,7 @@ $VSCODIUM_ASSETS= $GITHUB_RESPONSE | jq '.assets'
 echo "VSCodium assets: ${VSCODIUM_ASSETS}"
 
 # if we just don't have the github token, get out fast
-if (!$env:MAPPED_GITHUB_TOKEN.length -le 15) {
+if (!$env:MAPPED_GITHUB_TOKEN -like "GITHUB_TOKEN") {
   echo "This build does not have the GH token"
   echo $env:MAPPED_GITHUB_TOKEN
   return

From 1633faf37793052fd7fb730dd8b6f6d5f9a67255 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Sat, 22 Dec 2018 17:10:55 -0500
Subject: [PATCH 09/17] Recorrect GH token logic

---
 check_tags.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/check_tags.ps1 b/check_tags.ps1
index 02930543162..680ff956437 100644
--- a/check_tags.ps1
+++ b/check_tags.ps1
@@ -5,7 +5,7 @@ $VSCODIUM_ASSETS= $GITHUB_RESPONSE | jq '.assets'
 echo "VSCodium assets: ${VSCODIUM_ASSETS}"
 
 # if we just don't have the github token, get out fast
-if (!$env:MAPPED_GITHUB_TOKEN -like "GITHUB_TOKEN") {
+if (!$env:MAPPED_GITHUB_TOKEN -like "*GITHUB_TOKEN*") {
   echo "This build does not have the GH token"
   echo $env:MAPPED_GITHUB_TOKEN
   return

From 85da65c0b0acb643a0ed3628a389e7d1419dd124 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Sat, 22 Dec 2018 17:14:08 -0500
Subject: [PATCH 10/17] Add null check for GH token

---
 check_tags.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/check_tags.ps1 b/check_tags.ps1
index 680ff956437..e6969428734 100644
--- a/check_tags.ps1
+++ b/check_tags.ps1
@@ -5,7 +5,7 @@ $VSCODIUM_ASSETS= $GITHUB_RESPONSE | jq '.assets'
 echo "VSCodium assets: ${VSCODIUM_ASSETS}"
 
 # if we just don't have the github token, get out fast
-if (!$env:MAPPED_GITHUB_TOKEN -like "*GITHUB_TOKEN*") {
+if (!$env:MAPPED_GITHUB_TOKEN -or $env:MAPPED_GITHUB_TOKEN -like "*GITHUB_TOKEN*") {
   echo "This build does not have the GH token"
   echo $env:MAPPED_GITHUB_TOKEN
   return

From cf28585423c2c73a596237e0356d8a5b468faf51 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Thu, 10 Jan 2019 14:55:28 -0500
Subject: [PATCH 11/17] Use VSCodium in name of zip/tar

---
 create_zip.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/create_zip.sh b/create_zip.sh
index 5f84f16c28e..1abb6f37f8e 100755
--- a/create_zip.sh
+++ b/create_zip.sh
@@ -3,16 +3,16 @@
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
     cd VSCode-darwin
-    zip -r -X -y ../VSCode-darwin-${LATEST_MS_TAG}.zip ./*
+    zip -r -X -y ../VSCodium-darwin-${LATEST_MS_TAG}.zip ./*
   elif [[ "$BUILDARCH" == "ia32" ]]; then
     cd VSCode-linux-ia32
-    tar czf ../VSCode-linux-ia32-${LATEST_MS_TAG}.tar.gz .
+    tar czf ../VSCodium-linux-ia32-${LATEST_MS_TAG}.tar.gz .
   elif [[ "$BUILDARCH" == "arm64" ]]; then
     cd VSCode-linux-arm64
-    tar czf ../VSCode-linux-arm64-${LATEST_MS_TAG}.tar.gz .
+    tar czf ../VSCodium-linux-arm64-${LATEST_MS_TAG}.tar.gz .
   else
     cd VSCode-linux-x64
-    tar czf ../VSCode-linux-x64-${LATEST_MS_TAG}.tar.gz .
+    tar czf ../VSCodium-linux-x64-${LATEST_MS_TAG}.tar.gz .
   fi
 
   cd ..

From 1991d1af61e289593c345193f4eca5dc9c06c59c Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Tue, 15 Jan 2019 12:55:36 -0500
Subject: [PATCH 12/17] Add choco installation instructions

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 44bfd17e2f1..f098522cc6f 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@
 ## Table of Contents
 - [Download/Install](#download-install)
   - [Install with Brew](#install-with-brew)
+  - [Install with Chocolatey](#install-with-choco)
   - [Install with Package Manager](#install-with-package-manager)
 - [Why Does This Exist](#why)
 - [More Info](#more-info)
@@ -34,6 +35,12 @@ brew cask install vscodium
 
 _Note: if you see "App can’t be opened because it is from an unidentified developer" when opening VSCodium the first time, you can right-click the application and choose Open. This should only be required the first time opening on a Mac._
 
+#### <a id="install-with-choco"></a>Install with Chocolatey (Windows)
+If you use Windows and have [Chocolatey](https://chocolatey.org) installed (thanks to [@Thilas](https://github.com/Thilas)):
+```bash
+choco install vscodium
+```
+
 #### <a id="install-with-package-manager"></a>Install with Package Manager (Linux)
 You can always install using the downloads (deb, rpm, tar) on the [releases page](https://github.com/VSCodium/vscodium/releases), but you can also install using your favorite package manager and get automatic updates. [@paulcarroty](https://github.com/paulcarroty) has set up a repository with instructions [here](https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo). Any issues installing VSCodium using your package manager should be directed to that repository's issue tracker. 
 

From 3ccdd1171dfcc0c6de65b45fef70b60be1cfede4 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Wed, 23 Jan 2019 17:01:32 -0500
Subject: [PATCH 13/17] Add script to trigger Azure pipelines build

---
 .travis.yml      | 1 +
 trigger-azure.sh | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100755 trigger-azure.sh

diff --git a/.travis.yml b/.travis.yml
index 7ac53d061be..1fa76c5cde2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ before_install:
 
 script:
   - ./build.sh
+  - ./trigger-azure.sh
 
 before_deploy:
   - ./create_zip.sh
diff --git a/trigger-azure.sh b/trigger-azure.sh
new file mode 100755
index 00000000000..95f7410c826
--- /dev/null
+++ b/trigger-azure.sh
@@ -0,0 +1,7 @@
+if [ "$AZURE_TOKEN" != "" ]; then
+  if [[ "$SHOULD_BUILD" == "yes" ]]; then
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      curl -X POST -H "Content-Type: application/json" -H "Authorization: Basic $AZURE_TOKEN" -d '{"definition":{"id":1}}' https://dev.azure.com/VSCodium/vscodium/_apis/build/builds?api-version=5.0-preview.5
+    fi
+  fi
+fi

From f5bb3f60077a2e5d2a04e0e816a0fb5fdcc8529a Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Sat, 9 Feb 2019 07:40:42 -0500
Subject: [PATCH 14/17] Specify node version 8.x

---
 azure-pipelines.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b81c5aee5ea..a6750fa7434 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,6 +2,9 @@ pool:
   vmImage: 'vs2017-win2016'
 
 steps:
+- task: NodeTool@0 
+  inputs:
+    versionSpec: '8.x'
 - script: |
     choco install jq 
   displayName: 'install jq from choco'

From c38cc161c046e293cca0bb0bc4db8ea2a37aec56 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Thu, 14 Feb 2019 19:40:11 -0500
Subject: [PATCH 15/17] Fix linux 32 bit builds (#85)

* Correct Linux 32-bit dependency installation
---
 .travis.yml     |  2 +-
 install_deps.sh | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1fa76c5cde2..bea141df107 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ node_js: "8"
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH="$HOME/.yarn/bin:$PATH"
-  - ./install_deps.sh
+  - . install_deps.sh
   - . get_repo.sh
   - . check_tags.sh
 
diff --git a/install_deps.sh b/install_deps.sh
index 9027ffbdbf8..4d10ae5eb20 100755
--- a/install_deps.sh
+++ b/install_deps.sh
@@ -5,16 +5,28 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   brew install jq zip
 else
   sudo apt-get update
-  sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev fakeroot rpm jq
+  sudo apt-get install -y fakeroot rpm jq
   if [[ "$BUILDARCH" == "ia32" ]]; then
     sudo dpkg --add-architecture i386
     sudo apt-get update
-    sudo apt-get install libc6-dev-i386 gcc-multilib g++-multilib
-    sudo apt-get install libx11-dev:i386 libxkbfile-dev:i386
+    sudo apt-get install -y gcc-multilib g++-multilib
+    sudo apt-get install -y \
+      libgirepository-1.0-1:i386 \
+      gir1.2-glib-2.0:i386 \
+      libglib2.0-dev:i386 \
+      gir1.2-secret-1:i386 \
+      libx11-dev:i386 \
+      libxkbfile-dev:i386 \
+      libsecret-1-dev:i386
+    export CFLAGS=-m32
+    export CXXFLAGS=-m32
+    export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
   elif [[ $BUILDARCH == "arm64" ]]; then
     # Use the default C / C++ compilers,
     # because some makefiles default to CC:=gcc:
     export CC=/usr/bin/cc
     export CXX=/usr/bin/c++
+  else
+    sudo apt-get install libx11-dev libxkbfile-dev libsecret-1-dev fakeroot rpm jq
   fi
 fi

From e95b3f07321b333583a8bf49e3085ad92af1af18 Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Tue, 19 Feb 2019 15:59:29 -0500
Subject: [PATCH 16/17] Update DOCS.md to include link to workaround for
 code-settings-sync

---
 DOCS.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/DOCS.md b/DOCS.md
index dedd26a6d3f..82ab0072728 100644
--- a/DOCS.md
+++ b/DOCS.md
@@ -28,6 +28,8 @@ _(For example the C# extension `ms-vscode.csharp` sends tracking data to Microso
 ## <a id="extensions-marketplace"></a>Extensions + Marketplace
 Until something more open comes around, we use the Microsoft Marketplace/Extensions in the `product.json` file. Those links are licensed under MIT as per [the comments on this issue.](https://github.com/Microsoft/vscode/issues/31168#issuecomment-317319063)
 
+If you use the [code-settings-sync](https://github.com/shanalikhan/code-settings-sync) extension, you may have [an issue](https://github.com/VSCodium/vscodium/issues/72) installing extensions (via the plugin). Refer to [this workaround](https://github.com/shanalikhan/code-settings-sync/issues/668#issuecomment-462065341) to get it working properly.
+
 ## <a id="migrating"></a>Migrating from Visual Studio Code to VSCodium
 VSCodium (and a freshly cloned copy of vscode built from source) stores its extension files in `~/.vscode-oss`. So if you currently have Visual Studio Code installed, your extensions won't automatically populate. You can reinstall your extensions from the Marketplace in VSCodium, or copy the `extensions` from `~/.vscode/extensions` to `~/.vscode-oss/extensions`.
 

From a02839b466d8d01b8a61ea9611f0b74039538eae Mon Sep 17 00:00:00 2001
From: Peter Squicciarini <stripedpajamas273@gmail.com>
Date: Wed, 20 Feb 2019 15:23:26 -0500
Subject: [PATCH 17/17] Add workaround for C# extension woes

---
 DOCS.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/DOCS.md b/DOCS.md
index 82ab0072728..acf4be6fcbb 100644
--- a/DOCS.md
+++ b/DOCS.md
@@ -30,6 +30,11 @@ Until something more open comes around, we use the Microsoft Marketplace/Extensi
 
 If you use the [code-settings-sync](https://github.com/shanalikhan/code-settings-sync) extension, you may have [an issue](https://github.com/VSCodium/vscodium/issues/72) installing extensions (via the plugin). Refer to [this workaround](https://github.com/shanalikhan/code-settings-sync/issues/668#issuecomment-462065341) to get it working properly.
 
+### Proprietary Debugging Tools
+The debugger provided with Microsoft's [C# extension](https://github.com/OmniSharp/omnisharp-vscode) as well as the (Windows) debugger provided with their [C++ extension](https://github.com/Microsoft/vscode-cpptools) are very restrictively licensed to only work with the offical Visual Studio Code build. See [this comment in the C# extension repo](https://github.com/OmniSharp/omnisharp-vscode/issues/2491#issuecomment-418811364) and [this comment in the C++ extension repo](https://github.com/Microsoft/vscode-cpptools/issues/21#issuecomment-248349017). 
+
+A workaround exists to get debugging working in C# projects, by using Samsung's opensource [netcoredbg](https://github.com/Samsung/netcoredbg) package. See [this comment](https://github.com/VSCodium/vscodium/issues/82#issue-409806641) for instructions on how to set that up.
+
 ## <a id="migrating"></a>Migrating from Visual Studio Code to VSCodium
 VSCodium (and a freshly cloned copy of vscode built from source) stores its extension files in `~/.vscode-oss`. So if you currently have Visual Studio Code installed, your extensions won't automatically populate. You can reinstall your extensions from the Marketplace in VSCodium, or copy the `extensions` from `~/.vscode/extensions` to `~/.vscode-oss/extensions`.