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

Merge pull request #1471 from dotnet/davidfowl/fix-versions

Browse source 
Fixing versions
This commit is contained in:
David Fowler 2016-02-18 02:42:31 -08:00
commit 8645031db8
19 changed files with 341 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/dotnet-cli-build/CompileTargets.cs
View file

@ -157,11 +157,14 @@ namespace Microsoft.DotNet.Cli.Build
var configuration = c.BuildContext.Get<string>("Configuration");
var binDir = Path.Combine(outputDir, "bin");
var buildVesion = c.BuildContext.Get<BuildVersion>("BuildVersion");
Mkdirp(binDir);
foreach (var project in ProjectsToPublish)
{
// TODO: Use the flag once we get a full build round tripped
// --version-suffix buildVesion.VersionSuffix
dotnet.Publish(
"--native-subdirectory",
"--output",
@ -169,6 +172,7 @@ namespace Microsoft.DotNet.Cli.Build
"--configuration",
configuration,
Path.Combine(c.BuildContext.BuildDirectory, "src", project))
.Environment("DOTNET_BUILD_VERSION", buildVesion.VersionSuffix)
.Execute()
.EnsureSuccessful();
}
@ -210,7 +214,7 @@ namespace Microsoft.DotNet.Cli.Build
}
// Generate .version file
var version = c.BuildContext.Get<BuildVersion>("BuildVersion").SimpleVersion;
var version = buildVesion.SimpleVersion;
var content = $@"{c.BuildContext["CommitHash"]}{Environment.NewLine}{version}{Environment.NewLine}";
File.WriteAllText(Path.Combine(outputDir, ".version"), content);