Skip to content

Commit 1ed4491

Browse files
bradwilsonbradwilson
committed
Collapse down to a single NuGet package
1 parent f878cca commit 1ed4491

16 files changed

+89
-127
lines changed

‎build/xunit.runner.visualstudio.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
77
<Visible>False</Visible>
88
</Content>
9-
<Content Include="$(MSBuildThisFileDirectory)..\_common\xunit.runner.utility.dll">
10-
<Link>xunit.runner.utility.dll</Link>
9+
<Content Include="$(MSBuildThisFileDirectory)..\_common\xunit.runner.utility.desktop.dll">
10+
<Link>xunit.runner.utility.desktop.dll</Link>
1111
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1212
<Visible>False</Visible>
1313
</Content>

‎build/xunit.runner.visualstudio.win8.targets‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Target Name="SwapXunitTestAdapterLibs" AfterTargets="_ComputeAppxPackagePayload" BeforeTargets="_GenerateAppxManifest">
4-
<Message Text="Swapping xUnit.net Test Adapter Libraries" />
5-
3+
<Target Name="AddXunitTestAdapterLibs" AfterTargets="_ComputeAppxPackagePayload" BeforeTargets="_GenerateAppxManifest">
64
<ItemGroup>
7-
<xUnitVsLibs Include="$(MSBuildThisFileDirectory)device\xunit.runner.visualstudio.win8.dll">
5+
<xUnitVsLibs Include="$(MSBuildThisFileDirectory)xunit.runner.visualstudio.win8.dll">
86
<TargetPath>xunit.runner.visualstudio.testadapter.dll</TargetPath>
97
</xUnitVsLibs>
10-
<xUnitVsLibs Include="$(MSBuildThisFileDirectory)device\xunit.runner.utility.dll">
11-
<TargetPath>xunit.runner.utility.dll</TargetPath>
8+
<xUnitVsLibs Include="$(MSBuildThisFileDirectory)xunit.runner.utility.win8.dll">
9+
<TargetPath>xunit.runner.utility.win8.dll</TargetPath>
1210
</xUnitVsLibs>
13-
1411
<xUnitVsLibsToRemove Include="@(AppxPackagePayload)" Condition="'%(TargetPath)' == 'xunit.runner.visualstudio.testadapter.dll'"/>
15-
<xUnitVsLibsToRemove Include="@(AppxPackagePayload)" Condition="'%(TargetPath)' == 'xunit.runner.visualstudio.testadapter.pdb'"/>
16-
<xUnitVsLibsToRemove Include="@(AppxPackagePayload)" Condition="'%(TargetPath)' == 'xunit.runner.utility.dll'"/>
17-
<xUnitVsLibsToRemove Include="@(AppxPackagePayload)" Condition="'%(TargetPath)' == 'xunit.runner.utility.pdb'"/>
18-
12+
<xUnitVsLibsToRemove Include="@(AppxPackagePayload)" Condition="'%(TargetPath)' == 'xunit.runner.utility.desktop.dll'"/>
1913
<AppxPackagePayload Remove="@(xUnitVsLibsToRemove)" />
2014
<AppxPackagePayload Include="@(xUnitVsLibs)" />
2115
</ItemGroup>
22-
2316
</Target>
2417
</Project>

