Update the csproj, vbproj and project.json files

BuildAndTest.proj

@@ -14,7 +14,7 @@
     <IncludePattern Condition="'$(IncludePattern)' == ''">*.UnitTests*.dll</IncludePattern>
     <OutputDirectory>Binaries\$(Configuration)</OutputDirectory>
     <NuGetPackageRoot>$(UserProfile)\.nuget\packages</NuGetPackageRoot>
-    <XunitVersion>1.9.2</XunitVersion>
+    <XunitVersion>2.1.0-beta4-build3109</XunitVersion>
   </PropertyGroup>
 
   <Target Name="Build">
@@ -68,7 +68,7 @@
       <TestAssemblies Include="$(OutputDirectory)\**\$(IncludePattern)" />
     </ItemGroup>
 
-    <Exec Command="$(OutputDirectory)\RunTests.exe $(NuGetPackageRoot)\xunit.runners\2.0.0-alpha-build2576\tools $(RunTestArgs) @(TestAssemblies, ' ')" />
+    <Exec Command="Binaries\$(Configuration)\RunTests.exe packages\xunit.runner.console.2.1.0-beta4-build3109\tools $(RunTestArgs) @(TestAssemblies, ' ')" />
 
   </Target>
 

build/Targets/Roslyn.Toolsets.Xunit.targets

@@ -3,8 +3,8 @@
 
   <PropertyGroup>
     <StartAction Condition="'$(StartActions)' == ''">Program</StartAction>
-    <StartProgram Condition="'$(StartProgram)' == ''">$(MSBuildThisFileDirectory)\..\..\..\packages\xunit.runners.2.0.0-alpha-build2576\tools\xunit.console.x86.exe</StartProgram>
-    <StartArguments Condition="'$(StartArguments)' == ''">$(AssemblyName).dll</StartArguments>
+    <StartProgram Condition="'$(StartProgram)' == ''">$(NuGetPackagesPath)\xunit.runner.console.2.1.0-beta4-build3109\tools\xunit.console.x86.exe</StartProgram>
+    <StartArguments Condition="'$(StartArguments)' == ''">$(AssemblyName).dll -html $(OurDir)\xUnitResults\$(AssemblyName).html -noshadow</StartArguments>
     <StartWorkingDirectory Condition="'$(StartWorkingDirectory)' == ''">$(OutDir)</StartWorkingDirectory>
   </PropertyGroup>
 

build/ToolsetPackages/project.json

@@ -6,7 +6,7 @@
         "Microsoft.Net.Compilers": "1.1.0-beta1-20150727-01",
         "Microsoft.Net.RoslynDiagnostics": "1.1.1-beta1-20150818-01",
         "FakeSign": "0.9.2",
-        "xunit": "1.9.2",
+        "xunit": "2.1.0-beta4-build3109",
         "xunit.runner.console": "2.1.0-beta4-build3109",
         "xunit.runners": "2.0.0-alpha-build2576"
     },

cibuild.sh

@@ -10,7 +10,7 @@ usage()
     echo "  --os <os>           OS to run (Linux / Darwin)"
 }
 
-XUNIT_VERSION=2.0.0-alpha-build2576
+XUNIT_VERSION=2.1.0-beta4-build3109
 BUILD_CONFIGURATION=Debug
 OS_NAME=$(uname -s)
 USE_CACHE=true

