Update install scripts to download 'dotnet-dev' as stage0.
This commit is contained in:
parent
45d97bb80a
commit
4c06e3323f
3 changed files with 11 additions and 3 deletions
|
@ -4,6 +4,7 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
|
||||
|
@ -101,7 +102,14 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
}
|
||||
|
||||
// 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]}");
|
||||
|
||||
return c.Success();
|
||||
|
|
|
@ -18,7 +18,7 @@ if ($fileVersion -eq "Latest") {
|
|||
}
|
||||
$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"
|
||||
|
||||
function say($str)
|
||||
|
|
|
@ -129,7 +129,7 @@ install_dotnet()
|
|||
local os=$(current_os)
|
||||
local installLocation="$INSTALLDIR"
|
||||
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 [ "$FORCE" = "0" ]; then
|
||||
|
|
Loading…
Add table
Reference in a new issue