提交 6aee0929 编写于 作者: T Tanner Gooding

Revert "Update the XUnit runners to support CoreCLR"

This reverts commit 4ca8634b.
上级 fbab72fe
......@@ -10,6 +10,4 @@
<package id="FakeSign" version="0.9.2" targetFramework="net45" />
<package id="dnx-coreclr-win-x86" version="1.0.0-beta5-12101" />
<package id="dnx-mono" version="1.0.0-beta5-12101" />
<package id="xunit.runner.console" version="2.1.0-beta3-build3029" />
<package id="xunit.runner.msbuild" version="2.1.0-beta3-build3029" />
</packages>
......@@ -4,7 +4,7 @@
ToolsVersion="12.0">
<UsingTask
AssemblyFile="packages/xunit.runner.msbuild.2.1.0-beta3-build3029/build/portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS/xunit.runner.msbuild.dll"
AssemblyFile="packages\xunit.runners.2.0.0-alpha-build2576\tools\xunit.runner.msbuild.dll"
TaskName="Xunit.Runner.MSBuild.xunit" />
<!-- At the moment Jenkins runs on a machine without any build of Visual Studio 2015. Hence we must
......@@ -21,6 +21,7 @@
</PropertyGroup>
<Target Name="RestorePackages">
<Exec Command="&quot;$(MSBuildThisFileDirectory)\.nuget\Nuget.exe&quot; install xunit.runners -pre -version 2.0.0-alpha-build2576 -outputdirectory packages"/>
<Exec Command="&quot;$(MSBuildThisFileDirectory)\.nuget\Nuget.exe&quot; restore &quot;$(RoslynSolution)&quot;" />
</Target>
......@@ -76,7 +77,7 @@
Binaries\$(Configuration)\Roslyn.Services.Editor.CSharp.UnitTests.dll;" />
</ItemGroup>
<Exec Command="Binaries\$(Configuration)\RunTests.exe packages/xunit.runner.console.2.1.0-beta3-build3029/tools/ $(RunTestArgs) @(TestAssemblies, ' ')" />
<Exec Command="Binaries\$(Configuration)\RunTests.exe packages\xunit.runners.2.0.0-alpha-build2576\tools $(RunTestArgs) @(TestAssemblies, ' ')" />
</Target>
......
......@@ -10,7 +10,7 @@ usage()
echo " --os <os> OS to run (Linux / Darwin)"
}
XUNIT_VERSION=2.1.0-beta3-build3029
XUNIT_VERSION=2.0.0-alpha-build2576
BUILD_CONFIGURATION=Debug
OS_NAME=$(uname -s)
USE_CACHE=true
......@@ -183,7 +183,7 @@ set_mono_path()
test_roslyn()
{
local xunit_runner=packages/xunit.runner.console.$XUNIT_VERSION/tools/xunit.console.x86.exe
local xunit_runner=packages/xunit.runners.$XUNIT_VERSION/tools/xunit.console.x86.exe
local test_binaries=(
Roslyn.Compilers.CSharp.CommandLine.UnitTests
Roslyn.Compilers.CSharp.Syntax.UnitTests
......@@ -211,6 +211,7 @@ test_roslyn()
# temporary work around.
echo Restoring NuGet packages
run_nuget restore Roslyn.sln
run_nuget install xunit.runners -PreRelease -Version $XUNIT_VERSION -OutputDirectory packages
set_mono_path
which mono
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册