From c4e01b8156261a0d2433a329eae981d77fef2e0a Mon Sep 17 00:00:00 2001
From: Jason Malinowski <jason.malinowski@microsoft.com>
Date: Mon, 9 May 2016 13:01:26 -0700
Subject: [PATCH] Include Microsoft.Diagnostics.Runtime in the test setup VSIX

This allows us to properly deploy it into VS rather than rely on
AssemblyResolve hackery.
---
 src/VisualStudio/TestSetup/BindingAttributes.cs         | 3 ++-
 src/VisualStudio/TestSetup/VisualStudioTestSetup.csproj | 4 ++++
 src/VisualStudio/TestSetup/project.json                 | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/VisualStudio/TestSetup/BindingAttributes.cs b/src/VisualStudio/TestSetup/BindingAttributes.cs
index cf824b86a138a..58a5f6b597e2f 100644
--- a/src/VisualStudio/TestSetup/BindingAttributes.cs
+++ b/src/VisualStudio/TestSetup/BindingAttributes.cs
@@ -1,3 +1,4 @@
 using Microsoft.VisualStudio.Shell;
 
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Roslyn.Hosting.Diagnostics.dll")]
\ No newline at end of file
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Roslyn.Hosting.Diagnostics.dll")]
+[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.Diagnostics.Runtime.dll")]
\ No newline at end of file
diff --git a/src/VisualStudio/TestSetup/VisualStudioTestSetup.csproj b/src/VisualStudio/TestSetup/VisualStudioTestSetup.csproj
index 2f95dc31cbf7e..7419b68b6c63f 100644
--- a/src/VisualStudio/TestSetup/VisualStudioTestSetup.csproj
+++ b/src/VisualStudio/TestSetup/VisualStudioTestSetup.csproj
@@ -20,6 +20,7 @@
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <UseCodebase>true</UseCodebase>
+    <CopyNuGetImplementations>true</CopyNuGetImplementations>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
@@ -72,6 +73,9 @@
       <Name>VisualStudioTestUtilities</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <NuGetPackageToIncludeInVsix Include="Microsoft.Diagnostics.Runtime" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Design" />
diff --git a/src/VisualStudio/TestSetup/project.json b/src/VisualStudio/TestSetup/project.json
index 0bc688a02f4b9..a8b11b14b866c 100644
--- a/src/VisualStudio/TestSetup/project.json
+++ b/src/VisualStudio/TestSetup/project.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "Microsoft.Diagnostics.Runtime": "0.8.31-beta"
   },
   "frameworks": {
     "net46": {}