Skip to content

Commit f1744bc

Browse files
authored
Testlogger integration (#28)
* chore: upgrade test projects to netcoreapp3.1 since netcoreapp2.0 is eol. * feat: add spekt.testlogger dependency and upgrade to Microsoft.TestPlatform.ObjectModel 15.5.0. * feat: integrate with testlogger. * chore: use dotnet 3.1 in travis ci.
1 parent dfa24c2 commit f1744bc

18 files changed

+395
-567
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '2.1.{build}'
1+
version: '3.0.{build}'
22
image: Visual Studio 2019
33

44
clone_depth: 1

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ language: csharp
22

33
matrix:
44
include:
5-
- dotnet: 2.1
5+
- dotnet: 3.1
66
mono: latest
77

88
solution: xunit.testlogger.sln

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Changelog
2+
3+
## Unreleased (v3.0.x)
4+
5+
* Refactor to support [core testlogger][]
6+
* Compatibility: minimum framework is netstandard1.5 and TestPlatform 15.5.0
7+
8+
[core testlogger]: https://github.com/spekt/testlogger

NuGet.config

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
5+
<add key="myget" value="https://www.myget.org/F/spekt/api/v3/index.json" />
6+
</packageSources>
7+
</configuration>

scripts/dependencies.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
<MSTestVersion>1.3.2</MSTestVersion>
55
<NETTestSdkVersion>15.7.2</NETTestSdkVersion>
66
<MoqVersion>4.9.0</MoqVersion>
7+
<TestLoggerVersion>3.0.26</TestLoggerVersion>
78

89
<!-- Test Assets use the minimum supported versions -->
9-
<NETTestSdkMinimumVersion>15.0.0</NETTestSdkMinimumVersion>
10+
<NETTestSdkMinimumVersion>15.5.0</NETTestSdkMinimumVersion>
1011
<XunitVersion>2.3.1</XunitVersion>
1112
<XunitTestAdapterVersion>2.3.1</XunitTestAdapterVersion>
1213

scripts/settings.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<SourceRoot Condition="$(SourceRoot) == ''">$(MSBuildThisFileDirectory)../../</SourceRoot>
5-
<SourcePrefix>2.1.0</SourcePrefix>
5+
<SourcePrefix>3.0.0</SourcePrefix>
66
</PropertyGroup>
77
<PropertyGroup>
88
<!-- Versioning is defined from the build script. Use a default dev build if it's not defined.

scripts/version.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<PackageVersion Condition="'$(PackageVersion)' == ''">2.1.0-dev</PackageVersion>
3+
<PackageVersion Condition="'$(PackageVersion)' == ''">3.0.0-dev</PackageVersion>
44
</PropertyGroup>
55
</Project>
66
<!-- vi: set ft=xml: -->

src/Xunit.Xml.TestLogger.TestAdapter/Xunit.Xml.TestLogger.TestAdapter.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,17 @@
1919
<Compile Include="..\Xunit.Xml.TestLogger\XunitXmlTestLogger.cs">
2020
<Link>XunitXmlTestLogger.cs</Link>
2121
</Compile>
22+
<Compile Include="..\Xunit.Xml.TestLogger\XunitXmlSerializer.cs">
23+
<Link>XunitXmlSerializer.cs</Link>
24+
</Compile>
2225
<Compile Include="..\Xunit.Xml.TestLogger\TestResultInfo.cs">
2326
<Link>TestResultInfo.cs</Link>
2427
</Compile>
2528
</ItemGroup>
2629

2730
<ItemGroup>
28-
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.0.0" />
31+
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.5.0" />
32+
<PackageReference Include="Spekt.TestLogger" Version="$(TestLoggerVersion)" />
2933
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
3034
</ItemGroup>
3135
</Project>

src/Xunit.Xml.TestLogger/TestResultInfo.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Extension.Xunit.Xml.TestLogger
1111
// Disabling warning CS0659: 'XunitXmlTestLogger.TestResultInfo' overrides Object.Equals(object o) but does not override Object.GetHashCode()
1212
// As this is a false alarm here.
1313
#pragma warning disable 0659
14+
#if NONE
1415
public class TestResultInfo
1516
{
1617
public TestResultInfo(
@@ -76,4 +77,5 @@ public override bool Equals(object obj)
7677
return false;
7778
}
7879
}
80+
#endif
7981
}

src/Xunit.Xml.TestLogger/Xunit.Xml.TestLogger.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.0.0" />
20+
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.5.0" />
21+
<PackageReference Include="Spekt.TestLogger" Version="$(TestLoggerVersion)" />
2122
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
2223
</ItemGroup>
2324

0 commit comments

Comments
 (0)