Update code coverage to newer

hughbe · Jul 8, 2018 · c04e831 · c04e831
1 parent 820274b
commit c04e831
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 71 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,12 @@ bld/
 *.VisualState.xml
 TestResult.xml
 
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+coverage.opencover.xml
+lcov.info
+
 # Build Results of an ATL Project
 [Dd]ebugPS/
 [Rr]eleasePS/

diff --git a/coverage.bat b/coverage.bat
@@ -1,25 +1,11 @@
 @echo off
 
-set project_name=ExcelMapper
-set user_directory=C:\Users\hugh
+dotnet test tests /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
 
-set open_cover_version=4.6.519
 set report_generator_version=3.1.2
-set xunit_console_version=2.3.0-beta3-build3705
-
+set user_directory=C:\Users\hughb
 set packages_directory=%user_directory%\.nuget\packages
-set open_cover=%packages_directory%\opencover\%open_cover_version%\tools\OpenCover.Console.exe
 set report_generator=%packages_directory%\reportgenerator\%report_generator_version%\tools\ReportGenerator.exe
 
-set xunit=%packages_directory%\xunit.runner.console\%xunit_console_version%\tools\net452\xunit.console.exe
-
-set test_name=src\%project_name%.Tests\bin\Debug\net46\%project_name%.Tests.exe
-
-set report_name=coverage.xml
 set report_path=resources\coverage
-
-dotnet build src
-
-%open_cover% -register:user -output:"%report_name%" -filter:"+[*]* -[%project_name%.Tests]*" -target:"%xunit%" -targetargs:"%test_name% -noshadow"
-
-%report_generator% -reports:"%report_name%" -targetdir:"%report_path%"
+%report_generator% -reports:"tests\coverage.opencover.xml" -targetdir:"%report_path%"
diff --git a/tests/ExcelMapper.Tests.csproj b/tests/ExcelMapper.Tests.csproj
@@ -8,62 +8,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="Resources\SplitWithCustomSeparators.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\DuplicatedColumns.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\Non Zero Header Index.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\WithMappings.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\Enums.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\DateTimes.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\Numbers.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\Bools.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\EmptyValues.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\MultiMap.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\EmptyColumns.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\NestedObjects.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\Strings.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\Doubles.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\Uris.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\Primitives.xlsx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Resources\SplitWithComma.xlsx">
+    <Content Include="Resources\*.xlsx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="2.1.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
-    <PackageReference Include="OpenCover" Version="4.6.519" />
     <PackageReference Include="ReportGenerator" Version="3.1.2" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
@@ -81,8 +33,4 @@
     <ProjectReference Include="..\src\ExcelMapper.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
 </Project>