From 9342bb9d6c6b2f623ea2a4f84a5c9ca62aa8f1a0 Mon Sep 17 00:00:00 2001 From: Atif Aziz Date: Sat, 26 Dec 2020 17:42:34 +0100 Subject: [PATCH] Add .NET 5.0 as a test target (#777) --- .travis.yml | 2 +- MoreLinq.Test/MoreLinq.Test.csproj | 2 +- appveyor.yml | 2 +- test.cmd | 2 ++ test.sh | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ae20362cb..deb6e3fda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,4 +55,4 @@ script: - # curl -s https://codecov.io/bash > codecov - curl -sSL https://raw.githubusercontent.com/codecov/codecov-bash/14662d32a4862918c31efafe4b450de1305a38e1/codecov > codecov - chmod +x codecov - - ./codecov -f ./MoreLinq.Test/coverage.netcoreapp3.1.opencover.xml + - ./codecov -f ./MoreLinq.Test/coverage.net5.0.opencover.xml diff --git a/MoreLinq.Test/MoreLinq.Test.csproj b/MoreLinq.Test/MoreLinq.Test.csproj index e990760a7..7e5f2afd9 100644 --- a/MoreLinq.Test/MoreLinq.Test.csproj +++ b/MoreLinq.Test/MoreLinq.Test.csproj @@ -2,7 +2,7 @@ MoreLinq.Test - netcoreapp3.1;netcoreapp2.1;net451 + net5.0;netcoreapp3.1;netcoreapp2.1;net451 true portable MoreLinq.Test diff --git a/appveyor.yml b/appveyor.yml index 7b120873c..3f39d25cc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -48,7 +48,7 @@ build_script: } test_script: - cmd: test.cmd -- ps: dotnet reportgenerator -reports:MoreLinq.Test/coverage.netcoreapp3.1.opencover.xml -targetdir:tmp/cover -tag:(git show -q --pretty=%H) +- ps: dotnet reportgenerator -reports:MoreLinq.Test/coverage.net5.0.opencover.xml -targetdir:tmp/cover -tag:(git show -q --pretty=%H) - ps: Get-ChildItem tmp/cover | Compress-Archive -DestinationPath coverage-report.zip - cmd: | cd tmp\cover diff --git a/test.cmd b/test.cmd index 9d66b4a31..03ed51dc9 100644 --- a/test.cmd +++ b/test.cmd @@ -7,6 +7,8 @@ goto :EOF :main setlocal call build ^ + && call :test net5.0 Debug ^ + && call :test net5.0 Debug ^ && call :test netcoreapp2.1 Debug ^ && call :test netcoreapp2.1 Release ^ && call :test netcoreapp3.1 Debug ^ diff --git a/test.sh b/test.sh index b26ecb839..9108be273 100755 --- a/test.sh +++ b/test.sh @@ -7,7 +7,7 @@ if [[ -z "$1" ]]; then else configs="$1" fi -for v in 2.1 3.1; do +for f in netcoreapp2.1 netcoreapp3.1 net5.0; do for c in $configs; do if [[ "$c" == "Debug" ]]; then coverage_args="-p:CollectCoverage=true @@ -16,7 +16,7 @@ for v in 2.1 3.1; do else unset coverage_args fi - dotnet test --no-build -c $c -f netcoreapp$v MoreLinq.Test $coverage_args + dotnet test --no-build -c $c -f $f MoreLinq.Test $coverage_args done done if [[ -z `which mono 2>/dev/null` ]]; then