Merge pull request #6080 from jaredpar/split2

Split the recommendation tests into a separate DLL

Roslyn.sln

@@ -134,6 +134,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteractiveWindow", "src\In
 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}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EditorServicesTest", "src\EditorFeatures\Test\EditorServicesTest.csproj", "{8CEE3609-A5A9-4A9B-86D7-33118F5D6B33}"
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EditorServicesTest2", "src\EditorFeatures\Test2\EditorServicesTest2.vbproj", "{3CEA0D69-00D3-40E5-A661-DC41EA07269B}"
@@ -1432,6 +1434,26 @@ Global
 		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}.Release|x64.Build.0 = Release|Any CPU
 		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}.Release|x86.ActiveCfg = Release|Any CPU
 		{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}.Release|x86.Build.0 = Release|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Debug|ARM.Build.0 = Debug|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Debug|x64.Build.0 = Debug|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Debug|x86.Build.0 = Debug|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Release|ARM.ActiveCfg = Release|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Release|ARM.Build.0 = Release|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Release|x64.ActiveCfg = Release|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Release|x64.Build.0 = Release|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Release|x86.ActiveCfg = Release|Any CPU
+		{16e93074-4252-466c-89a3-3b905abaf779}.Release|x86.Build.0 = Release|Any CPU
 		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B33}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CEE3609-A5A9-4A9B-86D7-33118F5D6B33}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -2735,6 +2757,7 @@ Global
 		{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}
 		{3CEA0D69-00D3-40E5-A661-DC41EA07269B} = {EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6}
 		{76C6F005-C89D-4348-BB4A-39189DDBEB52} = {EE97CB90-33BB-4F3A-9B3D-69375DEC6AC6}

build/ToolsetPackages/project.lock.json

@@ -30,7 +30,7 @@
         }
       },
       "Microsoft.DiaSymReader.Native/1.2.0-rc": {},
-      "Microsoft.Net.Compilers/1.1.0-beta1": {},
+      "Microsoft.Net.Compilers/1.1.0-beta1-20150727-01": {},
       "Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150818-01": {},
       "Microsoft.Tpl.Dataflow/4.5.24": {
         "compile": {
@@ -114,7 +114,7 @@
           "runtimes/win/native/Microsoft.DiaSymReader.Native.x86.dll": {}
         }
       },
-      "Microsoft.Net.Compilers/1.1.0-beta1": {},
+      "Microsoft.Net.Compilers/1.1.0-beta1-20150727-01": {},
       "Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150818-01": {},
       "Microsoft.Tpl.Dataflow/4.5.24": {
         "compile": {
@@ -1075,39 +1075,26 @@
         "runtimes/win-x86/native/Microsoft.DiaSymReader.Native.x86.dll"
       ]
     },