‎build/xunit.runner.visualstudio.wpa81.targets‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,23 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Target Name="SwapXunitTestAdapterLibs" AfterTargets="_ComputeAppxPackagePayload" BeforeTargets="_GenerateAppxManifest">
4-
<Message Text="Swapping xUnit.net Test Adapter Libraries" />
5-
3+
<Target Name="AddXunitTestAdapterLibs" AfterTargets="_ComputeAppxPackagePayload" BeforeTargets="_GenerateAppxManifest">
64
<ItemGroup>
7-
<xUnitVsLibs Include="$(MSBuildThisFileDirectory)device\xunit.runner.visualstudio.wpa81.dll">
8-
<TargetPath>xunit.runner.visualstudio.wpa81.dll</TargetPath>
5+
<xUnitVsLibs Include="$(MSBuildThisFileDirectory)xunit.runner.visualstudio.wpa81.dll">
6+
<TargetPath>xunit.runner.visualstudio.testadapter.dll</TargetPath>
97
</xUnitVsLibs>
10-
<xUnitVsLibs Include="$(MSBuildThisFileDirectory)device\xunit.runner.visualstudio.wpa81.pri">
11-
<TargetPath>xunit.runner.visualstudio.wpa81.pri</TargetPath>
8+
<xUnitVsLibs Include="$(MSBuildThisFileDirectory)xunit.runner.visualstudio.wpa81.pri">
9+
<TargetPath>xunit.runner.visualstudio.testadapter.pri</TargetPath>
1210
</xUnitVsLibs>
13-
<xUnitVsLibs Include="$(MSBuildThisFileDirectory)device\xunit.runner.utility.dll">
14-
<TargetPath>xunit.runner.utility.dll</TargetPath>
11+
<xUnitVsLibs Include="$(MSBuildThisFileDirectory)xunit.runner.utility.universal.dll">
12+
<TargetPath>xunit.runner.utility.universal.dll</TargetPath>
1513
</xUnitVsLibs>
16-
<xUnitVsLibs Include="$(MSBuildThisFileDirectory)device\xunit.runner.utility.pri">
17-
<TargetPath>xunit.runner.utility.pri</TargetPath>
14+
<xUnitVsLibs Include="$(MSBuildThisFileDirectory)xunit.runner.utility.universal.pri">
15+
<TargetPath>xunit.runner.utility.universal.pri</TargetPath>
1816
</xUnitVsLibs>
19-
2017
<xUnitVsLibsToRemove Include="@(AppxPackagePayload)" Condition="'%(TargetPath)' == 'xunit.runner.visualstudio.testadapter.dll'"/>
21-
<xUnitVsLibsToRemove Include="@(AppxPackagePayload)" Condition="'%(TargetPath)' == 'xunit.runner.visualstudio.testadapter.pdb'"/>
22-
<xUnitVsLibsToRemove Include="@(AppxPackagePayload)" Condition="'%(TargetPath)' == 'xunit.runner.utility.dll'"/>
23-
<xUnitVsLibsToRemove Include="@(AppxPackagePayload)" Condition="'%(TargetPath)' == 'xunit.runner.utility.pri'"/>
24-
<xUnitVsLibsToRemove Include="@(AppxPackagePayload)" Condition="'%(TargetPath)' == 'xunit.runner.utility.pdb'"/>
25-
18+
<xUnitVsLibsToRemove Include="@(AppxPackagePayload)" Condition="'%(TargetPath)' == 'xunit.runner.utility.desktop.dll'"/>
2619
<AppxPackagePayload Remove="@(xUnitVsLibsToRemove)" />
2720
<AppxPackagePayload Include="@(xUnitVsLibs)" />
2821
</ItemGroup>
29-
3022
</Target>
3123
</Project>

‎common/GlobalAssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
[assembly: AssemblyCompany("Outercurve Foundation")]
44
[assembly: AssemblyProduct("xUnit.net Runner for Visual Studio")]
55
[assembly: AssemblyCopyright("Copyright (C) Outercurve Foundation")]
6-
[assembly: AssemblyVersion("0.99.9.0")]
6+
[assembly: AssemblyVersion("0.99.10.0")]

‎visualstudio.xunit.sln‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
ProjectSection(SolutionItems) = preProject
1414
xunit.runner.visualstudio.nuspec = xunit.runner.visualstudio.nuspec
1515
build\xunit.runner.visualstudio.props = build\xunit.runner.visualstudio.props
16-
xunit.runner.visualstudio.win8.nuspec = xunit.runner.visualstudio.win8.nuspec
1716
build\xunit.runner.visualstudio.win8.targets = build\xunit.runner.visualstudio.win8.targets
18-
xunit.runner.visualstudio.wp8.nuspec = xunit.runner.visualstudio.wp8.nuspec
19-
build\xunit.runner.visualstudio.wp8.targets = build\xunit.runner.visualstudio.wp8.targets
20-
xunit.runner.visualstudio.wpa81.nuspec = xunit.runner.visualstudio.wpa81.nuspec
2117
build\xunit.runner.visualstudio.wpa81.targets = build\xunit.runner.visualstudio.wpa81.targets
2218
EndProjectSection
2319
EndProject

