Merge branch 'dev' into feature/msbuild

This commit is contained in:
Nate McMaster 2017-01-13 10:53:41 -08:00
Родитель fd41c5f234 79fc7bc15b
Коммит 4271dbcd32
1 изменённых файлов: 10 добавлений и 2 удалений

Просмотреть файл

@ -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'