From e3dfafdad1eedec494b76b943c70dab4658b8b25 Mon Sep 17 00:00:00 2001 From: Marco Rossignoli Date: Mon, 23 Sep 2019 15:20:59 +0200 Subject: [PATCH 1/4] sign collector and update visibility --- .../DataCollection/CoverageManager.cs | 2 +- .../DataCollection/CoverageWrapper.cs | 1 - .../DataCollection/CoverletLogger.cs | 3 ++- src/coverlet.collector/Friends.cs | 8 ------- .../Properties/AssemblyInfo.cs | 8 +++++++ .../Utilities/Interfaces/ICoverageWrapper.cs | 4 ++-- src/coverlet.collector/coverlet.collector.snk | Bin 0 -> 596 bytes .../ConsoleTables/ConsoleTable.cs | 3 +-- src/coverlet.console/Logging/ConsoleLogger.cs | 3 ++- src/coverlet.core/Abstracts/IFileSystem.cs | 2 +- .../Abstracts/IInstrumentationHelper.cs | 2 +- .../{Logging => Abstracts}/ILogger.cs | 4 ++-- src/coverlet.core/Coverage.cs | 3 +-- src/coverlet.core/CoverageDetails.cs | 2 +- src/coverlet.core/CoveragePrepareResult.cs | 6 ++---- src/coverlet.core/CoverageResult.cs | 18 ++++++++-------- src/coverlet.core/CoverageSummary.cs | 2 +- src/coverlet.core/DependencyInjection.cs | 2 +- src/coverlet.core/Enums/ThresholdStatistic.cs | 2 +- src/coverlet.core/Enums/ThresholdTypeFlags.cs | 2 +- src/coverlet.core/Helpers/FileSystem.cs | 2 +- .../Helpers/InstrumentationHelper.cs | 1 + src/coverlet.core/Helpers/RetryHelper.cs | 2 +- .../Instrumentation/Instrumenter.cs | 2 +- .../Instrumentation/InstrumenterResult.cs | 12 +++++------ .../Instrumentation/ModuleTrackerTemplate.cs | 2 +- src/coverlet.core/Properties/AssemblyInfo.cs | 20 +++++++++++------- .../Reporters/CoberturaReporter.cs | 2 +- src/coverlet.core/Reporters/IReporter.cs | 4 ++-- src/coverlet.core/Reporters/JsonReporter.cs | 2 +- src/coverlet.core/Reporters/LcovReporter.cs | 2 +- .../Reporters/OpenCoverReporter.cs | 2 +- .../Reporters/ReporterFactory.cs | 2 +- .../Reporters/TeamCityReporter.cs | 2 +- src/coverlet.core/Symbols/BranchPoint.cs | 2 +- .../Symbols/CecilSymbolHelper.cs | 3 +-- src/coverlet.msbuild.tasks/MSBuildLogger.cs | 3 ++- .../CoverletCoverageDataCollectorTests.cs | 1 - .../Properties/AssemblyInfo.cs | 3 +++ .../coverlet.collector.tests.snk | Bin 0 -> 596 bytes test/coverlet.core.tests/CoverageTests.cs | 3 +-- .../Instrumentation/InstrumenterTests.cs | 4 ++-- .../coverlet.core.tests/InstrumenterHelper.cs | 5 ++--- .../Properties/AssemblyInfo.cs | 4 +++- .../Properties/AssemblyInfo.cs | 4 +++- 45 files changed, 86 insertions(+), 80 deletions(-) delete mode 100644 src/coverlet.collector/Friends.cs create mode 100644 src/coverlet.collector/Properties/AssemblyInfo.cs create mode 100644 src/coverlet.collector/coverlet.collector.snk rename src/coverlet.core/{Logging => Abstracts}/ILogger.cs (80%) create mode 100644 test/coverlet.collector.tests/Properties/AssemblyInfo.cs create mode 100644 test/coverlet.collector.tests/coverlet.collector.tests.snk diff --git a/src/coverlet.collector/DataCollection/CoverageManager.cs b/src/coverlet.collector/DataCollection/CoverageManager.cs index 818235bda..5dd59e2f6 100644 --- a/src/coverlet.collector/DataCollection/CoverageManager.cs +++ b/src/coverlet.collector/DataCollection/CoverageManager.cs @@ -6,7 +6,7 @@ using Coverlet.Collector.Utilities; using Coverlet.Collector.Utilities.Interfaces; using Coverlet.Core; -using Coverlet.Core.Logging; +using Coverlet.Core.Abstracts; using Coverlet.Core.Reporters; namespace Coverlet.Collector.DataCollection diff --git a/src/coverlet.collector/DataCollection/CoverageWrapper.cs b/src/coverlet.collector/DataCollection/CoverageWrapper.cs index 2854ed1d5..f1911bc5e 100644 --- a/src/coverlet.collector/DataCollection/CoverageWrapper.cs +++ b/src/coverlet.collector/DataCollection/CoverageWrapper.cs @@ -1,7 +1,6 @@ using Coverlet.Collector.Utilities.Interfaces; using Coverlet.Core; using Coverlet.Core.Abstracts; -using Coverlet.Core.Logging; namespace Coverlet.Collector.DataCollection { diff --git a/src/coverlet.collector/DataCollection/CoverletLogger.cs b/src/coverlet.collector/DataCollection/CoverletLogger.cs index 8304e2cf6..64324fba6 100644 --- a/src/coverlet.collector/DataCollection/CoverletLogger.cs +++ b/src/coverlet.collector/DataCollection/CoverletLogger.cs @@ -1,6 +1,7 @@ using System; + using Coverlet.Collector.Utilities; -using Coverlet.Core.Logging; +using Coverlet.Core.Abstracts; namespace Coverlet.Collector.DataCollection { diff --git a/src/coverlet.collector/Friends.cs b/src/coverlet.collector/Friends.cs deleted file mode 100644 index 5de27ab5b..000000000 --- a/src/coverlet.collector/Friends.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System.Runtime.CompilerServices; - -#region Test Assemblies - -[assembly: InternalsVisibleTo("coverlet.collector.tests")] -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] - -#endregion \ No newline at end of file diff --git a/src/coverlet.collector/Properties/AssemblyInfo.cs b/src/coverlet.collector/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..35079a9c9 --- /dev/null +++ b/src/coverlet.collector/Properties/AssemblyInfo.cs @@ -0,0 +1,8 @@ +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyKeyFile("coverlet.collector.snk")] +[assembly: InternalsVisibleTo("coverlet.core.tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100757cf9291d78a82e5bb58a827a3c46c2f959318327ad30d1b52e918321ffbd847fb21565b8576d2a3a24562a93e86c77a298b564a0f1b98f63d7a1441a3a8bcc206da3ed09d5dacc76e122a109a9d3ac608e21a054d667a2bae98510a1f0f653c0e6f58f42b4b3934f6012f5ec4a09b3dfd3e14d437ede1424bdb722aead64ad")] +[assembly: InternalsVisibleTo("coverlet.collector.tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed0ed6af9693182615b8dcadc83c918b8d36312f86cefc69539d67d4189cd1b89420e7c3871802ffef7f5ca7816c68ad856c77bf7c230cc07824d96aa5d1237eebd30e246b9a14e22695fb26b40c800f74ea96619092cbd3a5d430d6c003fc7a82e8ccd1e315b935105d9232fe9e99e8d7ff54bba6f191959338d4a3169df9b3")] +// Needed to mock internal type https://github.com/Moq/moq4/wiki/Quickstart#advanced-features +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] \ No newline at end of file diff --git a/src/coverlet.collector/Utilities/Interfaces/ICoverageWrapper.cs b/src/coverlet.collector/Utilities/Interfaces/ICoverageWrapper.cs index d8b2f515e..194435390 100644 --- a/src/coverlet.collector/Utilities/Interfaces/ICoverageWrapper.cs +++ b/src/coverlet.collector/Utilities/Interfaces/ICoverageWrapper.cs @@ -1,6 +1,6 @@ -using Coverlet.Collector.DataCollection; +using Coverlet.Core.Abstracts; +using Coverlet.Collector.DataCollection; using Coverlet.Core; -using Coverlet.Core.Logging; namespace Coverlet.Collector.Utilities.Interfaces { diff --git a/src/coverlet.collector/coverlet.collector.snk b/src/coverlet.collector/coverlet.collector.snk new file mode 100644 index 0000000000000000000000000000000000000000..c3af827b0da9618304007636cfbe885a4f85e1b0 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50096!Bf0N4A{E+vfv=Jak)5@9pU@$p$`G>Y z;N7foBYG+L_BI-TT6A<*wnl#PM4G|Q)>CeLo@K%uVX+n}MwV6zAl%9-W& z0Q13@XsIA{*EBmHl*2|-c4b-F=rhU1N;APyK2kY2I@p1jHsA09=K^DrMA`O^5w0WD;!?*n>okbrW2b1poJsas zDIEfIGs3EC@n4S3Q008G=%-sW?M>;Ax>tpW!s9|_Ebu~3Jdx;+Z3%_sV&6=}5a>up z&c5jn-4L{YS*v`P6d#tjsuy#Ys)#4`Y)~zA%U5TKTy;r%SglrL$$4dlogkk-YQ=F6 zS%S6oY7v{gVIN~wlq+i6u<6S>&++fTz2LvJzOO*KLC^)=)jOR?=Yl@TBwyXP@=~(V zrRSk7pW^~I-P@<#CyVlwA}|jK#@sCcdVPJ-304MrcGsb{z9YjR6A}LztsvZzj&oB>W?vGFzGqUj5xENCnRV{4* literal 0 HcmV?d00001 diff --git a/src/coverlet.console/ConsoleTables/ConsoleTable.cs b/src/coverlet.console/ConsoleTables/ConsoleTable.cs index 8f7785caf..6ed8c4516 100644 --- a/src/coverlet.console/ConsoleTables/ConsoleTable.cs +++ b/src/coverlet.console/ConsoleTables/ConsoleTable.cs @@ -27,13 +27,12 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Reflection; using System.Text; using System.Text.RegularExpressions; namespace ConsoleTables { - public class ConsoleTable + class ConsoleTable { public IList Columns { get; set; } public IList Rows { get; protected set; } diff --git a/src/coverlet.console/Logging/ConsoleLogger.cs b/src/coverlet.console/Logging/ConsoleLogger.cs index c0dc7ae90..eb6ce74ce 100644 --- a/src/coverlet.console/Logging/ConsoleLogger.cs +++ b/src/coverlet.console/Logging/ConsoleLogger.cs @@ -1,7 +1,8 @@ using System; -using Coverlet.Core.Logging; using static System.Console; +using Coverlet.Core.Abstracts; + namespace Coverlet.Console.Logging { class ConsoleLogger : ILogger diff --git a/src/coverlet.core/Abstracts/IFileSystem.cs b/src/coverlet.core/Abstracts/IFileSystem.cs index 806371803..c58b4fc79 100644 --- a/src/coverlet.core/Abstracts/IFileSystem.cs +++ b/src/coverlet.core/Abstracts/IFileSystem.cs @@ -2,7 +2,7 @@ namespace Coverlet.Core.Abstracts { - public interface IFileSystem + internal interface IFileSystem { bool Exists(string path); diff --git a/src/coverlet.core/Abstracts/IInstrumentationHelper.cs b/src/coverlet.core/Abstracts/IInstrumentationHelper.cs index b6c80d423..42bab81f3 100644 --- a/src/coverlet.core/Abstracts/IInstrumentationHelper.cs +++ b/src/coverlet.core/Abstracts/IInstrumentationHelper.cs @@ -1,6 +1,6 @@ namespace Coverlet.Core.Abstracts { - public interface IInstrumentationHelper + internal interface IInstrumentationHelper { void BackupOriginalModule(string module, string identifier); void DeleteHitsFile(string path); diff --git a/src/coverlet.core/Logging/ILogger.cs b/src/coverlet.core/Abstracts/ILogger.cs similarity index 80% rename from src/coverlet.core/Logging/ILogger.cs rename to src/coverlet.core/Abstracts/ILogger.cs index 9def57f75..3cb74885a 100644 --- a/src/coverlet.core/Logging/ILogger.cs +++ b/src/coverlet.core/Abstracts/ILogger.cs @@ -1,8 +1,8 @@ using System; -namespace Coverlet.Core.Logging +namespace Coverlet.Core.Abstracts { - public interface ILogger + internal interface ILogger { void LogVerbose(string message); void LogInformation(string message, bool important = false); diff --git a/src/coverlet.core/Coverage.cs b/src/coverlet.core/Coverage.cs index 530b1081c..57d5c4725 100644 --- a/src/coverlet.core/Coverage.cs +++ b/src/coverlet.core/Coverage.cs @@ -4,14 +4,13 @@ using System.Linq; using Coverlet.Core.Abstracts; using Coverlet.Core.Instrumentation; -using Coverlet.Core.Logging; using Newtonsoft.Json; using Newtonsoft.Json.Linq; namespace Coverlet.Core { - public class Coverage + internal class Coverage { private string _module; private string _identifier; diff --git a/src/coverlet.core/CoverageDetails.cs b/src/coverlet.core/CoverageDetails.cs index 6134e79b4..69d20f54c 100644 --- a/src/coverlet.core/CoverageDetails.cs +++ b/src/coverlet.core/CoverageDetails.cs @@ -2,7 +2,7 @@ namespace Coverlet.Core { - public class CoverageDetails + internal class CoverageDetails { private double _averageModulePercent; public double Covered { get; internal set; } diff --git a/src/coverlet.core/CoveragePrepareResult.cs b/src/coverlet.core/CoveragePrepareResult.cs index 12ac1cb99..9889c7b77 100644 --- a/src/coverlet.core/CoveragePrepareResult.cs +++ b/src/coverlet.core/CoveragePrepareResult.cs @@ -1,7 +1,5 @@ -using System; -using System.IO; +using System.IO; using System.Runtime.Serialization; -using System.Runtime.Serialization.Formatters.Binary; using Coverlet.Core.Instrumentation; namespace Coverlet.Core @@ -10,7 +8,7 @@ namespace Coverlet.Core // https://docs.microsoft.com/en-us/visualstudio/code-quality/ca2300-do-not-use-insecure-deserializer-binaryformatter?view=vs-2019 // https://docs.microsoft.com/en-us/visualstudio/code-quality/ca2301-do-not-call-binaryformatter-deserialize-without-first-setting-binaryformatter-binder?view=vs-2019 [DataContract] - public class CoveragePrepareResult + internal class CoveragePrepareResult { [DataMember] public string Identifier { get; set; } diff --git a/src/coverlet.core/CoverageResult.cs b/src/coverlet.core/CoverageResult.cs index 00f9cfabe..33fca874f 100644 --- a/src/coverlet.core/CoverageResult.cs +++ b/src/coverlet.core/CoverageResult.cs @@ -8,7 +8,7 @@ namespace Coverlet.Core { - public class BranchInfo + internal class BranchInfo { public int Line { get; set; } public int Offset { get; set; } @@ -18,11 +18,11 @@ public class BranchInfo public int Hits { get; set; } } - public class Lines : SortedDictionary { } + internal class Lines : SortedDictionary { } - public class Branches : List { } + internal class Branches : List { } - public class Method + internal class Method { internal Method() { @@ -32,12 +32,12 @@ internal Method() public Lines Lines; public Branches Branches; } - public class Methods : Dictionary { } - public class Classes : Dictionary { } - public class Documents : Dictionary { } - public class Modules : Dictionary { } + internal class Methods : Dictionary { } + internal class Classes : Dictionary { } + internal class Documents : Dictionary { } + internal class Modules : Dictionary { } - public class CoverageResult + internal class CoverageResult { public string Identifier; public Modules Modules; diff --git a/src/coverlet.core/CoverageSummary.cs b/src/coverlet.core/CoverageSummary.cs index 1a266e28a..5a64e0b93 100644 --- a/src/coverlet.core/CoverageSummary.cs +++ b/src/coverlet.core/CoverageSummary.cs @@ -4,7 +4,7 @@ namespace Coverlet.Core { - public class CoverageSummary + internal class CoverageSummary { public CoverageDetails CalculateLineCoverage(Lines lines) { diff --git a/src/coverlet.core/DependencyInjection.cs b/src/coverlet.core/DependencyInjection.cs index a701f233c..16568ba87 100644 --- a/src/coverlet.core/DependencyInjection.cs +++ b/src/coverlet.core/DependencyInjection.cs @@ -6,7 +6,7 @@ namespace Coverlet.Core { - public static class DependencyInjection + internal static class DependencyInjection { private static Lazy _serviceProvider = new Lazy(() => InitDefaultServices(), true); diff --git a/src/coverlet.core/Enums/ThresholdStatistic.cs b/src/coverlet.core/Enums/ThresholdStatistic.cs index 1bafe3dd8..9b7dd18ba 100644 --- a/src/coverlet.core/Enums/ThresholdStatistic.cs +++ b/src/coverlet.core/Enums/ThresholdStatistic.cs @@ -1,6 +1,6 @@ namespace Coverlet.Core.Enums { - public enum ThresholdStatistic + internal enum ThresholdStatistic { Minimum, Average, diff --git a/src/coverlet.core/Enums/ThresholdTypeFlags.cs b/src/coverlet.core/Enums/ThresholdTypeFlags.cs index fbc719186..11a082178 100644 --- a/src/coverlet.core/Enums/ThresholdTypeFlags.cs +++ b/src/coverlet.core/Enums/ThresholdTypeFlags.cs @@ -3,7 +3,7 @@ namespace Coverlet.Core.Enums { [Flags] - public enum ThresholdTypeFlags + internal enum ThresholdTypeFlags { None = 0, Line = 2, diff --git a/src/coverlet.core/Helpers/FileSystem.cs b/src/coverlet.core/Helpers/FileSystem.cs index b81a84c2e..bb0668adf 100644 --- a/src/coverlet.core/Helpers/FileSystem.cs +++ b/src/coverlet.core/Helpers/FileSystem.cs @@ -3,7 +3,7 @@ namespace Coverlet.Core.Helpers { - public class FileSystem : IFileSystem + internal class FileSystem : IFileSystem { // We need to partial mock this method on tests public virtual bool Exists(string path) diff --git a/src/coverlet.core/Helpers/InstrumentationHelper.cs b/src/coverlet.core/Helpers/InstrumentationHelper.cs index 75cb4b019..adfa3772e 100644 --- a/src/coverlet.core/Helpers/InstrumentationHelper.cs +++ b/src/coverlet.core/Helpers/InstrumentationHelper.cs @@ -8,6 +8,7 @@ using System.Reflection.Metadata; using System.Reflection.PortableExecutable; using System.Text.RegularExpressions; + using Coverlet.Core.Abstracts; namespace Coverlet.Core.Helpers diff --git a/src/coverlet.core/Helpers/RetryHelper.cs b/src/coverlet.core/Helpers/RetryHelper.cs index 0f83209b8..45531bf35 100644 --- a/src/coverlet.core/Helpers/RetryHelper.cs +++ b/src/coverlet.core/Helpers/RetryHelper.cs @@ -7,7 +7,7 @@ namespace Coverlet.Core.Helpers { // A slightly amended version of the code found here: https://stackoverflow.com/a/1563234/186184 // This code allows for varying backoff strategies through the use of Func. - public class RetryHelper : IRetryHelper + internal class RetryHelper : IRetryHelper { /// /// Retry a void method. diff --git a/src/coverlet.core/Instrumentation/Instrumenter.cs b/src/coverlet.core/Instrumentation/Instrumenter.cs index 9f8725a93..f42d8e307 100644 --- a/src/coverlet.core/Instrumentation/Instrumenter.cs +++ b/src/coverlet.core/Instrumentation/Instrumenter.cs @@ -4,9 +4,9 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Linq; + using Coverlet.Core.Abstracts; using Coverlet.Core.Attributes; -using Coverlet.Core.Logging; using Coverlet.Core.Symbols; using Microsoft.Extensions.FileSystemGlobbing; using Mono.Cecil; diff --git a/src/coverlet.core/Instrumentation/InstrumenterResult.cs b/src/coverlet.core/Instrumentation/InstrumenterResult.cs index 6c7823e32..34270ec7f 100644 --- a/src/coverlet.core/Instrumentation/InstrumenterResult.cs +++ b/src/coverlet.core/Instrumentation/InstrumenterResult.cs @@ -6,7 +6,7 @@ namespace Coverlet.Core.Instrumentation { [DataContract] - public class Line + internal class Line { [DataMember] public int Number; @@ -20,7 +20,7 @@ public class Line [DebuggerDisplay("Line = {Number} Offset = {Offset} EndOffset = {EndOffset} Path = {Path} Ordinal = {Ordinal} Hits = {Hits}")] [DataContract] - public class Branch : Line + internal class Branch : Line { [DataMember] public int Offset; @@ -35,7 +35,7 @@ public class Branch : Line [DebuggerDisplay("line = {Line} Ordinal = {Ordinal}")] // Implements IEquatable because is used by dictionary key https://docs.microsoft.com/en-us/dotnet/api/system.iequatable-1?view=netcore-2.2#remarks [DataContract] - public class BranchKey : IEquatable + internal class BranchKey : IEquatable { public BranchKey(int line, int ordinal) => (Line, Ordinal) = (line, ordinal); @@ -55,7 +55,7 @@ public override int GetHashCode() } [DataContract] - public class Document + internal class Document { public Document() { @@ -74,7 +74,7 @@ public Document() } [DataContract] - public class HitCandidate + internal class HitCandidate { public HitCandidate(bool isBranch, int docIndex, int start, int end) => (this.isBranch, this.docIndex, this.start, this.end) = (isBranch, docIndex, start, end); @@ -89,7 +89,7 @@ public class HitCandidate } [DataContract] - public class InstrumenterResult + internal class InstrumenterResult { public InstrumenterResult() { diff --git a/src/coverlet.core/Instrumentation/ModuleTrackerTemplate.cs b/src/coverlet.core/Instrumentation/ModuleTrackerTemplate.cs index 09eb4abbe..035209335 100644 --- a/src/coverlet.core/Instrumentation/ModuleTrackerTemplate.cs +++ b/src/coverlet.core/Instrumentation/ModuleTrackerTemplate.cs @@ -15,7 +15,7 @@ namespace Coverlet.Core.Instrumentation /// regarding visibility of members, etc. /// [ExcludeFromCodeCoverage] - public static class ModuleTrackerTemplate + internal static class ModuleTrackerTemplate { public static string HitsFilePath; public static int[] HitsArray; diff --git a/src/coverlet.core/Properties/AssemblyInfo.cs b/src/coverlet.core/Properties/AssemblyInfo.cs index b33f861f0..4e10ca353 100644 --- a/src/coverlet.core/Properties/AssemblyInfo.cs +++ b/src/coverlet.core/Properties/AssemblyInfo.cs @@ -1,9 +1,13 @@ -[assembly: System.Reflection.AssemblyKeyFileAttribute("coverlet.core.snk")] -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Coverlet.Core.Tests,PublicKey=" + -"0024000004800000940000000602000000240000525341310004000001000100757cf9291d78a8" + -"2e5bb58a827a3c46c2f959318327ad30d1b52e918321ffbd847fb21565b8576d2a3a24562a93e8" + -"6c77a298b564a0f1b98f63d7a1441a3a8bcc206da3ed09d5dacc76e122a109a9d3ac608e21a054" + -"d667a2bae98510a1f0f653c0e6f58f42b4b3934f6012f5ec4a09b3dfd3e14d437ede1424bdb722" + -"aead64ad")] +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyKeyFile("coverlet.core.snk")] + +[assembly: InternalsVisibleTo("coverlet.msbuild.tasks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e5f154a600df71cbdc8a8e69af077379c00889b9a597fbcac536c114911641809ef03b34a33dbe7befe8ea76535889175098bda0710bce04e321689e4458fc7515ca4a074b8618ad61489ec4d71171352e73ed04baeb1d8b8e4855342ef217968da2eebdfc53e119cdd93500a973974a3aed57c400f9bb187f784b0a0924099b")] +[assembly: InternalsVisibleTo("coverlet.console, PublicKey=00240000048000009400000006020000002400005253413100040000010001002515029761c695320036d518d74cc27defddd346afbfb4f16152ae3f4f0e779ae2fe048671a4ac3af595625db8e59fa3b5eeac22c06eacaebb54137ee8973449b68c5da8bbef903c2ac2d0b54143faf82f1b813fd24facfd5b6c7041ae5955ec63ba17cc57037b98eecbe44c7d2833c3aeabcc4e23109763f580067a74adacae")] +[assembly: InternalsVisibleTo("coverlet.collector, PublicKey=00240000048000009400000006020000002400005253413100040000010001003d23b9ef372215da7c81af920b919db5799fd021a1ca10b2e9e0ddac71237a29f8f6361a805a747457e561a7d616417f1870cda099486df25d580a4e11a0738293342881566254d7840e42f42fb9bfd8e8dca354df7dc68db14b2d0cd79bb2bf7afdbd62bd948d81b534cba7a326cf6ee840a1aee5dba0a1c660b30813ca99e5")] + +[assembly: InternalsVisibleTo("coverlet.core.tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100757cf9291d78a82e5bb58a827a3c46c2f959318327ad30d1b52e918321ffbd847fb21565b8576d2a3a24562a93e86c77a298b564a0f1b98f63d7a1441a3a8bcc206da3ed09d5dacc76e122a109a9d3ac608e21a054d667a2bae98510a1f0f653c0e6f58f42b4b3934f6012f5ec4a09b3dfd3e14d437ede1424bdb722aead64ad")] +[assembly: InternalsVisibleTo("coverlet.collector.tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100ed0ed6af9693182615b8dcadc83c918b8d36312f86cefc69539d67d4189cd1b89420e7c3871802ffef7f5ca7816c68ad856c77bf7c230cc07824d96aa5d1237eebd30e246b9a14e22695fb26b40c800f74ea96619092cbd3a5d430d6c003fc7a82e8ccd1e315b935105d9232fe9e99e8d7ff54bba6f191959338d4a3169df9b3")] // Needed to mock internal type https://github.com/Moq/moq4/wiki/Quickstart#advanced-features -[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] \ No newline at end of file +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] \ No newline at end of file diff --git a/src/coverlet.core/Reporters/CoberturaReporter.cs b/src/coverlet.core/Reporters/CoberturaReporter.cs index 48e202916..8cffac299 100644 --- a/src/coverlet.core/Reporters/CoberturaReporter.cs +++ b/src/coverlet.core/Reporters/CoberturaReporter.cs @@ -7,7 +7,7 @@ namespace Coverlet.Core.Reporters { - public class CoberturaReporter : IReporter + internal class CoberturaReporter : IReporter { public ReporterOutputType OutputType => ReporterOutputType.File; diff --git a/src/coverlet.core/Reporters/IReporter.cs b/src/coverlet.core/Reporters/IReporter.cs index 1e885ba4e..ab3e8f99d 100644 --- a/src/coverlet.core/Reporters/IReporter.cs +++ b/src/coverlet.core/Reporters/IReporter.cs @@ -1,6 +1,6 @@ namespace Coverlet.Core.Reporters { - public interface IReporter + internal interface IReporter { ReporterOutputType OutputType { get; } string Format { get; } @@ -8,7 +8,7 @@ public interface IReporter string Report(CoverageResult result); } - public enum ReporterOutputType + internal enum ReporterOutputType { File, Console, diff --git a/src/coverlet.core/Reporters/JsonReporter.cs b/src/coverlet.core/Reporters/JsonReporter.cs index 7d8c0e37d..09e23e83f 100644 --- a/src/coverlet.core/Reporters/JsonReporter.cs +++ b/src/coverlet.core/Reporters/JsonReporter.cs @@ -2,7 +2,7 @@ namespace Coverlet.Core.Reporters { - public class JsonReporter : IReporter + internal class JsonReporter : IReporter { public ReporterOutputType OutputType => ReporterOutputType.File; diff --git a/src/coverlet.core/Reporters/LcovReporter.cs b/src/coverlet.core/Reporters/LcovReporter.cs index ae6878a15..e8e94b68d 100644 --- a/src/coverlet.core/Reporters/LcovReporter.cs +++ b/src/coverlet.core/Reporters/LcovReporter.cs @@ -4,7 +4,7 @@ namespace Coverlet.Core.Reporters { - public class LcovReporter : IReporter + internal class LcovReporter : IReporter { public ReporterOutputType OutputType => ReporterOutputType.File; diff --git a/src/coverlet.core/Reporters/OpenCoverReporter.cs b/src/coverlet.core/Reporters/OpenCoverReporter.cs index f65b7c71d..4a5c61005 100644 --- a/src/coverlet.core/Reporters/OpenCoverReporter.cs +++ b/src/coverlet.core/Reporters/OpenCoverReporter.cs @@ -8,7 +8,7 @@ namespace Coverlet.Core.Reporters { - public class OpenCoverReporter : IReporter + internal class OpenCoverReporter : IReporter { public ReporterOutputType OutputType => ReporterOutputType.File; diff --git a/src/coverlet.core/Reporters/ReporterFactory.cs b/src/coverlet.core/Reporters/ReporterFactory.cs index e6d882581..7ac72337b 100644 --- a/src/coverlet.core/Reporters/ReporterFactory.cs +++ b/src/coverlet.core/Reporters/ReporterFactory.cs @@ -3,7 +3,7 @@ namespace Coverlet.Core.Reporters { - public class ReporterFactory + internal class ReporterFactory { private string _format; private IReporter[] _reporters; diff --git a/src/coverlet.core/Reporters/TeamCityReporter.cs b/src/coverlet.core/Reporters/TeamCityReporter.cs index f84b21251..a12a8f96c 100644 --- a/src/coverlet.core/Reporters/TeamCityReporter.cs +++ b/src/coverlet.core/Reporters/TeamCityReporter.cs @@ -5,7 +5,7 @@ namespace Coverlet.Core.Reporters { - public class TeamCityReporter : IReporter + internal class TeamCityReporter : IReporter { public ReporterOutputType OutputType => ReporterOutputType.Console; diff --git a/src/coverlet.core/Symbols/BranchPoint.cs b/src/coverlet.core/Symbols/BranchPoint.cs index 943b620bb..077d569d2 100644 --- a/src/coverlet.core/Symbols/BranchPoint.cs +++ b/src/coverlet.core/Symbols/BranchPoint.cs @@ -8,7 +8,7 @@ namespace Coverlet.Core.Symbols /// a branch point /// [DebuggerDisplay("StartLine = {StartLine}")] - public class BranchPoint + internal class BranchPoint { /// /// Line of the branching instruction diff --git a/src/coverlet.core/Symbols/CecilSymbolHelper.cs b/src/coverlet.core/Symbols/CecilSymbolHelper.cs index 82d58c79e..29b7a51d1 100644 --- a/src/coverlet.core/Symbols/CecilSymbolHelper.cs +++ b/src/coverlet.core/Symbols/CecilSymbolHelper.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using System.Runtime.CompilerServices; -using System.Text.RegularExpressions; using Coverlet.Core.Extensions; @@ -16,7 +15,7 @@ namespace Coverlet.Core.Symbols { - public static class CecilSymbolHelper + internal static class CecilSymbolHelper { private const int StepOverLineCode = 0xFEEFEE; diff --git a/src/coverlet.msbuild.tasks/MSBuildLogger.cs b/src/coverlet.msbuild.tasks/MSBuildLogger.cs index 71ceee45b..b6281aaf6 100644 --- a/src/coverlet.msbuild.tasks/MSBuildLogger.cs +++ b/src/coverlet.msbuild.tasks/MSBuildLogger.cs @@ -1,7 +1,8 @@ using System; + using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using ILogger = Coverlet.Core.Logging.ILogger; +using ILogger = Coverlet.Core.Abstracts.ILogger; namespace Coverlet.MSbuild.Tasks { diff --git a/test/coverlet.collector.tests/CoverletCoverageDataCollectorTests.cs b/test/coverlet.collector.tests/CoverletCoverageDataCollectorTests.cs index 07c56bd99..72bfc2e35 100644 --- a/test/coverlet.collector.tests/CoverletCoverageDataCollectorTests.cs +++ b/test/coverlet.collector.tests/CoverletCoverageDataCollectorTests.cs @@ -8,7 +8,6 @@ using Moq; using Microsoft.VisualStudio.TestPlatform.ObjectModel; using Coverlet.Core; -using Coverlet.Core.Logging; using Coverlet.Collector.Utilities.Interfaces; using Coverlet.Collector.Utilities; using Xunit; diff --git a/test/coverlet.collector.tests/Properties/AssemblyInfo.cs b/test/coverlet.collector.tests/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..b80d4b319 --- /dev/null +++ b/test/coverlet.collector.tests/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Reflection; + +[assembly: AssemblyKeyFile("coverlet.collector.tests.snk")] diff --git a/test/coverlet.collector.tests/coverlet.collector.tests.snk b/test/coverlet.collector.tests/coverlet.collector.tests.snk new file mode 100644 index 0000000000000000000000000000000000000000..4263b61af7665c61608938f29eee54862aa3bf95 GIT binary patch literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098)4%V-hlNcryxZJJCJdulyHZd=T&irXp zooCb-oYAXu=UlFQSj)G*e-1N?e|=*-dM6}dGKU6L~Xo|)*^|5UrC@sX92IMkySo%ypH z!_Pt>3H7Rko(0OXr~JwvlYeOF;R00m+z?jqg7Bdh;&;1rKmTXJNH^m1fL+_%efZxa zjGOmJY)+c|RGH0}jzfD!ET_O0<5$^5V*Rw8_bF08Yb*PUhx92Ag~T9Fx&jVOSWnsM z!cjD9A)cWJ-)Qg@qiOW3qXFnRHyGfl*|*Y7r#>l%Ne~A4uv6Csc>pXJWA=H;hOq7-;(Dh_3_S&-YR;sy-FC zAOltxOF_Mz28p^{xbtuK4-9uwPSF&^5rr3C6ZwpnF+71yDKpk%fzHd%eirih8Jc7` zyRJo-w*KOjfIZMiIIYX6E;EJo70#7q5)dg;QW_6kDWFvS;`lc literal 0 HcmV?d00001 diff --git a/test/coverlet.core.tests/CoverageTests.cs b/test/coverlet.core.tests/CoverageTests.cs index 240d1fc88..1c4b72ff2 100644 --- a/test/coverlet.core.tests/CoverageTests.cs +++ b/test/coverlet.core.tests/CoverageTests.cs @@ -1,15 +1,14 @@ using System; using System.IO; using System.Threading.Tasks; + using Coverlet.Core.Abstracts; using Coverlet.Core.Helpers; -using Coverlet.Core.Logging; using Coverlet.Core.Samples.Tests; using Coverlet.Tests.RemoteExecutor; using Moq; using Xunit; - namespace Coverlet.Core.Tests { public class CoverageTests diff --git a/test/coverlet.core.tests/Instrumentation/InstrumenterTests.cs b/test/coverlet.core.tests/Instrumentation/InstrumenterTests.cs index 3d954e5b5..147ed0ee9 100644 --- a/test/coverlet.core.tests/Instrumentation/InstrumenterTests.cs +++ b/test/coverlet.core.tests/Instrumentation/InstrumenterTests.cs @@ -4,8 +4,9 @@ using System.Linq; using System.Reflection; using System.Runtime.InteropServices; + using Coverlet.Core.Helpers; -using Coverlet.Core.Logging; +using Coverlet.Core.Abstracts; using Coverlet.Core.Samples.Tests; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; @@ -14,7 +15,6 @@ using Moq; using Xunit; - namespace Coverlet.Core.Instrumentation.Tests { public class InstrumenterTests diff --git a/test/coverlet.core.tests/InstrumenterHelper.cs b/test/coverlet.core.tests/InstrumenterHelper.cs index 46e366095..101eaa746 100644 --- a/test/coverlet.core.tests/InstrumenterHelper.cs +++ b/test/coverlet.core.tests/InstrumenterHelper.cs @@ -10,7 +10,6 @@ using Coverlet.Core.Abstracts; using Coverlet.Core.Helpers; using Coverlet.Core.Instrumentation; -using Coverlet.Core.Logging; using Coverlet.Core.Reporters; using Microsoft.Extensions.DependencyInjection; using Moq; @@ -26,7 +25,7 @@ public enum BuildConfiguration Release = 2 } - public static class TestInstrumentationAssert + static class TestInstrumentationAssert { public static Document Document(this CoverageResult coverageResult, string docName) { @@ -181,7 +180,7 @@ private static BuildConfiguration GetAssemblyBuildConfiguration() } } - public static class TestInstrumentationHelper + static class TestInstrumentationHelper { /// /// caller sample: TestInstrumentationHelper.GenerateHtmlReport(result, sourceFileFilter: @"+**\Samples\Instrumentation.cs"); diff --git a/test/coverlet.core.tests/Properties/AssemblyInfo.cs b/test/coverlet.core.tests/Properties/AssemblyInfo.cs index 2357f78b3..78d7bf29b 100644 --- a/test/coverlet.core.tests/Properties/AssemblyInfo.cs +++ b/test/coverlet.core.tests/Properties/AssemblyInfo.cs @@ -1 +1,3 @@ -[assembly: System.Reflection.AssemblyKeyFileAttribute("coverlet.core.tests.snk")] \ No newline at end of file +using System.Reflection; + +[assembly: AssemblyKeyFile("coverlet.core.tests.snk")] \ No newline at end of file diff --git a/test/coverlet.tests.remoteexecutor/Properties/AssemblyInfo.cs b/test/coverlet.tests.remoteexecutor/Properties/AssemblyInfo.cs index 7a382d5de..e4195b137 100644 --- a/test/coverlet.tests.remoteexecutor/Properties/AssemblyInfo.cs +++ b/test/coverlet.tests.remoteexecutor/Properties/AssemblyInfo.cs @@ -1 +1,3 @@ -[assembly: System.Reflection.AssemblyKeyFileAttribute("coverlet.tests.remoteexecutor.snk")] \ No newline at end of file +using System.Reflection; + +[assembly: AssemblyKeyFile("coverlet.tests.remoteexecutor.snk")] \ No newline at end of file From c52707a37cc845c06f18e57318cb946081e62af3 Mon Sep 17 00:00:00 2001 From: Marco Rossignoli Date: Mon, 25 Nov 2019 12:30:07 +0100 Subject: [PATCH 2/4] updates --- src/coverlet.core/Attributes/ExcludeFromCoverage.cs | 2 +- src/coverlet.core/Extensions/DependencyInjectionExtensions.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coverlet.core/Attributes/ExcludeFromCoverage.cs b/src/coverlet.core/Attributes/ExcludeFromCoverage.cs index 0fb1ef097..f7281ca04 100644 --- a/src/coverlet.core/Attributes/ExcludeFromCoverage.cs +++ b/src/coverlet.core/Attributes/ExcludeFromCoverage.cs @@ -3,5 +3,5 @@ namespace Coverlet.Core.Attributes { [AttributeUsage(AttributeTargets.Property | AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Class)] - public sealed class ExcludeFromCoverageAttribute : Attribute { } + internal sealed class ExcludeFromCoverageAttribute : Attribute { } } \ No newline at end of file diff --git a/src/coverlet.core/Extensions/DependencyInjectionExtensions.cs b/src/coverlet.core/Extensions/DependencyInjectionExtensions.cs index 380885fa9..38b9999a3 100644 --- a/src/coverlet.core/Extensions/DependencyInjectionExtensions.cs +++ b/src/coverlet.core/Extensions/DependencyInjectionExtensions.cs @@ -2,7 +2,7 @@ namespace Coverlet.Core.Extensions { - public static class DependencyInjectionExtensions + internal static class DependencyInjectionExtensions { public static T GetService(this IServiceProvider serviceProvider) { From b7d3a1d7c1de1e8fecf3d0f0d7eb14faa3040123 Mon Sep 17 00:00:00 2001 From: Marco Rossignoli Date: Mon, 25 Nov 2019 12:43:59 +0100 Subject: [PATCH 3/4] consolidate core lib ref --- src/coverlet.console/coverlet.console.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coverlet.console/coverlet.console.csproj b/src/coverlet.console/coverlet.console.csproj index 0db48ea21..89d78d42a 100644 --- a/src/coverlet.console/coverlet.console.csproj +++ b/src/coverlet.console/coverlet.console.csproj @@ -21,7 +21,7 @@ - + From eaaf0afc318857dd049822f09773dc800d33e699 Mon Sep 17 00:00:00 2001 From: Marco Rossignoli Date: Mon, 25 Nov 2019 12:45:41 +0100 Subject: [PATCH 4/4] consolidate core lib ref --- src/coverlet.console/coverlet.console.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coverlet.console/coverlet.console.csproj b/src/coverlet.console/coverlet.console.csproj index 89d78d42a..8d3855d6e 100644 --- a/src/coverlet.console/coverlet.console.csproj +++ b/src/coverlet.console/coverlet.console.csproj @@ -21,7 +21,7 @@ - +