‎xunit.runner.visualstudio.nuspec‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata minClientVersion="2.5">
44
<id>xunit.runner.visualstudio</id>
5-
<version>0.99.9</version>
5+
<version>0.99.10</version>
66
<title>xUnit.net [Visual Studio Runner]</title>
77
<authors>James Newkirk, Brad Wilson</authors>
88
<description>Includes support for running xUnit.net v1 and v2 tests from Visual Studio 2012+.</description>
@@ -14,15 +14,25 @@
1414
</metadata>
1515
<files>
1616
<!-- Discovery -->
17-
<file src="xunit.runner.visualstudio.testadapter\bin\Release\xunit.abstractions.dll" target="build\_common\xunit.abstractions.dll" />
18-
<file src="xunit.runner.visualstudio.testadapter\bin\Release\xunit.runner.utility.dll" target="build\_common\xunit.runner.utility.dll" />
19-
<file src="xunit.runner.visualstudio.testadapter\bin\Release\xunit.runner.visualstudio.testadapter.dll" target="build\_common\xunit.runner.visualstudio.testadapter.dll" />
20-
<file src="xunit.runner.visualstudio.testadapter\bin\Release\xunit.runner.visualstudio.testadapter.pdb" target="build\_common\xunit.runner.visualstudio.testadapter.pdb" />
17+
<file src="xunit.runner.visualstudio.testadapter\bin\Release\xunit.abstractions.dll" target="build\_common\" />
18+
<file src="xunit.runner.visualstudio.testadapter\bin\Release\xunit.runner.utility.desktop.dll" target="build\_common\" />
19+
<file src="xunit.runner.visualstudio.testadapter\bin\Release\xunit.runner.visualstudio.testadapter.dll" target="build\_common\" />
2120

2221
<!-- Execution -->
23-
<file src="build\_._" target="lib\net20\_._" />
24-
<file src="build\_._" target="lib\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\_._" />
2522
<file src="build\xunit.runner.visualstudio.props" target="build\net20\xunit.runner.visualstudio.props" />
23+
2624
<file src="build\xunit.runner.visualstudio.props" target="build\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\xunit.runner.visualstudio.props" />
25+
26+
<file src="build\xunit.runner.visualstudio.props" target="build\win8\xunit.runner.visualstudio.props" />
27+
<file src="build\xunit.runner.visualstudio.win8.targets" target="build\win8\xunit.runner.visualstudio.targets" />
28+
<file src="xunit.runner.visualstudio.win8\bin\Release\xunit.runner.utility.win8.dll" target="build\win8\" />
29+
<file src="xunit.runner.visualstudio.win8\bin\Release\xunit.runner.visualstudio.win8.dll" target="build\win8\" />
30+
31+
<file src="build\xunit.runner.visualstudio.props" target="build\wpa81\xunit.runner.visualstudio.props" />
32+
<file src="build\xunit.runner.visualstudio.wpa81.targets" target="build\wpa81\xunit.runner.visualstudio.targets" />
33+
<file src="xunit.runner.visualstudio.wpa81\bin\Release\xunit.runner.utility.universal.dll" target="build\wpa81\" />
34+
<file src="xunit.runner.visualstudio.wpa81\bin\Release\xunit.runner.utility.universal.pri" target="build\wpa81\" />
35+
<file src="xunit.runner.visualstudio.wpa81\bin\Release\xunit.runner.visualstudio.wpa81.dll" target="build\wpa81\" />
36+
<file src="xunit.runner.visualstudio.wpa81\bin\Release\xunit.runner.visualstudio.wpa81.pri" target="build\wpa81\" />
2737
</files>
2838
</package>

‎xunit.runner.visualstudio.testadapter/Utility/ExecutionHelper.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
namespace Xunit
2+
{
3+
internal static class ExecutionHelper
4+
{
5+
/// <summary>
6+
/// Gets the name of the execution DLL used to run xUnit.net v2 tests.
7+
/// </summary>
8+
#if WIN8_STORE
9+
public static readonly string AssemblyName = "xunit.execution.win8.dll";
10+
#elif WINDOWS_PHONE_APP
11+
public static readonly string AssemblyName = "xunit.execution.universal.dll";
12+
#else
13+
public static readonly string AssemblyName = "xunit.execution.desktop.dll";
14+
#endif
15+
}
16+
}

