Merge branch 'master' into update-rx

# Conflicts: # test/MetricsTests/MetricsTests/packages.config
2018-10-05 15:11:46 -04:00 · 2018-10-05 15:11:46 -04:00 · 0a5d6e55ed
--- a/.gitignore
+++ b/.gitignore
@ -235,6 +235,9 @@ $RECYCLE.BIN/
 #OpenCover output
 coverage.xml

+#Msbuild binary log output
+output.binlog
+
 AkavacheSqliteLinkerOverride.cs
 NuGetBuild
 WiX.Toolset.DummyFile.txt
--- a/GitHubVS.sln
+++ b/GitHubVS.sln
@ -44,8 +44,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{7B6C
 		scripts\common.ps1 = scripts\common.ps1
 		scripts\Get-CheckedOutBranch.ps1 = scripts\Get-CheckedOutBranch.ps1
 		scripts\Get-HeadSha1.ps1 = scripts\Get-HeadSha1.ps1
+		scripts\modules.ps1 = scripts\modules.ps1
 		nuget.config = nuget.config
 		scripts\Require-CleanWorkTree.ps1 = scripts\Require-CleanWorkTree.ps1
+		scripts\Run-CodeCoverage.ps1 = scripts\Run-CodeCoverage.ps1
 		scripts\Run-NUnit.ps1 = scripts\Run-NUnit.ps1
 		scripts\Run-Tests.ps1 = scripts\Run-Tests.ps1
 		scripts\Run-XUnit.ps1 = scripts\Run-XUnit.ps1
--- a/appveyor.yml
+++ b/appveyor.yml
@ -31,3 +31,5 @@ on_success:
    }
 on_finish:
 - ps: scripts\Run-CodeCoverage.ps1 -AppVeyor -Configuration:Release
+- IF NOT "%BCC_TOKEN%x"=="x" %USERPROFILE%\.nuget\packages\bcc-msbuildlog\0.0.2-alpha\tools\net471\BCC.MSBuildLog.exe -i output.binlog -o checkrun.json -c "%APPVEYOR_BUILD_FOLDER%"
+- IF NOT "%BCC_TOKEN%x"=="x" %USERPROFILE%\.nuget\packages\bcc-submission\0.0.2-alpha\tools\net471\BCC.Submission.exe -i checkrun.json -t "%BCC_TOKEN%" -h "%APPVEYOR_REPO_COMMIT%"
--- a/codecov.yml
+++ b/codecov.yml
@ -10,7 +10,7 @@ coverage:
  status:
    project: yes
    patch: yes
-    changes: yes
+    changes: no

 parsers:
  gcov:
@ -27,3 +27,8 @@ comment:
  
 fixes:
  - "/C/projects/visualstudio/::"
