Merge pull request #33 from Siphonophora/integrate-test-logger

Integrate test logger
spekt · Apr 7, 2021 · 422c0ff · 422c0ff
2 parents 144c241 + 9bb15be
commit 422c0ff
Show file tree

Hide file tree

Showing 26 changed files with 435 additions and 1,160 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,4 +1,4 @@
-version: '2.1.{build}'
+version: '3.0.{build}'
 image: Visual Studio 2019
 
 clone_depth: 1

diff --git a/.gitignore b/.gitignore
@@ -104,3 +104,4 @@ nugetPackage
 
 # Test results
 test/**/*test-results.xml
+CodeMaid.config
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: csharp
 
 matrix:
     include:
-        - dotnet: 2.1
+        - dotnet: 3.1
           mono: latest
 
 solution: junit.testlogger.sln

diff --git a/NuGet.config b/NuGet.config
@@ -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>
diff --git a/scripts/dependencies.props b/scripts/dependencies.props
@@ -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>
 

diff --git a/scripts/settings.targets b/scripts/settings.targets
@@ -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.

diff --git a/src/JUnit.Xml.TestLogger.TestAdapter/JUnit.Xml.TestLogger.TestAdapter.csproj b/src/JUnit.Xml.TestLogger.TestAdapter/JUnit.Xml.TestLogger.TestAdapter.csproj
@@ -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>
diff --git a/src/JUnit.Xml.TestLogger/JUnit.Xml.TestLogger.csproj b/src/JUnit.Xml.TestLogger/JUnit.Xml.TestLogger.csproj
@@ -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>