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

Merge pull request #1902 from Sridhar-MS/corehost-fixes

Browse source 
Make corehost pick pre-release SDK version when no production releases.
This commit is contained in:
Sridhar Periyasamy 2016-03-16 13:39:21 -07:00
commit 52f4ad2b91
3 changed files with 47 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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