зеркало из https://github.com/aspnet/KoreBuild.git
Merge branch 'rel/1.1.0' into dev
This commit is contained in:
Коммит
57a3b91239
|
@ -1 +1 @@
|
|||
1.0.0-preview2-1-003175
|
||||
1.0.0-preview2-1-003177
|
|
@ -76,6 +76,7 @@ function EnsureDotNet() {
|
|||
{
|
||||
Write-Host -ForegroundColor Green "Installing .NET Command-Line Tools ..."
|
||||
exec "$KoreBuildRoot\build\dotnet\dotnet-install.ps1" -Channel $dotnetChannel -Version $dotnetVersion -Architecture x64
|
||||
exec "$KoreBuildRoot\build\dotnet\dotnet-install.ps1" -SharedRuntime -Channel 'preview' -Version '1.0.0' -Architecture x64
|
||||
}
|
||||
if (!($env:Path.Split(';') -icontains $dotnetLocalInstallFolder))
|
||||
{
|
||||
|
|
|
@ -94,6 +94,8 @@ ensure_dotnet() {
|
|||
|
||||
__exec $DOTNET_INSTALL --channel $KOREBUILD_DOTNET_CHANNEL --version $KOREBUILD_DOTNET_VERSION >> $KOREBUILD_LOG
|
||||
|
||||
__exec $DOTNET_INSTALL --shared-runtime --channel preview --version 1.0.0 >> $KOREBUILD_LOG
|
||||
|
||||
# Add .NET installation directory to the path if it isn't yet included.
|
||||
[[ ":$PATH:" != *":$DOTNET_INSTALL_DIR:"* ]] && export PATH="$DOTNET_INSTALL_DIR:$PATH"
|
||||
fi
|
||||
|
|
Загрузка…
Ссылка в новой задаче