src/Compilers/CSharp/Test/CommandLine/project.json

 {
   "dependencies": {
     "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net45": { }

src/Compilers/CSharp/Test/Emit/project.json

-{
+{
   "dependencies": {
     "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02",
-    "Microsoft.DiaSymReader": "1.0.6",
-    "xunit": "1.9.2"
+    "Microsoft.DiaSymReader": "1.0.5.1",
+    "xunit": "1.9.2",
+    "xunit": "2.1.0-beta4-build3109",
   },
   "frameworks": {
-    "net45": {}
+    "net45": {
+    }
   }
-}
+}
\ No newline at end of file

src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj

@@ -144,4 +144,4 @@
     <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Compilers/CSharp/Test/Semantic/project.json

 {
   "dependencies": {
     "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net45": { }

src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj

@@ -198,4 +198,4 @@
     <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Compilers/CSharp/Test/Symbol/project.json

 {
   "dependencies": {
     "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net45": { }

src/Compilers/CSharp/Test/Syntax/project.json

 {
   "dependencies": {
     "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net45": { }

src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj

@@ -62,6 +62,5 @@
   </ItemGroup>
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />
-    <Import Project="..\..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
 </Project>

src/Compilers/CSharp/Test/WinRT/project.json

 {
   "dependencies": {
     "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net45": { }

src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj

@@ -178,4 +178,4 @@
     <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Compilers/Core/CodeAnalysisTest/project.json

 {
   "dependencies": {
-    "xunit": "1.9.2",
+    "xunit": "2.1.0-beta4-build3109",
   },
   "frameworks": {
     "net45": { }

src/Compilers/Core/MSBuildTaskTests/project.json

@@ -3,9 +3,9 @@
     "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02",
     "Microsoft.DiaSymReader": "1.0.6",
     "Moq": "4.2.1402.2112",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net45": {}
   }
-}
+}
\ No newline at end of file

src/Compilers/Core/VBCSCompilerTests/project.json

-{
+{
   "dependencies": {
-    "Microsoft.DiaSymReader": "1.0.6",
+    "Microsoft.DiaSymReader": "1.0.5.1",
     "Moq": "4.2.1402.2112",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109",
   },
   "frameworks": {
-    "net45": {}
+    "net45": { }
   }
-}
+}
\ No newline at end of file

src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj

@@ -98,4 +98,4 @@
     <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Compilers/VisualBasic/Test/CommandLine/project.json

 {
   "dependencies": {
     "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net45": { }

src/Compilers/VisualBasic/Test/Emit/project.json

-{
+{
   "dependencies": {
     "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02",
-    "Microsoft.DiaSymReader": "1.0.6",
-    "xunit": "1.9.2"
+    "Microsoft.DiaSymReader": "1.0.5.1",
+    "xunit": "2.1.0-beta4-build3109",
   },
   "frameworks": {
-    "net45": {}
+    "net45": { }
   }
-}
+}
\ No newline at end of file

src/Compilers/VisualBasic/Test/Semantic/project.json

 {
   "dependencies": {
-    "xunit": "1.9.2",
+    "xunit": "2.1.0-beta4-build3109",
   },
   "frameworks": {
     "net45": { }

src/Compilers/VisualBasic/Test/Symbol/project.json

 {
   "dependencies": {
-    "xunit": "1.9.2",
+    "xunit": "2.1.0-beta4-build3109",
   },
   "frameworks": {
     "net45": { }

src/Compilers/VisualBasic/Test/Syntax/project.json

 {
   "dependencies": {
     "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02",
+    "xunit" : "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net45": { }

src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj

@@ -657,4 +657,4 @@
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/EditorFeatures/CSharpTest/project.json

@@ -3,9 +3,9 @@
     "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02",
     "Moq": "4.2.1402.2112",
     "System.Diagnostics.Process": "4.0.0-beta-23123",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net46": {}
   }
-}
+}
\ No newline at end of file

src/EditorFeatures/Test/EditorServicesTest.csproj

@@ -369,4 +369,4 @@
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/EditorFeatures/Test/project.json

@@ -9,7 +9,7 @@
     "System.Runtime": "4.0.20",
     "System.Runtime.Extensions": "4.0.10",
     "System.Threading": "4.0.10",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net46": { }
@@ -17,4 +17,4 @@
   "runtimes": {
     "win7-anycpu": { }
   }
-}
+}
\ No newline at end of file

src/EditorFeatures/Test2/project.json

@@ -8,9 +8,9 @@
     "System.Runtime": "4.0.20",
     "System.Runtime.Extensions": "4.0.10",
     "System.Threading": "4.0.10",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net46": { }
   }
-}
+}
\ No newline at end of file

src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj

@@ -31,11 +31,21 @@
     <DefineConstants>$(DefineConstants);ARM</DefineConstants>
     <PlatformTarget>ARM</PlatformTarget>
   </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
+      <Project>{76c6f005-c89d-4348-bb4a-391898dbeb52}</Project>
+      <Name>TestUtilities.Desktop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
+      <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
+      <Name>TestUtilities.FX45</Name>
+    </ProjectReference>
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="ReachFramework" />
-    <Reference Include="System" />
+    <Reference Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6\System.dll" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
@@ -88,4 +98,4 @@
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/EditorFeatures/TestUtilities/project.json

 {
   "dependencies": {
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109",
+    "xunit.extensibility.execution": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net46": { }

src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj

@@ -624,4 +624,4 @@
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/EditorFeatures/VisualBasicTest/project.json

@@ -8,7 +8,7 @@
     "System.Runtime": "4.0.20",
     "System.Runtime.Extensions": "4.0.10",
     "System.Threading": "4.0.10",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net46": { }

src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json

-{
+{
   "dependencies": {
-    "Microsoft.DiaSymReader": "1.0.6",
-    "xunit": "1.9.2"
+    "Microsoft.DiaSymReader": "1.0.5.1",
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
-    "net45": {}
+    "net45": { }
   }
-}
+}
\ No newline at end of file

src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj

@@ -108,4 +108,4 @@
     <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json

 {
   "dependencies": {
     "System.Collections.Immutable": "1.1.37",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net45": {}
   }
-}
+}
\ No newline at end of file

src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json

-{
+{
   "dependencies": {
-    "Microsoft.DiaSymReader": "1.0.6",
-    "xunit": "1.9.2"
+    "Microsoft.DiaSymReader": "1.0.5.1",
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
-    "net45": {}
+    "net45": { }
   }
-}
+}
\ No newline at end of file

src/ExpressionEvaluator/Core/Test/ResultProvider/project.json

 {
   "dependencies": {
     "System.Collections.Immutable": "1.1.37",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net45": {}
   }
-}
+}
\ No newline at end of file

src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json

-{
+{
   "dependencies": {
-    "Microsoft.DiaSymReader": "1.0.6",
-    "xunit": "1.9.2"
+    "Microsoft.DiaSymReader": "1.0.5.1",     
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
-    "net45": {}
+    "net45": { }
   }
-}
+}
\ No newline at end of file

src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/project.json

 {
   "dependencies": {
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net45": { }

src/Interactive/HostTest/InteractiveHostTest.csproj

@@ -117,4 +117,4 @@
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Interactive/HostTest/project.json

@@ -6,9 +6,9 @@
     "System.Runtime": "4.0.20",
     "System.Runtime.Extensions": "4.0.10",
     "System.Threading": "4.0.10",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net46": { }
   }
-}
+}
\ No newline at end of file

src/InteractiveWindow/EditorTest/InteractiveWindowTest.csproj

@@ -96,4 +96,4 @@
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/InteractiveWindow/EditorTest/project.json

@@ -5,9 +5,9 @@
     "System.Diagnostics.Debug": "4.0.10",
     "System.Runtime": "4.0.20",
     "System.Runtime.Extensions": "4.0.10",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net46": { }
   }
-}
+}
\ No newline at end of file

src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj

@@ -66,6 +66,5 @@
   <ItemGroup />
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />
-    <Import Project="..\..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
 </Project>

src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json

 {
   "dependencies": {
     "System.Collections.Immutable": "1.1.37",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net452": {}
   }
-}
+}
\ No newline at end of file

src/Samples/CSharp/MakeConst/Test/MakeConstCS.UnitTests.csproj

@@ -58,6 +58,5 @@
   <ItemGroup />
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />
-    <Import Project="..\..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Samples/CSharp/MakeConst/Test/project.json

 {
   "dependencies": {
     "System.Collections.Immutable": "1.1.37",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net452": {}
   }
-}
+}
\ No newline at end of file

src/Samples/Shared/UnitTestFramework/UnitTestFramework.csproj

@@ -63,6 +63,5 @@
   </ItemGroup>
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
-    <Import Project="..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Samples/Shared/UnitTestFramework/project.json

@@ -2,9 +2,9 @@
   "dependencies": {
     "Moq": "4.2.1402.2112",
     "System.Collections.Immutable": "1.1.37",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net452": {}
   }
-}
+}
\ No newline at end of file

src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj

@@ -76,6 +76,5 @@
   </ItemGroup>
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />
-    <Import Project="..\..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json

 {
   "dependencies": {
     "System.Collections.Immutable": "1.1.37",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net452": {}
   }
-}
+}
\ No newline at end of file

