Fixup

src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj

@@ -11,7 +11,7 @@
     <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
     <ProjectTypeGuids>{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}</ProjectTypeGuids>
-    <RoslynProjectType>UnitTestPortable</RoslynProjectType>
+    <RoslynProjectType>UnitTest</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup>

src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb

@@ -847,15 +847,15 @@ Public Class BuildDevDivInsertionFiles
         add("Dlls\TestUtilities\Roslyn.Test.Utilities.dll")
         add("Dlls\TestUtilities\Roslyn.Test.Utilities.dll.config")
         add("Dlls\TestUtilities.FX45\Roslyn.Test.Utilities.FX45.dll")
-        add("UnitTests\Current\BasicUndo.dll")
-        add("UnitTests\Current\Esent.Interop.dll")
-        add("UnitTests\Current\Moq.dll")
-        add("UnitTests\Current\Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll")
-        add("UnitTests\Current\Microsoft.DiaSymReader.dll")
-        add("UnitTests\Current\Microsoft.DiaSymReader.Native.amd64.dll")
-        add("UnitTests\Current\Microsoft.DiaSymReader.Native.x86.dll")
-        add("UnitTests\Current\Microsoft.VisualStudio.Platform.VSEditor.Interop.dll")
-        add("Vsix\VisualStudioSetup.Next\Microsoft.VisualStudio.CallHierarchy.Package.Definitions.dll")
+        add("UnitTests\EditorServicesTest\BasicUndo.dll")
+        add("UnitTests\EditorServicesTest\Esent.Interop.dll")
+        add("UnitTests\EditorServicesTest\Moq.dll")
+        add("UnitTests\EditorServicesTest\Microsoft.CodeAnalysis.Test.Resources.Proprietary.dll")
+        add("UnitTests\EditorServicesTest\Microsoft.DiaSymReader.dll")
+        add("UnitTests\EditorServicesTest\Microsoft.DiaSymReader.Native.amd64.dll")
+        add("UnitTests\EditorServicesTest\Microsoft.DiaSymReader.Native.x86.dll")
+        add("UnitTests\EditorServicesTest\Microsoft.VisualStudio.Platform.VSEditor.Interop.dll")
+        add("UnitTests\VisualStudioTest.Next\Microsoft.VisualStudio.CallHierarchy.Package.Definitions.dll")
         add("Dlls\Concord\Microsoft.VisualStudio.Debugger.Engine.dll")
         add("Vsix\VisualStudioTestSetup\Microsoft.Diagnostics.Runtime.dll")
         add("Vsix\VisualStudioTestSetup\Roslyn.VisualStudio.Test.Setup.vsix")

src/Test/DeployCoreClrTestRuntime/DeployCoreClrTestRuntime.csproj

@@ -69,10 +69,6 @@
       <Project>{066f0dbd-c46c-4c20-afec-99829a172625}</Project>
       <Name>CSharpScripting</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Scripting\VisualBasicTest\BasicScriptingTest.vbproj">
-      <Project>{abc7262e-1053-49f3-b846-e3091bb92e8c}</Project>
-      <Name>BasicScriptingTest</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Scripting\VisualBasic\BasicScripting.vbproj">
       <Project>{3e7dea65-317b-4f43-a25d-62f18d96cfd7}</Project>
       <Name>BasicScripting</Name>

src/Test/DeployDesktopTestRuntime/DeployDesktopTestRuntime.csproj

@@ -62,10 +62,6 @@
       <Project>{066f0dbd-c46c-4c20-afec-99829a172625}</Project>
       <Name>CSharpScripting</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Scripting\VisualBasicTest\BasicScriptingTest.vbproj">
-      <Project>{abc7262e-1053-49f3-b846-e3091bb92e8c}</Project>
-      <Name>BasicScriptingTest</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Scripting\VisualBasic\BasicScripting.vbproj">
       <Project>{3e7dea65-317b-4f43-a25d-62f18d96cfd7}</Project>
       <Name>BasicScripting</Name>