Fix more scripting references

396acc69 · Jared Parsons · f65ad737 · 396acc69 · 396acc69 · 396acc69
3 changed file
--- a/Roslyn.sln
+++ b/Roslyn.sln
@@ -355,8 +355,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualStudioTest.Next", "sr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildBoss", "src\Tools\BuildBoss\BuildBoss.csproj", "{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Toolset", "build\Toolset\Toolset.csproj", "{57557F32-0635-421A-BCF8-549AED50F764}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptingTestUtilities", "src\Scripting\CoreTestUtilities\ScriptingTestUtilities.csproj", "{21A01C2D-2501-4619-8144-48977DD22D9C}"
 EndProject
 Global
@@ -3106,28 +3104,6 @@ Global
 		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|x64.Build.0 = Release|Any CPU
 		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|x86.ActiveCfg = Release|Any CPU
 		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|x86.Build.0 = Release|Any CPU
-<<<<<<< HEAD
-		{57557F32-0635-421A-BCF8-549AED50F764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Debug|ARM.Build.0 = Debug|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Debug|x64.Build.0 = Debug|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Debug|x86.Build.0 = Debug|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Release|Any CPU.Build.0 = Release|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Release|ARM.ActiveCfg = Release|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Release|ARM.Build.0 = Release|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Release|x64.ActiveCfg = Release|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Release|x64.Build.0 = Release|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Release|x86.ActiveCfg = Release|Any CPU
-		{57557F32-0635-421A-BCF8-549AED50F764}.Release|x86.Build.0 = Release|Any CPU
-=======
 		{21A01C2D-2501-4619-8144-48977DD22D9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{21A01C2D-2501-4619-8144-48977DD22D9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{21A01C2D-2501-4619-8144-48977DD22D9C}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -3148,7 +3124,6 @@ Global
 		{21A01C2D-2501-4619-8144-48977DD22D9C}.Release|x64.Build.0 = Release|Any CPU
 		{21A01C2D-2501-4619-8144-48977DD22D9C}.Release|x86.ActiveCfg = Release|Any CPU
 		{21A01C2D-2501-4619-8144-48977DD22D9C}.Release|x86.Build.0 = Release|Any CPU
->>>>>>> Separated out all of the scripting unit test projects
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3315,7 +3290,6 @@ Global
 		{FE0D4BDD-1C30-488E-A870-854F5B8C5014} = {8DBA5174-B0AA-4561-82B1-A46607697753}
 		{2E1658E2-5045-4F85-A64C-C0ECCD39F719} = {8DBA5174-B0AA-4561-82B1-A46607697753}
 		{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
-		{57557F32-0635-421A-BCF8-549AED50F764} = {FD0FAF5F-1DED-485C-99FA-84B97F3A8EEC}
 		{21A01C2D-2501-4619-8144-48977DD22D9C} = {38940C5F-97FD-4B2A-B2CD-C4E4EF601B05}
 	EndGlobalSection
 EndGlobal
--- a/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj
+++ b/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj
@@ -21,8 +21,10 @@
    <Reference Include="System.Xml" />
    <Reference Include="System.Xml.Linq" />
  </ItemGroup>
-  <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>
    <Compile Include="CsiTests.cs" />
    <Compile Include="InteractiveSessionTests.cs" />
@@ -58,9 +60,9 @@
      <Name>TestUtilities</Name>
      <Aliases>global,PortableTestUtils</Aliases>
    </ProjectReference>
-    <ProjectReference Include="..\CoreTest\ScriptingTest.csproj">
-      <Project>{2dae4406-7a89-4b5f-95c3-bc5472ce47ce}</Project>
-      <Name>ScriptingTest</Name>
+    <ProjectReference Include="..\CoreTestUtilities\ScriptingTestUtilities.csproj">
+      <Project>{21a01c2d-2501-4619-8144-48977dd22d9c}</Project>
+      <Name>ScriptingTestUtilities</Name>
    </ProjectReference>
    <ProjectReference Include="..\Core\Scripting.csproj">
      <Project>{12a68549-4e8c-42d6-8703-a09335f97997}</Project>

--- a/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj
+++ b/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj
@@ -7,7 +7,8 @@
    <ProjectGuid>{24973B4C-FD09-4EE1-97F4-EA03E6B12040}</ProjectGuid>
    <OutputType>Library</OutputType>
    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
    <AssemblyName>Microsoft.CodeAnalysis.VisualBasic.Scripting.Desktop.UnitTests</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
@@ -30,14 +31,14 @@
      <Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
      <Name>TestUtilities</Name>
    </ProjectReference>
+    <ProjectReference Include="..\CoreTestUtilities\ScriptingTestUtilities.csproj">
+      <Project>{21a01c2d-2501-4619-8144-48977dd22d9c}</Project>
+      <Name>ScriptingTestUtilities</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Core\Scripting.csproj">
      <Project>{12A68549-4E8C-42D6-8703-A09335F97997}</Project>
      <Name>Scripting</Name>
    </ProjectReference>
-    <ProjectReference Include="..\CoreTest\ScriptingTest.csproj">
-      <Project>{2DAE4406-7A89-4B5F-95C3-BC5472CE47CE}</Project>
-      <Name>ScriptingTest</Name>
-    </ProjectReference>
    <ProjectReference Include="..\VisualBasicTest\BasicScriptingTest.vbproj">
      <Project>{abc7262e-1053-49f3-b846-e3091bb92e8c}</Project>
      <Name>BasicScriptingTest</Name>
@@ -47,8 +48,10 @@
      <Name>BasicScripting</Name>
    </ProjectReference>
  </ItemGroup>
-  <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="System.Data" />
    <Reference Include="System.Runtime.Serialization" />