From 3ec1f4f54b2a4daf01f1871057f9966f3b7340e2 Mon Sep 17 00:00:00 2001 From: Sridhar Periyasamy Date: Tue, 15 Mar 2016 15:07:47 -0700 Subject: [PATCH] Layout the CLI SDK in the "1.0.0" instead of "1.0.0-beta-001793" dotnet host muxer does not support pre-release CLI SDK when no global.json file is present. So fixing the CLI layout to be in production version layout. THIS IS A TEMP HACK. --- scripts/dotnet-cli-build/PackageTargets.cs | 7 ++++++- scripts/dotnet-cli-build/Utils/BuildVersion.cs | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/dotnet-cli-build/PackageTargets.cs b/scripts/dotnet-cli-build/PackageTargets.cs index 4b54013cf..d263ec985 100644 --- a/scripts/dotnet-cli-build/PackageTargets.cs +++ b/scripts/dotnet-cli-build/PackageTargets.cs @@ -51,7 +51,12 @@ namespace Microsoft.DotNet.Cli.Build [Target] public static BuildTargetResult CopyCLISDKLayout(BuildTargetContext c) { - var nugetVersion = c.BuildContext.Get("BuildVersion").NuGetVersion; + // CLI SDK must be layed out in path which has a Nuget version. + // But the muxer does not currently support the pre-release CLI SDK without a global.json file. + // So we are creating a production version. + // var nugetVersion = c.BuildContext.Get("BuildVersion").NuGetVersion; + var nugetVersion = c.BuildContext.Get("BuildVersion").ProductionVersion; + var cliSdkRoot = Path.Combine(Dirs.Output, "obj", "clisdk"); var cliSdk = Path.Combine(cliSdkRoot, "sdk", nugetVersion); diff --git a/scripts/dotnet-cli-build/Utils/BuildVersion.cs b/scripts/dotnet-cli-build/Utils/BuildVersion.cs index df2b32c34..c7e2f50c7 100644 --- a/scripts/dotnet-cli-build/Utils/BuildVersion.cs +++ b/scripts/dotnet-cli-build/Utils/BuildVersion.cs @@ -12,6 +12,7 @@ public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}"; public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}"; public string NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}"; + public string ProductionVersion => $"{Major}.{Minor}.{Patch}"; public string GenerateMsiVersion() {