Fix package versions

This commit is contained in:
Piotr Puszkiewicz 2016-05-03 22:30:31 -07:00 committed by Bryan
parent 82e6b0408a
commit c3fe0d062f
24 changed files with 59 additions and 57 deletions

View file

@ -627,7 +627,9 @@ namespace Microsoft.DotNet.Cli.Build
outputDir,
"--configuration",
configuration,
Path.Combine(c.BuildContext.BuildDirectory, "src", project))
Path.Combine(c.BuildContext.BuildDirectory, "src", project),
"--version-suffix",
buildVersion.VersionSuffix)
.Environment("DOTNET_BUILD_VERSION", buildVersion.VersionSuffix)
.Execute()
.EnsureSuccessful();

View file

@ -13,16 +13,16 @@ namespace Microsoft.DotNet.Cli.Build
{
public static readonly string[] ProjectsToPack = new string[]
{
"dotnet-compile-fsc",
"Microsoft.DotNet.Cli.Utils",
"Microsoft.DotNet.Compiler.Common",
"Microsoft.DotNet.Files",
"Microsoft.DotNet.InternalAbstractions",
"Microsoft.DotNet.ProjectModel",
"Microsoft.DotNet.ProjectModel.Loader",
"Microsoft.DotNet.ProjectModel.Workspaces",
"Microsoft.DotNet.InternalAbstractions",
"Microsoft.Extensions.DependencyModel",
"Microsoft.Extensions.Testing.Abstractions",
"Microsoft.DotNet.Compiler.Common",
"Microsoft.DotNet.Files",
"dotnet-compile-fsc"
"Microsoft.Extensions.Testing.Abstractions"
};
[Target(nameof(PackageTargets.CopyCLISDKLayout),

View file

@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build
public string ReleaseSuffix { get; set; }
public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}";
public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}";
public string VersionSuffix => $"{CommitCountString}";
public string NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}";
public string NetCoreAppVersion => $"{Major}.{Minor}.{Patch}-rc2-3{CommitCountString}";
public string ProductionVersion => $"{Major}.{Minor}.{Patch}";