From 78e6fd004b7fa6890e49d4bdd4400c02e8658b3a Mon Sep 17 00:00:00 2001 From: Jared Parsons Date: Fri, 9 Oct 2015 16:16:48 -0700 Subject: [PATCH] Update the csproj, vbproj and project.json files --- BuildAndTest.proj | 4 +- build/Targets/Roslyn.Toolsets.Xunit.targets | 4 +- build/ToolsetPackages/project.json | 2 +- cibuild.sh | 2 +- .../CSharp/Test/CommandLine/project.json | 2 +- src/Compilers/CSharp/Test/Emit/project.json | 12 +++-- .../CSharpCompilerSemanticTest.csproj | 2 +- .../CSharp/Test/Semantic/project.json | 2 +- .../Symbol/CSharpCompilerSymbolTest.csproj | 2 +- src/Compilers/CSharp/Test/Symbol/project.json | 2 +- src/Compilers/CSharp/Test/Syntax/project.json | 2 +- .../CSharp/Test/WinRT/CSharpWinRTTest.csproj | 1 - src/Compilers/CSharp/Test/WinRT/project.json | 2 +- .../CodeAnalysisTest/CodeAnalysisTest.csproj | 2 +- .../Core/CodeAnalysisTest/project.json | 2 +- .../Core/MSBuildTaskTests/project.json | 4 +- .../Core/VBCSCompilerTests/project.json | 10 ++-- .../CSharp/CSharpCompilerTestUtilities.csproj | 2 +- .../VisualBasic/Test/CommandLine/project.json | 2 +- .../VisualBasic/Test/Emit/project.json | 10 ++-- .../VisualBasic/Test/Semantic/project.json | 2 +- .../VisualBasic/Test/Symbol/project.json | 2 +- .../VisualBasic/Test/Syntax/project.json | 1 + .../CSharpEditorServicesTest.csproj | 2 +- src/EditorFeatures/CSharpTest/project.json | 4 +- .../Test/EditorServicesTest.csproj | 2 +- src/EditorFeatures/Test/project.json | 4 +- src/EditorFeatures/Test2/project.json | 4 +- .../ServicesTestUtilities.csproj | 14 +++++- src/EditorFeatures/TestUtilities/project.json | 3 +- .../BasicEditorServicesTest.vbproj | 2 +- .../VisualBasicTest/project.json | 2 +- .../Test/ExpressionCompiler/project.json | 10 ++-- .../CSharpResultProviderTest.csproj | 2 +- .../CSharp/Test/ResultProvider/project.json | 4 +- .../Core/Test/ExpressionCompiler/project.json | 10 ++-- .../Core/Test/ResultProvider/project.json | 4 +- .../Test/ExpressionCompiler/project.json | 10 ++-- .../Test/ResultProvider/project.json | 2 +- .../HostTest/InteractiveHostTest.csproj | 2 +- src/Interactive/HostTest/project.json | 4 +- .../EditorTest/InteractiveWindowTest.csproj | 2 +- src/InteractiveWindow/EditorTest/project.json | 4 +- ...ntNotifyPropertyChangedCS.UnitTests.csproj | 1 - .../Test/project.json | 4 +- .../Test/MakeConstCS.UnitTests.csproj | 3 +- .../CSharp/MakeConst/Test/project.json | 4 +- .../UnitTestFramework.csproj | 3 +- .../Shared/UnitTestFramework/project.json | 4 +- .../ConvertToAutoPropertyVB.UnitTests.vbproj | 3 +- .../ConvertToAutoProperty/Test/project.json | 4 +- ...ntNotifyPropertyChangedVB.UnitTests.vbproj | 3 +- .../Test/project.json | 4 +- .../Test/MakeConstVB.UnitTests.vbproj | 3 +- .../VisualBasic/MakeConst/Test/project.json | 4 +- .../CSharpScriptingTest.Desktop.csproj | 2 +- .../ScriptingTest.Desktop.csproj | 2 +- src/Scripting/CoreTest/ScriptingTest.csproj | 2 +- .../BasicScriptingTest.Desktop.vbproj | 2 +- .../Desktop/TestUtilities.Desktop.csproj | 3 +- .../Portable.FX45/TestUtilities.FX45.csproj | 47 ++++++++++++++++++- src/Test/Utilities/Portable.FX45/project.json | 14 +++--- .../Utilities/Portable/TestUtilities.csproj | 2 +- src/VisualStudio/CSharp/Test/project.json | 4 +- .../Core/Test/ServicesVisualStudioTest.vbproj | 2 +- src/VisualStudio/Core/Test/project.json | 4 +- src/Workspaces/CoreTest/ServicesTest.csproj | 2 +- src/Workspaces/CoreTest/project.json | 1 - 68 files changed, 173 insertions(+), 121 deletions(-) diff --git a/BuildAndTest.proj b/BuildAndTest.proj index dae468fbcfa..5ee8f46a51d 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 fb0f6b1be54..ebd64e57891 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 09214aeb551..49fe6824b76 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 6a2d32445bc..5601172f5d6 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 df98f8dad2b..4135147da3b 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 aa7ebe77f9c..f38bba39d6b 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 739f9df02e6..25fc180195d 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 44b026a9489..fb6dec183bd 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 5429b31c4f0..af46d7e8433 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 44b026a9489..fb6dec183bd 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 44b026a9489..fb6dec183bd 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 a57557aeaa0..11dde9b404d 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 44b026a9489..fb6dec183bd 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 d886928fcf8..033392834f5 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 76af85f68e8..c627635861a 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 53bb7f24630..a9a0faabff0 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 3ca4807d79c..54c05ac9a9a 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 f5f041cf1cc..d7bf32d01eb 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 44b026a9489..fb6dec183bd 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 aa7ebe77f9c..33f07a91370 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 76af85f68e8..c627635861a 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 76af85f68e8..c627635861a 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 78e0c808d61..cc62225611d 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 40d3320f6bc..345a7a40a25 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 8a2d11eca72..69c29affe29 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 0dbab097438..06a720055f4 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 45f305c99b0..24d10d2c444 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 82ae9d9f487..beccc9be4b2 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 08d5ef58511..d7746387add 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 fc0f0d0aa94..adea9b1d2d9 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 672192549ad..0b477bf28e2 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 3c880d2f797..2148b02d8fc 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 85256010b12..4c2c23fe01a 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 9df052226c1..2b9e584fde9 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 eb6f8a57322..325289709e7 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 85256010b12..4c2c23fe01a 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 eb6f8a57322..325289709e7 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 85256010b12..047bf36e694 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 bb24dfbd9cf..fa8b23309d2 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 ee8137f04fb..527432cd446 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 10383ccf314..11cff6bd2c6 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 446b6e6adee..714cb22d7b4 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 f2cfaff10f1..ff00440e11c 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 141e6444c94..28e96a5a0b1 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 3338ea1dbba..4794d9eda5a 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 65b9adc98be..e6bb6bf78ec 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 3338ea1dbba..4794d9eda5a 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 c84f48eb29f..b73c58ecdc2 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 f54ab828130..2748f240006 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 48549898d3f..dfd6ac9abb2 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 3338ea1dbba..4794d9eda5a 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 0d0a6769ed3..c3161383cfa 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 3338ea1dbba..4794d9eda5a 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 226bc237d65..d2313a74bac 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 3338ea1dbba..4794d9eda5a 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 dfc6bc153a5..31ad7766ef4 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 207b51f1096..74a0aba552a 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 4ae0461e176..d4c12af9016 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 ad17cb8aba2..0e8960fbf3e 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 00be27a0b46..97d730025f7 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 de9e8c4ae37..132933b5754 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 18efdc0ad41..b1790dfbde6 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 2fa82971518..a567c21d984 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 28848afb453..19c1cede280 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 ba2f1ea9458..d13a8cdd186 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 78ff7a3c9d7..2340f0a4bfb 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 c6bd0bd19b6..fc0d86bfa9b 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 47df50feef8..48bcba6dead 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": { } -- GitLab