зеркало из https://github.com/aspnet/KoreBuild.git
Install the 1.0.0 shared runtime
This commit is contained in:
Родитель
6f5a2b3d59
Коммит
5369dd9277
|
@ -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))
|
||||
{
|
||||
|
|
|
@ -74,15 +74,10 @@ __exec() {
|
|||
}
|
||||
|
||||
ensure_dotnet() {
|
||||
if test `uname` = Darwin; then
|
||||
versionFileName="cli.version.darwin"
|
||||
else
|
||||
versionFileName="cli.version.unix"
|
||||
fi
|
||||
versionFile="$DOTNET_VERSION_DIR/$versionFileName"
|
||||
versionFile="$DOTNET_VERSION_DIR/cli.version"
|
||||
version=$(<$versionFile)
|
||||
|
||||
[ -z "$KOREBUILD_DOTNET_CHANNEL" ] && KOREBUILD_DOTNET_CHANNEL=rel-1.0.0
|
||||
[ -z "$KOREBUILD_DOTNET_CHANNEL" ] && KOREBUILD_DOTNET_CHANNEL=preview
|
||||
[ -z "$KOREBUILD_DOTNET_VERSION" ] && KOREBUILD_DOTNET_VERSION=$version
|
||||
|
||||
if [ ! -z "$KOREBUILD_SKIP_RUNTIME_INSTALL" ]; then
|
||||
|
@ -99,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
|
||||
|
|
Загрузка…
Ссылка в новой задаче