‎xunit.runner.visualstudio.testadapter/VsTestRunner.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@ public class VsTestRunner : ITestDiscoverer, ITestExecutor
3434
"microsoft.visualstudio.testplatform.utilities.dll",
3535
"vstest.executionengine.appcontainer.exe",
3636
"vstest.executionengine.appcontainer.x86.exe",
37-
"xunit.execution.dll",
38-
"xunit.runner.utility.dll",
37+
"xunit.execution.desktop.dll",
38+
"xunit.execution.win8.dll",
39+
"xunit.execution.universal.dll",
40+
"xunit.runner.utility.desktop.dll",
41+
"xunit.runner.utility.win8.dll",
42+
"xunit.runner.utility.universal.dll",
3943
"xunit.runner.visualstudio.testadapter.dll",
4044
"xunit.core.dll",
4145
"xunit.assert.dll"
@@ -202,7 +206,7 @@ static bool IsXunitTestAssembly(string assemblyFileName)
202206
return false;
203207

204208
var xunitPath = Path.Combine(Path.GetDirectoryName(assemblyFileName), "xunit.dll");
205-
var xunitExecutionPath = Path.Combine(Path.GetDirectoryName(assemblyFileName), "xunit.execution.dll");
209+
var xunitExecutionPath = Path.Combine(Path.GetDirectoryName(assemblyFileName), ExecutionHelper.AssemblyName);
206210
return File.Exists(xunitPath) || File.Exists(xunitExecutionPath);
207211
}
208212

‎xunit.runner.visualstudio.testadapter/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.VisualStudio.TestPlatform.ObjectModel" version="0.0.4" targetFramework="net35" />
4-
<package id="xunit.abstractions" version="2.0.0-beta5-build2808" targetFramework="net35" />
5-
<package id="xunit.runner.utility" version="2.0.0-beta5-build2808" targetFramework="net35" />
4+
<package id="xunit.abstractions" version="2.0.0-beta5-build2813" targetFramework="net35" />
5+
<package id="xunit.runner.utility" version="2.0.0-beta5-build2813" targetFramework="net35" />
66
</packages>

‎xunit.runner.visualstudio.testadapter/xunit.runner.visualstudio.testadapter.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,13 @@
4343
<Reference Include="System.Data.DataSetExtensions" />
4444
<Reference Include="System.Data" />
4545
<Reference Include="System.Xml" />
46-
<Reference Include="xunit.abstractions">
47-
<HintPath>..\packages\xunit.abstractions.2.0.0-beta5-build2808\lib\net35\xunit.abstractions.dll</HintPath>
46+
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
47+
<SpecificVersion>False</SpecificVersion>
48+
<HintPath>..\packages\xunit.abstractions.2.0.0-beta5-build2813\lib\net35\xunit.abstractions.dll</HintPath>
4849
</Reference>
49-
<Reference Include="xunit.runner.utility">
50-
<HintPath>..\packages\xunit.runner.utility.2.0.0-beta5-build2808\lib\net35\xunit.runner.utility.dll</HintPath>
50+
<Reference Include="xunit.runner.utility.desktop, Version=2.0.0.2813, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
51+
<SpecificVersion>False</SpecificVersion>
52+
<HintPath>..\packages\xunit.runner.utility.2.0.0-beta5-build2813\lib\net35\xunit.runner.utility.desktop.dll</HintPath>
5153
</Reference>
5254
</ItemGroup>
5355
<ItemGroup>
@@ -59,6 +61,7 @@
5961
<Compile Include="Utility\AssemblyExtensions.cs" />
6062
<Compile Include="Utility\AssemblyRunInfo.cs" />
6163
<Compile Include="Utility\ExceptionExtensions.cs" />
64+
<Compile Include="Utility\ExecutionHelper.cs" />
6265
<Compile Include="Utility\Guard.cs" />
6366
<Compile Include="Visitors\TestDiscoveryVisitor.cs" />
6467
<Compile Include="Visitors\IVsDiscoveryVisitor.cs" />

0 commit comments

Comments
 (0)