From 39c5aee9a19a2c28a02692ede05567a1e0fd0ff7 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Fri, 2 Mar 2018 18:07:01 -0800
Subject: [PATCH] Add other tooling assemblies to VSIX

---
 ...rosoft.VisualStudio.BlazorExtension.csproj | 23 +++++++++++++++++++
 .../Properties/AssemblyInfo.cs                | 16 ++++++++++++-
 .../source.extension.vsixmanifest             |  2 ++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj b/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj
index d0160b10c1..923931002c 100644
--- a/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj
+++ b/tooling/Microsoft.VisualStudio.BlazorExtension/Microsoft.VisualStudio.BlazorExtension.csproj
@@ -119,6 +119,18 @@
       <IncludeOutputGroupsInVSIXLocalOnly>
       </IncludeOutputGroupsInVSIXLocalOnly>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Blazor.Razor.Extensions\Microsoft.AspNetCore.Blazor.Razor.Extensions.csproj">
+      <Name>Microsoft.AspNetCore.Blazor.Razor.Extensions</Name>
+      <Private>False</Private>
+      <IncludeOutputGroupsInVSIX></IncludeOutputGroupsInVSIX>
+      <IncludeOutputGroupsInVSIXLocalOnly></IncludeOutputGroupsInVSIXLocalOnly>
+    </ProjectReference>
+    <Content Include="..\..\src\Microsoft.AspNetCore.Blazor.Razor.Extensions\bin\$(Configuration)\net461\Microsoft.AspNetCore.Blazor.Razor.Extensions.dll">
+      <Link>Microsoft.AspNetCore.Blazor.Razor.Extensions.dll</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
     <ProjectReference Include="..\Microsoft.VisualStudio.LanguageServices.Blazor\Microsoft.VisualStudio.LanguageServices.Blazor.csproj">
       <Project>{b9f7f502-6dd2-4e77-8fd1-cbd76f695b26}</Project>
       <Name>Microsoft.VisualStudio.LanguageServices.Blazor</Name>
@@ -134,6 +146,17 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>false</Visible>
     </Content>
+
+    <!--
+      This is built as a P2P by Microsoft.VisualStudio.LanguageServices.Blazor. This is required, adding the P2P	
+      to this project will cause a NU1201 error that doesn't have a workaround.	
+    -->
+    <Content Include="..\..\src\anglesharp\AngleSharpBuilder\dist\Microsoft.AspNetCore.Blazor.AngleSharp.dll">
+      <Link>Microsoft.AspNetCore.Blazor.AngleSharp.dll</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
   </ItemGroup>
   <!--
   
diff --git a/tooling/Microsoft.VisualStudio.BlazorExtension/Properties/AssemblyInfo.cs b/tooling/Microsoft.VisualStudio.BlazorExtension/Properties/AssemblyInfo.cs
index dc398d7ac4..3a7e1eccd9 100644
--- a/tooling/Microsoft.VisualStudio.BlazorExtension/Properties/AssemblyInfo.cs
+++ b/tooling/Microsoft.VisualStudio.BlazorExtension/Properties/AssemblyInfo.cs
@@ -9,9 +9,23 @@ using Microsoft.VisualStudio.Shell;
 // The versions here need to match what the build is producing. If you change the version numbers
 // for the Blazor assemblies, this needs to change as well.
 [assembly: ProvideBindingRedirection(
-    AssemblyName = "Microsoft.VisualStudio.LanguageServices.Blazor",
+    AssemblyName = "Microsoft.AspNetCore.Blazor.AngleSharp",
+    GenerateCodeBase = true,
+    PublicKeyToken = "",
+    OldVersionLowerBound = "0.0.0.0",
+    OldVersionUpperBound = "0.9.9.0",
+    NewVersion = "0.9.9.0")]
+[assembly: ProvideBindingRedirection(
+    AssemblyName = "Microsoft.AspNetCore.Blazor.Razor.Extensions",
     GenerateCodeBase = true,
     PublicKeyToken = "",
     OldVersionLowerBound = "0.0.0.0",
     OldVersionUpperBound = "0.0.5.0",
     NewVersion = "0.0.5.0")]
+[assembly: ProvideBindingRedirection(
+    AssemblyName = "Microsoft.VisualStudio.LanguageServices.Blazor",
+    GenerateCodeBase = true,
+    PublicKeyToken = "",
+    OldVersionLowerBound = "0.0.0.0",
+    OldVersionUpperBound = "0.0.5.0",
+    NewVersion = "0.0.5.0")]
\ No newline at end of file
diff --git a/tooling/Microsoft.VisualStudio.BlazorExtension/source.extension.vsixmanifest b/tooling/Microsoft.VisualStudio.BlazorExtension/source.extension.vsixmanifest
index b1a5bcaa6f..e040596767 100644
--- a/tooling/Microsoft.VisualStudio.BlazorExtension/source.extension.vsixmanifest
+++ b/tooling/Microsoft.VisualStudio.BlazorExtension/source.extension.vsixmanifest
@@ -18,6 +18,8 @@
     <Assets>
         <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
         <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="File" Path="Microsoft.VisualStudio.LanguageServices.Blazor.dll" />
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Microsoft.AspNetCore.Blazor.AngleSharp.dll" />	
+        <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Microsoft.AspNetCore.Blazor.Razor.Extensions.dll" />
         <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="File" Path="Microsoft.VisualStudio.LanguageServices.Blazor.dll" />
         <Asset Type="Microsoft.VisualStudio.VsPackage" Path="Templates.pkgdef" />
     </Assets>