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

Reference Shared Framework from Shared Host

Browse source
This commit is contained in:
Piotr Puszkiewicz 2016-03-18 01:54:40 -07:00 • committed by Bryan Thornbury
parent 63585087f8
commit e1ba3f23ef
4 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,15 @@ namespace Microsoft.DotNet.Cli.Build
Directory.CreateDirectory(objRoot);
Cmd(Path.Combine(Dirs.RepoRoot, "scripts", "package", "package-debian.sh"),
"-v", version, "-i", Dirs.Stage2, "-o", debFile, "-p", packageName, "-m", manPagesDir, "--previous-version-url", previousVersionURL, "--obj-root", objRoot)
"-v", version,
"-i", Dirs.Stage2,
"-o", debFile,
"-p", packageName,
"-m", manPagesDir,
"--framework-nuget-name", Monikers.SharedFrameworkName,
"--framework-nuget-version", c.BuildContext.Get<string>("SharedFrameworkNugetVersion"),
"--previous-version-url", previousVersionURL,
"--obj-root", objRoot)
.Execute()
.EnsureSuccessful();
return c.Success();

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

@ -101,16 +101,16 @@ namespace Microsoft.DotNet.Cli.Build
return c.Failed($"Stage 0 directory does not exist: {stage0}");
}
// // Identify the version
// string versionFile = Directory.GetFiles(stage0, ".version", SearchOption.AllDirectories).FirstOrDefault();
// Identify the version
string versionFile = Directory.GetFiles(stage0, ".version", SearchOption.AllDirectories).FirstOrDefault();
// if (string.IsNullOrEmpty(versionFile))
// {
// throw new Exception($"'.version' file not found in '{stage0}' folder");
// }
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]}");
var version = File.ReadAllLines(versionFile);
c.Info($"Using Stage 0 Version: {version[1]}");
return c.Success();
}