diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 58b75c74b9..9b580c60ff 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -32,12 +32,25 @@ jobs:
     - name: Build Debug
       run: dotnet build --configuration Debug --no-restore
 
+      # See https://github.com/microsoft/vstest/issues/2952 for why the --blame stuff below is needed.
+      # Without it, the test runner crashes on ubuntu (but not Windows)/
     - name: Test
       run: |
         sed -i 's/"stopOnFail": false/"stopOnFail": true/g' UnitTests/xunit.runner.json
-        dotnet test --verbosity normal --blame --diag:logs/logs.txt --blame-hang --blame-hang-timeout 60s
-        mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/
+        dotnet test --verbosity normal --collect:"XPlat Code Coverage" --settings UnitTests/coverlet.runsettings --diag:logs/logs.txt --blame --blame-crash --blame-hang --blame-hang-timeout 60s --blame-crash-collect-always 
+       
+        # mv -v UnitTests/TestResults/*/*.* UnitTests/TestResults/
 
+    - name: Upload Test Logs
+      if: always()
+      uses: actions/upload-artifact@v4
+      with:
+        name: test-logs
+        path: |
+          logs/    
+          uploads/
+          UnitTests/TestResults/
+  
     # Note: this step is currently not writing to the gist for some reason
     # - name: Create Test Coverage Badge
     #   uses: simon-k/dotnet-code-coverage-badge@v1.0.0