Remove Interactive Window (#13143)

dotnet · Oct 7, 2016 · db7a842 · db7a842
1 parent 1e55ad1
commit db7a842
Show file tree

Hide file tree

Showing 193 changed files with 103 additions and 19,557 deletions.
diff --git a/Roslyn.sln b/Roslyn.sln
@@ -117,8 +117,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpScriptingTest", "src\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteractiveFeatures", "src\Interactive\Features\InteractiveFeatures.csproj", "{8E2A252E-A140-45A6-A81A-2652996EA589}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteractiveWindow", "src\InteractiveWindow\Editor\InteractiveWindow.csproj", "{01E9BD68-0339-4A13-B42F-A3CA84D164F3}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpEditorServicesTest", "src\EditorFeatures\CSharpTest\CSharpEditorServicesTest.csproj", "{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpEditorServicesTest2", "src\EditorFeatures\CSharpTest2\CSharpEditorServicesTest2.csproj", "{16E93074-4252-466C-89A3-3B905ABAF779}"
@@ -143,10 +141,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "csi", "src\Interactive\csi\
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "vbi", "src\Interactive\vbi\vbi.vbproj", "{6E62A0FF-D0DC-4109-9131-AB8E60CDFF7B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteractiveWindowTest", "src\InteractiveWindow\EditorTest\InteractiveWindowTest.csproj", "{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualStudioInteractiveWindow", "src\InteractiveWindow\VisualStudio\VisualStudioInteractiveWindow.csproj", "{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServicesVisualStudio", "src\VisualStudio\Core\Def\ServicesVisualStudio.csproj", "{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServicesVisualStudioImpl", "src\VisualStudio\Core\Impl\ServicesVisualStudioImpl.csproj", "{C0E80510-4FBE-4B0C-AF2C-4F473787722C}"
@@ -1420,26 +1414,6 @@ Global
 		{8E2A252E-A140-45A6-A81A-2652996EA589}.Release|x64.Build.0 = Release|Any CPU
 		{8E2A252E-A140-45A6-A81A-2652996EA589}.Release|x86.ActiveCfg = Release|Any CPU
 		{8E2A252E-A140-45A6-A81A-2652996EA589}.Release|x86.Build.0 = Release|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Debug|ARM.Build.0 = Debug|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Debug|x64.Build.0 = Debug|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Debug|x86.Build.0 = Debug|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Release|ARM.ActiveCfg = Release|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Release|ARM.Build.0 = Release|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Release|x64.ActiveCfg = Release|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Release|x64.Build.0 = Release|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Release|x86.ActiveCfg = Release|Any CPU
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3}.Release|x86.Build.0 = Release|Any CPU
 		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1674,46 +1648,6 @@ Global
 		{6E62A0FF-D0DC-4109-9131-AB8E60CDFF7B}.Release|x64.Build.0 = Release|Any CPU
 		{6E62A0FF-D0DC-4109-9131-AB8E60CDFF7B}.Release|x86.ActiveCfg = Release|Any CPU
 		{6E62A0FF-D0DC-4109-9131-AB8E60CDFF7B}.Release|x86.Build.0 = Release|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Debug|x64.Build.0 = Debug|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Debug|x86.Build.0 = Debug|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Release|ARM.Build.0 = Release|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Release|x64.ActiveCfg = Release|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Release|x64.Build.0 = Release|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Release|x86.ActiveCfg = Release|Any CPU
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3}.Release|x86.Build.0 = Release|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Debug|ARM.Build.0 = Debug|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Debug|x64.Build.0 = Debug|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Debug|x86.Build.0 = Debug|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Release|ARM.ActiveCfg = Release|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Release|ARM.Build.0 = Release|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Release|x64.ActiveCfg = Release|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Release|x64.Build.0 = Release|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Release|x86.ActiveCfg = Release|Any CPU
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}.Release|x86.Build.0 = Release|Any CPU
 		{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -3233,7 +3167,6 @@ Global
 		{066F0DBD-C46C-4C20-AFEC-99829A172625} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05}
 		{2DAE4406-7A89-4B5F-95C3-BC5422CE47CE} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05}
 		{8E2A252E-A140-45A6-A81A-2652996EA589} = {2491A9B9-C0A8-49EE-9077-A32DE76E1E94}
-		{01E9BD68-0339-4A13-B42F-A3CA84D164F3} = {999FBDA2-33DA-4F74-B957-03AC72CCE5EC}
 		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D} = {EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6}
 		{16E93074-4252-466C-89A3-3B905ABAF779} = {EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6}
 		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B33} = {EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6}
