-Changed tests to run in .NET Core 2.0

This commit is contained in:
James Newton-King
2017-08-18 15:47:18 +10:00
parent c0f7661ccb
commit 5c2695e839
4 changed files with 223 additions and 75 deletions
+6 -3
View File
@@ -11,7 +11,8 @@
$buildNuGet = $false
$treatWarningsAsErrors = $false
$workingName = if ($workingName) {$workingName} else {"Working"}
$netCliVersion = "1.0.4"
$netCliChannel = "2.0"
$netCliVersion = "2.0.0"
$nugetUrl = "http://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
$baseDir = resolve-path ..
@@ -30,7 +31,7 @@
$nunitConsolePath = "$buildDir\Temp\NUnit.ConsoleRunner.$nunitConsoleVersion"
$builds = @(
@{Framework = "netstandard1.3"; TestsFunction = "NetCliTests"; TestFramework = "netcoreapp1.1"; Enabled=$true},
@{Framework = "netstandard1.3"; TestsFunction = "NetCliTests"; TestFramework = "netcoreapp2.0"; Enabled=$true},
@{Framework = "netstandard1.0"; TestsFunction = "NetCliTests"; TestFramework = "netcoreapp1.0"; Enabled=$true},
@{Framework = "net45"; TestsFunction = "NUnitTests"; TestFramework = "net46"; NUnitFramework="net-4.0"; Enabled=$true},
@{Framework = "net40"; TestsFunction = "NUnitTests"; NUnitFramework="net-4.0"; Enabled=$true},
@@ -216,7 +217,7 @@ function NetCliTests($build)
$location = "$workingSourceDir\Newtonsoft.Json.Tests"
$testDir = if ($build.TestFramework -ne $null) { $build.TestFramework } else { $build.Framework }
exec { .\Tools\Dotnet\dotnet-install.ps1 -Version $netCliVersion | Out-Default }
exec { .\Tools\Dotnet\dotnet-install.ps1 -Channel $netCliChannel -Version $netCliVersion | Out-Default }
try
{
@@ -225,6 +226,8 @@ function NetCliTests($build)
exec { dotnet --version | Out-Default }
Write-Host -ForegroundColor Green "Running tests for $testDir"
Write-Host "Location: $location"
Write-Host "Project path: $projectPath"
Write-Host
exec { dotnet test $projectPath -f $testDir -c Release -l trx --no-build | Out-Default }