Update dotnet-install.ps1 to stop overwriting dotnet.exe

Also, update to NuGet.exe 4.0.0-rc4
This commit is contained in:
Nate McMaster 2017-02-09 15:19:20 -08:00
Родитель 74d196033d
Коммит 4714308000
3 изменённых файлов: 16 добавлений и 16 удалений

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

@ -98,7 +98,7 @@ if (!(Test-Path "$koreBuildFolder\Sake"))
}
# We still nuget because dotnet doesn't have support for pushing packages
Invoke-WebRequest "https://dist.nuget.org/win-x86-commandline/v3.5.0-beta2/NuGet.exe" -OutFile "$koreBuildFolder/nuget.exe"
Invoke-WebRequest "https://dist.nuget.org/win-x86-commandline/v4.0.0-rc4/NuGet.exe" -OutFile "$koreBuildFolder/nuget.exe"
}
$makeFilePath = "makefile.shade"

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

@ -108,7 +108,7 @@ export DOTNET_REFERENCE_ASSEMBLIES_PATH=$netFrameworkContentDir
nugetPath="$koreBuildFolder/nuget.exe"
if [ ! -f $nugetPath ]; then
nugetUrl="https://dist.nuget.org/win-x86-commandline/v3.5.0-beta2/NuGet.exe"
nugetUrl="https://dist.nuget.org/win-x86-commandline/v4.0.0-rc4/NuGet.exe"
wget -O $nugetPath $nugetUrl 2>/dev/null || curl -o $nugetPath --location $nugetUrl 2>/dev/null
fi

2
build/dotnet/dotnet-install.ps1 поставляемый
Просмотреть файл

@ -69,7 +69,7 @@ $BinFolderRelativePath=""
# example path with regex: shared/1.0.0-beta-12345/somepath
$VersionRegEx="/\d+\.\d+[^/]+/"
$OverrideNonVersionedFiles=$true
$OverrideNonVersionedFiles=$false
function Say($str) {
Write-Host "dotnet-install: $str"