@@ -3246,8 +3179,6 @@ Global
 		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B34} = {5CA5F70E-0FDB-467B-B22C-3CD5994F0087}
 		{14118347-ED06-4608-9C45-18228273C712} = {5CA5F70E-0FDB-467B-B22C-3CD5994F0087}
 		{6E62A0FF-D0DC-4109-9131-AB8E60CDFF7B} = {5CA5F70E-0FDB-467B-B22C-3CD5994F0087}
-		{7F3CB45E-4993-4FA4-8D6A-C2DFFED2DFC3} = {999FBDA2-33DA-4F74-B957-03AC72CCE5EC}
-		{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F} = {999FBDA2-33DA-4F74-B957-03AC72CCE5EC}
 		{86FD5B9A-4FA0-4B10-B59F-CFAF077A859C} = {8DBA5174-B0AA-4561-82B1-A46607697753}
 		{C0E80510-4FBE-4B0C-AF2C-4F473787722C} = {8DBA5174-B0AA-4561-82B1-A46607697753}
 		{7BE3DEEB-87F8-4E15-9C21-4F94B0B1C2D6} = {8DBA5174-B0AA-4561-82B1-A46607697753}

diff --git a/build/config/SignToolData.json b/build/config/SignToolData.json
@@ -37,7 +37,6 @@
             "Microsoft.DiaSymReader.PortablePdb.dll",
             "Microsoft.VisualStudio.CSharp.Repl.dll",
             "Microsoft.VisualStudio.InteractiveServices.dll",
-            "Microsoft.VisualStudio.InteractiveWindow.dll",
             "Microsoft.VisualStudio.LanguageServices.CSharp.dll",
             "Microsoft.VisualStudio.LanguageServices.dll",
             "Microsoft.VisualStudio.LanguageServices.Implementation.dll",
@@ -46,7 +45,6 @@
             "Microsoft.VisualStudio.LanguageServices.VisualBasic.dll",
             "Microsoft.VisualStudio.LanguageServices.Xaml.dll",
             "Microsoft.VisualStudio.VisualBasic.Repl.dll",
-            "Microsoft.VisualStudio.VsInteractiveWindow.dll",
             "Pdb2Xml.exe",
             "Roslyn.Compilers.Extension.dll",
             "Roslyn.Hosting.Diagnostics.dll",
@@ -90,7 +88,6 @@
             "strongName": null,
             "values": [
                 "ExpressionEvaluatorPackage.vsix",
-                "Microsoft.VisualStudio.VsInteractiveWindow.vsix",
                 "Roslyn.Compilers.Extension.vsix",
                 "Roslyn.Deployment.Full.vsix",
                 "Roslyn.Deployment.Full.Next.vsix",

diff --git a/src/Deployment/Roslyn.csproj b/src/Deployment/Roslyn.csproj
@@ -44,13 +44,6 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <IncludeOutputGroupsInVSIX>VSIXContainerProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
     </ProjectReference>
-    <ProjectReference Include="..\InteractiveWindow\VisualStudio\VisualStudioInteractiveWindow.csproj">
-      <Project>{20BB6FAC-44D2-4D76-ABFE-0C1E163A1A4F}</Project>
-      <Name>VisualStudioInteractiveWindow</Name>
-      <VSIXSubPath>Vsixes</VSIXSubPath>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <IncludeOutputGroupsInVSIX>VSIXContainerProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
-    </ProjectReference>
     <ProjectReference Include="..\VisualStudio\SetupInteractive\VisualStudioSetupInteractive.csproj">
       <Project>{C467FEFA-337D-4705-BB5A-BDF41A555FDC}</Project>
       <Name>VisualStudioSetupInteractive</Name>
@@ -74,4 +67,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="..\..\build\Targets\VSL.Imports.targets" />
-</Project>
+</Project>
diff --git a/src/Deployment/source.extension.vsixmanifest b/src/Deployment/source.extension.vsixmanifest
@@ -29,15 +29,6 @@
                 Location="|VisualStudioSetup;VSIXContainerProjectOutputGroup|"
                 Id="|VisualStudioSetup;VSIXIdentifierProjectOutputGroup|" />
 
-    <Dependency d:ProjectName="VisualStudioInteractiveWindow" 
-                DisplayName="|VisualStudioInteractiveWindow;VSIXNameProjectOutputGroup|" 
-                Version="[|%CurrentProject%;GetBuildVersion|,)"
-                d:Source="Project" 
-                d:InstallSource="Embed" 
-                d:VsixSubPath="Vsixes" 
-                Location="|VisualStudioInteractiveWindow;VSIXContainerProjectOutputGroup|" 
-                Id="|VisualStudioInteractiveWindow;VSIXIdentifierProjectOutputGroup|" />
-
     <Dependency d:ProjectName="VisualStudioInteractiveComponents" 
                 DisplayName="|VisualStudioInteractiveComponents;VSIXNameProjectOutputGroup|" 
                 Version="[|%CurrentProject%;GetBuildVersion|,)"

diff --git a/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj b/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj
@@ -51,10 +51,6 @@
       <Project>{8E2A252E-A140-45A6-A81A-2652996EA589}</Project>
       <Name>InteractiveFeatures</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\InteractiveWindow\Editor\InteractiveWindow.csproj">
-      <Project>{01E9BD68-0339-4A13-B42F-A3CA84D164F3}</Project>
-      <Name>InteractiveWindow</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\EditorFeatures\Text\TextEditorFeatures.csproj">
       <Project>{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}</Project>
       <Name>TextEditorFeatures</Name>

diff --git a/src/EditorFeatures/CSharpTest/project.json b/src/EditorFeatures/CSharpTest/project.json
@@ -4,6 +4,10 @@
             "version": "14.3.25407",
             "suppressParent": "all"
         },