src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj

@@ -60,6 +60,5 @@
   </ItemGroup>
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />
-    <Import Project="..\..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json

 {
   "dependencies": {
     "System.Collections.Immutable": "1.1.37",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net452": {}
   }
-}
+}
\ No newline at end of file

src/Samples/VisualBasic/MakeConst/Test/MakeConstVB.UnitTests.vbproj

@@ -82,6 +82,5 @@
   </ItemGroup>
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\..\..\build\Targets\VSL.Imports.targets" />
-    <Import Project="..\..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Samples/VisualBasic/MakeConst/Test/project.json

 {
   "dependencies": {
     "System.Collections.Immutable": "1.1.37",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net452": {}
   }
-}
+}
\ No newline at end of file

src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj

@@ -74,4 +74,4 @@
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj

@@ -70,4 +70,4 @@
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Scripting/CoreTest/ScriptingTest.csproj

@@ -81,4 +81,4 @@
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

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

@@ -77,4 +77,4 @@
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj

@@ -163,8 +163,9 @@
   <ItemGroup>
     <None Include="project.json" />
   </ItemGroup>
+  <Import Project="..\Shared\TestUtilities.projitems" Label="Shared" />
   <ImportGroup Label="Targets">
     <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Test/Utilities/Portable.FX45/TestUtilities.FX45.csproj

