From 2223da1a5c1cd8f1eea6eb452121e3221b371806 Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Thu, 24 Mar 2016 16:35:42 -0700 Subject: [PATCH] fix versions on the deb packages --- scripts/dotnet-cli-build/DebTargets.cs | 6 +++--- scripts/dotnet-cli-build/Utils/Monikers.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/dotnet-cli-build/DebTargets.cs b/scripts/dotnet-cli-build/DebTargets.cs index 024d41ac6..532c53429 100644 --- a/scripts/dotnet-cli-build/DebTargets.cs +++ b/scripts/dotnet-cli-build/DebTargets.cs @@ -27,7 +27,7 @@ namespace Microsoft.DotNet.Cli.Build { var channel = c.BuildContext.Get("Channel").ToLower(); var packageName = Monikers.GetSdkDebianPackageName(c); - var version = c.BuildContext.Get("BuildVersion").SimpleVersion; + var version = c.BuildContext.Get("BuildVersion").NuGetVersion; var debFile = c.BuildContext.Get("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"; @@ -64,7 +64,7 @@ namespace Microsoft.DotNet.Cli.Build public static BuildTargetResult GenerateSharedHostDeb(BuildTargetContext c) { var packageName = Monikers.GetDebianSharedHostPackageName(c); - var version = c.BuildContext.Get("BuildVersion").SimpleVersion; + var version = c.BuildContext.Get("BuildVersion").NuGetVersion; var inputRoot = c.BuildContext.Get("SharedHostPublishRoot"); var debFile = c.BuildContext.Get("SharedHostInstallerFile"); var objRoot = Path.Combine(Dirs.Output, "obj", "debian", "sharedhost"); @@ -89,7 +89,7 @@ namespace Microsoft.DotNet.Cli.Build public static BuildTargetResult GenerateSharedFrameworkDeb(BuildTargetContext c) { var packageName = Monikers.GetDebianSharedFrameworkPackageName(c); - var version = c.BuildContext.Get("BuildVersion").SimpleVersion; + var version = c.BuildContext.Get("SharedFrameworkNugetVersion"); var inputRoot = c.BuildContext.Get("SharedFrameworkPublishRoot"); var debFile = c.BuildContext.Get("SharedFrameworkInstallerFile"); var objRoot = Path.Combine(Dirs.Output, "obj", "debian", "sharedframework"); diff --git a/scripts/dotnet-cli-build/Utils/Monikers.cs b/scripts/dotnet-cli-build/Utils/Monikers.cs index bbe881aef..91dd0e665 100644 --- a/scripts/dotnet-cli-build/Utils/Monikers.cs +++ b/scripts/dotnet-cli-build/Utils/Monikers.cs @@ -42,7 +42,7 @@ namespace Microsoft.DotNet.Cli.Build public static string GetSdkDebianPackageName(BuildTargetContext c) { var channel = c.BuildContext.Get("Channel").ToLower(); - var sharedFrameworkNugetVersion = c.BuildContext.Get("SharedFrameworkNugetVersion"); + var nugetVersion = c.BuildContext.Get("BuildVersion").NuGetVersion; var packagePrefix = ""; switch (channel) @@ -60,7 +60,7 @@ namespace Microsoft.DotNet.Cli.Build throw new Exception($"Unknown channel - {channel}"); } - return $"{packagePrefix}-dev-{sharedFrameworkNugetVersion}"; + return $"{packagePrefix}-dev-{nugetVersion}"; } public static string GetDebianSharedFrameworkPackageName(BuildTargetContext c)