Merge pull request #1976 from github/fixes-code-coverage-more-time

Codecov final fix (hopefully)

Author: StanleyGoldman

scripts/Run-CodeCoverage.ps1

@@ -35,7 +35,7 @@ $testAssemblies = @(
 
 $opencoverTargetArgs = ($testAssemblies -join " ") + " --where \`"cat!=Timings and cat!=CodeCoverageFlake\`" --inprocess --noresult"
 
-$opencoverDirectory = Join-Path $rootDirectory packages\OpenCover.4.6.519\tools
+$opencoverDirectory = Join-Path $env:USERPROFILE .nuget\packages\opencover\4.6.519\tools
 $opencover = Join-Path $opencoverDirectory OpenCover.Console.exe
 $opencoverArgs = @(
     "-target:`"$nunitConsoleRunner`"",
@@ -44,25 +44,39 @@ $opencoverArgs = @(
     "-register:user -output:$rootDirectory\coverage.xml"
 ) -join " "
 
-$codecovDirectory = Join-Path $rootDirectory packages\Codecov.1.1.0\tools
+$codecovDirectory = Join-Path $env:USERPROFILE .nuget\packages\codecov\1.1.0\tools
 $codecov = Join-Path $codecovDirectory codecov.exe
 $codecovArgs = "-f $rootDirectory\coverage.xml"
 
 & {
     Trap {
-        Write-Output "Code coverage failed"
+        Write-Output "OpenCover trapped"
         exit 0
     }
 
+    Write-Output $opencover
+
     Run-Process 600 $opencover $opencoverArgs
 
-    if($AppVeyor) {
+    if (!$?) {
+        Write-Output "OpenCover failed"
+        exit 0
+    }
+}
+
+if($AppVeyor) {
+    & {
+        Trap {
+            Write-Output "Codecov trapped"
+            exit 0
+        }
+
         Push-AppveyorArtifact "$rootDirectory\coverage.xml"
         Run-Process 300 $codecov $codecovArgs
-    }
 
-    if (!$?) {
-        Write-Output "Code coverage failed"
-        exit 0
+        if (!$?) {
+            Write-Output "Codecov failed"
+            exit 0
+        }
     }
 }

test/GitHub.VisualStudio.UnitTests/GitHub.VisualStudio.UnitTests.csproj

@@ -25,6 +25,7 @@
     <PackageReference Include="BCC-Submission" Version="0.0.2-alpha" />
     <PackageReference Include="NSubstitute" Version="2.0.3" />
     <PackageReference Include="NUnit" version="3.9.0" />
+    <PackageReference Include="OpenCover" Version="4.6.519" />
     <PackageReference Include="Rx-Main" Version="2.2.5-custom" targetFramework="net45" />
     <PackageReference Include="Rx-Testing" Version="2.2.5-custom" targetFramework="net45" />
   </ItemGroup>

test/MetricsTests/MetricsTests/packages.config

@@ -3,5 +3,4 @@
   <package id="NUnit" version="3.9.0" targetFramework="net452" />
   <package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net452" />
   <package id="NUnit3TestAdapter" version="3.9.0" targetFramework="net452" />
-  <package id="OpenCover" version="4.6.519" targetFramework="net461" />
 </packages>