Skip to content

Commit

Permalink
Merge branch 'jm_OnlyNetStandardProj' into jm_RenameNetStandardProj
Browse files Browse the repository at this point in the history
  • Loading branch information
masojus committed Nov 13, 2017
2 parents 50e9740 + 16046c9 commit 8d1f2f9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Expand Up @@ -98,7 +98,7 @@ test_script:
# Some comments on this can be found here: https://github.com/OpenCover/opencover/issues/601
- .\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:dotnet.exe -targetargs:"test --logger \"trx;LogFileName=dotnetcore_test_results.xml\" .\Keen.Test\Keen.Test.csproj /property:DebugType=Full" -mergeoutput -output:coverage.xml -filter:"+[*]* -[*.Test]* -[Moq*]*" -oldStyle -returntargetcode -register:user

# Upload merged coverage results from both test runs
# Upload coverage results
- .\tools\coveralls.net.0.8.0-unstable0013\tools\csmacnz.Coveralls.exe --opencover -i .\coverage.xml

# Upload netstandard test results to appveyor
Expand Down
2 changes: 1 addition & 1 deletion NewSemVer.ps1
Expand Up @@ -39,7 +39,7 @@ function Get-MajMinPatchVersion([string] $version) {


<#
Effect version updates in SharedVersionInfo.cs.
Effect version updates in .csproj file.
#>
function Update-AssemblyVersionAttributes ([string] $version) {
$majMinPatchPattern = '[0-9]+(\.([0-9]+|\*)){1,3}'
Expand Down

0 comments on commit 8d1f2f9

Please sign in to comment.