diff --git a/BuildAndTest.proj b/BuildAndTest.proj index dae468fbcfaf9b68f3a6ac8bce7dc02e0e05c85b..5ee8f46a51d9269d6726e1ee4ae81ebdce642f32 100644 --- a/BuildAndTest.proj +++ b/BuildAndTest.proj @@ -14,7 +14,7 @@ *.UnitTests*.dll Binaries\$(Configuration) $(UserProfile)\.nuget\packages - 1.9.2 + 2.1.0-beta4-build3109 @@ -68,7 +68,7 @@ - + diff --git a/build/Targets/Roslyn.Toolsets.Xunit.targets b/build/Targets/Roslyn.Toolsets.Xunit.targets index fb0f6b1be54a8f5080ff981abb058072fc3c5222..ebd64e57891a80f3f0f43a11f6c5877920f9cbb5 100644 --- a/build/Targets/Roslyn.Toolsets.Xunit.targets +++ b/build/Targets/Roslyn.Toolsets.Xunit.targets @@ -3,8 +3,8 @@ Program - $(MSBuildThisFileDirectory)\..\..\..\packages\xunit.runners.2.0.0-alpha-build2576\tools\xunit.console.x86.exe - $(AssemblyName).dll + $(NuGetPackagesPath)\xunit.runner.console.2.1.0-beta4-build3109\tools\xunit.console.x86.exe + $(AssemblyName).dll -html $(OurDir)\xUnitResults\$(AssemblyName).html -noshadow $(OutDir) diff --git a/build/ToolsetPackages/project.json b/build/ToolsetPackages/project.json index 09214aeb5515e51b0962987fa2554411644a7e85..49fe6824b765b1ba217c526312d87d16b1805332 100644 --- a/build/ToolsetPackages/project.json +++ b/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" }, diff --git a/cibuild.sh b/cibuild.sh index 6a2d32445bc35e216f7fa5834ad400f1c7307727..5601172f5d656b747e51fb3b3566fad62c212f06 100755 --- a/cibuild.sh +++ b/cibuild.sh @@ -10,7 +10,7 @@ usage() echo " --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 diff --git a/src/Compilers/CSharp/Test/CommandLine/project.json b/src/Compilers/CSharp/Test/CommandLine/project.json index df98f8dad2b0916724af197e931e65d8df45c0ef..4135147da3b38a2ad153e0c15248c1aaf3865231 100644 --- a/src/Compilers/CSharp/Test/CommandLine/project.json +++ b/src/Compilers/CSharp/Test/CommandLine/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02", - "xunit": "1.9.2" + "xunit": "2.1.0-beta4-build3109" }, "frameworks": { "net45": { } diff --git a/src/Compilers/CSharp/Test/Emit/project.json b/src/Compilers/CSharp/Test/Emit/project.json index aa7ebe77f9c7b5005e7b282beab19c56e3ac9bf3..f38bba39d6b8d70b70ea68870e3b31801c0cfb98 100644 --- a/src/Compilers/CSharp/Test/Emit/project.json +++ b/src/Compilers/CSharp/Test/Emit/project.json @@ -1,10 +1,12 @@ -{ +{ "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 +} diff --git a/src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj b/src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj index 739f9df02e6ad5afb668b47061e95a6f84c9d66b..25fc180195dd6fb451172b3f0dc31e874c15bd2d 100644 --- a/src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj +++ b/src/Compilers/CSharp/Test/Semantic/CSharpCompilerSemanticTest.csproj @@ -144,4 +144,4 @@ - \ No newline at end of file + diff --git a/src/Compilers/CSharp/Test/Semantic/project.json b/src/Compilers/CSharp/Test/Semantic/project.json index 44b026a948928e080b2a9c4578902dd75dce526e..fb6dec183bd6a843c4c689833342cc2ff989a10e 100644 --- a/src/Compilers/CSharp/Test/Semantic/project.json +++ b/src/Compilers/CSharp/Test/Semantic/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02", - "xunit": "1.9.2" + "xunit": "2.1.0-beta4-build3109" }, "frameworks": { "net45": { } diff --git a/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj b/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj index 5429b31c4f02b891611e9d96b15b0ca5a7e7af3b..af46d7e84339a67353fc9de314dae3299ba25604 100644 --- a/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj +++ b/src/Compilers/CSharp/Test/Symbol/CSharpCompilerSymbolTest.csproj @@ -198,4 +198,4 @@ - \ No newline at end of file + diff --git a/src/Compilers/CSharp/Test/Symbol/project.json b/src/Compilers/CSharp/Test/Symbol/project.json index 44b026a948928e080b2a9c4578902dd75dce526e..fb6dec183bd6a843c4c689833342cc2ff989a10e 100644 --- a/src/Compilers/CSharp/Test/Symbol/project.json +++ b/src/Compilers/CSharp/Test/Symbol/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02", - "xunit": "1.9.2" + "xunit": "2.1.0-beta4-build3109" }, "frameworks": { "net45": { } diff --git a/src/Compilers/CSharp/Test/Syntax/project.json b/src/Compilers/CSharp/Test/Syntax/project.json index 44b026a948928e080b2a9c4578902dd75dce526e..fb6dec183bd6a843c4c689833342cc2ff989a10e 100644 --- a/src/Compilers/CSharp/Test/Syntax/project.json +++ b/src/Compilers/CSharp/Test/Syntax/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02", - "xunit": "1.9.2" + "xunit": "2.1.0-beta4-build3109" }, "frameworks": { "net45": { } diff --git a/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj b/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj index a57557aeaa034fde95c795b5be9b4bca11e5dc3a..11dde9b404dfab44e324b4138d37b7365f5cb6a9 100644 --- a/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj +++ b/src/Compilers/CSharp/Test/WinRT/CSharpWinRTTest.csproj @@ -62,6 +62,5 @@ - diff --git a/src/Compilers/CSharp/Test/WinRT/project.json b/src/Compilers/CSharp/Test/WinRT/project.json index 44b026a948928e080b2a9c4578902dd75dce526e..fb6dec183bd6a843c4c689833342cc2ff989a10e 100644 --- a/src/Compilers/CSharp/Test/WinRT/project.json +++ b/src/Compilers/CSharp/Test/WinRT/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02", - "xunit": "1.9.2" + "xunit": "2.1.0-beta4-build3109" }, "frameworks": { "net45": { } diff --git a/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj b/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj index d886928fcf82a86e5a9e1d2c034c9a569bdad568..033392834f5a5450d17ce24d1036684fb207e5ed 100644 --- a/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj +++ b/src/Compilers/Core/CodeAnalysisTest/CodeAnalysisTest.csproj @@ -178,4 +178,4 @@ - \ No newline at end of file + diff --git a/src/Compilers/Core/CodeAnalysisTest/project.json b/src/Compilers/Core/CodeAnalysisTest/project.json index 76af85f68e8692f6785dd9cb643ca4f559a96937..c627635861a10722f068eba40dd9510f719d760c 100644 --- a/src/Compilers/Core/CodeAnalysisTest/project.json +++ b/src/Compilers/Core/CodeAnalysisTest/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "xunit": "1.9.2", + "xunit": "2.1.0-beta4-build3109", }, "frameworks": { "net45": { } diff --git a/src/Compilers/Core/MSBuildTaskTests/project.json b/src/Compilers/Core/MSBuildTaskTests/project.json index 53bb7f24630e5c1de9777c8372adcd7febde3a08..a9a0faabff058642acd1695894d14015d093a2ba 100644 --- a/src/Compilers/Core/MSBuildTaskTests/project.json +++ b/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 +} diff --git a/src/Compilers/Core/VBCSCompilerTests/project.json b/src/Compilers/Core/VBCSCompilerTests/project.json index 3ca4807d79c9f846d7bf4ae5052dcdb602c7b867..54c05ac9a9a5d699a9db3ffd41631564f3cd85e0 100644 --- a/src/Compilers/Core/VBCSCompilerTests/project.json +++ b/src/Compilers/Core/VBCSCompilerTests/project.json @@ -1,10 +1,10 @@ -{ +{ "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 +} diff --git a/src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj b/src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj index f5f041cf1cc11b36a4e26367b695c07d5d6957b1..d7bf32d01ebe61f11c8b77bb368e592d2abf1610 100644 --- a/src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj +++ b/src/Compilers/Test/Utilities/CSharp/CSharpCompilerTestUtilities.csproj @@ -98,4 +98,4 @@ - \ No newline at end of file + diff --git a/src/Compilers/VisualBasic/Test/CommandLine/project.json b/src/Compilers/VisualBasic/Test/CommandLine/project.json index 44b026a948928e080b2a9c4578902dd75dce526e..fb6dec183bd6a843c4c689833342cc2ff989a10e 100644 --- a/src/Compilers/VisualBasic/Test/CommandLine/project.json +++ b/src/Compilers/VisualBasic/Test/CommandLine/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02", - "xunit": "1.9.2" + "xunit": "2.1.0-beta4-build3109" }, "frameworks": { "net45": { } diff --git a/src/Compilers/VisualBasic/Test/Emit/project.json b/src/Compilers/VisualBasic/Test/Emit/project.json index aa7ebe77f9c7b5005e7b282beab19c56e3ac9bf3..33f07a91370a8856506531290d6512051a3c74da 100644 --- a/src/Compilers/VisualBasic/Test/Emit/project.json +++ b/src/Compilers/VisualBasic/Test/Emit/project.json @@ -1,10 +1,10 @@ -{ +{ "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 +} diff --git a/src/Compilers/VisualBasic/Test/Semantic/project.json b/src/Compilers/VisualBasic/Test/Semantic/project.json index 76af85f68e8692f6785dd9cb643ca4f559a96937..c627635861a10722f068eba40dd9510f719d760c 100644 --- a/src/Compilers/VisualBasic/Test/Semantic/project.json +++ b/src/Compilers/VisualBasic/Test/Semantic/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "xunit": "1.9.2", + "xunit": "2.1.0-beta4-build3109", }, "frameworks": { "net45": { } diff --git a/src/Compilers/VisualBasic/Test/Symbol/project.json b/src/Compilers/VisualBasic/Test/Symbol/project.json index 76af85f68e8692f6785dd9cb643ca4f559a96937..c627635861a10722f068eba40dd9510f719d760c 100644 --- a/src/Compilers/VisualBasic/Test/Symbol/project.json +++ b/src/Compilers/VisualBasic/Test/Symbol/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "xunit": "1.9.2", + "xunit": "2.1.0-beta4-build3109", }, "frameworks": { "net45": { } diff --git a/src/Compilers/VisualBasic/Test/Syntax/project.json b/src/Compilers/VisualBasic/Test/Syntax/project.json index 78e0c808d614c95578fc56f690dc2db12a336311..cc62225611dbd4c2b4225b3cd9784a23d2674107 100644 --- a/src/Compilers/VisualBasic/Test/Syntax/project.json +++ b/src/Compilers/VisualBasic/Test/Syntax/project.json @@ -1,6 +1,7 @@ { "dependencies": { "Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150824-02", + "xunit" : "2.1.0-beta4-build3109" }, "frameworks": { "net45": { } diff --git a/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj b/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj index 40d3320f6bc499cd6c8ded0fbd4aadd2553c87e5..345a7a40a2513077b3a684c86bbe02255898dbf5 100644 --- a/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj +++ b/src/EditorFeatures/CSharpTest/CSharpEditorServicesTest.csproj @@ -657,4 +657,4 @@ - \ No newline at end of file + diff --git a/src/EditorFeatures/CSharpTest/project.json b/src/EditorFeatures/CSharpTest/project.json index 8a2d11eca723a96dfae3bae11ce33ecda64429ee..69c29affe29ee727f08bfae81fcc8a555c9898eb 100644 --- a/src/EditorFeatures/CSharpTest/project.json +++ b/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 +} diff --git a/src/EditorFeatures/Test/EditorServicesTest.csproj b/src/EditorFeatures/Test/EditorServicesTest.csproj index 0dbab097438c2d44a7b283103b9c81498e55f879..06a720055f42034fbffcb721beb0e0a9decf7a7d 100644 --- a/src/EditorFeatures/Test/EditorServicesTest.csproj +++ b/src/EditorFeatures/Test/EditorServicesTest.csproj @@ -369,4 +369,4 @@ - \ No newline at end of file + diff --git a/src/EditorFeatures/Test/project.json b/src/EditorFeatures/Test/project.json index 45f305c99b0a94f17b4c04a6d86e16ed3a377822..24d10d2c444c5489801ee88d83b5c7fe17856f82 100644 --- a/src/EditorFeatures/Test/project.json +++ b/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 +} diff --git a/src/EditorFeatures/Test2/project.json b/src/EditorFeatures/Test2/project.json index 82ae9d9f48712f521309d889d97b247481802bf5..beccc9be4b2af671f31abda72e900fc6de2c4fcc 100644 --- a/src/EditorFeatures/Test2/project.json +++ b/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 +} diff --git a/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj b/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj index 08d5ef585117bda2391d060a9109121f23fe3b77..d7746387add1f2e73881859e1d59c0c7da6754c5 100644 --- a/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj +++ b/src/EditorFeatures/TestUtilities/ServicesTestUtilities.csproj @@ -31,11 +31,21 @@ $(DefineConstants);ARM ARM + + + {76c6f005-c89d-4348-bb4a-391898dbeb52} + TestUtilities.Desktop + + + {f7712928-1175-47b3-8819-ee086753dee2} + TestUtilities.FX45 + + - + @@ -88,4 +98,4 @@ - \ No newline at end of file + diff --git a/src/EditorFeatures/TestUtilities/project.json b/src/EditorFeatures/TestUtilities/project.json index fc0f0d0aa9480a6862697867aedac993bf6f2a2b..adea9b1d2d9268c49497b36f8364fa8056631b89 100644 --- a/src/EditorFeatures/TestUtilities/project.json +++ b/src/EditorFeatures/TestUtilities/project.json @@ -1,6 +1,7 @@ { "dependencies": { - "xunit": "1.9.2" + "xunit": "2.1.0-beta4-build3109", + "xunit.extensibility.execution": "2.1.0-beta4-build3109" }, "frameworks": { "net46": { } diff --git a/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj b/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj index 672192549ad94fe85f2a0458e0e2c4069a835ed4..0b477bf28e245f58ce0e783e18b8e114c488e4a8 100644 --- a/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj +++ b/src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj @@ -624,4 +624,4 @@ - \ No newline at end of file + diff --git a/src/EditorFeatures/VisualBasicTest/project.json b/src/EditorFeatures/VisualBasicTest/project.json index 3c880d2f7975ee8a986469105af77a83a2b94332..2148b02d8fc4d44342e8568541d2812f221cd4cb 100644 --- a/src/EditorFeatures/VisualBasicTest/project.json +++ b/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": { } diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json index 85256010b12b460cbcce1b0b8ca537b515c3453b..4c2c23fe01a9769806e92755d6425cf5d77aa03d 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/project.json @@ -1,9 +1,9 @@ -{ +{ "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 +} diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj index 9df052226c1ff34a23a1229d4a61b5b6a9a02b56..2b9e584fde9de1a1f88493fc549e496ba1c12b63 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/CSharpResultProviderTest.csproj @@ -108,4 +108,4 @@ - \ No newline at end of file + diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json index eb6f8a57322b05454707a38eb07ee3ba2c9a786e..325289709e77c7fe378fd3dc16b5ab9c4d9d34d6 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/project.json @@ -1,9 +1,9 @@ { "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 +} diff --git a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json index 85256010b12b460cbcce1b0b8ca537b515c3453b..4c2c23fe01a9769806e92755d6425cf5d77aa03d 100644 --- a/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json +++ b/src/ExpressionEvaluator/Core/Test/ExpressionCompiler/project.json @@ -1,9 +1,9 @@ -{ +{ "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 +} diff --git a/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json b/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json index eb6f8a57322b05454707a38eb07ee3ba2c9a786e..325289709e77c7fe378fd3dc16b5ab9c4d9d34d6 100644 --- a/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json +++ b/src/ExpressionEvaluator/Core/Test/ResultProvider/project.json @@ -1,9 +1,9 @@ { "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 +} diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json index 85256010b12b460cbcce1b0b8ca537b515c3453b..047bf36e69456cc5af82726d21c74a55e9f63793 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json +++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/project.json @@ -1,9 +1,9 @@ -{ +{ "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 +} diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/project.json b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/project.json index bb24dfbd9cf4b6e58c156e51c1dbbf03c879965b..fa8b23309d2d42d478681457f1efff6bd5950ee9 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/project.json +++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "xunit": "1.9.2" + "xunit": "2.1.0-beta4-build3109" }, "frameworks": { "net45": { } diff --git a/src/Interactive/HostTest/InteractiveHostTest.csproj b/src/Interactive/HostTest/InteractiveHostTest.csproj index ee8137f04fb74dd8726f264529cf85a15c0098a5..527432cd4465adb6a1232cd715ef8fff4989c35f 100644 --- a/src/Interactive/HostTest/InteractiveHostTest.csproj +++ b/src/Interactive/HostTest/InteractiveHostTest.csproj @@ -117,4 +117,4 @@ - \ No newline at end of file + diff --git a/src/Interactive/HostTest/project.json b/src/Interactive/HostTest/project.json index 10383ccf3146de2c56885df91ab2bda3a7e6d2b4..11cff6bd2c69131b59a979a18e2489a337b0251b 100644 --- a/src/Interactive/HostTest/project.json +++ b/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 +} diff --git a/src/InteractiveWindow/EditorTest/InteractiveWindowTest.csproj b/src/InteractiveWindow/EditorTest/InteractiveWindowTest.csproj index 446b6e6adee56c7565079ab3456654ca7c275c9b..714cb22d7b46e71801c603bb28a3303af33be3e9 100644 --- a/src/InteractiveWindow/EditorTest/InteractiveWindowTest.csproj +++ b/src/InteractiveWindow/EditorTest/InteractiveWindowTest.csproj @@ -96,4 +96,4 @@ - \ No newline at end of file + diff --git a/src/InteractiveWindow/EditorTest/project.json b/src/InteractiveWindow/EditorTest/project.json index f2cfaff10f19c1bdf98c84018f6de829b67ef94c..ff00440e11c578cb527f567978a31f8d3ef01f9d 100644 --- a/src/InteractiveWindow/EditorTest/project.json +++ b/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 +} diff --git a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj index 141e6444c9429a30360c5bc112145dfe278dd314..28e96a5a0b1036fd2ed8a0419730ec262f0d43f7 100644 --- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj +++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedCS.UnitTests.csproj @@ -66,6 +66,5 @@ - diff --git a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json index 3338ea1dbba3222a69e3646aa85beb1975361d09..4794d9eda5a241acc2bcd401756550b06904e57c 100644 --- a/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json +++ b/src/Samples/CSharp/ImplementNotifyPropertyChanged/Test/project.json @@ -1,9 +1,9 @@ { "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 +} diff --git a/src/Samples/CSharp/MakeConst/Test/MakeConstCS.UnitTests.csproj b/src/Samples/CSharp/MakeConst/Test/MakeConstCS.UnitTests.csproj index 65b9adc98bedd30caa6d9b8862d7149390a8ee49..e6bb6bf78ec30ab93768dc8b33ebd196252fcfce 100644 --- a/src/Samples/CSharp/MakeConst/Test/MakeConstCS.UnitTests.csproj +++ b/src/Samples/CSharp/MakeConst/Test/MakeConstCS.UnitTests.csproj @@ -58,6 +58,5 @@ - - \ No newline at end of file + diff --git a/src/Samples/CSharp/MakeConst/Test/project.json b/src/Samples/CSharp/MakeConst/Test/project.json index 3338ea1dbba3222a69e3646aa85beb1975361d09..4794d9eda5a241acc2bcd401756550b06904e57c 100644 --- a/src/Samples/CSharp/MakeConst/Test/project.json +++ b/src/Samples/CSharp/MakeConst/Test/project.json @@ -1,9 +1,9 @@ { "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 +} diff --git a/src/Samples/Shared/UnitTestFramework/UnitTestFramework.csproj b/src/Samples/Shared/UnitTestFramework/UnitTestFramework.csproj index c84f48eb29f2aca0b28bbd2167a37b3b349b91b2..b73c58ecdc2a8cb3f2295488b526706534bfbae7 100644 --- a/src/Samples/Shared/UnitTestFramework/UnitTestFramework.csproj +++ b/src/Samples/Shared/UnitTestFramework/UnitTestFramework.csproj @@ -63,6 +63,5 @@ - - \ No newline at end of file + diff --git a/src/Samples/Shared/UnitTestFramework/project.json b/src/Samples/Shared/UnitTestFramework/project.json index f54ab828130c74ce9f42e54971db3b2d840e32de..2748f240006215ff1593ba1f10526f13a09df258 100644 --- a/src/Samples/Shared/UnitTestFramework/project.json +++ b/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 +} diff --git a/src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj b/src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj index 48549898d3fd0e04e10e0e761551c116e6ec8013..dfd6ac9abb2b88b88ce3ec615b700a4e6301f153 100644 --- a/src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj +++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Test/ConvertToAutoPropertyVB.UnitTests.vbproj @@ -76,6 +76,5 @@ - - \ No newline at end of file + diff --git a/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json b/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json index 3338ea1dbba3222a69e3646aa85beb1975361d09..4794d9eda5a241acc2bcd401756550b06904e57c 100644 --- a/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json +++ b/src/Samples/VisualBasic/ConvertToAutoProperty/Test/project.json @@ -1,9 +1,9 @@ { "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 +} diff --git a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj index 0d0a6769ed3039c0ce554cad2a3e69b6a7275acd..c3161383cfaedd5759dfc19e5519501520893d87 100644 --- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj +++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/ImplementNotifyPropertyChangedVB.UnitTests.vbproj @@ -60,6 +60,5 @@ - - \ No newline at end of file + diff --git a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json index 3338ea1dbba3222a69e3646aa85beb1975361d09..4794d9eda5a241acc2bcd401756550b06904e57c 100644 --- a/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json +++ b/src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Test/project.json @@ -1,9 +1,9 @@ { "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 +} diff --git a/src/Samples/VisualBasic/MakeConst/Test/MakeConstVB.UnitTests.vbproj b/src/Samples/VisualBasic/MakeConst/Test/MakeConstVB.UnitTests.vbproj index 226bc237d65b8f2fcde21f889af09337ad6200ee..d2313a74bac5ca4b4d294800ed620f050635196c 100644 --- a/src/Samples/VisualBasic/MakeConst/Test/MakeConstVB.UnitTests.vbproj +++ b/src/Samples/VisualBasic/MakeConst/Test/MakeConstVB.UnitTests.vbproj @@ -82,6 +82,5 @@ - - \ No newline at end of file + diff --git a/src/Samples/VisualBasic/MakeConst/Test/project.json b/src/Samples/VisualBasic/MakeConst/Test/project.json index 3338ea1dbba3222a69e3646aa85beb1975361d09..4794d9eda5a241acc2bcd401756550b06904e57c 100644 --- a/src/Samples/VisualBasic/MakeConst/Test/project.json +++ b/src/Samples/VisualBasic/MakeConst/Test/project.json @@ -1,9 +1,9 @@ { "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 +} diff --git a/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj b/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj index dfc6bc153a5824bd00085d7aa1479556ec04b8fe..31ad7766ef4f9f5ff56e48ce4a7bafb3241c1e8e 100644 --- a/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj +++ b/src/Scripting/CSharpTest.Desktop/CSharpScriptingTest.Desktop.csproj @@ -74,4 +74,4 @@ - \ No newline at end of file + diff --git a/src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj b/src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj index 207b51f109697e2c7c097adc5afa21ac2dd54509..74a0aba552a5ffabec401247dd164e9bde83535c 100644 --- a/src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj +++ b/src/Scripting/CoreTest.Desktop/ScriptingTest.Desktop.csproj @@ -70,4 +70,4 @@ - \ No newline at end of file + diff --git a/src/Scripting/CoreTest/ScriptingTest.csproj b/src/Scripting/CoreTest/ScriptingTest.csproj index 4ae0461e17624834595e3a3bf7080589182323db..d4c12af9016e4ecae39fbc043b0bc384a00b18f6 100644 --- a/src/Scripting/CoreTest/ScriptingTest.csproj +++ b/src/Scripting/CoreTest/ScriptingTest.csproj @@ -81,4 +81,4 @@ - \ No newline at end of file + diff --git a/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj b/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj index ad17cb8aba2a1fcf216df950e689bcc61dbe8237..0e8960fbf3eaa5b883146efc81bb6100dacb7cb6 100644 --- a/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj +++ b/src/Scripting/VisualBasicTest.Desktop/BasicScriptingTest.Desktop.vbproj @@ -77,4 +77,4 @@ - \ No newline at end of file + diff --git a/src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj b/src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj index 00be27a0b46171b82b4b4ad7f31ae94cbd23845e..97d730025f77c743631f0ddada6977479bd8fd8c 100644 --- a/src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj +++ b/src/Test/Utilities/Desktop/TestUtilities.Desktop.csproj @@ -163,8 +163,9 @@ + - \ No newline at end of file + diff --git a/src/Test/Utilities/Portable.FX45/TestUtilities.FX45.csproj b/src/Test/Utilities/Portable.FX45/TestUtilities.FX45.csproj index de9e8c4ae37e4770ecb01cc41b471dac4cd45790..132933b57544d432ca53312830f104ccbccbc855 100644 --- a/src/Test/Utilities/Portable.FX45/TestUtilities.FX45.csproj +++ b/src/Test/Utilities/Portable.FX45/TestUtilities.FX45.csproj @@ -3,7 +3,6 @@ - Debug @@ -41,6 +40,52 @@ CompilerTestResources + + + ..\..\..\..\packages\System.Reflection.Metadata.$(SystemReflectionMetadataVersion)\lib\portable-net45+win8\System.Reflection.Metadata.dll + + + ..\..\..\..\packages\System.Collections.Immutable.$(SystemCollectionsImmutableVersion)\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + + + ..\..\..\..\packages\Microsoft.DiaSymReader.1.0.5\lib\net45\Microsoft.DiaSymReader.dll + + + + ARM + + + ARM + + + + + + + + + + + true + ..\..\..\..\Binaries\Debug\amd64 + true + true + 1591 + full + x64 + prompt + MinimumRecommendedRules.ruleset + + + ..\..\..\..\Binaries\Release\amd64 + true + true + 1591 + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + diff --git a/src/Test/Utilities/Portable.FX45/project.json b/src/Test/Utilities/Portable.FX45/project.json index 18efdc0ad416e2e1103e8626b60ebc154f404720..b1790dfbde6cf363a18d79bbb49303ebcf7c3d28 100644 --- a/src/Test/Utilities/Portable.FX45/project.json +++ b/src/Test/Utilities/Portable.FX45/project.json @@ -1,14 +1,14 @@ -{ +{ "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 +} diff --git a/src/Test/Utilities/Portable/TestUtilities.csproj b/src/Test/Utilities/Portable/TestUtilities.csproj index 2fa82971518555d85bc944dec9ecae335943e9b3..a567c21d98483b7e5d140445dd1dad1e9f7c088b 100644 --- a/src/Test/Utilities/Portable/TestUtilities.csproj +++ b/src/Test/Utilities/Portable/TestUtilities.csproj @@ -124,4 +124,4 @@ - \ No newline at end of file + diff --git a/src/VisualStudio/CSharp/Test/project.json b/src/VisualStudio/CSharp/Test/project.json index 28848afb45318126ddf2bc90bfcc723729d466a1..19c1cede2802991dbbcb390ca2e3523f5a1c5127 100644 --- a/src/VisualStudio/CSharp/Test/project.json +++ b/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 +} diff --git a/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj b/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj index ba2f1ea9458d0d6d319854ec1a92b9d870dd7048..d13a8cdd186645d70c0ca361dee67dd925e81c30 100644 --- a/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj +++ b/src/VisualStudio/Core/Test/ServicesVisualStudioTest.vbproj @@ -456,4 +456,4 @@ - \ No newline at end of file + diff --git a/src/VisualStudio/Core/Test/project.json b/src/VisualStudio/Core/Test/project.json index 78ff7a3c9d7583deea9a11e0564ab195c9290bc5..2340f0a4bfb3e4d9482c6aa57f05ebc7d82db832 100644 --- a/src/VisualStudio/Core/Test/project.json +++ b/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 +} diff --git a/src/Workspaces/CoreTest/ServicesTest.csproj b/src/Workspaces/CoreTest/ServicesTest.csproj index c6bd0bd19b6886a740d357cad31ba74fbc8191f0..fc0d86bfa9bc92aac9458bc46ba2d9719a8890c9 100644 --- a/src/Workspaces/CoreTest/ServicesTest.csproj +++ b/src/Workspaces/CoreTest/ServicesTest.csproj @@ -291,4 +291,4 @@ - \ No newline at end of file + diff --git a/src/Workspaces/CoreTest/project.json b/src/Workspaces/CoreTest/project.json index 47df50feef85970fa00111102e990b695be2c73f..48bcba6deadcf0bf254dd11a4d88d129b5dba7d7 100644 --- a/src/Workspaces/CoreTest/project.json +++ b/src/Workspaces/CoreTest/project.json @@ -1,6 +1,5 @@ { "dependencies": { - "xunit.extensions": "1.9.2" }, "frameworks": { "net452": { }