fixed virtual override, removed non required references, removed Any CPU configuration

aschet · aschet · commit 9cae3a3ea17d · 2016-05-22T20:55:56.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,9 @@
+﻿################################################################################
+# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
+################################################################################
+
+.suo
+/src/VisualCoverage.Console/obj
+/src/VisualCoverage.Console/bin
+/src/VisualCoverage.Core/obj
+/src/VisualCoverage.Core/bin
diff --git a/lib/Microsoft.VisualStudio.Coverage.Analysis.dll b/lib/Microsoft.VisualStudio.Coverage.Analysis.dll
diff --git a/lib/Microsoft.VisualStudio.Coverage.Interop.dll b/lib/Microsoft.VisualStudio.Coverage.Interop.dll
diff --git a/src/VisualCoverage.Console/CmdDriver.cs b/src/VisualCoverage.Console/CmdDriver.cs
@@ -32,7 +32,6 @@ namespace VisualCoverage.Console
 {
     using System;
     using System.Collections;
-    using System.Globalization;
     using VisualCoverage.Core;
     using VisualCoverage.Core.Util;
     using VisualCoverage.Core.Elements;
diff --git a/src/VisualCoverage.Console/VisualCoverage.Console.csproj b/src/VisualCoverage.Console/VisualCoverage.Console.csproj
@@ -38,12 +38,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CmdDriver.cs" />
@@ -52,15 +47,15 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="..\CommonAssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VisualCoverage.Core\VisualCoverage.Core.csproj">
-      <Project>{91ACD43C-267E-46E9-9E87-52C9F0151AA4}</Project>
+      <Project>{91acd43c-267e-46e9-9e87-52c9f0151aa4}</Project>
       <Name>VisualCoverage.Core</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/VisualCoverage.Core/Elements/FileElement.cs b/src/VisualCoverage.Core/Elements/FileElement.cs
@@ -30,7 +30,6 @@ namespace VisualCoverage.Core.Elements
 {
     using System;
     using System.Collections.Generic;
-    using System.IO;
     using VisualCoverage.Core.Metrics;
 
     public class FileElement
diff --git a/src/VisualCoverage.Core/Elements/LineElement.cs b/src/VisualCoverage.Core/Elements/LineElement.cs
@@ -29,7 +29,6 @@
 namespace VisualCoverage.Core.Elements
 {
     using System;
-    using VisualCoverage.Core.Metrics;
 
     public class LineElement
     {
diff --git a/src/VisualCoverage.Core/Elements/PackageElement.cs b/src/VisualCoverage.Core/Elements/PackageElement.cs
@@ -30,7 +30,6 @@ namespace VisualCoverage.Core.Elements
 {
     using System;
     using System.Collections.Generic;
-    using System.IO;
     using VisualCoverage.Core.Metrics;
 
     public class PackageElement
diff --git a/src/VisualCoverage.Core/Elements/ProjectElement.cs b/src/VisualCoverage.Core/Elements/ProjectElement.cs
@@ -30,7 +30,6 @@ namespace VisualCoverage.Core.Elements
 {
     using System;
     using System.Collections.Generic;
-    using System.IO;
     using VisualCoverage.Core.Metrics;
 
     public class ProjectElement
diff --git a/src/VisualCoverage.Core/Metrics/BaseMetrics.cs b/src/VisualCoverage.Core/Metrics/BaseMetrics.cs
@@ -64,7 +64,7 @@ public void Add ( BaseMetrics bm )
             }
         }
         
-        public String ToXml ()
+        public virtual String ToXml ()
         {
             StringBuilder buffer = new StringBuilder();
             buffer.Append("<metrics ");
diff --git a/src/VisualCoverage.Core/Metrics/ClassMetrics.cs b/src/VisualCoverage.Core/Metrics/ClassMetrics.cs
@@ -29,8 +29,6 @@
 namespace VisualCoverage.Core.Metrics
 {
     using System;
-    using System.Text;
-    using System.Collections.Specialized;
 
     public class ClassMetrics : BaseMetrics
     {
@@ -57,7 +55,7 @@ public uint CoveredElements
             get { return _metrics["coveredconditionals"] + _metrics["coveredstatements"] + _metrics["coveredmethods"]; }
         }
         
-        public String ToXml ()
+        public override String ToXml ()
         {
             SetMetric("elements", Elements);
             SetMetric("coveredelements", CoveredElements);
diff --git a/src/VisualCoverage.Core/Metrics/FileMetrics.cs b/src/VisualCoverage.Core/Metrics/FileMetrics.cs
@@ -28,8 +28,6 @@
 //
 namespace VisualCoverage.Core.Metrics
 {
-    using System;
-
     public class FileMetrics : ClassMetrics
     {
         public FileMetrics ( uint complexity, uint statements, uint covered_statements, uint conditionals, uint covered_conditionals, uint methods, uint covered_methods, uint classes, uint nloc, uint ncloc )
diff --git a/src/VisualCoverage.Core/Metrics/PackageMetrics.cs b/src/VisualCoverage.Core/Metrics/PackageMetrics.cs
@@ -28,8 +28,6 @@
 //
 namespace VisualCoverage.Core.Metrics
 {
-    using System;
-
     public class PackageMetrics : FileMetrics
     {
         public PackageMetrics ( uint complexity, uint statements, uint covered_statements, uint conditionals, uint covered_conditionals, uint methods, uint covered_methods, uint classes, uint nloc, uint ncloc, uint files )
diff --git a/src/VisualCoverage.Core/Metrics/ProjectMetrics.cs b/src/VisualCoverage.Core/Metrics/ProjectMetrics.cs
@@ -28,8 +28,6 @@
 //
 namespace VisualCoverage.Core.Metrics
 {
-    using System;
-
     public class ProjectMetrics : PackageMetrics
     {
         public ProjectMetrics ( uint complexity, uint statements, uint covered_statements, uint conditionals, uint covered_conditionals, uint methods, uint covered_methods, uint classes, uint nloc, uint ncloc, uint files, uint packages )
diff --git a/src/VisualCoverage.Core/MikeParser.cs b/src/VisualCoverage.Core/MikeParser.cs
@@ -31,11 +31,8 @@ namespace VisualCoverage.Core.Util
     using System;
     using System.IO;
     using System.Data;
-    using System.Linq;
-    using System.Collections;
     using System.Collections.Generic;
     using System.Collections.Specialized;
-    using System.Text;
     using System.Text.RegularExpressions;
     using Microsoft.VisualStudio.Coverage.Analysis;
     using VisualCoverage.Core.Elements;
diff --git a/src/VisualCoverage.Core/VisualCoverage.Core.csproj b/src/VisualCoverage.Core/VisualCoverage.Core.csproj
@@ -33,21 +33,37 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.Coverage.Analysis">
-      <HintPath>..\..\lib\Microsoft.VisualStudio.Coverage.Analysis.dll</HintPath>
+      <HintPath>$(VS140COMNTOOLS)..\IDE\PrivateAssemblies\Microsoft.VisualStudio.Coverage.Analysis.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Coverage.Interop">
-      <HintPath>..\..\lib\Microsoft.VisualStudio.Coverage.Interop.dll</HintPath>
+      <HintPath>$(VS140COMNTOOLS)..\IDE\PrivateAssemblies\Microsoft.VisualStudio.Coverage.Interop.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CloverReport.cs" />
diff --git a/visual-coverage.sln b/visual-coverage.sln
@@ -1,40 +1,34 @@
 ﻿
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualCoverage.Core", "src\VisualCoverage.Core\VisualCoverage.Core.csproj", "{91ACD43C-267E-46E9-9E87-52C9F0151AA4}"
-EndProject
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualCoverage.Console", "src\VisualCoverage.Console\VisualCoverage.Console.csproj", "{E3BB86AA-FD69-4243-94FB-E448BAF608FD}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualCoverage.Core", "src\VisualCoverage.Core\VisualCoverage.Core.csproj", "{91ACD43C-267E-46E9-9E87-52C9F0151AA4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Release|x86.ActiveCfg = Release|Any CPU
 		{E3BB86AA-FD69-4243-94FB-E448BAF608FD}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{E3BB86AA-FD69-4243-94FB-E448BAF608FD}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{E3BB86AA-FD69-4243-94FB-E448BAF608FD}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{E3BB86AA-FD69-4243-94FB-E448BAF608FD}.Debug|x86.ActiveCfg = Debug|x86
 		{E3BB86AA-FD69-4243-94FB-E448BAF608FD}.Debug|x86.Build.0 = Debug|x86
 		{E3BB86AA-FD69-4243-94FB-E448BAF608FD}.Release|Any CPU.ActiveCfg = Release|x86
-		{E3BB86AA-FD69-4243-94FB-E448BAF608FD}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{E3BB86AA-FD69-4243-94FB-E448BAF608FD}.Release|Mixed Platforms.Build.0 = Release|x86
 		{E3BB86AA-FD69-4243-94FB-E448BAF608FD}.Release|x86.ActiveCfg = Release|x86
 		{E3BB86AA-FD69-4243-94FB-E448BAF608FD}.Release|x86.Build.0 = Release|x86
+		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Debug|x86.ActiveCfg = Debug|x86
+		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Debug|x86.Build.0 = Debug|x86
+		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Release|x86.ActiveCfg = Release|x86
+		{91ACD43C-267E-46E9-9E87-52C9F0151AA4}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ namespace VisualCoverage.Console`
`32`	`32`	`{`
`33`	`33`	`using System;`
`34`	`34`	`using System.Collections;`
`35`		`- using System.Globalization;`
`36`	`35`	`using VisualCoverage.Core;`
`37`	`36`	`using VisualCoverage.Core.Util;`
`38`	`37`	`using VisualCoverage.Core.Elements;`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ namespace VisualCoverage.Core.Elements`
`30`	`30`	`{`
`31`	`31`	`using System;`
`32`	`32`	`using System.Collections.Generic;`
`33`		`- using System.IO;`
`34`	`33`	`using VisualCoverage.Core.Metrics;`
`35`	`34`
`36`	`35`	`public class FileElement`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@`
`29`	`29`	`namespace VisualCoverage.Core.Elements`
`30`	`30`	`{`
`31`	`31`	`using System;`
`32`		`- using VisualCoverage.Core.Metrics;`
`33`	`32`
`34`	`33`	`public class LineElement`
`35`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public void Add ( BaseMetrics bm )`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`- public String ToXml ()`
	`67`	`+ public virtual String ToXml ()`
`68`	`68`	`{`
`69`	`69`	`StringBuilder buffer = new StringBuilder();`
`70`	`70`	`buffer.Append("<metrics ");`