+        "RoslynDependencies.Microsoft.VisualStudio.Text.Internal": {
+           "version": "14.3.25407",
+           "suppressParent": "all"
+        },
         "RoslynDependencies.Microsoft.VisualStudio.Language.CallHierarchy": {
             "version": "14.3.25407",
             "suppressParent": "all"

diff --git a/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj b/src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj
@@ -51,10 +51,6 @@
       <Project>{8E2A252E-A140-45A6-A81A-2652996EA589}</Project>
       <Name>InteractiveFeatures</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\InteractiveWindow\Editor\InteractiveWindow.csproj">
-      <Project>{01E9BD68-0339-4A13-B42F-A3CA84D164F3}</Project>
-      <Name>InteractiveWindow</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\EditorFeatures\Text\TextEditorFeatures.csproj">
       <Project>{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}</Project>
       <Name>TextEditorFeatures</Name>

diff --git a/src/EditorFeatures/Core/EditorFeatures.csproj b/src/EditorFeatures/Core/EditorFeatures.csproj
@@ -40,10 +40,6 @@
       <Project>{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}</Project>
       <Name>TextEditorFeatures</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\InteractiveWindow\Editor\InteractiveWindow.csproj">
-      <Project>{01E9BD68-0339-4A13-B42F-A3CA84D164F3}</Project>
-      <Name>InteractiveWindow</Name>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/src/EditorFeatures/Core/project.json b/src/EditorFeatures/Core/project.json
@@ -1,6 +1,14 @@
 {
     "dependencies": {
         "System.Collections.Immutable": "1.2.0",
+        "Microsoft.VisualStudio.InteractiveWindow": {
+            "version": "2.0.0-beta5-60820-04",
+            "suppressParent": "all"
+        },
+        "RoslynDependencies.Microsoft.VisualStudio.Text.Internal": {
+            "version": "14.3.25407",
+            "suppressParent": "all"
+        },
         "RoslynDependencies.Microsoft.VisualStudio.Language.CallHierarchy": {
             "version": "14.3.25407",
             "suppressParent": "all"
@@ -9,6 +17,10 @@
             "version": "14.3.25407",
             "suppressParent": "all"
         },
+        "Microsoft.VisualStudio.Language.StandardClassification": {
+            "version": "14.3.25407",
+            "suppressParent": "all"
+        },
         "Microsoft.VisualStudio.Language.Intellisense": {
             "version": "14.3.25407",
             "suppressParent": "all"

diff --git a/src/EditorFeatures/Next/EditorFeatures.Next.csproj b/src/EditorFeatures/Next/EditorFeatures.Next.csproj
@@ -43,11 +43,6 @@
       <Project>{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}</Project>
       <Name>TextEditorFeatures</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\InteractiveWindow\Editor\InteractiveWindow.csproj">
-      <Project>{01E9BD68-0339-4A13-B42F-A3CA84D164F3}</Project>
-      <Name>InteractiveWindow</Name>
-      <Aliases>InteractiveWindow</Aliases>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/src/EditorFeatures/Test/EditorServicesTest.csproj b/src/EditorFeatures/Test/EditorServicesTest.csproj
@@ -87,10 +87,6 @@
       <Project>{8E2A252E-A140-45A6-A81A-2652996EA589}</Project>
       <Name>InteractiveFeatures</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\InteractiveWindow\Editor\InteractiveWindow.csproj">
-      <Project>{01E9BD68-0339-4A13-B42F-A3CA84D164F3}</Project>
-      <Name>InteractiveWindow</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\EditorFeatures\Text\TextEditorFeatures.csproj">
       <Project>{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}</Project>
       <Name>TextEditorFeatures</Name>

diff --git a/src/EditorFeatures/Test/project.json b/src/EditorFeatures/Test/project.json
@@ -7,6 +7,10 @@
             "version": "14.3.25407",
             "suppressParent": "all"
         },
+        "RoslynDependencies.Microsoft.VisualStudio.Text.Internal" : {
+            "version": "14.3.25407",
+            "suppressParent": "all"
+        },
         "RoslynDependencies.Microsoft.VisualStudio.Language.CallHierarchy": {
             "version": "14.3.25407",
             "suppressParent": "all"
@@ -15,6 +19,10 @@
             "version": "14.3.25407",
             "suppressParent": "all"
         },
+        "Microsoft.VisualStudio.Language.StandardClassification": {
+            "version": "14.3.25407",
+            "suppressParent": "all"
+        },
         "Microsoft.VisualStudio.Text.UI": {
             "version": "14.3.25407",
             "suppressParent": "all"

diff --git a/src/EditorFeatures/Test2/EditorServicesTest2.vbproj b/src/EditorFeatures/Test2/EditorServicesTest2.vbproj
@@ -25,10 +25,6 @@
       <Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project>
       <Name>BasicCodeAnalysis</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\InteractiveWindow\Editor\InteractiveWindow.csproj">
-      <Project>{01e9bd68-0339-4a13-b42f-a3ca84d164f3}</Project>
-      <Name>InteractiveWindow</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Interactive\EditorFeatures\Core\InteractiveEditorFeatures.csproj">
       <Project>{92412d1a-0f23-45b5-b196-58839c524917}</Project>
       <Name>InteractiveEditorFeatures</Name>

diff --git a/src/EditorFeatures/Test2/project.json b/src/EditorFeatures/Test2/project.json
@@ -1,9 +1,17 @@
 {
     "dependencies": {
+        "Microsoft.VisualStudio.InteractiveWindow": {
+            "version": "2.0.0-beta5-60820-04",
+            "suppressParent": "all"
+        },
         "Microsoft.VisualStudio.Language.Intellisense": {
             "version": "14.3.25407",
             "suppressParent": "all"
         },
+        "RoslynDependencies.Microsoft.VisualStudio.Text.Internal": {
+            "version": "14.3.25407",
+            "suppressParent": "all"
+        },
         "RoslynDependencies.Microsoft.VisualStudio.Language.CallHierarchy": {
             "version": "14.3.25407",
             "suppressParent": "all"

diff --git a/src/EditorFeatures/TestUtilities/project.json b/src/EditorFeatures/TestUtilities/project.json
@@ -12,10 +12,18 @@
       "version": "14.2.19-pre",
       "suppressParent": "all"
     },
+    "RoslynDependencies.Microsoft.VisualStudio.Text.Internal": {
+      "version": "14.3.25407",
+      "suppressParent": "all"
+    },
     "RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": {
       "version": "14.3.25407",
       "suppressParent": "all"
     },
+    "Microsoft.VisualStudio.Language.StandardClassification" : {
+      "version": "14.3.25407",
+      "suppressParent": "all"
+    },
     "Microsoft.VisualStudio.Language.Intellisense": {
       "version": "14.3.25407",
       "suppressParent": "all"

diff --git a/src/EditorFeatures/VisualBasicTest/project.json b/src/EditorFeatures/VisualBasicTest/project.json
@@ -4,6 +4,10 @@
             "version": "14.3.25407",
             "suppressParent": "all"
         },
+        "RoslynDependencies.Microsoft.VisualStudio.Text.Internal": {
+           "version": "14.3.25407",
+           "suppressParent": "all"
+        },
         "RoslynDependencies.Microsoft.VisualStudio.Language.NavigateTo.Interfaces": {
             "version": "14.3.25407",
             "suppressParent": "all"

diff --git a/src/Interactive/EditorFeatures/CSharp/CSharpInteractiveEditorFeatures.csproj b/src/Interactive/EditorFeatures/CSharp/CSharpInteractiveEditorFeatures.csproj
@@ -52,10 +52,6 @@
       <Project>{8E2A252E-A140-45A6-A81A-2652996EA589}</Project>
       <Name>InteractiveFeatures</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\InteractiveWindow\Editor\InteractiveWindow.csproj">
-      <Project>{01E9BD68-0339-4A13-B42F-A3CA84D164F3}</Project>
-      <Name>InteractiveWindow</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\EditorFeatures\Text\TextEditorFeatures.csproj">
       <Project>{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}</Project>
       <Name>TextEditorFeatures</Name>

diff --git a/src/Interactive/EditorFeatures/CSharp/project.json b/src/Interactive/EditorFeatures/CSharp/project.json
@@ -1,5 +1,9 @@
 {
     "dependencies": {
+        "Microsoft.VisualStudio.InteractiveWindow": {
+            "version": "2.0.0-beta5-60820-04",
+            "suppressParent": "all"
+        },
         "Microsoft.VisualStudio.Text.UI.Wpf": {
             "version": "14.3.25407",
             "suppressParent": "all"