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

make sdk package sdk only

Browse source 
fix dependencies between packages

re-disable upgrade test

another fi to add_dir_to_install

fix sdk package name

update the package name functino in monikers
This commit is contained in:
Bryan Thornbury 2016-03-22 11:40:57 -07:00
parent 4bed9db16b
commit 1c38b17f8b
6 changed files with 42 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,11 +26,13 @@ namespace Microsoft.DotNet.Cli.Build
public static BuildTargetResult GenerateSdkDeb(BuildTargetContext c)
{
var channel = c.BuildContext.Get<string>("Channel").ToLower();
var packageName = Monikers.GetDebianPackageName(c);
var packageName = Monikers.GetSdkDebianPackageName(c);
var version = c.BuildContext.Get<BuildVersion>("BuildVersion").SimpleVersion;
var debFile = c.BuildContext.Get<string>("SdkInstallerFile");
var manPagesDir = Path.Combine(Dirs.RepoRoot, "Documentation", "manpages");
var previousVersionURL = $"https://dotnetcli.blob.core.windows.net/dotnet/{channel}/Installers/Latest/dotnet-ubuntu-x64.latest.deb";
var sdkPublishRoot = c.BuildContext.Get<string>("CLISDKRoot");
var sharedFxDebianPackageName = Monikers.GetDebianSharedFrameworkPackageName(c);
var objRoot = Path.Combine(Dirs.Output, "obj", "debian", "sdk");
@ -43,10 +45,11 @@ namespace Microsoft.DotNet.Cli.Build
Cmd(Path.Combine(Dirs.RepoRoot, "scripts", "package", "package-debian.sh"),
"-v", version,
"-i", Dirs.Stage2,
"-i", sdkPublishRoot,
"-o", debFile,
"-p", packageName,
"-m", manPagesDir,
"--framework-debian-package-name", sharedFxDebianPackageName,
"--framework-nuget-name", Monikers.SharedFrameworkName,
"--framework-nuget-version", c.BuildContext.Get<string>("SharedFrameworkNugetVersion"),
"--previous-version-url", previousVersionURL,

24
scripts/dotnet-cli-build/Utils/Monikers.cs
View file

@ -40,6 +40,30 @@ namespace Microsoft.DotNet.Cli.Build
return packageName;
}
public static string GetSdkDebianPackageName(BuildTargetContext c)
{
var channel = c.BuildContext.Get<string>("Channel").ToLower();
var sharedFrameworkNugetVersion = c.BuildContext.Get<string>("SharedFrameworkNugetVersion");
var packagePrefix = "";
switch (channel)
{
case "dev":
packagePrefix = "dotnet-nightly";
break;
case "beta":
case "rc1":
case "rc2":
case "rtm":
packagePrefix = "dotnet";
break;
default:
throw new Exception($"Unknown channel - {channel}");
}
return $"{packagePrefix}-dev-{sharedFrameworkNugetVersion}";
}
public static string GetDebianSharedFrameworkPackageName(BuildTargetContext c)
{
var sharedFrameworkNugetVersion = c.BuildContext.Get<string>("SharedFrameworkNugetVersion");