build/build.ps1: Switching from NUnit3 Console Runner to .NET Core 2.0 SDK for .NET Framework 4.5.1 test run
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/06b676ec Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/06b676ec Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/06b676ec Branch: refs/heads/master Commit: 06b676ec81e59754b099deae81fb73ad4c0f2923 Parents: 9e47928 Author: Shad Storhaug <[email protected]> Authored: Mon Sep 18 03:18:05 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Mon Sep 18 03:18:05 2017 +0700 ---------------------------------------------------------------------- build/build.ps1 | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/06b676ec/build/build.ps1 ---------------------------------------------------------------------- diff --git a/build/build.ps1 b/build/build.ps1 index db954c3..2f83e75 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -263,37 +263,37 @@ task Test -depends InstallSDK1IfRequired, InstallSDK2IfRequired, Restore -descri $testResultDirectory = "$test_results_directory\$framework\$testName" Ensure-Directory-Exists $testResultDirectory - if ($framework.StartsWith("netcore")) { + #if ($framework.StartsWith("netcore")) { $testExpression = "dotnet.exe test $testProject --configuration $configuration --framework $framework --no-build" - if ($framework -ne "netcoreapp1.0") { + #if ($framework -ne "netcoreapp1.0") { $testExpression = "$testExpression --no-restore" $testExpression = "$testExpression --results-directory $testResultDirectory\TestResult.xml" - } + #} if ($where -ne $null -and (-Not [System.String]::IsNullOrEmpty($where))) { $testExpression = "$testExpression --filter $where" } - } else { - $projectDirectory = $testProject.DirectoryName - Write-Host "Directory: $projectDirectory" -ForegroundColor Green - - $binaryRoot = "$projectDirectory\bin\$configuration\$framework" - - $testBinary = "$binaryRoot\win7-x64\$testName.dll" - if (-not (Test-Path $testBinary)) { - $testBinary = "$binaryRoot\win7-x32\$testName.dll" - } - if (-not (Test-Path $testBinary)) { - $testBinary = "$binaryRoot\$testName.dll" - } - - $testExpression = "$tools_directory\NUnit\NUnit.ConsoleRunner.3.5.0\tools\nunit3-console.exe $testBinary --teamcity" - $testExpression = "$testExpression --result:$testResultDirectory\TestResult.xml" - - if ($where -ne $null -and (-Not [System.String]::IsNullOrEmpty($where))) { - $testExpression = "$testExpression --where=$where" - } - } + #} else { + # $projectDirectory = $testProject.DirectoryName + # Write-Host "Directory: $projectDirectory" -ForegroundColor Green + + # $binaryRoot = "$projectDirectory\bin\$configuration\$framework" + + # $testBinary = "$binaryRoot\win7-x64\$testName.dll" + # if (-not (Test-Path $testBinary)) { + # $testBinary = "$binaryRoot\win7-x32\$testName.dll" + # } + # if (-not (Test-Path $testBinary)) { + # $testBinary = "$binaryRoot\$testName.dll" + # } + + # $testExpression = "$tools_directory\NUnit\NUnit.ConsoleRunner.3.5.0\tools\nunit3-console.exe $testBinary --teamcity" + # $testExpression = "$testExpression --result:$testResultDirectory\TestResult.xml" + + # if ($where -ne $null -and (-Not [System.String]::IsNullOrEmpty($where))) { + # $testExpression = "$testExpression --where=$where" + # } + #} Write-Host $testExpression -ForegroundColor Magenta
