Use coverlet code coverage

Author: Oren Novotny

CodeCoverage.runsettings

@@ -2,33 +2,15 @@
 <!-- File name extension must be .runsettings -->
 <RunSettings>
   <DataCollectionRunSettings>
-    <DataCollectors>
-      <DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0" assemblyQualifiedName="Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <DataCollectors>      
+       <DataCollector friendlyName="XPlat code coverage">
         <Configuration>
-          <CodeCoverage>
-
-            <!--  
-About include/exclude lists:  
-Empty "Include" clauses imply all; empty "Exclude" clauses imply none.  
-Each element in the list is a regular expression (ECMAScript syntax). See http://msdn.microsoft.com/library/2k3te2cs.aspx.  
-An item must first match at least one entry in the include list to be included.  
-Included items must then not match any entries in the exclude list to remain included.  
--->
-
-            <!-- Match assembly file paths: -->
-            <ModulePaths>
-              <Include>
-                <ModulePath>.*Crypto.*</ModulePath>
-              </Include>
-              <Exclude>
-                <ModulePath>.*Test.dll$</ModulePath>
-                <ModulePath>.*nunit.*</ModulePath>
-              </Exclude>
-            </ModulePaths>
-
-          </CodeCoverage>
+          <Format>cobertura</Format>
+          <Exclude>[xunit.*]*,[*Tests]*</Exclude> <!-- [Assembly-Filter]Type-Filter -->
+          <ExcludeByAttribute>Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute</ExcludeByAttribute>
+          <SingleHit>false</SingleHit>
         </Configuration>
-      </DataCollector>
+      </DataCollector>    
     </DataCollectors>
   </DataCollectionRunSettings>
-</RunSettings>
+</RunSettings>

README.md

@@ -1,7 +1,7 @@
 Portable.BouncyCastle
 ================
 
-BouncyCastle portable version with support for .NET 4, .NET Standard 1.0-2.0, WP, Silverlight, MonoAndroid, Xamarin.iOS, .NET Core
+BouncyCastle portable version with support for .NET 4, .NET Standard 2.0, MonoAndroid, Xamarin.iOS, .NET Core
 
 ================
 

azure-pipelines.yml

@@ -16,7 +16,7 @@ variables:
 steps:
 - task: DotNetCoreInstaller@0
   inputs:
-    version: '3.0.100-preview5-011568'
+    version: '3.0.100-preview7-012821'
 
 - task: DotNetCoreCLI@2  
   inputs:
@@ -36,13 +36,29 @@ steps:
     configuration: $(BuildConfiguration)
     arguments: /p:PackageId="Portable.BouncyCastle" 
   displayName: Build  
+
+- task: DotNetCoreCLI@2
+  inputs:
+    command: custom
+    custom: tool
+    arguments: install --tool-path . dotnet-reportgenerator-globaltool
+  displayName: Install ReportGenerator tool
 
 - task: DotNetCoreCLI@2
   inputs:
     command: test
     projects: .\crypto\test\crypto.test.csproj
-    arguments: -c $(BuildConfiguration) --collect:"Code Coverage" -s $(System.DefaultWorkingDirectory)\CodeCoverage.runsettings /p:DebugType=portable
+    arguments: -c $(BuildConfiguration) --collect:"XPlat Code Coverage" -s $(System.DefaultWorkingDirectory)\CodeCoverage.runsettings
   displayName: Run Tests
+
+- script: reportgenerator -reports:$(Agent.TempDirectory)/**/coverage.cobertura.xml -targetdir:$(Build.SourcesDirectory)/reports -reporttypes:"Cobertura"
+  displayName: Create reports
+
+- task: PublishCodeCoverageResults@1
+  displayName: 'Publish code coverage'
+  inputs:
+    codeCoverageTool: Cobertura
+    summaryFileLocation: $(Build.SourcesDirectory)/reports/Cobertura.xml
 
 - task: PowerShell@2
   displayName: Authenticode Sign artifacts

crypto/test/crypto.test.csproj

@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
+    <PackageReference Include="coverlet.collector" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\src\crypto.csproj" />

version.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.5.1",
+  "version": "1.8.5.2",
   "publicReleaseRefSpec": [
     "^refs/heads/master$", // we release out of master
     "^refs/heads/netstandard$", // we release out of netstandard