From f4c711a5bd30c5009ba9ee4abe1a73f8c597b0c7 Mon Sep 17 00:00:00 2001
From: Valters Melnalksnis <valters.melnalksnis@outlook.com>
Date: Mon, 19 Feb 2024 08:44:59 +0200
Subject: [PATCH] test: Fix code coverage generation

---
 Directory.Build.props      |  5 -----
 Gnomeshade.sln             |  1 +
 codecov.yml                |  3 ---
 deployment/publish.ps1     |  5 +++++
 deployment/publish.sh      |  5 +++++
 deployment/test.sh         | 12 +++++++++++-
 tests/coverlet.runsettings | 12 ++++++++++++
 7 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 tests/coverlet.runsettings

diff --git a/Directory.Build.props b/Directory.Build.props
index 55430a187..61b6b6691 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -19,11 +19,6 @@
 
 	<PropertyGroup Condition="'$(Configuration)' == 'Release'">
 		<PublishSingleFile>true</PublishSingleFile>
-		<DebuggerSupport>false</DebuggerSupport>
-		<DebugSymbols>false</DebugSymbols>
-		<DebugType>None</DebugType>
-		<TrimmerRemoveSymbols>true</TrimmerRemoveSymbols>
-		<StripSymbols>true</StripSymbols>
 		<EnableUnsafeBinaryFormatterSerialization>false</EnableUnsafeBinaryFormatterSerialization>
 		<EnableUnsafeUTF7Encoding>false</EnableUnsafeUTF7Encoding>
 		<MetadataUpdaterSupport>false</MetadataUpdaterSupport>
diff --git a/Gnomeshade.sln b/Gnomeshade.sln
index dc0007925..920b8e06f 100644
--- a/Gnomeshade.sln
+++ b/Gnomeshade.sln
@@ -45,6 +45,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{367D9DDB
 ProjectSection(SolutionItems) = preProject
 	tests\.editorconfig = tests\.editorconfig
 	tests\Directory.Build.props = tests\Directory.Build.props
+	tests\coverlet.runsettings = tests\coverlet.runsettings
 EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gnomeshade.TestingHelpers", "tests\Gnomeshade.TestingHelpers\Gnomeshade.TestingHelpers.csproj", "{CFFBE37B-AD26-4D48-AC8F-655D735732A4}"
diff --git a/codecov.yml b/codecov.yml
index 4cc25a747..17c6590d4 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,6 +1,3 @@
-ignore:
-  - "**/*.axaml"
-
 comment:
   layout: "header, diff, components"
 
diff --git a/deployment/publish.ps1 b/deployment/publish.ps1
index 6aa214804..cb65bd890 100644
--- a/deployment/publish.ps1
+++ b/deployment/publish.ps1
@@ -26,6 +26,11 @@ $dotnetArgs = $dotnetArgs + "--self-contained"
 $dotnetArgs = $dotnetArgs + "--no-restore"
 $dotnetArgs = $dotnetArgs + "-p:AssemblyVersion=$version.$RunNumber"
 $dotnetArgs = $dotnetArgs + "-p:InformationalVersion=$version$Tag+$Runtime"
+$dotnetArgs = $dotnetArgs + "-p:DebuggerSupport=false"
+$dotnetArgs = $dotnetArgs + "-p:DebugSymbols=false"
+$dotnetArgs = $dotnetArgs + "-p:DebugType=None"
+$dotnetArgs = $dotnetArgs + "-p:TrimmerRemoveSymbols=true"
+$dotnetArgs = $dotnetArgs + "-p:StripSymbols=true"
 $dotnetArgs = $dotnetArgs + "/warnAsError"
 $dotnetArgs = $dotnetArgs + "/nologo"
 
diff --git a/deployment/publish.sh b/deployment/publish.sh
index 642b73e7b..6e3d2220d 100755
--- a/deployment/publish.sh
+++ b/deployment/publish.sh
@@ -15,6 +15,11 @@ dotnet publish \
 	--no-restore \
 	-p:AssemblyVersion="$version.$3" \
 	-p:InformationalVersion="$version$4$2" \
+	-p:DebuggerSupport=false \
+	-p:DebugSymbols=false \
+	-p:DebugType=None \
+	-p:TrimmerRemoveSymbols=true \
+	-p:StripSymbols=true \
 	/warnAsError \
 	/nologo
 
diff --git a/deployment/test.sh b/deployment/test.sh
index 4e2e38321..edf9076ed 100755
--- a/deployment/test.sh
+++ b/deployment/test.sh
@@ -2,4 +2,14 @@
 set -e
 
 ./deployment/build.sh
-dotnet test -p:CollectCoverage=true -p:BuildInParallel=true -m:8 --configuration Release --collect:"XPlat Code Coverage" --no-build
+dotnet test \
+	-p:CollectCoverage=true \
+	-p:BuildInParallel=true \
+	-p:ContinuousIntegrationBuild=false \
+	-p:DebugType=portable \
+	-p:CopyLocalLockFileAssemblies=true \
+	-m:8 \
+	--configuration Release \
+	--collect:"XPlat Code Coverage" \
+	--settings ./tests/coverlet.runsettings \
+	--no-build
diff --git a/tests/coverlet.runsettings b/tests/coverlet.runsettings
new file mode 100644
index 000000000..9e6c06b9b
--- /dev/null
+++ b/tests/coverlet.runsettings
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<RunSettings>
+	<DataCollectionRunSettings>
+		<DataCollectors>
+			<DataCollector friendlyName="XPlat code coverage">
+				<Configuration>
+					<Include>[Gnomeshade.*]*</Include>
+				</Configuration>
+			</DataCollector>
+		</DataCollectors>
+	</DataCollectionRunSettings>
+</RunSettings>