-    "Microsoft.Net.Compilers/1.1.0-beta1": {
-      "sha512": "If6Kfw/iSiRVxEdUmXNULKTQj0ZoX3uzuh3/K3lrB/cFuIIu+2zf/BDT70JbnWzrELY/JlGydkCJqJ2a7vihhA==",
+    "Microsoft.Net.Compilers/1.1.0-beta1-20150727-01": {
+      "sha512": "rPa6sso1Eruoa/1hlUV1d19TFtHXyemVZRwjFyAffXLb9RoBE68Rl1hNHgWMwD8Vauwhl3BaohAssCmIG9Z3xw==",
       "type": "Package",
       "files": [
         "[Content_Types].xml",
         "_rels/.rels",
         "build/Microsoft.Net.Compilers.props",
         "Microsoft.Net.Compilers.nuspec",
-        "package/services/metadata/core-properties/5fd3b6f9332540b9bcc59cd42cb93e82.psmdcp",
+        "package/services/metadata/core-properties/4ce0f680aca94a61820b5dd3aa595e09.psmdcp",
         "ThirdPartyNotices.rtf",
         "tools/csc.exe",
-        "tools/csc.exe.config",
-        "tools/csc.rsp",
-        "tools/csi.exe",
-        "tools/csi.rsp",
         "tools/Microsoft.Build.Tasks.CodeAnalysis.dll",
         "tools/Microsoft.CodeAnalysis.CSharp.dll",
         "tools/Microsoft.CodeAnalysis.dll",
-        "tools/Microsoft.CodeAnalysis.Scripting.CSharp.dll",
-        "tools/Microsoft.CodeAnalysis.Scripting.dll",
         "tools/Microsoft.CodeAnalysis.VisualBasic.dll",
         "tools/Microsoft.CSharp.Core.targets",
         "tools/Microsoft.VisualBasic.Core.targets",
-        "tools/System.AppContext.dll",
         "tools/System.Collections.Immutable.dll",
-        "tools/System.Console.dll",
-        "tools/System.Diagnostics.StackTrace.dll",
-        "tools/System.IO.FileSystem.dll",
-        "tools/System.IO.FileSystem.Primitives.dll",
         "tools/System.Reflection.Metadata.dll",
         "tools/vbc.exe",
-        "tools/vbc.exe.config",
-        "tools/vbc.rsp",
         "tools/VBCSCompiler.exe",
         "tools/VBCSCompiler.exe.config"
       ]
@@ -1256,7 +1243,7 @@
       "Microsoft.Build.Mono.Debug >= 14.1.0-prerelease",
       "Microsoft.CodeAnalysis.Test.Resources.Proprietary >= 1.1.0-beta1-20150817-01",
       "Microsoft.DiaSymReader.Native >= 1.2.0-rc",
-      "Microsoft.Net.Compilers >= 1.1.0-beta1",
+      "Microsoft.Net.Compilers >= 1.1.0-beta1-20150727-01",
       "Microsoft.Net.RoslynDiagnostics >= 1.1.1-beta1-20150818-01",
       "xunit >= 2.1.0-beta4-build3109",
       "xunit.runner.console >= 2.1.0-beta4-build3109"

src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj

@@ -352,135 +352,6 @@
     <Compile Include="Outlining\TypeDeclarationOutlinerTests.cs" />
     <Compile Include="QuickInfo\SemanticQuickInfoSourceTests.cs" />
     <Compile Include="QuickInfo\SyntacticQuickInfoSourceTests.cs" />
-    <Compile Include="Recommendations\AbstractKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\AddKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\AliasKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\AscendingKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\AsKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\AssemblyKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\AsyncKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\AwaitKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\BaseKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\BoolKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\BreakKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ByKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ByteKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\CaseKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\CatchKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\CharKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\CheckedKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ChecksumKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ClassKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ConstKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ContinueKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\DecimalKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\DefaultKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\DefineKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\DelegateKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\DescendingKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\DisableKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\DoKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\DoubleKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\DynamicKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ElifKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ElseKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\EndIfKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\EndRegionKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\EnumKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\EqualsKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ErrorKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\EventKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ExplicitKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ExternKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\FalseKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\FieldKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\FinallyKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\FixedKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\FloatKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ForEachKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ForKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\FromKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\GetKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\GlobalKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\GotoKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\GroupKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\HiddenKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\IfKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ImplicitKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\InKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\InterfaceKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\InternalKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\IntKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\IntoKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\IsKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\JoinKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\KeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\LetKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\LineKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\LockKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\LongKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\MethodKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ModuleKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\NamespaceKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\NewKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\NullKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ObjectKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\OnKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\OperatorKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\OrderByKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\OutKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\OverrideKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ParamKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ParamsKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\PartialKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\PragmaKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\PrivateKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\PropertyKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ProtectedKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\PublicKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ReadOnlyKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\RecommenderTests.cs" />
-    <Compile Include="Recommendations\ReferenceKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\RefKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\RegionKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\RemoveKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\RestoreKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ReturnKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\SByteKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\SealedKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\SelectKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\SetKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ShortKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\SizeOfKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\StackAllocKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\StaticKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\StringKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\StructKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\SwitchKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ThisKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ThrowKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\TrueKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\TryKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\TypeKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\NameOfKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\TypeOfKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\TypeVarKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\UIntKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\ULongKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\UncheckedKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\UndefKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\UnsafeKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\UShortKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\UsingKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\VarKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\VirtualKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\VoidKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\VolatileKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\WarningKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\WhenKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\WhereKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\WhileKeywordRecommenderTests.cs" />
-    <Compile Include="Recommendations\YieldKeywordRecommenderTests.cs" />
     <Compile Include="Semantics\SpeculationAnalyzerTests.cs" />
     <Compile Include="SignatureHelp\AbstractCSharpSignatureHelpProviderTests.cs" />
     <Compile Include="SignatureHelp\AttributeSignatureHelpProviderTests.cs" />
@@ -653,6 +524,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleToTest Include="Roslyn.Services.Editor.CSharp.UnitTests2" />
+  </ItemGroup>
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />

src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj

+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="Settings">
+    <Import Project="..\..\..\build\Targets\VSL.Settings.targets" />
+  </ImportGroup>
+  <PropertyGroup>
+    <StartupObject />
+    <SolutionDir Condition="'$(SolutionDir)' == '' OR '$(SolutionDir)' == '*Undefined*'">..\..\..\</SolutionDir>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <ItemGroup Label="File References">
+    <Reference Include="Microsoft.VisualStudio.Composition, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>$(DevEnvDir)\PrivateAssemblies\Microsoft.VisualStudio.Composition.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
+      <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
+      <Name>CodeAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj">
+      <Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>
+      <Name>CSharpCodeAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Compilers\Test\Utilities\CSharp\CSharpCompilerTestUtilities.csproj">
+      <Project>{4371944A-D3BA-4B5B-8285-82E5FFC6D1F9}</Project>
+      <Name>CSharpCompilerTestUtilities</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Interactive\EditorFeatures\CSharp\CSharpInteractiveEditorFeatures.csproj">
+      <Project>{fe2cbea6-d121-4faa-aa8b-fc9900bf8c83}</Project>
+      <Name>CSharpInteractiveEditorFeatures</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
+      <Project>{76C6F005-C89D-4348-BB4A-391898DBEB52}</Project>
+      <Name>TestUtilities.Desktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Workspaces\Core\Desktop\Workspaces.Desktop.csproj">
+      <Project>{2e87fa96-50bb-4607-8676-46521599f998}</Project>
+      <Name>Workspaces.Desktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Workspaces\Core\Portable\Workspaces.csproj">
+      <Project>{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}</Project>
+      <Name>Workspaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Features\CSharp\Portable\CSharpFeatures.csproj">
+      <Project>{3973B09A-4FBF-44A5-8359-3D22CEB71F71}</Project>
+      <Name>CSharpFeatures</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Features\Core\Portable\Features.csproj">
+      <Project>{EDC68A0E-C68D-4A74-91B7-BF38EC909888}</Project>
+      <Name>Features</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Interactive\EditorFeatures\Core\InteractiveEditorFeatures.csproj">
+      <Project>{92412D1A-0F23-45B5-B196-58839C524917}</Project>
+      <Name>InteractiveEditorFeatures</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Interactive\Features\InteractiveFeatures.csproj">
+      <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>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Workspaces\CSharp\Portable\CSharpWorkspace.csproj">
+      <Project>{21B239D0-D144-430F-A394-C066D58EE267}</Project>
+      <Name>CSharpWorkspace</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\EditorFeatures\Core\EditorFeatures.csproj">
+      <Project>{3CDEEAB7-2256-418A-BEB2-620B5CB16302}</Project>
+      <Name>EditorFeatures</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Test\EditorServicesTest.csproj">
+      <Project>{8CEE3609-A5A9-4A9B-86D7-33118F5D6B33}</Project>
+      <Name>EditorServicesTest</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\EditorFeatures\CSharp\CSharpEditorFeatures.csproj">
+      <Project>{B0CE9307-FFDB-4838-A5EC-CE1F7CDC4AC2}</Project>
+      <Name>CSharpEditorFeatures</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
+      <Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
+      <Name>TestUtilities.FX45</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Compilers\Test\Resources\Core\CompilerTestResources.csproj">
+      <Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
+      <Name>CompilerTestResources</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\TestUtilities\ServicesTestUtilities.csproj">
+      <Project>{76C6F005-C89D-4348-BB4A-39189DDBEB52}</Project>
+      <Name>ServicesTestUtilities</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\CSharpTest\CSharpEditorServicesTest.csproj">
+      <Project>{AC2BCEFB-9298-4621-AC48-1FF5E639E48D}</Project>
+      <Name>CSharpEditorServicesTest</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <PropertyGroup>
+    <Nonshipping>true</Nonshipping>
+    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+    <Platform Condition="'$(Platform)' == ''">AnyCPU</Platform>
+    <ProjectGuid>{16e93074-4252-466c-89a3-3b905abaf779}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Microsoft.CodeAnalysis.Editor.CSharp.UnitTests</RootNamespace>
+    <AssemblyName>Roslyn.Services.Editor.CSharp.UnitTests2</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Language.CallHierarchy, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.VisualStudio.Language.Intellisense, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.VisualStudio.Platform.VSEditor, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.VisualStudio.Text.Data, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Text.Internal, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.VisualStudio.Text.Logic, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Text.UI, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=$(VisualStudioReferenceAssemblyVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.XML" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Recommendations\AbstractKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\AddKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\AliasKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\AscendingKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\AsKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\AssemblyKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\AsyncKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\AwaitKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\BaseKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\BoolKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\BreakKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ByKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ByteKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\CaseKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\CatchKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\CharKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\CheckedKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ChecksumKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ClassKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ConstKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ContinueKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\DecimalKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\DefaultKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\DefineKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\DelegateKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\DescendingKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\DisableKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\DoKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\DoubleKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\DynamicKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ElifKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ElseKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\EndIfKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\EndRegionKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\EnumKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\EqualsKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ErrorKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\EventKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ExplicitKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ExternKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\FalseKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\FieldKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\FinallyKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\FixedKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\FloatKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ForEachKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ForKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\FromKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\GetKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\GlobalKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\GotoKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\GroupKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\HiddenKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\IfKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ImplicitKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\InKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\InterfaceKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\InternalKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\IntKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\IntoKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\IsKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\JoinKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\KeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\LetKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\LineKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\LockKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\LongKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\MethodKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ModuleKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\NamespaceKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\NewKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\NullKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ObjectKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\OnKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\OperatorKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\OrderByKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\OutKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\OverrideKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ParamKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ParamsKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\PartialKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\PragmaKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\PrivateKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\PropertyKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ProtectedKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\PublicKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ReadOnlyKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\RecommenderTests.cs" />
+    <Compile Include="Recommendations\ReferenceKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\RefKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\RegionKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\RemoveKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\RestoreKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ReturnKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\SByteKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\SealedKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\SelectKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\SetKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ShortKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\SizeOfKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\StackAllocKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\StaticKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\StringKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\StructKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\SwitchKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ThisKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ThrowKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\TrueKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\TryKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\TypeKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\NameOfKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\TypeOfKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\TypeVarKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\UIntKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\ULongKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\UncheckedKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\UndefKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\UnsafeKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\UShortKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\UsingKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\VarKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\VirtualKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\VoidKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\VolatileKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\WarningKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\WhenKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\WhereKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\WhileKeywordRecommenderTests.cs" />
+    <Compile Include="Recommendations\YieldKeywordRecommenderTests.cs" />
+    <None Include="app.config" />
+    <None Include="project.json" />
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
+  <ImportGroup Label="Targets">
+    <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
+    <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
+  </ImportGroup>
+</Project>