Merge pull request #25 from rubberduck203/fix-code-cov

Fix code cov
rubberduck203 · Nov 14, 2020 · 116f2b9 · 116f2b9
2 parents 1c213ac + 46d2cb2
commit 116f2b9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -8,20 +8,18 @@ environment:
     secure: XqcH4XNIcPF1EAuxfTCmhxV4f4GlLbcYMwY9awynisZu860oD8kb79jyrNzhspU6
 build_script:
 - cmd: >-
-    dotnet restore
+    dotnet build -c release
 
-    dotnet build -c Release
 test_script:
-- cmd: >-
-    dotnet test tests/gitnstats.test/gitnstats.test.csproj /p:CollectCoverage=true /p:Exclude=\"[gitnstats.core]*,[gitnstats.core.tests]*,[gitnstats]GitNStats.CliView,[gitnstats]GitNStats.Program,[gitnstats]GitNStats.Options,[gitnstats]GitNStats.FileSystem\" /p:CoverletOutput=./bin/coverage.xml /p:CoverletOutputFormat="opencover"
-    
-    dotnet test tests/gitnstats.core.tests/gitnstats.core.tests.csproj /p:CollectCoverage=true /p:CoverletOutput=./bin/coverage.xml /p:CoverletOutputFormat="opencover"
+- ps: |
+    $env:MSYS_NO_PATHCONV=1
+    bash test.sh
 
 after_test:
   - ps: |
       $env:PATH = 'C:\msys64\usr\bin;' + $env:PATH
       Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
-      bash codecov.sh -f "tests/gitnstats.test/bin/coverage.xml" -f "tests/gitnstats.core.tests/bin/coverage.xml" -t $env:CODECOV_TOKEN
+      bash codecov.sh -f "tests/gitnstats.test/bin/coverage.opencover.xml" -f "tests/gitnstats.core.tests/bin/coverage.opencover.xml" -t $env:CODECOV_TOKEN
 
       bash publish.sh
 

diff --git a/test.sh b/test.sh
@@ -1,4 +1,5 @@
-#! /bin/bash
+#!/usr/bin/env bash
+set -e
 
 dotnet test tests/gitnstats.test/gitnstats.test.csproj \
     /p:CollectCoverage=true \

diff --git a/tests/gitnstats.core.tests/gitnstats.core.tests.csproj b/tests/gitnstats.core.tests/gitnstats.core.tests.csproj
@@ -15,6 +15,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\gitnstats.core\gitnstats.core.csproj" />

diff --git a/tests/gitnstats.test/gitnstats.test.csproj b/tests/gitnstats.test/gitnstats.test.csproj
@@ -14,6 +14,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="coverlet.msbuild" Version="2.9.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\gitnstats\gitnstats.csproj" />