More progress

src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj

@@ -390,7 +390,6 @@
     <Compile Include="UseObjectInitializer\UseObjectInitializerTests.cs" />
     <Compile Include="Utilities\CodeSnippets.cs" />
     <Compile Include="Utilities\CSharpServiceTestExtensions.cs" />
-    <Compile Include="Utilities\Options.cs" />
     <Compile Include="TypeInferrer\TypeInferrerTests.Delegate.cs" />
     <Compile Include="TypeInferrer\TypeInferrerTests.cs" />
     <Compile Include="Workspaces\WorkspaceTests.cs" />

src/EditorFeatures/CSharpTest2/CSharpEditorServicesTest2.csproj

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

src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj

@@ -225,6 +225,7 @@
     <Compile Include="Threading\WpfTestCase.cs" />
     <Compile Include="Traits.cs" />
     <Compile Include="TypeInferrer\TypeInferrerTestBase.cs" />
+    <Compile Include="Utilities\Options.cs" />
     <Compile Include="Utilities\TestEditorOptions.cs" />
     <Compile Include="Utilities\TestWaitContext.cs" />
     <Compile Include="VisualStudioSendKeys.cs" />
@@ -267,6 +268,7 @@
     <InternalsVisibleToTest Include="Roslyn.Compilers.VisualBasic.Test.Utilities" />
     <InternalsVisibleToTest Include="Roslyn.InteractiveHost.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.CSharp.UnitTests" />
+    <InternalsVisibleToTest Include="Roslyn.Services.Editor.CSharp.UnitTests2" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.UnitTests" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.UnitTests2" />
     <InternalsVisibleToTest Include="Roslyn.Services.Editor.VisualBasic.UnitTests" />
@@ -281,4 +283,4 @@
   <ItemGroup />
   <Import Project="..\..\..\build\Targets\Imports.targets" />
   <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
-</Project>
\ No newline at end of file
+</Project>

src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj

@@ -39,10 +39,6 @@
       <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
       <Name>Scripting</Name>
     </ProjectReference>
-    <ProjectReference Include="..\VisualBasicTest\BasicScriptingTest.vbproj">
-      <Project>{abc7262e-1053-49f3-b846-e3091bb92e8c}</Project>
-      <Name>BasicScriptingTest</Name>
-    </ProjectReference>
     <ProjectReference Include="..\VisualBasic\BasicScripting.vbproj">
       <Project>{3E7DEA65-317B-4F43-A25D-62F18D96CFD7}</Project>
       <Name>BasicScripting</Name>

src/Tools/BuildBoss/ProjectCheckerUtil.cs

@@ -133,7 +133,7 @@ private bool CheckProjectReferences(TextWriter textWriter)
             allGood &= CheckProjectReferencesComplete(textWriter, declaredList);
 
             // Disabling this check until we have time to discuss the team implications.
-            allGood &= CheckUnitTestReferenceRestriction(textWriter, declaredList);
+            // allGood &= CheckUnitTestReferenceRestriction(textWriter, declaredList);
 
             allGood &= CheckTransitiveReferences(textWriter, declaredList);