+
+ignore:
+  - "*.xaml"
+  - "*.xaml.cs"
+  - "**/SampleData/*"
--- a/lib/BCC-MSBuildLog.0.0.2-alpha.nupkg
+++ b/lib/BCC-MSBuildLog.0.0.2-alpha.nupkg
--- a/lib/BCC-Submission.0.0.2-alpha.nupkg
+++ b/lib/BCC-Submission.0.0.2-alpha.nupkg
--- a/scripts/Run-CodeCoverage.ps1
+++ b/scripts/Run-CodeCoverage.ps1
@ -20,49 +20,64 @@ $nunitDirectory = Join-Path $rootDirectory packages\NUnit.ConsoleRunner.3.7.0\to
 $nunitConsoleRunner = Join-Path $nunitDirectory nunit3-console.exe

 $testAssemblies = @(
-    "test\GitHub.Api.UnitTests\bin\$Configuration\GitHub.Api.UnitTests.dll",
-    "test\GitHub.App.UnitTests\bin\$Configuration\GitHub.App.UnitTests.dll",
-    "test\GitHub.Exports.Reactive.UnitTests\bin\$Configuration\GitHub.Exports.Reactive.UnitTests.dll",
-    "test\GitHub.Exports.UnitTests\bin\$Configuration\GitHub.Exports.UnitTests.dll",
-    "test\GitHub.Extensions.UnitTests\bin\$Configuration\GitHub.Extensions.UnitTests.dll",
-    "test\GitHub.InlineReviews.UnitTests\bin\$Configuration\GitHub.InlineReviews.UnitTests.dll",
-    "test\GitHub.Primitives.UnitTests\bin\$Configuration\GitHub.Primitives.UnitTests.dll",
-    "test\GitHub.TeamFoundation.UnitTests\bin\$Configuration\GitHub.TeamFoundation.UnitTests.dll",
-    "test\GitHub.UI.UnitTests\bin\$Configuration\GitHub.UI.UnitTests.dll",
-    "test\GitHub.VisualStudio.UnitTests\bin\$Configuration\GitHub.VisualStudio.UnitTests.dll",
+    "test\GitHub.Api.UnitTests\bin\$Configuration\net461\GitHub.Api.UnitTests.dll",
+    "test\GitHub.App.UnitTests\bin\$Configuration\net461\GitHub.App.UnitTests.dll",
+    "test\GitHub.Exports.Reactive.UnitTests\bin\$Configuration\net461\GitHub.Exports.Reactive.UnitTests.dll",
+    "test\GitHub.Exports.UnitTests\bin\$Configuration\net461\GitHub.Exports.UnitTests.dll",
+    "test\GitHub.Extensions.UnitTests\bin\$Configuration\net461\GitHub.Extensions.UnitTests.dll",
+    "test\GitHub.InlineReviews.UnitTests\bin\$Configuration\net461\GitHub.InlineReviews.UnitTests.dll",
+    "test\GitHub.TeamFoundation.UnitTests\bin\$Configuration\net461\GitHub.TeamFoundation.UnitTests.dll",
+    "test\GitHub.UI.UnitTests\bin\$Configuration\net461\GitHub.UI.UnitTests.dll",
+    "test\GitHub.VisualStudio.UnitTests\bin\$Configuration\net461\GitHub.VisualStudio.UnitTests.dll",
    "test\MetricsTests\MetricsTests\bin\$Configuration\MetricsTests.dll",
-    "test\TrackingCollectionTests\bin\$Configuration\TrackingCollectionTests.dll"
+    "test\TrackingCollectionTests\bin\$Configuration\net461\TrackingCollectionTests.dll"
 )

 $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`"",
    "-targetargs:`"$opencoverTargetArgs`"",
-    "-filter:`"+[GitHub*]* -[GitHub*UnitTests]*`"",
+    "-filter:`"+[GitHub*]* -[GitHub*Unit]GitHub.*.SampleData -[GitHub*UnitTests]*`"",
+    "-excludebyfile:*.xaml;*.xaml.cs",
    "-register:user -output:$rootDirectory\coverage.xml"
 ) -join " "

-$codecovDirectory = Join-Path $rootDirectory packages\Codecov.1.0.5\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 "$Project tests failed"
+        Write-Output "OpenCover trapped"
        exit 0
    }

+    Write-Output $opencover
+
    Run-Process 600 $opencover $opencoverArgs

-    if($AppVeyor) {
-        Run-Process 60 $codecov $codecovArgs
-    }
-
    if (!$?) {
-        Write-Output "$Project tests failed"
+        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 "Codecov failed"
+            exit 0
+        }
+    }
+}
--- a/scripts/modules.ps1
+++ b/scripts/modules.ps1
@ -129,8 +129,8 @@ New-Module -ScriptBlock {

        $msbuild = Find-MSBuild

-        Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 $flag1 $flag2"
-        Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 $flag1 $flag2 }
+        Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 /bl:output.binlog $flag1 $flag2"
+        Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 /bl:output.binlog $flag1 $flag2 }
    }

    Export-ModuleMember -Function Find-MSBuild,Build-Solution
