Use coverlet.msbuild

Ignore leading spaces and tabs in tests
mganss · Jul 20, 2018 · 410bbdf · 410bbdf
1 parent aeddccd
commit 410bbdf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/XmlSchemaClassGenerator.Tests/XmlSchemaClassGenerator.Tests.csproj b/XmlSchemaClassGenerator.Tests/XmlSchemaClassGenerator.Tests.csproj
@@ -18,6 +18,7 @@
  <ProjectReference Include="..\XmlSchemaClassGenerator\XmlSchemaClassGenerator.csproj" />
  </ItemGroup>
  <ItemGroup>
+ <PackageReference Include="coverlet.msbuild" Version="2.1.1" />
  <PackageReference Include="Microsoft.Net.Compilers.netcore" Version="1.3.2" />
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
  <PackageReference Include="System.CodeDom" Version="4.5.0" />

diff --git a/XmlSchemaClassGenerator.Tests/XmlTests.cs b/XmlSchemaClassGenerator.Tests/XmlTests.cs
@@ -444,7 +444,7 @@ public enum SimpleType
 
  private static void CompareOutput(string expected, string actual)
  {
- string Normalize(string input) => Regex.Replace(input, @"\s*\r\n", "\n");
+ string Normalize(string input) => Regex.Replace(input, @"[ \t]*\r\n", "\n");
  Assert.Equal(Normalize(expected), Normalize(actual));
  }
  }

diff --git a/appveyor.yml b/appveyor.yml
@@ -17,9 +17,7 @@ build_script:
  - dotnet pack --include-symbols --include-source -c Release xscgen
  - 7z a -mx=9 XmlSchemaClassGenerator.%APPVEYOR_BUILD_VERSION%.zip ".\XmlSchemaClassGenerator.Console\bin\Release\net45\publish\*"
 test_script:
- - dotnet build -c Debug
- - dotnet tool install --global coverlet.console
- - coverlet XmlSchemaClassGenerator.Tests\bin\Debug\netcoreapp2.1\XmlSchemaClassGenerator.Tests.dll --target dotnet --targetargs "test XmlSchemaClassGenerator.Tests\XmlSchemaClassGenerator.Tests.csproj --no-build" --format opencover --output ".\coverage.xml" --exclude "[XmlSampleGenerator]*"
+ - dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput="..\coverage.xml" XmlSchemaClassGenerator.Tests\XmlSchemaClassGenerator.Tests.csproj /p:Exclude="[XmlSampleGenerator]*"
  - pip install codecov
  - codecov -f "coverage.xml"
 artifacts: