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

Layout the CLI SDK in the "1.0.0" instead of "1.0.0-beta-001793"

Browse source 
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.
This commit is contained in:
Sridhar Periyasamy 2016-03-15 15:07:47 -07:00
parent 2ce679c57d
commit 3ec1f4f54b
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,12 @@ namespace Microsoft.DotNet.Cli.Build
[Target] [Target]
public static BuildTargetResult CopyCLISDKLayout(BuildTargetContext c) public static BuildTargetResult CopyCLISDKLayout(BuildTargetContext c)
{ {
var nugetVersion = c.BuildContext.Get<BuildVersion>("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>("BuildVersion").NuGetVersion;
var nugetVersion = c.BuildContext.Get<BuildVersion>("BuildVersion").ProductionVersion;
var cliSdkRoot = Path.Combine(Dirs.Output, "obj", "clisdk"); var cliSdkRoot = Path.Combine(Dirs.Output, "obj", "clisdk");
var cliSdk = Path.Combine(cliSdkRoot, "sdk", nugetVersion); var cliSdk = Path.Combine(cliSdkRoot, "sdk", nugetVersion);

1
scripts/dotnet-cli-build/Utils/BuildVersion.cs
View file

@ -12,6 +12,7 @@
public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}"; public string SimpleVersion => $"{Major}.{Minor}.{Patch}.{CommitCountString}";
public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}"; public string VersionSuffix => $"{ReleaseSuffix}-{CommitCountString}";
public string NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}"; public string NuGetVersion => $"{Major}.{Minor}.{Patch}-{VersionSuffix}";
public string ProductionVersion => $"{Major}.{Minor}.{Patch}";
public string GenerateMsiVersion() public string GenerateMsiVersion()
{ {