--- a/src/CredentialManagement/CredentialManagement.csproj
+++ b/src/CredentialManagement/CredentialManagement.csproj
@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net461</TargetFramework>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>
  <Import Project="$(SolutionDir)\src\common\signing.props" />
  <ItemGroup>
--- a/src/GitHub.Api/GitHub.Api.csproj
+++ b/src/GitHub.Api/GitHub.Api.csproj
@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net461</TargetFramework>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>
  
  <Import Project="$(SolutionDir)\src\common\signing.props" />
--- a/src/GitHub.App/GitHub.App.csproj
+++ b/src/GitHub.App/GitHub.App.csproj
@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net461</TargetFramework>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>

  <Import Project="$(SolutionDir)\src\common\signing.props" />
--- a/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj
+++ b/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj
@ -2,6 +2,8 @@
  <PropertyGroup>
    <TargetFramework>net461</TargetFramework>
    <RootNamespace>GitHub</RootNamespace>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>

  <Import Project="$(SolutionDir)\src\common\signing.props" />
--- a/src/GitHub.Exports/GitHub.Exports.csproj
+++ b/src/GitHub.Exports/GitHub.Exports.csproj
@ -2,6 +2,8 @@
  <PropertyGroup>
    <TargetFramework>net461</TargetFramework>
    <RootNamespace>GitHub</RootNamespace>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>

  <Import Project="$(SolutionDir)\src\common\signing.props" />
--- a/src/GitHub.Extensions.Reactive/GitHub.Extensions.Reactive.csproj
+++ b/src/GitHub.Extensions.Reactive/GitHub.Extensions.Reactive.csproj
@ -2,6 +2,8 @@
  <PropertyGroup>
    <TargetFramework>net461</TargetFramework>
    <RootNamespace>GitHub</RootNamespace>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>

  <Import Project="$(SolutionDir)\src\common\signing.props" />
--- a/src/GitHub.Extensions/GitHub.Extensions.csproj
+++ b/src/GitHub.Extensions/GitHub.Extensions.csproj
@ -2,6 +2,8 @@
  <PropertyGroup>
    <TargetFramework>net461</TargetFramework>
    <RootNamespace>GitHub</RootNamespace>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>
  
  <Import Project="$(SolutionDir)\src\common\signing.props" />
--- a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
+++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
@ -35,10 +35,10 @@
    <CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
    <CreateVsixContainer>False</CreateVsixContainer>
    <DeployExtension>False</DeployExtension>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <DefineConstants>TRACE;DEBUG</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
@ -47,8 +47,6 @@
    <OutputPath>bin\Debug\</OutputPath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugCodeAnalysis|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
@ -57,7 +55,6 @@
    <OutputPath>bin\Debug\</OutputPath>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
--- a/src/GitHub.Logging/GitHub.Logging.csproj
+++ b/src/GitHub.Logging/GitHub.Logging.csproj
@ -2,6 +2,8 @@
  <PropertyGroup>
    <TargetFramework>net461</TargetFramework>
    <RootNamespace>GitHub</RootNamespace>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>

  <Import Project="$(SolutionDir)\src\common\signing.props" />
--- a/src/GitHub.Services.Vssdk/GitHub.Services.Vssdk.csproj
+++ b/src/GitHub.Services.Vssdk/GitHub.Services.Vssdk.csproj
@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net461</TargetFramework>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>

  <Import Project="$(SolutionDir)\src\common\signing.props" />
--- a/src/GitHub.StartPage/GitHub.StartPage.csproj
+++ b/src/GitHub.StartPage/GitHub.StartPage.csproj
@ -34,10 +34,10 @@
    <CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
    <CreateVsixContainer>False</CreateVsixContainer>
    <DeployExtension>False</DeployExtension>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <DefineConstants>TRACE;DEBUG</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
