Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate test logger #33

Merged
merged 5 commits into from
Apr 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2.1.{build}'
version: '3.0.{build}'
image: Visual Studio 2019

clone_depth: 1
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,4 @@ nugetPackage

# Test results
test/**/*test-results.xml
CodeMaid.config
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ language: csharp

matrix:
include:
- dotnet: 2.1
- dotnet: 3.1
mono: latest

solution: junit.testlogger.sln
Expand Down
7 changes: 7 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
<add key="myget" value="https://www.myget.org/F/spekt/api/v3/index.json" />
</packageSources>
</configuration>
3 changes: 2 additions & 1 deletion scripts/dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
<MSTestVersion>2.0.0</MSTestVersion>
<NETTestSdkVersion>15.7.2</NETTestSdkVersion>
<MoqVersion>4.9.0</MoqVersion>
<TestLoggerVersion>3.0.37</TestLoggerVersion>

<!-- Test Assets use the minimum supported versions -->
<NETTestSdkMinimumVersion>15.0.0</NETTestSdkMinimumVersion>
<NETTestSdkMinimumVersion>15.5.0</NETTestSdkMinimumVersion>
<NUnitVersion>3.10.1</NUnitVersion>
<NUnitTestAdapterVersion>3.10.0</NUnitTestAdapterVersion>

Expand Down
2 changes: 1 addition & 1 deletion scripts/settings.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SourceRoot Condition="$(SourceRoot) == ''">$(MSBuildThisFileDirectory)../../</SourceRoot>
<SourcePrefix>2.1.0</SourcePrefix>
<SourcePrefix>3.0.0</SourcePrefix>
</PropertyGroup>
<PropertyGroup>
<!-- Versioning is defined from the build script. Use a default dev build if it's not defined.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,13 @@
</PropertyGroup>

<ItemGroup>
<Compile Include="..\JUnit.Xml.TestLogger\JUnitXmlTestLogger.cs">
<Link>JUnitXmlTestLogger.cs</Link>
</Compile>
<Compile Include="..\JUnit.Xml.TestLogger\StringExtensions.cs">
<Link>StringExtensions.cs</Link>
</Compile>
<Compile Include="..\JUnit.Xml.TestLogger\TestCaseNameParser.cs" Link="TestCaseNameParser.cs" />
<Compile Include="..\JUnit.Xml.TestLogger\TestResultInfo.cs">
<Link>TestResultInfo.cs</Link>
</Compile>
<Compile Include="..\JUnit.Xml.TestLogger\JunitXmlSerializer.cs" Link="JunitXmlSerializer.cs" />
<Compile Include="..\JUnit.Xml.TestLogger\JUnitXmlTestLogger.cs" Link="JUnitXmlTestLogger.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.5.0" />
<PackageReference Include="Spekt.TestLogger" Version="$(TestLoggerVersion)" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/JUnit.Xml.TestLogger/JUnit.Xml.TestLogger.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="15.5.0" />
<PackageReference Include="Spekt.TestLogger" Version="$(TestLoggerVersion)" />
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
</ItemGroup>
</Project>
Loading