Merge pull request #10681 from davkean/xUnit

Unified dependencies to xUnit

Merge pull request #10681 from davkean/xUnit
Unified dependencies to xUnit
7907f109 · David Kean · e8c8e309 · 995ba6c7 · 7907f109 · 7907f109
82 changed file
--- a/Roslyn.sln
+++ b/Roslyn.sln
@@ -345,6 +345,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Immutable", "src\Dependenci
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Metadata", "src\Dependencies\Metadata\Metadata.csproj", "{E6796B97-D5C6-45B2-AE46-351D15DCFC71}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xUnit.net", "src\Dependencies\xUnit.net\xUnit.net.csproj", "{8635CB8F-D210-41ED-B4FF-71502CDB475C}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Test\Utilities\Shared\TestUtilities.projitems*{76c6f005-c89d-4348-bb4a-391898dbeb52}*SharedItemsImports = 4
@@ -377,18 +379,18 @@ Global
 		src\ExpressionEvaluator\CSharp\Source\ResultProvider\CSharpResultProvider.projitems*{bf9dac1e-3a5e-4dc3-bb44-9a64e0d4e9d3}*SharedItemsImports = 4
 		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{afde6bea-5038-4a4a-a88e-dbd2e4088eed}*SharedItemsImports = 4
 		src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{fa0e905d-ec46-466d-b7b2-3b5557f9428c}*SharedItemsImports = 4
-		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
 		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
-		src\Compilers\Core\CommandLine\CommandLine.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4
+		src\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems*{1ee8cad3-55f9-4d91-96b2-084641da9a6c}*SharedItemsImports = 4
 		src\Compilers\Core\MSBuildTask\Shared\MSBuildTask.Shared.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4
+		src\Compilers\Core\CommandLine\CommandLine.projitems*{7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3}*SharedItemsImports = 4
 		src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{3973b09a-4fbf-44a5-8359-3d22ceb71f71}*SharedItemsImports = 4
 		src\ExpressionEvaluator\Core\Source\ResultProvider\ResultProvider.projitems*{bedc5a4a-809e-4017-9cfd-6c8d4e1847f0}*SharedItemsImports = 4
 		src\Compilers\CSharp\CSharpAnalyzerDriver\CSharpAnalyzerDriver.projitems*{b501a547-c911-4a05-ac6e-274a50dff30e}*SharedItemsImports = 4
 		src\Compilers\VisualBasic\BasicAnalyzerDriver\BasicAnalyzerDriver.projitems*{2523d0e6-df32-4a3e-8ae0-a19bffae2ef6}*SharedItemsImports = 4
 		src\Compilers\Core\CommandLine\CommandLine.projitems*{4b45ca0c-03a0-400f-b454-3d4bcb16af38}*SharedItemsImports = 4
 		src\Compilers\Core\SharedCollections\SharedCollections.projitems*{c1930979-c824-496b-a630-70f5369a636f}*SharedItemsImports = 13
-		src\Compilers\Core\CommandLine\CommandLine.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4
 		src\Compilers\Core\MSBuildTask\Shared\MSBuildTask.Shared.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4
+		src\Compilers\Core\CommandLine\CommandLine.projitems*{d874349c-8bb3-4bdc-8535-2d52ccca1198}*SharedItemsImports = 4
 		src\Compilers\Core\CommandLine\CommandLine.projitems*{e3cd2895-76a8-4d11-a316-ea67cb5ea42c}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -2932,6 +2934,26 @@ Global
 		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|x64.Build.0 = Debug|Any CPU
 		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|x86.ActiveCfg = Debug|Any CPU
 		{E6796B97-D5C6-45B2-AE46-351D15DCFC71}.Release|x86.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|x64.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|x86.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|ARM.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|ARM.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|x64.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|x64.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|x86.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3090,5 +3112,6 @@ Global
 		{D2B8B03E-A85D-48A2-818F-9177D89586A9} = {C2D1346B-9665-4150-B644-075CF1636BAA}
 		{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA} = {C2D1346B-9665-4150-B644-075CF1636BAA}
 		{E6796B97-D5C6-45B2-AE46-351D15DCFC71} = {C2D1346B-9665-4150-B644-075CF1636BAA}
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C} = {C2D1346B-9665-4150-B644-075CF1636BAA}
 	EndGlobalSection
 EndGlobal
