From d2939c410a1ea2efb93a0566bebade3cde7470dc Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Fri, 7 Jul 2023 13:22:44 -0400
Subject: [PATCH] Adjust runsettings for GitHub test logger

---
 .dockerignore                                  | 2 +-
 .github/workflows/ci-pipeline.yml              | 8 ++++----
 build/{coverlet.runsettings => ci.runsettings} | 3 +++
 tgstation-server.sln                           | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)
 rename build/{coverlet.runsettings => ci.runsettings} (79%)

diff --git a/.dockerignore b/.dockerignore
index 018b718239..3d9e0e32dd 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -13,7 +13,7 @@ appveyor.yml
 omnisharp.json
 README.md
 build/package/**
-build/coverlet.runsettings
+build/ci.runsettings
 build/Dockerfile
 build/GenerateMigrations.sh
 build/OpenApiValidationSettings.json
diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index 0da4e45b60..2d6b3d00ca 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -257,7 +257,7 @@ jobs:
       run: dotnet build -c ${{ matrix.configuration }}NoWindows
 
     - name: Run Unit Tests
-      run: sudo dotnet test --no-build --logger GitHubActions --filter FullyQualifiedName!~TestLiveServer -c ${{ matrix.configuration }}NoWindows --collect:"XPlat Code Coverage" --settings build/coverlet.runsettings --results-directory ./TestResults tgstation-server.sln
+      run: sudo dotnet test --no-build --logger GitHubActions --filter FullyQualifiedName!~TestLiveServer -c ${{ matrix.configuration }}NoWindows --collect:"XPlat Code Coverage" --settings build/ci.runsettings --results-directory ./TestResults tgstation-server.sln
 
     - name: Store Code Coverage
       uses: actions/upload-artifact@v3
@@ -300,7 +300,7 @@ jobs:
       run: dotnet build -c ${{ matrix.configuration }}NoWix
 
     - name: Run Unit Tests
-      run: dotnet test --no-build --logger GitHubActions --filter FullyQualifiedName!~TestLiveServer -c ${{ matrix.configuration }}NoWix --collect:"XPlat Code Coverage" --settings build/coverlet.runsettings --results-directory ./TestResults tgstation-server.sln
+      run: dotnet test --no-build --logger GitHubActions --filter FullyQualifiedName!~TestLiveServer -c ${{ matrix.configuration }}NoWix --collect:"XPlat Code Coverage" --settings build/ci.runsettings --results-directory ./TestResults tgstation-server.sln
 
     - name: Store Code Coverage
       uses: actions/upload-artifact@v3
@@ -415,7 +415,7 @@ jobs:
       run: |
         cd tests/Tgstation.Server.Tests
         Start-Sleep -Seconds 10
-        dotnet test -c ${{ matrix.configuration }} --no-build --filter FullyQualifiedName~TestLiveServer --logger GitHubActions --collect:"XPlat Code Coverage" --settings ../../build/coverlet.runsettings --results-directory ../../TestResults
+        dotnet test -c ${{ matrix.configuration }} --no-build --filter FullyQualifiedName~TestLiveServer --logger GitHubActions --collect:"XPlat Code Coverage" --settings ../../build/ci.runsettings --results-directory ../../TestResults
 
     - name: Store Code Coverage
       uses: actions/upload-artifact@v3
@@ -584,7 +584,7 @@ jobs:
       run: |
         cd tests/Tgstation.Server.Tests
         sleep 10
-        dotnet test -c ${{ matrix.configuration }}NoWindows --filter FullyQualifiedName~TestLiveServer --logger GitHubActions --no-build --collect:"XPlat Code Coverage" --settings ../../build/coverlet.runsettings --results-directory ../../TestResults
+        dotnet test -c ${{ matrix.configuration }}NoWindows --filter FullyQualifiedName~TestLiveServer --logger GitHubActions --no-build --collect:"XPlat Code Coverage" --settings ../../build/ci.runsettings --results-directory ../../TestResults
 
     - name: Store Code Coverage
       uses: actions/upload-artifact@v3
diff --git a/build/coverlet.runsettings b/build/ci.runsettings
similarity index 79%
rename from build/coverlet.runsettings
rename to build/ci.runsettings
index d41d735568..d7a0a49a82 100644
--- a/build/coverlet.runsettings
+++ b/build/ci.runsettings
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <RunSettings>
+  <RunConfiguration>
+    <CollectSourceInformation>true</CollectSourceInformation>
+  </RunConfiguration>
   <DataCollectionRunSettings>
     <DataCollectors>
       <DataCollector friendlyName="XPlat Code Coverage">
diff --git a/tgstation-server.sln b/tgstation-server.sln
index 1b023a2b7d..956d93077f 100644
--- a/tgstation-server.sln
+++ b/tgstation-server.sln
@@ -27,7 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6FF654E6
 		build\BuildDox.ps1 = build\BuildDox.ps1
 		build\Common.props = build\Common.props
 		build\ControlPanelVersion.props = build\ControlPanelVersion.props
-		build\coverlet.runsettings = build\coverlet.runsettings
+		build\ci.runsettings = build\ci.runsettings
 		build\Dockerfile = build\Dockerfile
 		build\GenerateMigrations.sh = build\GenerateMigrations.sh
 		build\NugetCommon.props = build\NugetCommon.props