@ -56,7 +56,6 @@
    <OutputPath>bin\Debug\</OutputPath>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
--- a/src/GitHub.TeamFoundation.14/GitHub.TeamFoundation.14.csproj
+++ b/src/GitHub.TeamFoundation.14/GitHub.TeamFoundation.14.csproj
@ -42,13 +42,14 @@
    <OutputPath>bin\Debug\</OutputPath>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
+    <DebugType>full</DebugType>
    <Optimize>true</Optimize>
    <DefineConstants>TRACE;TEAMEXPLORER14</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <RunCodeAnalysis>true</RunCodeAnalysis>
    <OutputPath>bin\Release\</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>
  <Import Project="$(SolutionDir)\src\common\signing.props" />
  <ItemGroup>
--- a/src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.csproj
+++ b/src/GitHub.TeamFoundation.15/GitHub.TeamFoundation.15.csproj
@ -20,10 +20,10 @@
    <CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <Optimize>false</Optimize>
    <DefineConstants>DEBUG;TRACE;TEAMEXPLORER15</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
@ -32,8 +32,6 @@
    <OutputPath>bin\Debug\</OutputPath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugCodeAnalysis|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <DefineConstants>CODE_ANALYSIS;DEBUG;TRACE;TEAMEXPLORER15</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
@ -42,7 +40,6 @@
    <OutputPath>bin\Debug\</OutputPath>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <DefineConstants>TRACE;TEAMEXPLORER15</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
--- a/src/GitHub.UI.Reactive/GitHub.UI.Reactive.csproj
+++ b/src/GitHub.UI.Reactive/GitHub.UI.Reactive.csproj
@ -3,6 +3,8 @@
    <TargetFramework>net461</TargetFramework>
    <RootNamespace>GitHub</RootNamespace>
    <ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>

  <Import Project="$(SolutionDir)\src\common\signing.props" />
--- a/src/GitHub.UI/GitHub.UI.csproj
+++ b/src/GitHub.UI/GitHub.UI.csproj
@ -2,6 +2,8 @@
  <PropertyGroup>
    <TargetFramework>net461</TargetFramework>
    <ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>

  <Import Project="$(SolutionDir)\src\common\signing.props" />
--- a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj
+++ b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj
@ -2,6 +2,8 @@
  <PropertyGroup>
    <TargetFramework>net461</TargetFramework>
    <ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>

  <Import Project="$(SolutionDir)\src\common\signing.props" />
--- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
+++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
@ -50,10 +50,10 @@
    <DeployExtension>True</DeployExtension>
    <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
    <OutputPath>..\..\build\Debug\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugCodeAnalysis|AnyCPU'">
    <DebugSymbols>true</DebugSymbols>
    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugCodeAnalysis|AnyCPU'">
    <Optimize>false</Optimize>
    <DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
@ -64,8 +64,6 @@
    <OutputPath>..\..\build\Debug\</OutputPath>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWithoutVsix|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
    <Optimize>false</Optimize>
    <DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
@ -76,7 +74,6 @@
    <OutputPath>..\..\build\Debug\</OutputPath>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
    <Optimize>true</Optimize>
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
--- a/test/GitHub.VisualStudio.UnitTests/GitHub.VisualStudio.UnitTests.csproj
+++ b/test/GitHub.VisualStudio.UnitTests/GitHub.VisualStudio.UnitTests.csproj
@ -20,7 +20,13 @@
  </ItemGroup>

  <ItemGroup>
+    <PackageReference Include="Codecov" Version="1.1.0" />
+    <PackageReference Include="BCC-MSBuildLog" Version="0.0.2-alpha" />
+    <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>
 </Project>
--- a/test/MetricsTests/MetricsTests/packages.config
+++ b/test/MetricsTests/MetricsTests/packages.config
@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Codecov" version="1.0.5" targetFramework="net461" />
  <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" />
  <package id="System.Reactive" version="4.0.0" targetFramework="net461" />
 </packages>