Merge pull request #241 from xt0rted/test-reporting

Use GitHubActionsTestLogger for test reporting

Author: xt0rted

.editorconfig

@@ -21,8 +21,15 @@ indent_size = 2
 [*.json]
 indent_size = 2
 
-[*.verified.txt]
+# Verify settings
+[*.{received,verified}.{txt,xml,json}]
+charset = "utf-8-bom"
+end_of_line = lf
+indent_size = unset
+indent_style = unset
 insert_final_newline = false
+tab_width = unset
+trim_trailing_whitespace = false
 
 [*.yml]
 indent_size = 2

.gitattributes

@@ -1,2 +1,14 @@
 # Auto detect text files and perform LF normalization
 * text=auto
+
+*.jpg  	binary
+*.png 	binary
+*.gif 	binary
+
+*.cs text diff=csharp
+*.csproj text
+*.sln text eol=crlf
+
+*.verified.txt text eol=lf working-tree-encoding=UTF-8
+*.verified.xml text eol=lf working-tree-encoding=UTF-8
+*.verified.json text eol=lf working-tree-encoding=UTF-8

.github/dependabot.yml

@@ -42,9 +42,9 @@ updates:
           - "System.CommandLine.*"
       testing:
         patterns:
-          - "coverlet.collector"
           - "FakeItEasy"
           - "FakeItEasy.*"
+          - "GitHubActionsTestLogger"
           - "Microsoft.NET.Test.Sdk"
           - "Shouldly"
           - "Verify.Xunit"

.github/workflows/ci.yml

@@ -72,23 +72,24 @@ jobs:
 
       - run: dotnet r build
 
-      - run: dotnet r test -- --logger "trx;LogFilePrefix=${{ matrix.os }}"
+      - run: dotnet r test -- --no-build --logger GitHubActions
 
-      - run: dotnet r pack -- --version-suffix ${{ env.VERSION_SUFFIX }}
+      - run: dotnet r pack -- --no-build --version-suffix ${{ env.VERSION_SUFFIX }}
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3.1.3
         if: matrix.os == 'ubuntu-latest'
+        uses: actions/upload-artifact@v3.1.3
         with:
           name: nupkg
           path: ./artifacts/*.nupkg
 
       - name: Upload test results
+        if: failure()
         uses: actions/upload-artifact@v3.1.3
-        if: always()
         with:
-          name: test-results
-          path: ./coverage/*.trx
+          name: build-verify-test-results
+          path: |
+            **/*.received.*
 
   integration:
     needs:
@@ -160,28 +161,29 @@ jobs:
 
       - run: |
           if [ "${{ matrix.shell }}" == "default" ]; then
-            dotnet r test --verbose -- --logger "trx;LogFilePrefix=${{ matrix.os }}-default"
+            dotnet r test --verbose -- --no-build --logger GitHubActions
           else
             shellName="${{ matrix.shell }}"
 
             if [[ "$shellName" == *\.exe ]]; then
               shellName="bash"
             fi
 
-            dotnet r test --verbose --script-shell "${{ matrix.shell }}" -- --logger "trx;LogFilePrefix=${{ matrix.os }}-$shellName"
+            dotnet r test --verbose --script-shell "${{ matrix.shell }}" -- --no-build --logger GitHubActions
           fi
         shell: bash
 
+      - run: dotnet r integration:ci --verbose -- --no-build --logger GitHubActions
+
+      - run: dotnet r clean:bin build test --verbose
+
       - name: Upload test results
+        if: failure()
         uses: actions/upload-artifact@v3.1.3
-        if: always()
         with:
-          name: integration-test-results
-          path: ./coverage/*.trx
-
-      - run: dotnet r integration:ci --verbose -- --logger "trx;LogFilePrefix=ci test"
-
-      - run: dotnet r clean:bin build test --verbose
+          name: integration-verify-test-results
+          path: |
+            **/*.received.*
 
   release:
     if: github.event_name == 'push'

.github/workflows/release.yml

@@ -40,23 +40,16 @@ jobs:
 
       - run: dotnet r build
 
-      - run: dotnet r test
+      - run: dotnet r test -- --no-build --logger GitHubActions
 
-      - run: dotnet r pack
+      - run: dotnet r pack -- --no-build
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3.1.3
         with:
           name: nupkg
           path: ./artifacts/*.nupkg
 
-      - name: Upload test results
-        uses: actions/upload-artifact@v3.1.3
-        if: always()
-        with:
-          name: test-results
-          path: ./coverage/*.trx
-
       - name: Upload release assets
         uses: softprops/action-gh-release@v1
         id: release_updater
@@ -87,3 +80,11 @@ jobs:
           dotnet nuget push "./artifacts/*.nupkg" \
             --api-key ${{ secrets.NUGET_TOKEN }} \
             --source https://api.nuget.org/v3/index.json
+
+      - name: Upload test results
+        if: failure()
+        uses: actions/upload-artifact@v3.1.3
+        with:
+          name: verify-test-results
+          path: |
+            **/*.received.*

.github/workflows/test-results.yml

@@ -399,6 +399,3 @@ FodyWeavers.xsd
 
 # Verify snapshots
 *.received.*
-
-# Test results
-*.trx

.gitignore

@@ -5,25 +5,27 @@
   //"scriptShell": "pwsh",
   "scripts": {
     // project scripts
-    "clean": "dotnet rimraf artifacts coverage",
+    "clean": "dotnet r clean:*",
+    "clean:artifacts": "dotnet rimraf artifacts",
     "clean:bin": "dotnet rimraf **/bin **/obj",
-    "prebuild": "dotnet r clean",
+
     "build": "dotnet build",
-    "test": "dotnet test --no-build --logger \"trx;LogFilePrefix=tests\" --results-directory \"./coverage\"",
+
+    "test": "dotnet test",
     "test:6": "dotnet r test -- --framework net6.0",
 
-    "testbase": "dotnet test --no-build --logger \"trx;LogFilePrefix=tests\" --results-directory \"./coverage\"",
-    "test:unit": "dotnet r testbase -- --filter \"category=unit\"",
-    "test:int": "dotnet r testbase -- --filter \"category=integration\"",
+    "test:unit": "dotnet r test -- --filter \"category=unit\"",
+    "test:int": "dotnet r test -- --filter \"category=integration\"",
 
-    "pack": "dotnet pack --no-build --output \"./artifacts\"",
+    "prepack": "dotnet r clean:artifacts",
+    "pack": "dotnet pack --output \"./artifacts\"",
 
     "build:release": "dotnet r build -- --configuration Release",
     "test:release": "dotnet r test -- --configuration Release",
     "pack:release": "dotnet r pack -- --configuration Release",
 
     // integration tests
-    "integration:ci": "dotnet r clean clean:bin && dotnet build && dotnet test --no-build",
+    "integration:ci": "dotnet r clean build && dotnet test --no-build",
 
     // test scripts
     "info": "dotnet r dotnet:version dotnet:info",

global.json

@@ -11,15 +11,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="FakeItEasy" Version="7.4.0" />
     <PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
     <PackageReference Include="Shouldly" Version="4.2.1" />
     <PackageReference Include="Verify.Xunit" Version="20.8.2" />