Removed more references

src/EditorFeatures/Test/EditorServicesTest.csproj

@@ -208,8 +208,6 @@
     <Compile Include="Structure\BlockSpanTests.cs" />
     <Compile Include="Structure\StructureTaggerTests.cs" />
     <Compile Include="Preview\PreviewWorkspaceTests.cs" />
-    <Compile Include="RenameTracking\MockPreviewDialogService.cs" />
-    <Compile Include="RenameTracking\MockRefactorNotifyService.cs" />
     <Compile Include="RenameTracking\RenameTrackingTaggerProviderTests.cs" />
     <Compile Include="RenameTracking\RenameTrackingTestState.cs" />
     <Compile Include="RenameTracking\RenameTrackingWaiter.cs" />
@@ -225,7 +223,6 @@
     <Compile Include="Utilities\BloomFilterTests.cs" />
     <Compile Include="Utilities\PatternMatcherTests.cs" />
     <Compile Include="Utilities\SymbolEquivalenceComparerTests.cs" />
-    <Compile Include="Utilities\TestWaitContext.cs" />
     <Compile Include="Workspaces\ProjectCacheHostServiceFactoryTests.cs" />
     <Compile Include="Workspaces\TextFactoryTests.cs" />
   </ItemGroup>

src/EditorFeatures/Test2/EditorServicesTest2.vbproj

@@ -69,10 +69,6 @@
       <Project>{EDC68A0E-C68D-4A74-91B7-BF38EC909888}</Project>
       <Name>Features</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/Test2/Rename/RenameTestHelpers.vb

@@ -121,7 +121,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
                 workspace.ExportProvider.GetExport(Of IWaitIndicator)().Value,
                 workspace.ExportProvider.GetExport(Of IInlineRenameService)().Value,
                 workspace.ExportProvider.GetExport(Of IDiagnosticAnalyzerService)().Value,
-                SpecializedCollections.SingletonEnumerable(New MockRefactorNotifyService()),
+                {New MockRefactorNotifyService()},
                 DirectCast(workspace.ExportProvider.GetExports(Of IAsynchronousOperationListener, FeatureMetadata), IEnumerable(Of Lazy(Of IAsynchronousOperationListener, FeatureMetadata))))
 
             Return tracker.CreateTagger(Of RenameTrackingTag)(document.GetTextBuffer())

src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj

@@ -201,6 +201,8 @@
     <Compile Include="OptionExtensions.cs" />
     <Compile Include="QuickInfo\AbstractQuickInfoSourceTests.cs" />
     <Compile Include="QuickInfo\AbstractSemanticQuickInfoSourceTests.cs" />
+    <Compile Include="RenameTracking\MockPreviewDialogService.cs" />
+    <Compile Include="RenameTracking\MockRefactorNotifyService.cs" />
     <Compile Include="Semantics\SpeculationAnalyzerTestsBase.cs" />
     <Compile Include="ServiceTestExportProvider.cs" />
     <Compile Include="SignatureHelp\AbstractSignatureHelpProviderTests.cs" />
@@ -224,6 +226,7 @@
     <Compile Include="Traits.cs" />
     <Compile Include="TypeInferrer\TypeInferrerTestBase.cs" />
     <Compile Include="Utilities\TestEditorOptions.cs" />
+    <Compile Include="Utilities\TestWaitContext.cs" />
     <Compile Include="VisualStudioSendKeys.cs" />
     <Compile Include="Workspaces\CSharpTestWorkspaceFixture.cs" />
     <Compile Include="Workspaces\MefTestWorkspace.cs" />

src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj

@@ -22,6 +22,10 @@
       <Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>
       <Name>CSharpCodeAnalysis</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\EditorFeatures\Test2\EditorServicesTest2.vbproj">
+      <Project>{3cea0d69-00d3-40e5-a661-dc41ea07269b}</Project>
+      <Name>EditorServicesTest2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
       <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
       <Name>TestUtilities.FX45</Name>
@@ -50,10 +54,6 @@
       <Project>{EDC68A0E-C68D-4A74-91B7-BF38EC909888}</Project>
       <Name>Features</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\EditorFeatures\Test2\EditorServicesTest2.vbproj">
-      <Project>{3CEA0D69-00D3-40E5-A661-DC41EA07269B}</Project>
-      <Name>EditorServicesTest2</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\EditorFeatures\Text\TextEditorFeatures.csproj">
       <Project>{18F5FBB8-7570-4412-8CC7-0A86FF13B7BA}</Project>
       <Name>TextEditorFeatures</Name>
@@ -70,10 +70,6 @@
       <Project>{3CDEEAB7-2256-418A-BEB2-620B5CB16302}</Project>
       <Name>EditorFeatures</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\EditorFeatures\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>