Updates project files to fix broken extension (#337)

* Updates project files to fix broken extension.

* Includes *.targets, Newtensoft.Json and NUglify in VSIX package.

* Removes Bootstrapper packages.

* Includes *.targets in NuGet package.

Author: djanosik

src/WebCompiler/WebCompiler.csproj

@@ -13,9 +13,6 @@
     <!-- forces SDK to copy dependencies into build output to make packing easier -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
-  <ItemGroup>
-    <Content Include="MSBuild\*.targets" PackagePath="build\" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Node\prepare.cmd" />
     <EmbeddedResource Include="Node\node.7z" />
@@ -29,6 +26,9 @@
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" PrivateAssets="All" />
     <PackageReference Include="NUglify" Version="1.5.5" PrivateAssets="All" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="MSBuild\*.targets" PackagePath="build\" />
+  </ItemGroup>
   <Target Name="PrepareNpmDependencies" AfterTargets="Restore">
     <Exec Command="..\..\build\build.cmd" />
   </Target>

src/WebCompilerVsix/WebCompilerVsix.csproj

@@ -212,10 +212,16 @@
     <Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <Private>False</Private>
     </Reference>
-    <Reference Include="NuGet.VisualStudio, Version=2.8.60318.667, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=x86">
-      <HintPath>..\..\packages\NuGet.VisualStudio.2.8.5\lib\net40\NuGet.VisualStudio.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="NuGet.VisualStudio, Version=3.5.0.1996, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NuGet.VisualStudio.3.5.0\lib\net45\NuGet.VisualStudio.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="NUglify, Version=1.5.5.0, Culture=neutral, PublicKeyToken=15bc7810aec21b5e, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUglify.1.5.5\lib\net40\NUglify.dll</HintPath>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -226,12 +232,20 @@
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Design" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <!--
+    Exclude some facade-only assemblies (i.e. assemblies without any implementation) from the VSIX using the SuppressFromVsix ItemGroup.
+    The list is dependent on the framework being targeted. Changes to TargetFrameworkVersion would may require changes to the SuppressFromVsix ItemGroup.
+    -->
+    <SuppressFromVsix Include="Microsoft.Build.Framework.dll" Visible="false" />
+    <SuppressFromVsix Include="Microsoft.Build.Utilities.Core.dll" Visible="false" />
+    <SuppressFromVsix Include="System.Threading.Thread.dll" Visible="false" />
     <ProjectReference Include="..\WebCompiler\WebCompiler.csproj">
       <Project>{b714b5b9-27c4-443c-9517-fe5c5ef46ea2}</Project>
-      <Name>WebCompiler</Name>      
+      <Name>WebCompiler</Name>
       <!-- Workaround for https://github.com/dotnet/sdk/issues/433 -->
       <Private>false</Private>
       <IncludeOutputGroupsInVSIX>
@@ -240,15 +254,15 @@
       </IncludeOutputGroupsInVSIXLocalOnly>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <VSIXSourceItem Include="..\WebCompiler\MSBuild\*.targets" Visible="false" />
+    <VSIXSourceItem Include="..\WebCompiler\bin\$(Configuration)\net46\WebCompiler.pdb" Visible="false" />
+    <VSIXSourceItem Include="..\WebCompiler\bin\$(Configuration)\net46\WebCompiler.exe" Visible="false" />
+    <Content Include="@(VSIXSourceItem)">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets')" />
   <ProjectExtensions />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

src/WebCompilerVsix/packages.config

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NuGet.VisualStudio" version="2.8.5" targetFramework="net451" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
+  <package id="NuGet.VisualStudio" version="3.5.0" targetFramework="net46" />
+  <package id="NUglify" version="1.5.5" targetFramework="net46" />
 </packages>