From 97adaeddc8f40cc2267e5856c9f48b83e19ab9f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?=
 <tmat@users.noreply.github.com>
Date: Fri, 13 Jan 2017 09:49:23 -0800
Subject: [PATCH] Revert "Vsix cleanup"

---
 .../Setup.Next/VisualStudioSetup.Next.csproj  |  2 ++
 .../Setup/VisualStudioSetup.csproj            | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj b/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj
index 1261e7fe112..3dc057844c6 100644
--- a/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj
+++ b/src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj
@@ -91,6 +91,8 @@
   <ItemGroup>
     <!-- Visual Studio ships with some, but not all, of the assemblies in Microsoft.Composition, but we need them all -->
     <NuGetPackageToIncludeInVsix Include="Microsoft.Composition" />
+    <NuGetPackageToIncludeInVsix Include="System.Reflection.Metadata" />
+    <NuGetPackageToIncludeInVsix Include="System.Collections.Immutable" />
   </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
diff --git a/src/VisualStudio/Setup/VisualStudioSetup.csproj b/src/VisualStudio/Setup/VisualStudioSetup.csproj
index 5510f746a22..936f1f38242 100644
--- a/src/VisualStudio/Setup/VisualStudioSetup.csproj
+++ b/src/VisualStudio/Setup/VisualStudioSetup.csproj
@@ -202,9 +202,40 @@
   <ItemGroup>
     <NuGetPackageToIncludeInVsix Include="ManagedEsent" />
     <NuGetPackageToIncludeInVsix Include="Microsoft.CodeAnalysis.Elfie" />
+    <NuGetPackageToIncludeInVsix Include="Microsoft.DiaSymReader" />
+    <NuGetPackageToIncludeInVsix Include="Microsoft.DiaSymReader.PortablePdb" />
     <!-- Visual Studio ships with some, but not all, of the assemblies in Microsoft.Composition, but we need them all -->
     <NuGetPackageToIncludeInVsix Include="Microsoft.Composition" />
+    <NuGetPackageToIncludeInVsix Include="System.Reflection.Metadata" />
+    <NuGetPackageToIncludeInVsix Include="System.Collections.Immutable" />
+    <NuGetPackageToIncludeInVsix Include="System.Collections" />
+    <NuGetPackageToIncludeInVsix Include="System.Collections.Concurrent" />
+    <NugetPackageToIncludeInVsix Include="System.Diagnostics.Contracts" />
+    <NuGetPackageToIncludeInVsix Include="System.Diagnostics.Tools" />
+    <NuGetPackageToIncludeInVsix Include="System.Diagnostics.FileVersionInfo" />
+    <NuGetPackageToIncludeInVsix Include="System.IO" />
+    <NuGetPackageToIncludeInVsix Include="System.IO.Compression" />
+    <NuGetPackageToIncludeInVsix Include="System.IO.FileSystem" />
+    <NuGetPackageToIncludeInVsix Include="System.IO.FileSystem.Primitives" />
+    <NuGetPackageToIncludeInVsix Include="System.Linq.Expressions" />
+    <NuGetPackageToIncludeInVsix Include="System.Linq.Parallel" />
+    <NuGetPackageToIncludeInVsix Include="System.ObjectModel" />
+    <NuGetPackageToIncludeInVsix Include="System.Runtime.InteropServices.RuntimeInformation" />
+    <NuGetPackageToIncludeInVsix Include="System.Runtime.Numerics" />
+    <NuGetPackageToIncludeInVsix Include="System.Security.Cryptography.Algorithms" />
+    <NuGetPackageToIncludeInVsix Include="System.Security.Cryptography.Encoding" />
+    <NuGetPackageToIncludeInVsix Include="System.Security.Cryptography.Primitives" />
+    <NuGetPackageToIncludeInVsix Include="System.Security.Cryptography.X509Certificates" />
+    <NuGetPackageToIncludeInVsix Include="System.Text.Encoding" />
     <NuGetPackageToIncludeInVsix Include="System.Text.Encoding.CodePages" />
+    <NuGetPackageToIncludeInVsix Include="System.Text.Encoding.Extensions" />
+    <NuGetPackageToIncludeInVsix Include="System.Text.RegularExpressions" />
+    <NuGetPackageToIncludeInVsix Include="System.Threading.Tasks.Parallel" />
+    <NuGetPackageToIncludeInVsix Include="System.ValueTuple" />
+    <NuGetPackageToIncludeInVsix Include="System.Xml.ReaderWriter" />
+    <NuGetPackageToIncludeInVsix Include="System.Xml.XDocument" />
+    <NuGetPackageToIncludeInVsix Include="System.Xml.XmlDocument" />
+    <NuGetPackageToIncludeInVsix Include="System.Xml.XPath.XDocument" />
   </ItemGroup>
   <ItemGroup>
     <VSIXSourceItem Include="$(OutputPath)Microsoft.DiaSymReader.Native.amd64.dll" />
-- 
GitLab