Merge pull request #3594 from amcasey/VsMefVsix

Restore assemblies removed from vsix
dotnet · Jun 19, 2015 · 21efbe1 · 21efbe1
2 parents cf9e83d + 0ff12c5
commit 21efbe1
Showing 1 changed file with 10 additions and 0 deletions.
diff --git 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>