Skip to content

Commit 7b11ac4

Browse files
bradwilsonbradwilson
committed
Fixes #340: Split xunit.runners into xunit.runner.console and xunit.runner.msbuild
1 parent ad94ce5 commit 7b11ac4

9 files changed

Lines changed: 98 additions & 22 deletions

src/build/empty.dll renamed to src/build/_

File renamed without changes.

‎src/readme_upgrade_extensions.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
The xunit.extensions package has been retired.
2+
3+
Some of the classes contained in extensions are now part of the core
4+
framework, and some are now part of the samples. For more information,
5+
please visit:
6+
7+
http://xunit.github.io/docs/upgrade-extensions.html

‎src/readme_upgrade_runners.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
The xunit.runners package has been retired.
2+
3+
For the console runner, install xunit.runner.console.
4+
For the MSBuild runner, install xunit.runner.msbuild.
5+
6+
You can safely uninstall xunit.runners now.

‎src/xunit.extensions.nuspec‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata minClientVersion="2.8.1">
4+
<id>xunit.extensions</id>
5+
<version>99.99.99</version>
6+
<title>xUnit.net [Extensions]</title>
7+
<authors>James Newkirk, Brad Wilson</authors>
8+
<description>
9+
NOTE: This empty package exists to assist users upgrading from xUnit.net v1.x to v2.x.
10+
</description>
11+
<language>en-US</language>
12+
<projectUrl>https://github.com/xunit/xunit</projectUrl>
13+
<iconUrl>https://raw.githubusercontent.com/xunit/media/master/logo-512-transparent.png</iconUrl>
14+
<licenseUrl>https://raw.githubusercontent.com/xunit/xunit/master/license.txt</licenseUrl>
15+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
16+
<dependencies>
17+
<dependency id="xunit" version="[99.99.99]" />
18+
</dependencies>
19+
</metadata>
20+
<files>
21+
<file src="readme_upgrade_extensions.txt" target="readme.txt" />
22+
<file src="build\_" target="lib\_" />
23+
</files>
24+
</package>

‎src/xunit.runner.console.nuspec‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata minClientVersion="2.8.1">
4+
<id>xunit.runner.console</id>
5+
<version>99.99.99</version>
6+
<title>xUnit.net [Runner: Console]</title>
7+
<authors>James Newkirk, Brad Wilson</authors>
8+
<description>
9+
Console runner for the xUnit.net framework.
10+
Supported platforms: Desktop .NET 4.5+.
11+
</description>
12+
<language>en-US</language>
13+
<projectUrl>https://github.com/xunit/xunit</projectUrl>
14+
<iconUrl>https://raw.githubusercontent.com/xunit/media/master/logo-512-transparent.png</iconUrl>
15+
<licenseUrl>https://raw.githubusercontent.com/xunit/xunit/master/license.txt</licenseUrl>
16+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
17+
</metadata>
18+
<files>
19+
<file src="xunit.console\*.xslt" target="tools\" />
20+
<file src="xunit.console\bin\Release\xunit.abstractions.dll" target="tools\" />
21+
<file src="xunit.console\bin\Release\xunit.runner.utility.desktop.dll" target="tools\" />
22+
<file src="xunit.console\bin\Release\xunit.console.exe" target="tools\" />
23+
<file src="xunit.console\bin\Release\xunit.console.exe.config" target="tools\" />
24+
<file src="xunit.console\bin\Release.x86\xunit.console.x86.exe" target="tools\" />
25+
<file src="xunit.console\bin\Release.x86\xunit.console.x86.exe.config" target="tools\" />
26+
</files>
27+
</package>

‎src/xunit.runner.msbuild.nuspec‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata minClientVersion="2.8.1">
4+
<id>xunit.runner.msbuild</id>
5+
<version>99.99.99</version>
6+
<title>xUnit.net [Runner: MSBuild]</title>
7+
<authors>James Newkirk, Brad Wilson</authors>
8+
<description>
9+
MSBuild runner for the xUnit.net framework.
10+
Supported platforms: Desktop .NET 4.5+.
11+
</description>
12+
<language>en-US</language>
13+
<projectUrl>https://github.com/xunit/xunit</projectUrl>
14+
<iconUrl>https://raw.githubusercontent.com/xunit/media/master/logo-512-transparent.png</iconUrl>
15+
<licenseUrl>https://raw.githubusercontent.com/xunit/xunit/master/license.txt</licenseUrl>
16+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
17+
</metadata>
18+
<files>
19+
<file src="xunit.console\*.xslt" target="build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\" />
20+
<file src="xunit.runner.msbuild\bin\Release\xunit.abstractions.dll" target="build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\" />
21+
<file src="xunit.runner.msbuild\bin\Release\xunit.runner.utility.desktop.dll" target="build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\" />
22+
<file src="xunit.runner.msbuild\bin\Release\xunit.runner.msbuild.dll" target="build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\" />
23+
<file src="xunit.runner.msbuild\build\xunit.runner.msbuild.props" target="build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\" />
24+
<file src="build\_" target="lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\_" />
25+
</files>
26+
</package>

‎src/xunit.runner.msbuild/build/xunit.runner.msbuild.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<UsingTask
3+
AssemblyFile="$(MSBuildThisFileDirectory)xunit.runner.msbuild.dll"
4+
Condition="Exists('$(MSBuildThisFileDirectory)xunit.runner.msbuild.dll')"
5+
TaskName="Xunit.Runner.MSBuild.xunit"/>
6+
</Project>

‎src/xunit.runner.msbuild/build/xunit.runners.props‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/xunit.runners.nuspec‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
<title>xUnit.net [Runners]</title>
77
<authors>James Newkirk, Brad Wilson</authors>
88
<description>
9-
Runners for the xUnit.net framework, including Console and MSBuild.
10-
Supported platforms: Desktop .NET 4.5+.
9+
NOTE: This empty package exists to assist users upgrading from xUnit.net v1.x to v2.x.
1110
</description>
1211
<language>en-US</language>
1312
<projectUrl>https://github.com/xunit/xunit</projectUrl>
@@ -16,19 +15,6 @@
1615
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1716
</metadata>
1817
<files>
19-
<!-- Core -->
20-
<file src="xunit.abstractions.pcl\bin\Release\xunit.abstractions.dll" target="tools\" />
21-
<file src="xunit.runner.utility.desktop\bin\Release\xunit.runner.utility.desktop.dll" target="tools\" />
22-
23-
<!-- Console runner -->
24-
<file src="xunit.console\*.xslt" target="tools\" />
25-
<file src="xunit.console\bin\Release\xunit.console.exe" target="tools\" />
26-
<file src="xunit.console\bin\Release\xunit.console.exe.config" target="tools\" />
27-
<file src="xunit.console\bin\Release.x86\xunit.console.x86.exe" target="tools\" />
28-
<file src="xunit.console\bin\Release.x86\xunit.console.x86.exe.config" target="tools\" />
29-
30-
<!-- MSBuild runner -->
31-
<file src="xunit.runner.msbuild\bin\Release\xunit.runner.msbuild.dll" target="tools\" />
32-
<file src="xunit.runner.msbuild\build\xunit.runners.props" target="build\" />
18+
<file src="readme_upgrade_runners.txt" target="readme.txt" />
3319
</files>
3420
</package>

0 commit comments

Comments
 (0)