Merge pull request #946 from Caliburn-Micro/945-fix-code-scanning-ale…

…rt-missed-ternary-opportunity

Refactor code and update test coverage settings

.github/workflows/dotnet.yml

@@ -62,7 +62,7 @@ jobs:
       run: msbuild ${{env.caliburn_sln}} /t:Build /p:Configuration=${{env.build_configuration}}
 
     - name: Run Unit Tests
-      run: dotnet test ${{env.caliburn_sln}}  --configuration ${{env.build_configuration}} -p:CollectCoverage=true -p:CoverletOutputFormat=json --no-build --verbosity normal    
+      run: dotnet test ${{env.caliburn_sln}}  --configuration ${{env.build_configuration}} --settings coverage.runsettings --no-build --verbosity normal    
 
     - name: Restore nuget packages for tutorial
       run:  msbuild ${{env.caliburn_tutorial}} -t:restore 

coverage.runsettings

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<RunSettings>
+<DataCollectionRunSettings>
+    <DataCollectors>
+        <DataCollector friendlyName="XPlat code coverage">
+            <Configuration>
+                <Format>json</Format>
+            </Configuration>
+        </DataCollector>
+    </DataCollectors>
+</DataCollectionRunSettings>
+<InProcDataCollectionRunSettings>
+    <InProcDataCollectors>
+        <InProcDataCollector assemblyQualifiedName="Coverlet.Collector.DataCollection.CoverletInProcDataCollector, coverlet.collector, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null"
+                        friendlyName="XPlat Code Coverage"
+                        enabled="True"
+                        codebase="coverlet.collector.dll" />
+    </InProcDataCollectors>
+</InProcDataCollectionRunSettings>
+</RunSettings>