--- a/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj
+++ b/src/Compilers/CSharp/Test/CommandLine/CSharpCommandLineTest.csproj
@@ -17,6 +17,10 @@
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
  </PropertyGroup>
  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\Test\Utilities\CSharp.Desktop\CSharpCompilerTestUtilities.Desktop.csproj">
      <Project>{7a4b2176-7bfd-4b75-a61a-e25a1fdd0a1e}</Project>
      <Name>CSharpCompilerTestUtilities.Desktop</Name>

--- a/src/Compilers/CSharp/Test/CommandLine/project.json
+++ b/src/Compilers/CSharp/Test/CommandLine/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj
+++ b/src/Compilers/CSharp/Test/Emit/CSharpCompilerEmitTest.csproj
@@ -20,6 +20,10 @@
      <Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
      <Name>DiaSymReader</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
      <Project>{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}</Project>
      <Name>PdbUtilities</Name>

--- a/src/Compilers/CSharp/Test/Emit/project.json
+++ b/src/Compilers/CSharp/Test/Emit/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj
+++ b/src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj
@@ -16,6 +16,10 @@
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
  </PropertyGroup>
  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
      <Project>{76C6F005-C89D-4348-BB4A-391898DBEB52}</Project>
      <Name>TestUtilities.Desktop</Name>

