Merge pull request #52 from SixLabors/js/codecov

Use official CodeCov app

Author: JimBobSquarePants

.github/workflows/build-and-test.yml

@@ -85,14 +85,10 @@ jobs:
                   CI: True
                   XUNIT_PATH: .\tests\ImageSharp.Drawing.Tests # Required for xunit
 
-            # Avoid "Please provide the repository token to upload reports via `-t :repository-token`"
-            # https://community.codecov.io/t/whitelist-github-action-servers-to-upload-without-a-token/491/10
-            # https://github.community/t5/GitHub-Actions/Make-secrets-available-to-builds-of-forks/m-p/42814/highlight/true#M5129
             - name: Update Codecov
-              uses: iansu/codecov-action-node@v1.0.0
+              uses: codecov/codecov-action@v1.0.7
               if: matrix.options.codecov == true && startsWith(github.repository, 'SixLabors')
               with:
-                  token: c2b9d8b3-6204-44d7-a49f-bc48c5d0b138
                   flags: unittests
 
     Publish:

ci-test.ps1

@@ -17,7 +17,7 @@ if ($codecov -eq 'true') {
 
   # Allow toggling of profile to workaround any potential JIT errors caused by code injection.
   dotnet clean -c $codecovProfile
-  dotnet test -c $codecovProfile -f $targetFramework /p:codecov=true
+  dotnet test --collect "XPlat Code Coverage" --settings .\tests\coverlet.runsettings -c $codecovProfile -f $targetFramework /p:CodeCov=true
 }
 elseif ($platform -eq '-x86' -and $targetFramework -match $netFxRegex) {
 

tests/Directory.Build.props

@@ -27,7 +27,7 @@
 
   <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(IsTestProject)' == 'true'">
     <PackageReference Include="Microsoft.NET.Test.Sdk" IsImplicitlyDefined="true" />
     <PackageReference Include="xunit" IsImplicitlyDefined="true" />
     <PackageReference Include="xunit.runner.visualstudio" IsImplicitlyDefined="true" />

tests/Directory.Build.targets

@@ -17,25 +17,12 @@
   <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.targets" />
 
   <!-- Tool versions for tool references across all projects -->
-  <ItemGroup>
+  <ItemGroup Condition="'$(IsTestProject)' == 'true'">
     <!--dotnet tools does not have an x86 runner. You have to use separate SDKs-->
     <!--https://github.com/actions/setup-dotnet/issues/72-->
     <DotNetCliToolReference Update="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
-  <!--Code coverage specific settings-->
-  <!--https://github.com/tonerdo/coverlet-->
-  <PropertyGroup Condition="'$(codecov)' == 'true' AND '$(IsTestProject)' == 'true'">
-    <CollectCoverage>true</CollectCoverage>
-    <UseSourceLink>true</UseSourceLink>
-    <CoverletOutputFormat>opencover</CoverletOutputFormat>
-    <!--Output injects target framework into name despite explicit config. See build yml-->
-    <CoverletOutput>$(MSBuildThisFileDirectory)..\coverage.xml</CoverletOutput>
-    <!--Used by coverlet dues to reference issues with SixLabors.Core-->
-    <!--https://github.com/tonerdo/coverlet/blob/master/Documentation/KnowIssues.md#4-failed-to-resolve-assembly-during-instrumentation-->
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-  </PropertyGroup>
-
   <ItemGroup>
     <!--Test Dependencies-->
     <PackageReference Update="BenchmarkDotNet" Version="0.12.0" />