You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/09/17 20:18:18 UTC
[1/2] lucenenet git commit: build/build.ps1: Installing .NET Core 2.0
SDK during 1.0 testing due to 'illegal characters in path error' that began
when not installing both SDKs for that task
Repository: lucenenet
Updated Branches:
refs/heads/master 537055a73 -> 06b676ec8
build/build.ps1: Installing .NET Core 2.0 SDK during 1.0 testing due to 'illegal characters in path error' that began when not installing both SDKs for that task
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/9e47928d
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/9e47928d
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/9e47928d
Branch: refs/heads/master
Commit: 9e47928de4e8e9ad0ec9f050f6c504e05bcbb2c2
Parents: 537055a
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Mon Sep 18 02:57:53 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Mon Sep 18 02:57:53 2017 +0700
----------------------------------------------------------------------
build/build.ps1 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9e47928d/build/build.ps1
----------------------------------------------------------------------
diff --git a/build/build.ps1 b/build/build.ps1
index 205aeaa..db954c3 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -88,9 +88,10 @@ task InstallSDK -description "This task makes sure the correct SDK version is in
task InstallSDK2IfRequired -description "This task installs the .NET Core 2.x SDK (required for testing under .NET Core 2.0 or .NET Framework)" {
Write-Host "##teamcity[progressMessage 'Installing SDK']"
- if ($frameworks_to_test.Contains("netcoreapp2.") -or $frameworks_to_test.Contains("net45")) {
+ # netcoreapp1.0 requires the .NET Core SDK 2.0 or there is an 'illegal characters in path' error
+ #if ($frameworks_to_test.Contains("netcoreapp2.") -or $frameworks_to_test.Contains("net45")) {
Invoke-Task InstallSDK
- }
+ #}
}
task InstallSDK1IfRequired -description "This task installs the .NET Core 1.x SDK (required for testing under .NET Core 1.0)" {
[2/2] lucenenet git commit: build/build.ps1: Switching from NUnit3
Console Runner to .NET Core 2.0 SDK for .NET Framework 4.5.1 test run
Posted by ni...@apache.org.
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 <sh...@shadstorhaug.com>
Authored: Mon Sep 18 03:18:05 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
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