Down to just a few remaining references

src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj

@@ -17,6 +17,8 @@
     <Compile Include="..\..\Shared\GlobalAssemblyCacheHelpers\FusionAssemblyIdentity.cs">
       <Link>FusionAssemblyIdentity.cs</Link>
     </Compile>
+    <Compile Include="Diagnostics\SuppressMessageAttributeTests.cs" />
+    <Compile Include="Diagnostics\SuppressMessageAttributeTests.DiagnosticAnalyzers.cs" />
     <Compile Include="EmbeddedTextTests.cs" />
     <Compile Include="AnalyzerFileReferenceTests.cs" />
     <Compile Include="AssemblyUtilitiesTests.cs" />
@@ -107,8 +109,6 @@
     <Compile Include="CommonTypedConstantTests.cs" />
     <Compile Include="CorLibTypesTests.cs" />
     <Compile Include="DiagnosticBagTests.cs" />
-    <Compile Include="Diagnostics\SuppressMessageAttributeTests.cs" />
-    <Compile Include="Diagnostics\SuppressMessageAttributeTests.DiagnosticAnalyzers.cs" />
     <Compile Include="Diagnostics\SuppressMessageTargetSymbolResolverTests.cs" />
     <Compile Include="DiffUtilTests.cs" />
     <Compile Include="Emit\EmitBaselineTests.cs" />

src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj

@@ -63,10 +63,6 @@
       <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>

src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj

@@ -63,10 +63,6 @@
       <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>
@@ -97,8 +93,10 @@
     <AssemblyName>Roslyn.Services.Editor.CSharp.UnitTests2</AssemblyName>
     <RoslynProjectType>UnitTest</RoslynProjectType>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="PresentationCore" />

src/EditorFeatures/Test/EditorServicesTest.csproj

@@ -15,6 +15,10 @@
     <RoslynProjectType>UnitTest</RoslynProjectType>
   </PropertyGroup>
   <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\Compilers\Core\CodeAnalysisTest\CodeAnalysisTest.csproj">
+      <Project>{a4c99b85-765c-4c65-9c2a-bb609aab09e6}</Project>
+      <Name>CodeAnalysisTest</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Compilers\Core\Portable\CodeAnalysis.csproj">
       <Project>{1EE8CAD3-55F9-4D91-96B2-084641DA9A6C}</Project>
       <Name>CodeAnalysis</Name>
@@ -113,10 +117,6 @@
       <Project>{76C6F005-C89D-4348-BB4A-39189DDBEB52}</Project>
       <Name>ServicesTestUtilities</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Compilers\Core\CodeAnalysisTest\CodeAnalysisTest.csproj">
-      <Project>{A4C99B85-765C-4C65-9C2A-BB609AAB09E6}</Project>
-      <Name>CodeAnalysisTest</Name>
-    </ProjectReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
   </PropertyGroup>
@@ -142,11 +142,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AbstractCommandHandlerTestState.cs" />
     <Compile Include="Attributes\AttributeTests.cs" />
-    <Compile Include="BlockCommentEditing\AbstractBlockCommentEditingTests.cs" />
-    <Compile Include="BraceHighlighting\AbstractBraceHighlightingTests.cs" />
-    <Compile Include="CallHierarchy\CallHierarchyTestState.cs" />
     <Compile Include="CodeActions\CodeActionSmartTagProducerTests.cs" />
     <Compile Include="CodeAnalysisResources.cs" />
     <Compile Include="CodeFixes\CodeFixServiceTests.cs" />

src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj

@@ -134,13 +134,17 @@
     <Compile Include="..\..\visualstudio\core\next\remote\JsonRpcSession.cs">
       <Link>Remote\JsonRpcSession.cs</Link>
     </Compile>
+    <Compile Include="AbstractCommandHandlerTestState.cs" />
     <Compile Include="Async\AsynchronousOperationBlocker.cs" />
     <Compile Include="Async\Checkpoint.cs" />
     <Compile Include="Async\WaitHelper.cs" />
     <Compile Include="AutomaticCompletion\AbstractAutomaticBraceCompletionTests.cs" />
     <Compile Include="AutomaticCompletion\AbstractAutomaticLineEnderTests.cs" />
     <Compile Include="BlindAggregatorFactory.cs" />
+    <Compile Include="BlockCommentEditing\AbstractBlockCommentEditingTests.cs" />
+    <Compile Include="BraceHighlighting\AbstractBraceHighlightingTests.cs" />
     <Compile Include="BraceMatching\AbstractBraceMatcherTests.cs" />
+    <Compile Include="CallHierarchy\CallHierarchyTestState.cs" />
     <Compile Include="ChangeSignature\AbstractChangeSignatureTests.cs" />
     <Compile Include="ChangeSignature\ChangeSignatureTestState.cs" />
     <Compile Include="ChangeSignature\TestChangeSignatureOptionsService.cs" />