@@ -3,7 +3,6 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="Settings">
     <Import Project="..\..\..\..\build\Targets\VSL.Settings.targets" />
-    <Import Project="..\Shared\TestUtilities.projitems" Label="Shared" />
   </ImportGroup>
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
@@ -41,6 +40,52 @@
       <Name>CompilerTestResources</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup Label="File References">
+    <Reference Include="System.Reflection.Metadata">
+      <HintPath>..\..\..\..\packages\System.Reflection.Metadata.$(SystemReflectionMetadataVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable">
+      <HintPath>..\..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.DiaSymReader">
+      <HintPath>..\..\..\..\packages\Microsoft.DiaSymReader.1.0.5\lib\net45\Microsoft.DiaSymReader.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM' ">
+    <PlatformTarget>ARM</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM' ">
+    <PlatformTarget>ARM</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Any CPU' ">
+    <PlatformTarget>
+    </PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Any CPU' ">
+    <PlatformTarget>
+    </PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutDir>..\..\..\..\Binaries\Debug\amd64</OutDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <NoWarn>1591</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutDir>..\..\..\..\Binaries\Release\amd64</OutDir>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <NoWarn>1591</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />

src/Test/Utilities/Portable.FX45/project.json

-{
+{
   "dependencies": {
     "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02",
-    "Microsoft.DiaSymReader": "1.0.6",
-    "xunit": "1.9.2"
+    "Microsoft.DiaSymReader": "1.0.5.1",
+    "xunit": "2.1.0-beta4-build3109",
   },
   "frameworks": {
-    "net45": {}
+    "net45": { }
   },
   "runtimes": {
-    "win7-anycpu": {},
-    "ubuntu.14.04-anycpu": {}
+    "win7-anycpu": { },
+    "ubuntu.14.04-anycpu": { }
   }
-}
+}
\ No newline at end of file

src/Test/Utilities/Portable/TestUtilities.csproj

@@ -124,4 +124,4 @@
       <UserProperties project_1json__JSONSchema="http://json.schemastore.org/launchsettings" />
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>
\ No newline at end of file

src/VisualStudio/CSharp/Test/project.json

@@ -7,9 +7,9 @@
     "System.Runtime": "4.0.20",
     "System.Runtime.Extensions": "4.0.10",
     "System.Threading": "4.0.10",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net46": { }
   }
-}
+}
\ No newline at end of file

src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj

@@ -456,4 +456,4 @@
     <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/VisualStudio/Core/Test/project.json

@@ -8,9 +8,9 @@
     "System.Runtime": "4.0.20",
     "System.Runtime.Extensions": "4.0.10",
     "System.Threading": "4.0.10",
-    "xunit": "1.9.2"
+    "xunit": "2.1.0-beta4-build3109"
   },
   "frameworks": {
     "net46": { }
   },
-}
+}
\ No newline at end of file

src/Workspaces/CoreTest/ServicesTest.csproj

@@ -291,4 +291,4 @@
     <Import Project="..\..\..\build\Targets\VSL.Imports.targets" />
     <Import Project="..\..\..\build\Targets\Roslyn.Toolsets.Xunit.targets" />
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

src/Workspaces/CoreTest/project.json

 {
   "dependencies": {
-    "xunit.extensions": "1.9.2"
   },
   "frameworks": {
     "net452": { }