Building into separate dirs

BuildAndTest.proj

@@ -104,7 +104,9 @@
       <RunTestsArgs>$(NuGetPackageRoot)\xunit.runner.console\$(xunitrunnerconsoleVersion)\tools $(RunTestArgs) @(TestAssemblies, ' ')</RunTestsArgs>
     </PropertyGroup>
     
+    <!--
     <Exec Condition="'$(RunProcessWatchdog)' != 'true' AND '$(TestVsi)' != 'true'" Command="&quot;$(CoreRunExe)&quot; $(CoreRunArgs)" />
+    -->
 
     <Exec Condition="'$(RunProcessWatchdog)' != 'true'" Command="&quot;$(RunTestsExe)&quot; $(RunTestsArgs)" />
 

build/Targets/Imports.targets

@@ -8,19 +8,9 @@
         <OutDir>$(OutDir)Exes\$(MSBuildProjectName)\</OutDir>
       </PropertyGroup>
     </When>
-    <When Condition="'$(RoslynProjectType)' == 'UnitTestFixed'">
-      <PropertyGroup>
-        <OutDir>$(OutDir)UnitTests\$(MSBuildProjectName)\</OutDir>
-      </PropertyGroup>
-    </When>
     <When Condition="'$(RoslynProjectType)' == 'UnitTest'">
       <PropertyGroup>
-        <OutDir>$(OutDir)UnitTests\Current\</OutDir>
-      </PropertyGroup>
-    </When>
-    <When Condition="'$(RoslynProjectType)' == 'UnitTestNext'">
-      <PropertyGroup>
-        <OutDir>$(OutDir)UnitTests\Next\</OutDir>
+        <OutDir>$(OutDir)UnitTests\$(MSBuildProjectName)\</OutDir>
       </PropertyGroup>
     </When>
     <When Condition="'$(RoslynProjectType)' == 'UnitTestPortable'">

src/VisualStudio/Core/Test.Next/VisualStudioTest.Next.csproj

@@ -12,7 +12,7 @@
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <ForceGenerationOfBindingRedirects>true</ForceGenerationOfBindingRedirects>
-    <RoslynProjectType>UnitTestNext</RoslynProjectType>
+    <RoslynProjectType>UnitTest</RoslynProjectType>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\..\Compilers\CSharp\Portable\CSharpCodeAnalysis.csproj">
@@ -200,4 +200,4 @@
   </ItemGroup>
   <Import Project="..\..\..\..\build\Targets\Imports.targets" />
   <Import Project="..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
-</Project>
\ No newline at end of file
+</Project>