mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update install scripts to download 'dotnet-dev' as stage0.

Browse source
This commit is contained in:
Sridhar Periyasamy 2016-03-17 21:45:03 -07:00
parent 45d97bb80a
commit 4c06e3323f
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/dotnet-cli-build/PrepareTargets.cs
View file

@ -4,6 +4,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
@ -101,7 +102,14 @@ namespace Microsoft.DotNet.Cli.Build
} }
// Identify the version // Identify the version
var version = File.ReadAllLines(Path.Combine(stage0, ".version")); string versionFile = Directory.GetFiles(stage0, ".version", SearchOption.AllDirectories).FirstOrDefault();
if (string.IsNullOrEmpty(versionFile))
{
throw new Exception($"'.version' file not found in '{stage0}' folder");
}
var version = File.ReadAllLines(versionFile);
c.Info($"Using Stage 0 Version: {version[1]}"); c.Info($"Using Stage 0 Version: {version[1]}");
return c.Success(); return c.Success();

2
scripts/obtain/install.ps1
View file

@ -18,7 +18,7 @@ if ($fileVersion -eq "Latest") {
} }
$Feed="https://dotnetcli.blob.core.windows.net/dotnet" $Feed="https://dotnetcli.blob.core.windows.net/dotnet"
$DotNetFileName="dotnet-combined-framework-sdk-host-win-$Architecture.$fileVersion.zip" $DotNetFileName="dotnet-dev-win-$Architecture.$fileVersion.zip"
$DotNetUrl="$Feed/$Channel/Binaries/$Version" $DotNetUrl="$Feed/$Channel/Binaries/$Version"
function say($str) function say($str)

2
scripts/obtain/install.sh
View file

@ -129,7 +129,7 @@ install_dotnet()
local os=$(current_os) local os=$(current_os)
local installLocation="$INSTALLDIR" local installLocation="$INSTALLDIR"
local dotnet_url="https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/Binaries/$VERSION" local dotnet_url="https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/Binaries/$VERSION"
local dotnet_filename="dotnet-combined-framework-sdk-host-$os-x64.$fileVersion.tar.gz" local dotnet_filename="dotnet-dev-$os-x64.$fileVersion.tar.gz"
if [ "$RELINK" = "0" ]; then if [ "$RELINK" = "0" ]; then
if [ "$FORCE" = "0" ]; then if [ "$FORCE" = "0" ]; then