Updated packages and build.sh (#114)

gfoidl · Nov 4, 2022 · 666e1c1 · 666e1c1
1 parent 792eebc
commit 666e1c1
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 86 deletions.
diff --git a/build.sh b/build.sh
@@ -6,7 +6,6 @@
 #   build               builds the solution
 #   test                runs all tests under ./tests
 #   test-coverage       test + determines code coverage with coverlet.msbuild
-#   coverage            determines code coverage with coverlet and uploads to codecov
 #   pack                creates the NuGet-package
 #   deploy              deploys to $2, which must be either nuget or custom
 #                       * when CI_SKIP_DEPLOY is set, no deploy is done
@@ -22,19 +21,16 @@
 #   TEST_DIR            directory in which to search for test-assemblies
 #   TEST_FRAMEWORK      when set only the specified test-framework (dotnet test -f) will be used
 #   TESTS_TO_SKIP       a list of test-projects to skip / ignore, separated by ;
-#   CODECOV_TOKEN       the token for codecov to uploads the opencover-xml
 #   MOVE_TRX            moves the test-results (trx) to tests/TestResults
 #
 # Functions (sorted alphabetically):
 #   build               builds the solution
-#   coverage            code coverage
 #   deploy              deploys the solution either to nuget or custom
 #   main                entry-point
 #   pack                creates the NuGet-package
 #   setBuildEnv         sets the environment variables regarding the build-environment
 #   test                runs tests for projects in ./tests
 #   test-coverage       runs tests for projects in ./tests and collects code-coverage
-#   _coverageCore       helper -- used by coverage
 #   _deployCore         helper -- used by deploy
 #   _testCore           helper -- used by test
 #
@@ -51,7 +47,6 @@ help() {
     echo "  build                  builds the solution"
     echo "  test                   runs all tests under ./tests"
     echo "  test-coverage          test + determines code coverage with coverlet.msbuild"
-    echo "  coverage               determines code coverage with coverlet and uploads to codecov"
     echo "  pack                   creates the NuGet-package"
     echo "  deploy [nuget|custom]  deploys to the destination"
 }
@@ -129,20 +124,20 @@ _testCore() {
         dotnetTestArgs+=("-f ${TEST_FRAMEWORK}")
     fi
 
+    # Must be before adding args for code coverage.
+    dotnetTestArgs+=("${testFullName}")
+
+    # It's a bit strange, but doesn't work otherwise due to : "Unable to find a datacollector with friendly name 'XPlat'."
     if [[ -n "$collectCoverage" ]]; then
-        echo "running tests and collecting code coverage"
+        echo "invoke test with args: ${dotnetTestArgs[@]} --collect:\"XPlat Code Coverage\""
         echo ""
-
-        # Strange but git-bash (Windows) needs double-escapes, so //p:CollectCoverage=true
-        # whereas non-Windows just needs /p:CollectCoverage=true
-        # To avoid platform detection like [[ $(uname | grep mingw -i | wc -l) -ge 0 ]]
-        # use -p instead to be on the safe side.
-        dotnetTestArgs+=("-p:CollectCoverage=true" "-p:CoverletOutputFormat=cobertura")
+        dotnet test ${dotnetTestArgs[@]} --collect:"XPlat Code Coverage"
+    else
+        echo "invoke test with args: ${dotnetTestArgs[@]}"
+        echo ""
+        dotnet test ${dotnetTestArgs[@]}
     fi
 
-    dotnetTestArgs+=("${testFullName}")
-    dotnet test ${dotnetTestArgs[@]}
-
     local result=$?
 
     if [[ -n "$MOVE_TRX" ]]; then
@@ -193,63 +188,10 @@ test_coverage() {
 
     echo ""
 
-    reportgenerator -reports:tests/**/*.cobertura.xml -targetdir:tests/Coverage -reporttypes:"Cobertura;HtmlInline_AzurePipelines"
-}
-#------------------------------------------------------------------------------
-_coverageCore() {
-    local testFullName
-    local testDir
-    local targetFramework
-
-    testFullName="$1"
-    testDir=$(dirname "$testFullName")
-
-    cd "$testDir"
-
-    for test in ./bin/$BUILD_CONFIG/**/*.Tests*.dll; do
-        targetFramework=$(basename $(dirname $test))
-        mkdir -p "coverage/$targetFramework"
-        coverlet "$test" --target "dotnet" --targetargs "test --no-build -c $BUILD_CONFIG" --format opencover -o "./coverage/$targetFramework/coverage.opencover.xml"
-    done
-
-    cd "$workingDir"
-}
-#------------------------------------------------------------------------------
-coverage() {
-    local testDir
-    testDir="./tests"
-
-    if [[ ! -d "$testDir" ]]; then
-        echo "test-directory not existing -> no coverage need to run"
-        return
-    fi
-
-    echo "check if coverlet.console is installed..."
-    if [[ $(dotnet tool list -g | grep coverlet.console | wc -l) -eq 0 ]]; then
-        echo "not installed -> will install it"
-        export PATH="$PATH:$HOME/.dotnet/tools"
-        dotnet tool install -g coverlet.console
-    else
-        echo "already installed"
-    fi
-
-    for testProject in "$testDir"/**/*.csproj; do
-        _coverageCore "$testProject"
-    done
-
-    # when $CODECOV_TOKEN is set via env-variable, so it may be omitted as argument
-    if [[ -n "$CODECOV_TOKEN" ]]; then
-        if [[ ! -f codecov.sh ]]; then
-            echo "codecov.sh does not exists -- fetching..."
-            curl -s https://codecov.io/bash > codecov.sh
-            chmod u+x codecov.sh
-        fi
-
-        # a cool script, does quite a lot without any args :-)
-        ./codecov.sh -Z
-    else
-        echo "CODECOV_TOKEN not set -- skipping upload"
-    fi
+    reportgenerator                                         \
+        -reports:tests/**/coverage.cobertura.xml            \
+        -targetdir:tests/Coverage                           \
+        -reporttypes:"Cobertura;HtmlInline_AzurePipelines"
 }
 #------------------------------------------------------------------------------
 pack() {

diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/MsTestSample/MsTestSample.csproj b/samples/MsTestSample/MsTestSample.csproj
@@ -5,8 +5,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
-        <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
+        <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+        <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/NUnitSample/NUnitSample.csproj b/samples/NUnitSample/NUnitSample.csproj
@@ -5,8 +5,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="NUnit" Version="3.13.2" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.1.0">
+        <PackageReference Include="NUnit" Version="3.13.3" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.3.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/samples/XUnitSample/XUnitSample.csproj b/samples/XUnitSample/XUnitSample.csproj
@@ -5,10 +5,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        <PackageReference Include="xunit" Version="2.4.2" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
 

diff --git a/source/trx2junit.Core/Worker.cs b/source/trx2junit.Core/Worker.cs
@@ -22,7 +22,14 @@ public class Worker
     private readonly IFileSystem  _fileSystem;
     private readonly IGlobHandler _globHandler;
 
+    /// <summary>
+    /// Event that is fired when the worker triggers a notification.
+    /// </summary>
     public event EventHandler<WorkerNotificationEventArgs>? WorkerNotification;
+
+    /// <summary>
+    /// Event that is fired when the worker triggers an error.
+    /// </summary>
     public event EventHandler<WorkerNotificationEventArgs>? WorkerErrorNotification;
     //-------------------------------------------------------------------------
     /// <summary>

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -8,13 +8,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.msbuild" Version="3.1.0">
+        <PackageReference Include="coverlet.collector" Version="3.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-        <PackageReference Include="NUnit" Version="3.13.2" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.1.0">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+        <PackageReference Include="NUnit" Version="3.13.3" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.3.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/tests/trx2junit.Core.Tests/trx2junit.Core.Tests.csproj b/tests/trx2junit.Core.Tests/trx2junit.Core.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFrameworks>$(TestTfm)</TargetFrameworks>