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

Merge pull request #3429 from eerhardt/FixUbuntuRel

Browse source 
Fix Ubuntu build break.
This commit is contained in:
Eric Erhardt 2016-06-08 07:18:34 -05:00
commit cd0f847cd7
4 changed files with 17 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build_projects/dotnet-cli-build/CliMonikers.cs Normal file
View file

@ -0,0 +1,14 @@
using Microsoft.DotNet.Cli.Build.Framework;
namespace Microsoft.DotNet.Cli.Build
{
public static class CliMonikers
{
public static string GetSdkDebianPackageName(BuildTargetContext c)
{
var nugetVersion = c.BuildContext.Get<BuildVersion>("BuildVersion").NuGetVersion;
return $"dotnet-dev-{nugetVersion}";
}
}
}

4
build_projects/dotnet-cli-build/DebTargets.cs
View file

@ -24,7 +24,7 @@ namespace Microsoft.DotNet.Cli.Build
public static BuildTargetResult GenerateSdkDeb(BuildTargetContext c) public static BuildTargetResult GenerateSdkDeb(BuildTargetContext c)
{ {
var channel = c.BuildContext.Get<string>("Channel").ToLower(); var channel = c.BuildContext.Get<string>("Channel").ToLower();
var packageName = Monikers.GetSdkDebianPackageName(c); var packageName = CliMonikers.GetSdkDebianPackageName(c);
var version = c.BuildContext.Get<BuildVersion>("BuildVersion").NuGetVersion; var version = c.BuildContext.Get<BuildVersion>("BuildVersion").NuGetVersion;
var debFile = c.BuildContext.Get<string>("SdkInstallerFile"); var debFile = c.BuildContext.Get<string>("SdkInstallerFile");
var manPagesDir = Path.Combine(Dirs.RepoRoot, "Documentation", "manpages"); var manPagesDir = Path.Combine(Dirs.RepoRoot, "Documentation", "manpages");
@ -116,7 +116,7 @@ namespace Microsoft.DotNet.Cli.Build
{ {
IEnumerable<string> orderedPackageNames = new List<string>() IEnumerable<string> orderedPackageNames = new List<string>()
{ {
Monikers.GetSdkDebianPackageName(c), CliMonikers.GetSdkDebianPackageName(c),
Monikers.GetDebianSharedFrameworkPackageName(CliDependencyVersions.SharedFrameworkVersion), Monikers.GetDebianSharedFrameworkPackageName(CliDependencyVersions.SharedFrameworkVersion),
Monikers.GetDebianSharedHostPackageName(c) Monikers.GetDebianSharedHostPackageName(c)
}; };

2
build_projects/dotnet-cli-build/PublishTargets.cs
View file

@ -276,7 +276,7 @@ namespace Microsoft.DotNet.Cli.Build
{ {
var version = CliNuGetVersion; var version = CliNuGetVersion;
var packageName = Monikers.GetSdkDebianPackageName(c); var packageName = CliMonikers.GetSdkDebianPackageName(c);
var installerFile = c.BuildContext.Get<string>("SdkInstallerFile"); var installerFile = c.BuildContext.Get<string>("SdkInstallerFile");
var uploadUrl = AzurePublisherTool.CalculateInstallerUploadUrl(installerFile, Channel, version); var uploadUrl = AzurePublisherTool.CalculateInstallerUploadUrl(installerFile, Channel, version);

48
build_projects/shared-build-targets-utils/Utils/Monikers.cs
View file

@ -45,54 +45,6 @@ namespace Microsoft.DotNet.Cli.Build
return $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}"; return $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}";
} }
public static string GetDebianPackageName(BuildTargetContext c)
{
var channel = c.BuildContext.Get<string>("Channel").ToLower();
var packageName = "";
switch (channel)
{
case "dev":
packageName = "dotnet-nightly";
break;
case "beta":
case "rc1":
case "rc2":
case "preview":
case "rtm":
packageName = "dotnet";
break;
default:
throw new Exception($"Unknown channel - {channel}");
}
return packageName;
}
public static string GetSdkDebianPackageName(BuildTargetContext c)
{
var channel = c.BuildContext.Get<string>("Channel").ToLower();
var nugetVersion = c.BuildContext.Get<BuildVersion>("BuildVersion").NuGetVersion;
var packagePrefix = "";
switch (channel)
{
case "dev":
packagePrefix = "dotnet-nightly";
break;
case "beta":
case "rc1":
case "rc2":
case "preview":
case "rtm":
packagePrefix = "dotnet";
break;
default:
throw new Exception($"Unknown channel - {channel}");
}
return $"{packagePrefix}-dev-{nugetVersion}";
}
public static string GetDebianSharedFrameworkPackageName(string sharedFrameworkNugetVersion) public static string GetDebianSharedFrameworkPackageName(string sharedFrameworkNugetVersion)
{ {
return $"dotnet-sharedframework-{SharedFrameworkName}-{sharedFrameworkNugetVersion}".ToLower(); return $"dotnet-sharedframework-{SharedFrameworkName}-{sharedFrameworkNugetVersion}".ToLower();