move CoverageTracker class to separate assembly

tonerdo · tonerdo · commit 807f7b1bd5be · 2018-06-24T13:09:14.000+01:00
diff --git a/coverlet.sln b/coverlet.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+﻿Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
@@ -14,6 +14,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "coverlet.core.tests", "test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "coverlet.console", "src\coverlet.console\coverlet.console.csproj", "{F3DBE7C3-ABBB-4B8B-A6CB-A1D3D607163E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "coverlet.tracker", "src\coverlet.tracker\coverlet.tracker.csproj", "{F4273009-536D-4999-A126-B0A2E3AA3E70}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -72,6 +74,18 @@ Global
 		{F3DBE7C3-ABBB-4B8B-A6CB-A1D3D607163E}.Release|x64.Build.0 = Release|Any CPU
 		{F3DBE7C3-ABBB-4B8B-A6CB-A1D3D607163E}.Release|x86.ActiveCfg = Release|Any CPU
 		{F3DBE7C3-ABBB-4B8B-A6CB-A1D3D607163E}.Release|x86.Build.0 = Release|Any CPU
+		{F4273009-536D-4999-A126-B0A2E3AA3E70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4273009-536D-4999-A126-B0A2E3AA3E70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4273009-536D-4999-A126-B0A2E3AA3E70}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F4273009-536D-4999-A126-B0A2E3AA3E70}.Debug|x64.Build.0 = Debug|Any CPU
+		{F4273009-536D-4999-A126-B0A2E3AA3E70}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F4273009-536D-4999-A126-B0A2E3AA3E70}.Debug|x86.Build.0 = Debug|Any CPU
+		{F4273009-536D-4999-A126-B0A2E3AA3E70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4273009-536D-4999-A126-B0A2E3AA3E70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4273009-536D-4999-A126-B0A2E3AA3E70}.Release|x64.ActiveCfg = Release|Any CPU
+		{F4273009-536D-4999-A126-B0A2E3AA3E70}.Release|x64.Build.0 = Release|Any CPU
+		{F4273009-536D-4999-A126-B0A2E3AA3E70}.Release|x86.ActiveCfg = Release|Any CPU
+		{F4273009-536D-4999-A126-B0A2E3AA3E70}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -81,6 +95,7 @@ Global
 		{FA73E423-9790-4F35-B018-3C4E3CA338BA} = {E877EBA4-E78B-4F7D-A2D3-1E070FED04CD}
 		{E7637CC6-43F7-461A-A0BF-3C14562419BD} = {2FEBDE1B-83E3-445B-B9F8-5644B0E0E134}
 		{F3DBE7C3-ABBB-4B8B-A6CB-A1D3D607163E} = {E877EBA4-E78B-4F7D-A2D3-1E070FED04CD}
+		{F4273009-536D-4999-A126-B0A2E3AA3E70} = {E877EBA4-E78B-4F7D-A2D3-1E070FED04CD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9CA57C02-97B0-4C38-A027-EA61E8741F10}
diff --git a/src/coverlet.core/Helpers/InstrumentationHelper.cs b/src/coverlet.core/Helpers/InstrumentationHelper.cs
@@ -41,15 +41,13 @@ public static bool HasPdb(string module)
 
         public static void CopyCoverletDependency(string module)
         {
-            var directory = Path.GetDirectoryName(module);
             var moduleFileName = Path.GetFileName(module);
-
-            var assembly = typeof(Coverage).Assembly;
-            string name = Path.GetFileName(assembly.Location);
-            if (name == moduleFileName)
+            if (Path.GetFileName(typeof(Coverage).Assembly.Location) == moduleFileName)
                 return;
 
-            File.Copy(assembly.Location, Path.Combine(directory, name), true);
+            var directory = Path.GetDirectoryName(module);
+            var assembly = typeof(Coverlet.Tracker.CoverageTracker).Assembly;
+            File.Copy(assembly.Location, Path.Combine(directory, Path.GetFileName(assembly.Location)), true);
         }
 
         public static void BackupOriginalModule(string module, string identifier)
diff --git a/src/coverlet.core/Instrumentation/Instrumenter.cs b/src/coverlet.core/Instrumentation/Instrumenter.cs
@@ -8,6 +8,7 @@
 using Coverlet.Core.Attributes;
 using Coverlet.Core.Helpers;
 using Coverlet.Core.Symbols;
+using Coverlet.Tracker;
 
 using Mono.Cecil;
 using Mono.Cecil.Cil;
diff --git a/src/coverlet.core/coverlet.core.csproj b/src/coverlet.core/coverlet.core.csproj
@@ -12,4 +12,8 @@
     <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="2.0.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\coverlet.tracker\coverlet.tracker.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/coverlet.tracker/CoverageTracker.cs b/src/coverlet.tracker/CoverageTracker.cs
