Merge VS Code 1.31.1 (#4283)

resources/linux/code.desktop

@@ -5,7 +5,7 @@ GenericName=Text Editor
 Exec=/usr/share/@@NAME@@/@@NAME@@ --unity-launch %F
 Icon=@@ICON@@
 Type=Application
-StartupNotify=true
+StartupNotify=false
 StartupWMClass=@@NAME_SHORT@@
 Categories=Utility;TextEditor;Development;IDE;
 MimeType=text/plain;inode/directory;

resources/linux/debian/control.template

@@ -1,7 +1,7 @@
 Package: @@NAME@@
 Version: @@VERSION@@
 Section: devel
-Depends: libnotify4, libnss3 (>= 2:3.26), gnupg, apt, libxkbfile1, libgconf-2-4, libsecret-1-0, libgtk-3-0 (>= 3.10.0), libunwind8
+Depends: libnotify4, libnss3 (>= 2:3.26), gnupg, apt, libxkbfile1, libsecret-1-0, libgtk-3-0 (>= 3.10.0), libxss1
 Priority: optional
 Architecture: @@ARCHITECTURE@@
 Maintainer: Microsoft Corporation

resources/linux/rpm/code.spec.template

@@ -18,9 +18,13 @@ Visual Studio Code is a new choice of tool that combines the simplicity of a cod
 mkdir -p %{buildroot}/usr/share/@@NAME@@
 mkdir -p %{buildroot}/usr/share/applications
 mkdir -p %{buildroot}/usr/share/pixmaps
+#mkdir -p %{buildroot}/usr/share/bash-completion/completions
+#mkdir -p %{buildroot}/usr/share/zsh/site-functions
 cp -r usr/share/@@NAME@@/* %{buildroot}/usr/share/@@NAME@@
 cp -r usr/share/applications/@@NAME@@.desktop %{buildroot}/usr/share/applications
 cp -r usr/share/pixmaps/@@NAME@@.png %{buildroot}/usr/share/pixmaps
+#cp usr/share/bash-completion/completions/code %{buildroot}/usr/share/bash-completion/completions/code
+#cp usr/share/zsh/site-functions/_code %{buildroot}/usr/share/zsh/site-functions/_code
 
 %post
 # Remove the legacy bin command if this is the stable build
@@ -52,3 +56,5 @@ fi
 /usr/share/@@NAME@@/
 /usr/share/applications/@@NAME@@.desktop
 /usr/share/pixmaps/@@NAME@@.png
+#/usr/share/bash-completion/completions/code
+#/usr/share/zsh/site-functions/_code

resources/linux/rpm/dependencies.json

@@ -27,7 +27,6 @@
 		"libX11.so.6()(64bit)",
 		"libXss.so.1()(64bit)",
 		"libXtst.so.6()(64bit)",
-		"libgconf-2.so.4()(64bit)",
 		"libgmodule-2.0.so.0()(64bit)",
 		"librt.so.1()(64bit)",
 		"libglib-2.0.so.0()(64bit)",
@@ -107,7 +106,6 @@
 		"libgcc_s.so.1",
 		"libgcc_s.so.1(GCC_4.0.0)",
 		"libgcc_s.so.1(GLIBC_2.0)",
-		"libgconf-2.so.4",
 		"libgdk-x11-2.0.so.0",
 		"libgdk_pixbuf-2.0.so.0",
 		"libgio-2.0.so.0",

resources/linux/snap/snapcraft.yaml

@@ -15,7 +15,7 @@ parts:
     source: .
     stage-packages:
       - libasound2
-      - libgconf2-4
+      - libc++1
       - libnotify4
       - libnspr4
       - libnss3