зеркало из https://github.com/aspnet/KoreBuild.git
Merge branch 'dev' into feature/msbuild
This commit is contained in:
Коммит
4271dbcd32
|
@ -54,7 +54,15 @@ else
|
|||
# Install the version of dotnet-cli used to compile
|
||||
& "$koreBuildFolder\dotnet\dotnet-install.ps1" -Channel $dotnetChannel -Version $dotnetVersion -Architecture x64
|
||||
InstallSharedRuntime '1.1.0' 'release/1.1.0'
|
||||
InstallSharedRuntime $sharedRuntimeVersion 'master'
|
||||
|
||||
$sharedRuntimeChannel='master'
|
||||
InstallSharedRuntime $sharedRuntimeVersion $sharedRuntimeChannel
|
||||
|
||||
Write-Host ''
|
||||
Write-Host -ForegroundColor Cyan 'To run tests in Visual Studio, you may need to run this installer:'
|
||||
Write-Host -ForegroundColor Cyan "https://dotnetcli.blob.core.windows.net/dotnet/$sharedRuntimeChannel/Installers/$sharedRuntimeVersion/dotnet-win-x64.$sharedRuntimeVersion.exe"
|
||||
Write-Host ''
|
||||
|
||||
if ($env:KOREBUILD_DOTNET_SHARED_RUNTIME_VERSION)
|
||||
{
|
||||
$channel = 'master'
|
||||
|
@ -105,4 +113,4 @@ if (!(Test-Path $makeFilePath))
|
|||
Write-Host "Using makefile: $makeFilePath"
|
||||
|
||||
$env:KOREBUILD_FOLDER=$koreBuildFolder
|
||||
&"$koreBuildFolder\Sake\0.2.2\tools\Sake.exe" -I $koreBuildFolder\shade -f $makeFilePath @args
|
||||
&"$koreBuildFolder\Sake\0.2.2\tools\Sake.exe" -I $koreBuildFolder\shade -f $makeFilePath @args
|
||||
|
|
Загрузка…
Ссылка в новой задаче