--- a/src/Compilers/CSharp/Test/Semantic/project.json
+++ b/src/Compilers/CSharp/Test/Semantic/project.json
 {
  "dependencies": {
-    
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj
+++ b/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj
@@ -16,6 +16,10 @@
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
  </PropertyGroup>
  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
      <Project>{76C6F005-C89D-4348-BB4A-391898DBEB52}</Project>
      <Name>TestUtilities.Desktop</Name>

--- a/src/Compilers/CSharp/Test/Symbol/project.json
+++ b/src/Compilers/CSharp/Test/Symbol/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj
+++ b/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj
@@ -25,6 +25,10 @@
    <Compile Include="Metadata\WinMdMetadataTests.cs" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
      <Project>{76c6f005-c89d-4348-bb4a-391898dbeb52}</Project>
      <Name>TestUtilities.Desktop</Name>

--- a/src/Compilers/CSharp/Test/WinRT/project.json
+++ b/src/Compilers/CSharp/Test/WinRT/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj
+++ b/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj
@@ -54,6 +54,10 @@
    <Compile Include="XmlDocumentationCommentTextReaderTests.cs" />
  </ItemGroup>
  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
      <Project>{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}</Project>
      <Name>PdbUtilities</Name>

--- a/src/Compilers/Core/CodeAnalysisTest/project.json
+++ b/src/Compilers/Core/CodeAnalysisTest/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0",
    "Moq": "4.2.1402.2112",
  },
  "frameworks": {

--- a/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj
+++ b/src/Compilers/Core/MSBuildTaskTests/MSBuildTaskTests.csproj
@@ -18,6 +18,10 @@
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
  </PropertyGroup>
  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
      <Project>{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}</Project>
      <Name>PdbUtilities</Name>
@@ -98,4 +102,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
--- a/src/Compilers/Core/MSBuildTaskTests/project.json
+++ b/src/Compilers/Core/MSBuildTaskTests/project.json
 {
  "dependencies": {
    "Moq": "4.2.1402.2112",
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj
+++ b/src/Compilers/Server/VBCSCompilerTests/VBCSCompilerTests.csproj
@@ -23,6 +23,10 @@
      <Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
      <Name>DiaSymReader</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\CSharp\csc\csc.csproj">
      <Project>{4b45ca0c-03a0-400f-b454-3d4bcb16af38}</Project>
      <Name>csc</Name>

--- a/src/Compilers/Server/VBCSCompilerTests/project.json
+++ b/src/Compilers/Server/VBCSCompilerTests/project.json
 {
  "dependencies": {
    "Moq": "4.2.1402.2112",
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net46": { }

--- a/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj
+++ b/src/Compilers/VisualBasic/Test/CommandLine/BasicCommandLineTest.vbproj
@@ -18,6 +18,10 @@
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
  </PropertyGroup>
  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
      <Project>{76C6F005-C89D-4348-BB4A-391898DBEB52}</Project>
      <Name>TestUtilities.Desktop</Name>

--- a/src/Compilers/VisualBasic/Test/CommandLine/project.json
+++ b/src/Compilers/VisualBasic/Test/CommandLine/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj
+++ b/src/Compilers/VisualBasic/Test/Emit/BasicCompilerEmitTest.vbproj
@@ -18,6 +18,10 @@
      <Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
      <Name>DiaSymReader</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\PdbUtilities\PdbUtilities.csproj">
      <Project>{AFDE6BEA-5038-4A4A-A88E-DBD2E4088EED}</Project>
      <Name>PdbUtilities</Name>

--- a/src/Compilers/VisualBasic/Test/Emit/project.json
+++ b/src/Compilers/VisualBasic/Test/Emit/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj
+++ b/src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj
@@ -14,6 +14,10 @@
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
  </PropertyGroup>
  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
      <Project>{76C6F005-C89D-4348-BB4A-391898DBEB52}</Project>
      <Name>TestUtilities.Desktop</Name>

--- a/src/Compilers/VisualBasic/Test/Semantic/project.json
+++ b/src/Compilers/VisualBasic/Test/Semantic/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj
+++ b/src/Compilers/VisualBasic/Test/Symbol/BasicCompilerSymbolTest.vbproj
@@ -14,6 +14,10 @@
    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
  </PropertyGroup>
  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
      <Project>{76C6F005-C89D-4348-BB4A-391898DBEB52}</Project>
      <Name>TestUtilities.Desktop</Name>

--- a/src/Compilers/VisualBasic/Test/Symbol/project.json
+++ b/src/Compilers/VisualBasic/Test/Symbol/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj
+++ b/src/Compilers/VisualBasic/Test/Syntax/BasicCompilerSyntaxTest.vbproj
@@ -18,6 +18,10 @@
    <SyntaxTestDefinition Include="..\..\Portable\Syntax\Syntax.xml" />
  </ItemGroup>
  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
      <Project>{76C6F005-C89D-4348-BB4A-391898DBEB52}</Project>
      <Name>TestUtilities.Desktop</Name>

--- a/src/Compilers/VisualBasic/Test/Syntax/project.json
+++ b/src/Compilers/VisualBasic/Test/Syntax/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/Microsoft.DiaSymReader.PortablePdb.UnitTests.csproj
+++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/Microsoft.DiaSymReader.PortablePdb.UnitTests.csproj
@@ -24,6 +24,10 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
  <ItemGroup>
+    <ProjectReference Include="..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\Test\PdbUtilities\PdbUtilities.csproj">
      <Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
      <Name>PdbUtilities</Name>

--- a/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.json
+++ b/src/Debugging/Microsoft.DiaSymReader.PortablePdb.Tests/project.json
@@ -7,7 +7,6 @@
    "System.Runtime.Extensions": "4.0.10",
    "System.Runtime.InteropServices": "4.0.20",
    "System.IO.FileSystem": "4.0.0",
-    "xunit": "2.1.0"
  },
  "frameworks": {
    "netstandard1.3": {

--- a/src/Dependencies/Immutable/Immutable.csproj
+++ b/src/Dependencies/Immutable/Immutable.csproj
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
  <Import Project="..\..\..\build\Targets\ProducesNoOutput.Settings.targets" />
-  
  <PropertyGroup>
-    <ProjectGuid>DCDA908D-EF5E-494B-ADDC-C26F5FD610CA</ProjectGuid>
+    <ProjectGuid>{DCDA908D-EF5E-494B-ADDC-C26F5FD610CA}</ProjectGuid>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
  </PropertyGroup>
  <ItemGroup>
    <Content Include="project.json" />
  </ItemGroup>
-
  <Import Project="..\..\..\build\Targets\ProducesNoOutput.Imports.targets" />
-
 </Project>
\ No newline at end of file
--- a/src/Dependencies/Metadata/Metadata.csproj
+++ b/src/Dependencies/Metadata/Metadata.csproj
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
  <Import Project="..\..\..\build\Targets\ProducesNoOutput.Settings.targets" />
-  
  <PropertyGroup>
-    <ProjectGuid>E6796B97-D5C6-45B2-AE46-351D15DCFC71</ProjectGuid>
+    <ProjectGuid>{E6796B97-D5C6-45B2-AE46-351D15DCFC71}</ProjectGuid>
    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
  </PropertyGroup>
  <ItemGroup>
    <Content Include="project.json" />
  </ItemGroup>
-
  <Import Project="..\..\..\build\Targets\ProducesNoOutput.Imports.targets" />
-
 </Project>
\ No newline at end of file
--- a/src/Dependencies/xUnit.net/project.json
+++ b/src/Dependencies/xUnit.net/project.json
+{
+  "supports": {},
+  "dependencies": {
+    "xunit": "2.1.0",
+    "xunit.runner.console": "2.1.0"
+  },
+  "frameworks": {
+    ".NETPortable,Version=v4.5,Profile=Profile7": {}
+  }
+}
\ No newline at end of file
--- a/src/Dependencies/xUnit.net/xUnit.net.csproj
+++ b/src/Dependencies/xUnit.net/xUnit.net.csproj
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\build\Targets\ProducesNoOutput.Settings.targets" />
+  <PropertyGroup>
+    <ProjectGuid>{8635CB8F-D210-41ED-B4FF-71502CDB475C}</ProjectGuid>
+    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="project.json" />
+  </ItemGroup>
+  <Import Project="..\..\..\build\Targets\ProducesNoOutput.Imports.targets" />
+</Project>
\ No newline at end of file
--- a/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj
+++ b/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj
@@ -31,6 +31,10 @@
    <PlatformTarget>ARM</PlatformTarget>
  </PropertyGroup>
  <ItemGroup>
+    <ProjectReference Include="..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
      <Project>{76c6f005-c89d-4348-bb4a-391898dbeb52}</Project>
      <Name>TestUtilities.Desktop</Name>

--- a/src/EditorFeatures/TestUtilities/project.json
+++ b/src/EditorFeatures/TestUtilities/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.extensibility.execution": "2.1.0"
  },
  "frameworks": {
    "net46": { }

--- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj
+++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/CSharpExpressionCompilerTest.csproj
@@ -24,6 +24,10 @@
      <Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
      <Name>DiaSymReader</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
      <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
      <Name>TestUtilities.FX45</Name>

--- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj
+++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj
@@ -22,6 +22,10 @@
      <Project>{7a4b2176-7bfd-4b75-a61a-e25a1fdd0a1e}</Project>
      <Name>CSharpCompilerTestUtilities.Desktop</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
      <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
      <Name>TestUtilities.FX45</Name>

--- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json
+++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj
+++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/ExpressionCompilerTestUtilities.csproj
@@ -26,6 +26,10 @@
      <Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
      <Name>DiaSymReader</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
      <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
      <Name>TestUtilities.FX45</Name>

--- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/ResultProviderTestUtilities.csproj
@@ -26,6 +26,10 @@
      <Project>{030f8ab1-d06d-4526-adec-8e6010899c71}</Project>
      <Name>Immutable</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\Utilities\Desktop\TestUtilities.Desktop.csproj">
      <Project>{76c6f005-c89d-4348-bb4a-391898dbeb52}</Project>
      <Name>TestUtilities.Desktop</Name>

--- a/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json
+++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/BasicExpressionCompilerTest.vbproj
@@ -21,6 +21,10 @@
      <Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
      <Name>DiaSymReader</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
      <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
      <Name>TestUtilities.FX45</Name>

--- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json
+++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj
+++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/BasicResultProviderTest.vbproj
@@ -22,6 +22,10 @@
    <Reference Include="System.Xml.Linq" />
  </ItemGroup>
  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
      <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
      <Name>TestUtilities.FX45</Name>

--- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/project.json
+++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/InteractiveWindow/EditorTest/InteractiveWindowTest.csproj
+++ b/src/InteractiveWindow/EditorTest/InteractiveWindowTest.csproj
@@ -19,6 +19,10 @@
    <Reference Include="PresentationFramework" />
  </ItemGroup>
  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\EditorFeatures\TestUtilities\ServicesTestUtilities.csproj">
      <Project>{76c6f005-c89d-4348-bb4a-39189ddbeb52}</Project>
      <Name>ServicesTestUtilities</Name>

--- a/src/InteractiveWindow/EditorTest/project.json
+++ b/src/InteractiveWindow/EditorTest/project.json
@@ -2,8 +2,6 @@
  "dependencies": {
    "BasicUndo": "0.9.3",
    "Moq": "4.2.1402.2112",
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net46": {}

--- a/src/Samples/CSharp/APISampleUnitTests/APISampleUnitTestsCS.csproj
+++ b/src/Samples/CSharp/APISampleUnitTests/APISampleUnitTestsCS.csproj
@@ -23,6 +23,10 @@
      <Project>{B501A547-C911-4A05-AC6E-274A50DFF30E}</Project>
      <Name>Microsoft.CodeAnalysis.CSharp</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\Workspaces\Core\Portable\Workspaces.csproj">
      <Project>{5F8D2414-064A-4B3A-9B42-8E2A04246BE5}</Project>
      <Name>Microsoft.CodeAnalysis.Workspaces</Name>
@@ -70,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
--- a/src/Samples/CSharp/APISampleUnitTests/project.json
+++ b/src/Samples/CSharp/APISampleUnitTests/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0"
  },
  "frameworks": {
    "net452": {}

--- a/src/Samples/CSharp/ConvertToConditional/Test/ConvertToConditionalCS.UnitTests.csproj
+++ b/src/Samples/CSharp/ConvertToConditional/Test/ConvertToConditionalCS.UnitTests.csproj
@@ -41,6 +41,10 @@
      <Project>{3CDEEAB7-2256-418A-BEB2-620B5CB16302}</Project>
      <Name>Microsoft.CodeAnalysis.EditorFeatures</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj">
      <Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project>
      <Name>UnitTestFramework</Name>
@@ -74,4 +78,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
--- a/src/Samples/CSharp/ConvertToConditional/Test/project.json
+++ b/src/Samples/CSharp/ConvertToConditional/Test/project.json
 {
  "dependencies": {
-    "Microsoft.Composition": "1.0.27",
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
+    "Microsoft.Composition": "1.0.27"
  },
  "frameworks": {
    "net46": {}

--- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj
+++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj
@@ -37,6 +37,10 @@
      <Project>{21B239D0-D144-430F-A394-C066D58EE267}</Project>
      <Name>Microsoft.CodeAnalysis.CSharp.Workspaces</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj">
      <Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project>
      <Name>UnitTestFramework</Name>
@@ -69,4 +73,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
--- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json
+++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net452": {}

--- a/src/Samples/Samples.sln
+++ b/src/Samples/Samples.sln
@@ -124,6 +124,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Immutable", "..\Dependencie
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Metadata", "..\Dependencies\Metadata\Metadata.csproj", "{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xUnit.net", "..\Dependencies\xUnit.net\xUnit.net.csproj", "{8635CB8F-D210-41ED-B4FF-71502CDB475C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -496,24 +498,36 @@ Global
 		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Debug|x86.Build.0 = Debug|Any CPU
-		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|Any CPU.Build.0 = Release|Any CPU
-		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|x86.ActiveCfg = Release|Any CPU
-		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|x86.Build.0 = Release|Any CPU
+		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|x86.ActiveCfg = Debug|Any CPU
+		{030F8AB1-D06D-4526-ADEC-8E6010899C71}.Release|x86.Build.0 = Debug|Any CPU
 		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Debug|x86.Build.0 = Debug|Any CPU
-		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|x86.ActiveCfg = Release|Any CPU
-		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|x86.Build.0 = Release|Any CPU
+		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|x86.ActiveCfg = Debug|Any CPU
+		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF}.Release|x86.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Debug|x86.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|x86.ActiveCfg = Debug|Any CPU
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C}.Release|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -571,5 +585,6 @@ Global
 		{D89124D4-FB1D-4D08-BD95-F60BD24D5965} = {87DABD98-F9EB-4723-A466-9B7AF11E390D}
 		{030F8AB1-D06D-4526-ADEC-8E6010899C71} = {D14160E0-ACA0-4D2D-A670-CB72A57225F2}
 		{B36C94C7-F34C-43BC-8834-0B9EEA6DD4DF} = {D14160E0-ACA0-4D2D-A670-CB72A57225F2}
+		{8635CB8F-D210-41ED-B4FF-71502CDB475C} = {D14160E0-ACA0-4D2D-A670-CB72A57225F2}
 	EndGlobalSection
 EndGlobal
--- a/src/Samples/Shared/UnitTestFramework/UnitTestFramework.csproj
+++ b/src/Samples/Shared/UnitTestFramework/UnitTestFramework.csproj
@@ -38,6 +38,10 @@
      <Project>{2E87FA96-50BB-4607-8676-46521599F998}</Project>
      <Name>Microsoft.CodeAnalysis.Workspaces.Desktop</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
  </ItemGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  </PropertyGroup>
@@ -69,4 +73,4 @@
  <ImportGroup Label="Targets">
    <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
  </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
--- a/src/Samples/Shared/UnitTestFramework/project.json
+++ b/src/Samples/Shared/UnitTestFramework/project.json
 {
  "dependencies": {
-    "Moq": "4.2.1402.2112",
-    "xunit": "2.1.0"
+    "Moq": "4.2.1402.2112"
  },
  "frameworks": {
    "net452": {}

--- a/src/Samples/VisualBasic/APISampleUnitTests/APISampleUnitTestsVB.vbproj
+++ b/src/Samples/VisualBasic/APISampleUnitTests/APISampleUnitTestsVB.vbproj
@@ -34,6 +34,10 @@
      <Project>{57CA988D-F010-4BF2-9A2E-07D6DCD2FF2C}</Project>
      <Name>Microsoft.CodeAnalysis.VisualBasic.Workspaces</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
  </ItemGroup>
  <PropertyGroup>
    <NonShipping>true</NonShipping>
@@ -88,4 +92,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
--- a/src/Samples/VisualBasic/APISampleUnitTests/project.json
+++ b/src/Samples/VisualBasic/APISampleUnitTests/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net452": {}

--- a/src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj
+++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj
@@ -18,6 +18,10 @@
    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
  </PropertyGroup>
  <ItemGroup Label="Project References">
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj">
      <Project>{D571F126-F0B6-487E-BB79-E91EAEE46F4F}</Project>
      <Name>UnitTestFramework</Name>
@@ -77,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
--- a/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json
+++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net452": {}

--- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj
+++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj
@@ -36,6 +36,10 @@
      <Project>{2E87FA96-50BB-4607-8676-46521599F998}</Project>
      <Name>Microsoft.CodeAnalysis.Workspaces.Desktop</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\..\Shared\UnitTestFramework\UnitTestFramework.csproj">
      <Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project>
      <Name>UnitTestFramework</Name>
@@ -67,4 +71,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
--- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json
+++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net452": {}

--- a/src/Samples/VisualBasic/RemoveByVal/Test/RemoveByValVB.UnitTests.vbproj
+++ b/src/Samples/VisualBasic/RemoveByVal/Test/RemoveByValVB.UnitTests.vbproj
@@ -42,6 +42,10 @@
      <Project>{d571f126-f0b6-487e-bb79-e91eaee46f4f}</Project>
      <Name>UnitTestFramework</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Impl\RemoveByValVB.vbproj">
      <Project>{4900921D-C548-4FBB-9681-BAF88E09DB3C}</Project>
      <Name>RemoveByValVB</Name>
@@ -85,4 +89,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
--- a/src/Samples/VisualBasic/RemoveByVal/Test/project.json
+++ b/src/Samples/VisualBasic/RemoveByVal/Test/project.json
 {
  "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net46": {}

--- a/src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj
+++ b/src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj
@@ -32,6 +32,10 @@
      <Project>{2523D0E6-DF32-4A3E-8AE0-A19BFFAE2EF6}</Project>
      <Name>BasicCodeAnalysis</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.csproj">
      <Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
      <Name>TestUtilities</Name>

--- a/src/Scripting/CoreTest.Desktop/project.json
+++ b/src/Scripting/CoreTest.Desktop/project.json
 {
  "dependencies": {
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net46": {}

--- a/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj
+++ b/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj
@@ -29,6 +29,10 @@
      <Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
      <Name>CompilerTestResources</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\Test\Utilities\Portable\TestUtilities.csproj">
      <Project>{ccbd3438-3e84-40a9-83ad-533f23bcfca5}</Project>
      <Name>TestUtilities</Name>
@@ -75,4 +79,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
--- a/src/Scripting/VisualBasicTest.Desktop/project.json
+++ b/src/Scripting/VisualBasicTest.Desktop/project.json
 {
  "dependencies": {
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net46": {}

--- a/src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj
+++ b/src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj
@@ -34,6 +34,10 @@
      <Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
      <Name>DiaSymReader</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Portable.FX45\TestUtilities.FX45.csproj">
      <Project>{F7712928-1175-47B3-8819-EE086753DEE2}</Project>
      <Name>TestUtilities.FX45</Name>

--- a/src/Test/Utilities/Desktop/project.json
+++ b/src/Test/Utilities/Desktop/project.json
@@ -2,7 +2,6 @@
  "dependencies": {
    "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.2.0-beta1-20160105-04",
    "Microsoft.DiaSymReader.Native": "1.3.3",    
-    "xunit": "2.1.0"
  },
  "frameworks": {
    "net45": { }

--- a/src/Test/Utilities/Portable.FX45/TestUtilities.FX45.csproj
+++ b/src/Test/Utilities/Portable.FX45/TestUtilities.FX45.csproj
@@ -23,6 +23,10 @@
      <Project>{27b7a354-80cc-4bac-abf5-d4081056cea9}</Project>
      <Name>DiaSymReader</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\PdbUtilities\PdbUtilities.csproj">
      <Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
      <Name>PdbUtilities</Name>

--- a/src/Test/Utilities/Portable.FX45/project.json
+++ b/src/Test/Utilities/Portable.FX45/project.json
 {
  "dependencies": {
    "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.2.0-beta1-20160105-04",
-    "xunit": "2.1.0"
  },
  "frameworks": {
    "net45": {}

--- a/src/Test/Utilities/Portable/TestUtilities.csproj
+++ b/src/Test/Utilities/Portable/TestUtilities.csproj
@@ -32,6 +32,10 @@
      <Project>{7fe6b002-89d8-4298-9b1b-0b5c247dd1fd}</Project>
      <Name>CompilerTestResources</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\PdbUtilities\PdbUtilities.csproj">
      <Project>{afde6bea-5038-4a4a-a88e-dbd2e4088eed}</Project>
      <Name>PdbUtilities</Name>

--- a/src/Test/Utilities/Portable/project.json
+++ b/src/Test/Utilities/Portable/project.json
@@ -12,8 +12,6 @@
    "System.Threading.Thread": "4.0.0-rc2-23931",
    "System.Xml.XDocument": "4.0.10",
    "System.Xml.XmlDocument": "4.0.0",
-    "xunit": "2.1.0",
-    "xunit.extensibility.execution": "2.1.0"
  },
  "frameworks": {
    "netstandard1.3": {

--- a/src/Workspaces/CSharpTest/CSharpServicesTest.csproj
+++ b/src/Workspaces/CSharpTest/CSharpServicesTest.csproj
@@ -27,6 +27,10 @@
      <Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
      <Name>CompilerTestResources</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
      <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
      <Name>TestUtilities.FX45</Name>

--- a/src/Workspaces/CSharpTest/project.json
+++ b/src/Workspaces/CSharpTest/project.json
 {
  "dependencies": {
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net452": {}

--- a/src/Workspaces/CoreTest/ServicesTest.csproj
+++ b/src/Workspaces/CoreTest/ServicesTest.csproj
@@ -30,6 +30,10 @@
      <Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
      <Name>CompilerTestResources</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
      <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
      <Name>TestUtilities.FX45</Name>

--- a/src/Workspaces/CoreTest/project.json
+++ b/src/Workspaces/CoreTest/project.json
 {
  "dependencies": {
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net452": {}

--- a/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj
+++ b/src/Workspaces/VisualBasicTest/VisualBasicServicesTest.vbproj
@@ -24,6 +24,10 @@
      <Project>{7FE6B002-89D8-4298-9B1B-0B5C247DD1FD}</Project>
      <Name>CompilerTestResources</Name>
    </ProjectReference>
+    <ProjectReference Include="..\..\Dependencies\xUnit.net\xUnit.net.csproj">
+      <Project>{8635cb8f-d210-41ed-b4ff-71502cdb475c}</Project>
+      <Name>xUnit.net</Name>
+    </ProjectReference>
    <ProjectReference Include="..\..\Test\Utilities\Portable.FX45\TestUtilities.FX45.csproj">
      <Project>{f7712928-1175-47b3-8819-ee086753dee2}</Project>
      <Name>TestUtilities.FX45</Name>

--- a/src/Workspaces/VisualBasicTest/project.json
+++ b/src/Workspaces/VisualBasicTest/project.json
 {
  "dependencies": {
-    "xunit.runner.console": "2.1.0"
  },
  "frameworks": {
    "net452": {}