huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.1' into release/2.2

This commit is contained in:
Nate McMaster 2018-09-26 11:05:32 -07:00
parent aa72dc6682 02dac71f64
commit deaeb45a64
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/Cli.FunctionalTests/run-tests.ps1
View File

@ -27,7 +27,7 @@ The RID of the platform running the tests. (Determined automatically if possible
.PARAMETER ProdConManifestUrl .PARAMETER ProdConManifestUrl
The prodcon build.xml file The prodcon build.xml file
.PARAMETER ProcConChannel .PARAMETER ProdConChannel
The prodcon channel to use if a build.xml file isn't set. The prodcon channel to use if a build.xml file isn't set.
#> #>
@ -40,7 +40,7 @@ param(
$TestRuntimeIdentifier, $TestRuntimeIdentifier,
$HostRid, $HostRid,
$ProdConManifestUrl, $ProdConManifestUrl,
$ProcConChannel = 'release/2.2' $ProdConChannel = 'release/2.2'
) )
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
@ -89,7 +89,7 @@ try {
if (-not $ProdConManifestUrl) { if (-not $ProdConManifestUrl) {
Write-Host -ForegroundColor Magenta "Running tests for the latest ProdCon build" Write-Host -ForegroundColor Magenta "Running tests for the latest ProdCon build"
$ProdConManifestUrl = "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/product/cli/$ProcConChannel/build.xml" $ProdConManifestUrl = "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/product/cli/$ProdConChannel/build.xml"
} }
Write-Host "ProdConManifestUrl: $ProdConManifestUrl" Write-Host "ProdConManifestUrl: $ProdConManifestUrl"