From 0ff12c54653c8392c571ef748350983dd97f5892 Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Thu, 18 Jun 2015 18:41:04 -0700
Subject: [PATCH] Restore assemblies removed from vsix

System.Composition.Convention|Hosting|TypedParts
System.Collections.Immutable
System.Reflection.Metadata

Only restored to Roslyn.VisualStudio.Setup.vsix
---
 src/VisualStudio/Setup/VisualStudioSetup.csproj | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/VisualStudio/Setup/VisualStudioSetup.csproj b/src/VisualStudio/Setup/VisualStudioSetup.csproj
index ff6a23d41d0..44ae7244bbc 100644
--- a/src/VisualStudio/Setup/VisualStudioSetup.csproj
+++ b/src/VisualStudio/Setup/VisualStudioSetup.csproj
@@ -189,22 +189,32 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
       <Private>True</Private>
+      <!-- Included in the VSIX because it makes our setup authoring (DevDivInsertionFiles) easier. -->
+      <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
     </Reference>
     <Reference Include="System.Reflection.Metadata">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\System.Reflection.Metadata.$(SystemReflectionMetadataVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+      <!-- Included in the VSIX because it makes our setup authoring (DevDivInsertionFiles) easier. -->
+      <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
     </Reference>
     <Reference Include="System.Composition.Convention">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
+      <!-- Included in the VSIX because it makes our setup authoring (DevDivInsertionFiles) easier. -->
+      <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
     </Reference>
     <Reference Include="System.Composition.Hosting">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
+      <!-- Included in the VSIX because it makes our setup authoring (DevDivInsertionFiles) easier. -->
+      <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
     </Reference>
     <Reference Include="System.Composition.TypedParts">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Composition.$(MicrosoftCompositionVersion)\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
+      <!-- Included in the VSIX because it makes our setup authoring (DevDivInsertionFiles) easier. -->
+      <ForceIncludeInVSIX>true</ForceIncludeInVSIX>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-- 
GitLab