@@ -1,18 +1,19 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.IO.Compression;
-using Coverlet.Core.Attributes;
-using Coverlet.Core.Extensions;
 
-namespace Coverlet.Core
+using Coverlet.Tracker.Extensions;
+
+namespace Coverlet.Tracker
 {
     public static class CoverageTracker
     {
         private static Dictionary<string, List<string>> _markers;
         private static Dictionary<string, int> _markerFileCount;
 
-        [ExcludeFromCoverage]
+        [ExcludeFromCodeCoverage]
         static CoverageTracker()
         {
             _markers = new Dictionary<string, List<string>>();
@@ -21,7 +22,7 @@ static CoverageTracker()
             AppDomain.CurrentDomain.DomainUnload += new EventHandler(CurrentDomain_ProcessExit);
         }
 
-        [ExcludeFromCoverage]
+        [ExcludeFromCodeCoverage]
         public static void MarkExecuted(string path, string marker)
         {
             lock (_markers)
@@ -35,7 +36,7 @@ public static void MarkExecuted(string path, string marker)
                     using (var gz = new GZipStream(fs, CompressionMode.Compress))
                     using (var sw = new StreamWriter(gz))
                     {
-                        foreach(var line in _markers[path])
+                        foreach (var line in _markers[path])
                         {
                             sw.WriteLine(line);
                         }
@@ -46,7 +47,7 @@ public static void MarkExecuted(string path, string marker)
             }
         }
 
-        [ExcludeFromCoverage]
+        [ExcludeFromCodeCoverage]
         public static void CurrentDomain_ProcessExit(object sender, EventArgs e)
         {
             lock (_markers)
@@ -57,7 +58,7 @@ public static void CurrentDomain_ProcessExit(object sender, EventArgs e)
                     using (var gz = new GZipStream(fs, CompressionMode.Compress))
                     using (var sw = new StreamWriter(gz))
                     {
-                        foreach(var line in kvp.Value)
+                        foreach (var line in kvp.Value)
                         {
                             sw.WriteLine(line);
                         }
diff --git a/src/coverlet.tracker/Extensions/DictionaryExtensions.cs b/src/coverlet.tracker/Extensions/DictionaryExtensions.cs
@@ -1,11 +1,11 @@
 using System.Collections.Generic;
-using Coverlet.Core.Attributes;
+using System.Diagnostics.CodeAnalysis;
 
-namespace Coverlet.Core.Extensions
+namespace Coverlet.Tracker.Extensions
 {
     internal static class DictionaryExtensions
     {
-        [ExcludeFromCoverage]
+        [ExcludeFromCodeCoverage]
         public static bool TryAdd<T, U>(this Dictionary<T, U> dictionary, T key, U value)
         {
             if (dictionary.ContainsKey(key))
diff --git a/src/coverlet.tracker/coverlet.tracker.csproj b/src/coverlet.tracker/coverlet.tracker.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/test/coverlet.core.tests/Extensions/DictionaryExtensionsTests.cs b/test/coverlet.core.tests/Extensions/DictionaryExtensionsTests.cs
diff --git a/test/coverlet.core.tests/Helpers/InstrumentationHelperTests.cs b/test/coverlet.core.tests/Helpers/InstrumentationHelperTests.cs
@@ -46,7 +46,7 @@ public void TestCopyCoverletDependency()
             var directory = Directory.CreateDirectory(Path.Combine(tempPath, "tempdir"));
             InstrumentationHelper.CopyCoverletDependency(Path.Combine(directory.FullName, "somemodule.dll"));
 
-            Assert.True(File.Exists(Path.Combine(directory.FullName, "coverlet.core.dll")));
+            Assert.True(File.Exists(Path.Combine(directory.FullName, "coverlet.tracker.dll")));
             Directory.Delete(directory.FullName, true);
         }
 
diff --git a/test/coverlet.core.tests/Samples/Samples.cs b/test/coverlet.core.tests/Samples/Samples.cs
@@ -175,8 +175,8 @@ public string Method(string input)
 
             return input;
         }
-    }
-
+    }
+
     [ExcludeFromCodeCoverage]
     public class ClassExcludedByCodeAnalysisCodeCoverageAttr
     {
@@ -189,6 +189,4 @@ public string Method(string input)
             return input;
         }
     }
-
-
 }

Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,19 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using System.Diagnostics.CodeAnalysis;`
`3`	`4`	`using System.IO;`
`4`	`5`	`using System.IO.Compression;`
`5`		`-using Coverlet.Core.Attributes;`
`6`		`-using Coverlet.Core.Extensions;`
`7`	`6`
`8`		`-namespace Coverlet.Core`
	`7`	`+using Coverlet.Tracker.Extensions;`
	`8`	`+`
	`9`	`+namespace Coverlet.Tracker`
`9`	`10`	`{`
`10`	`11`	`public static class CoverageTracker`
`11`	`12`	`{`
`12`	`13`	`private static Dictionary<string, List<string>> _markers;`
`13`	`14`	`private static Dictionary<string, int> _markerFileCount;`
`14`	`15`
`15`		`- [ExcludeFromCoverage]`
	`16`	`+ [ExcludeFromCodeCoverage]`
`16`	`17`	`static CoverageTracker()`
`17`	`18`	`{`
`18`	`19`	`_markers = new Dictionary<string, List<string>>();`
`@@ -21,7 +22,7 @@ static CoverageTracker()`
`21`	`22`	`AppDomain.CurrentDomain.DomainUnload += new EventHandler(CurrentDomain_ProcessExit);`
`22`	`23`	`}`
`23`	`24`
`24`		`- [ExcludeFromCoverage]`
	`25`	`+ [ExcludeFromCodeCoverage]`
`25`	`26`	`public static void MarkExecuted(string path, string marker)`
`26`	`27`	`{`
`27`	`28`	`lock (_markers)`
`@@ -35,7 +36,7 @@ public static void MarkExecuted(string path, string marker)`
`35`	`36`	`using (var gz = new GZipStream(fs, CompressionMode.Compress))`
`36`	`37`	`using (var sw = new StreamWriter(gz))`
`37`	`38`	`{`
`38`		`- foreach(var line in _markers[path])`
	`39`	`+ foreach (var line in _markers[path])`
`39`	`40`	`{`
`40`	`41`	`sw.WriteLine(line);`
`41`	`42`	`}`
`@@ -46,7 +47,7 @@ public static void MarkExecuted(string path, string marker)`
`46`	`47`	`}`
`47`	`48`	`}`
`48`	`49`
`49`		`- [ExcludeFromCoverage]`
	`50`	`+ [ExcludeFromCodeCoverage]`
`50`	`51`	`public static void CurrentDomain_ProcessExit(object sender, EventArgs e)`
`51`	`52`	`{`
`52`	`53`	`lock (_markers)`
`@@ -57,7 +58,7 @@ public static void CurrentDomain_ProcessExit(object sender, EventArgs e)`
`57`	`58`	`using (var gz = new GZipStream(fs, CompressionMode.Compress))`
`58`	`59`	`using (var sw = new StreamWriter(gz))`
`59`	`60`	`{`
`60`		`- foreach(var line in kvp.Value)`
	`61`	`+ foreach (var line in kvp.Value)`
`61`	`62`	`{`
`62`	`63`	`sw.WriteLine(line);`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`		`-using Coverlet.Core.Attributes;`
	`2`	`+using System.Diagnostics.CodeAnalysis;`
`3`	`3`
`4`		`-namespace Coverlet.Core.Extensions`
	`4`	`+namespace Coverlet.Tracker.Extensions`
`5`	`5`	`{`
`6`	`6`	`internal static class DictionaryExtensions`
`7`	`7`	`{`
`8`		`- [ExcludeFromCoverage]`
	`8`	`+ [ExcludeFromCodeCoverage]`
`9`	`9`	`public static bool TryAdd<T, U>(this Dictionary<T, U> dictionary, T key, U value)`
`10`	`10`	`{`
`11`	`11`	`if (dictionary.ContainsKey(key))`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public void TestCopyCoverletDependency()`
`46`	`46`	`var directory = Directory.CreateDirectory(Path.Combine(tempPath, "tempdir"));`
`47`	`47`	`InstrumentationHelper.CopyCoverletDependency(Path.Combine(directory.FullName, "somemodule.dll"));`
`48`	`48`
`49`		`- Assert.True(File.Exists(Path.Combine(directory.FullName, "coverlet.core.dll")));`
	`49`	`+ Assert.True(File.Exists(Path.Combine(directory.FullName, "coverlet.tracker.dll")));`
`50`	`50`	`Directory.Delete(directory.FullName, true);`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -175,8 +175,8 @@ public string Method(string input)`
`175`	`175`
`176`	`176`	`return input;`
`177`	`177`	`}`
`178`		`- }`
`179`		`-`
	`178`	`+ }`
	`179`	`+`
`180`	`180`	`[ExcludeFromCodeCoverage]`
`181`	`181`	`public class ClassExcludedByCodeAnalysisCodeCoverageAttr`
`182`	`182`	`{`
`@@ -189,6 +189,4 @@ public string Method(string input)`
`189`	`189`	`return input;`
`190`	`190`	`}`
`191`	`191`	`}`
`192`		`-`
`193`		`-`
`194`	`192`	`}`