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

make install and build scripts use new package

Browse source
This commit is contained in:
Andrew Stanton-Nurse 2016-03-16 10:55:24 -07:00
parent 8ab2bae472
commit e2d8d6e31e
6 changed files with 26 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -99,7 +99,7 @@ namespace Microsoft.DotNet.Cli.Build
}
// Identify the version
var version = File.ReadAllLines(Path.Combine(stage0, "..", ".version"));
var version = File.ReadAllLines(Path.Combine(stage0, ".version"));
c.Info($"Using Stage 0 Version: {version[1]}");
return c.Success();

4
scripts/dotnet-cli-build/Utils/DotNetCli.cs
View file

@ -37,11 +37,11 @@ namespace Microsoft.DotNet.Cli.Build
{
return Path.Combine(Directory.GetCurrentDirectory(), ".dotnet_stage0",
PlatformServices.Default.Runtime.OperatingSystemPlatform.ToString(),
PlatformServices.Default.Runtime.RuntimeArchitecture, "cli", "bin");
PlatformServices.Default.Runtime.RuntimeArchitecture, "cli");
}
else
{
return Path.Combine(Directory.GetCurrentDirectory(), ".dotnet_stage0", PlatformServices.Default.Runtime.OperatingSystemPlatform.ToString(), "share", "dotnet", "cli", "bin");
return Path.Combine(Directory.GetCurrentDirectory(), ".dotnet_stage0", PlatformServices.Default.Runtime.OperatingSystemPlatform.ToString(), "cli");
}
}
}