Refactor test commands and update log file patterns in CI workflows

Author: Bertk

.github/workflows/dotnet.yml

@@ -131,7 +131,7 @@ jobs:
         dotnet build-server shutdown
         dotnet test ./test/coverlet.collector.tests/coverlet.collector.tests.csproj -c ${{env.BuildConfiguration}} --no-build -bl:test.collector.binlog /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Exclude="[coverlet.core.tests.samples.netstandard]*%2c[coverlet.tests.projectsample]*" /p:ExcludeByAttribute="GeneratedCodeAttribute" --diag:"./artifacts/log/${{env.BuildConfiguration}}/coverlet.collector.test.diag.log;tracelevel=verbose"
         dotnet build-server shutdown
-        dotnet test ./test/coverlet.integration.tests/coverlet.integration.tests.csproj -c ${{env.BuildConfiguration}} --no-build -bl:test.integration.binlog -- --results-directory "./artifacts/reports" --report-xunit-trx --report-xunit-trx-filename "coverlet.integration.tests.trx" --diagnostic --diagnostic-output-directory "./artifacts/log/${{env.BuildConfiguration}}" --diagnostic-output-fileprefix "coverlet.integration.tests"
+        dotnet test ./test/coverlet.integration.tests/coverlet.integration.tests.csproj -c ${{env.BuildConfiguration}} --no-build -bl:test.integration.binlog -- --results-directory "./artifacts/reports" --report-xunit-trx --report-xunit-trx-filename "coverlet.integration.tests.trx" --diagnostic --diagnostic-output-directory "./artifacts/log/${{env.BuildConfiguration}}"
       name: Run unit tests with coverage
       env:
         MSBUILDDISABLENODEREUSE: 1

eng/publish-coverlet-result-files.yml

@@ -6,20 +6,23 @@ steps:
   inputs:
     SourceFolder: '$(Build.SourcesDirectory)/artifacts'
     Contents: |
-       **/*.trx
-       **/*.html
-       **/*.opencover.xml
-       **/*.cobertura.xml
-       **/*.coverage.json
-       **/*.diag.log
-       **/log.txt
-       **/log.datacollector.*.txt
-       **/log.host.*.txt
-       **/coverlet.integration.tests.diag*.log
-       **/coverlet.collector.tests.diag*.log
-       **/coverlet.msbuild.tasks.tests.diag*.log
-       **/coverlet.core.coverage.tests.diag*.log
-       **/coverlet.core.tests.diag*.log
+      **/*.trx
+      **/*.html
+      **/*.opencover.xml
+      **/*.cobertura.xml
+      **/*.coverage.json
+      **/log.txt
+      **/log.datacollector.*.txt
+      **/log.host.*.txt
+      **/coverlet.MTP.unit.tests/**/*.diag
+      **/coverlet.MTP.unit.tests/**/*.log
+      **/coverlet.MTP.validation.tests/**/*.diag
+      **/coverlet.MTP.validation.tests/**/*.log
+      **/coverlet.core.coverage.tests/**/*.diag
+      **/coverlet.core.coverage.tests/**/*.log
+      **/coverlet.core.tests/**/*.diag
+      **/coverlet.core.tests/**/*.log
+      **/*.diag
     TargetFolder: '$(Build.SourcesDirectory)/artifacts/TestLogs'
 
 - task: CopyFiles@2

eng/test.sh

@@ -30,7 +30,7 @@ dotnet test test/coverlet.collector.tests/coverlet.collector.tests.csproj -c Deb
 
 # coverlet.integration.tests (default net8.0)
 dotnet build-server shutdown
-dotnet test test/coverlet.integration.tests/coverlet.integration.tests.csproj -f net8.0 -c Debug --no-build -bl:test.integration.binlog -- --results-directory "$WORKSPACE_ROOT/artifacts/reports" --report-xunit-trx --report-xunit-trx-filename "coverlet.integration.tests.trx" --diagnostic --diagnostic-output-directory "$WORKSPACE_ROOT/artifacts/log/Debug" --diagnostic-output-fileprefix "coverlet.integration.tests"
+dotnet test test/coverlet.integration.tests/coverlet.integration.tests.csproj -f net8.0 -c Debug --no-build -bl:test.integration.binlog -- --results-directory "$WORKSPACE_ROOT/artifacts/reports" --report-xunit-trx --report-xunit-trx-filename "coverlet.integration.tests.trx" --diagnostic --diagnostic-output-directory "$WORKSPACE_ROOT/artifacts/log/Debug"
 
 dotnet build-server shutdown
 
@@ -43,8 +43,7 @@ if [[ "$SDK_MAJOR_VERSION" -ge 9 ]]; then
     # Check if the net9.0 test dll exists
     if [ -f "$WORKSPACE_ROOT/artifacts/bin/coverlet.integration.tests/debug_net9.0/coverlet.integration.tests.dll" ]; then
         echo "Executing command for SDK version $SDK_VERSION (9.0+ detected)..."
-        dotnet test test/coverlet.integration.tests/coverlet.integration.tests.csproj -f net9.0 -c Debug --no-build -bl:test.integration.binlog -- --results-directory "$WORKSPACE_ROOT/artifacts/reports" --report-xunit-trx --report-xunit-trx-filename "coverlet.integration.tests.trx" --diagnostic --diagnostic-output-directory "$WORKSPACE_ROOT/artifacts/log/Debug" --diagnostic-output-fileprefix "coverlet.integration.tests"
-        dotnet build-server shutdown
+        dotnet test test/coverlet.integration.tests/coverlet.integration.tests.csproj -f net9.0 -c Debug --no-build -bl:test.integration.binlog -- --results-directory "$WORKSPACE_ROOT/artifacts/reports" --report-xunit-trx --report-xunit-trx-filename "coverlet.integration.tests.trx" --diagnostic --diagnostic-output-directory "$WORKSPACE_ROOT/artifacts/log/Debug"
     else
         echo "Skipping command execution. Required file does not exist."
     fi