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

Respond to PR feedback and fix CommitCount not being padded with zeros.

Browse source
This commit is contained in:
Eric Erhardt 2016-06-28 18:59:15 -05:00
parent aff23d00f4
commit bf172df39b
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/Microsoft.DotNet.Cli.Prepare.targets
View file

@ -103,15 +103,9 @@
<Target DependsOnTargets="Init" Name="RestorePackages"> <Target DependsOnTargets="Init" Name="RestorePackages">
<!-- Clean NuGet Temp Cache on Linux (seeing some issues on Linux) -->
<!-- TODO: do we still need this? Seems unnecessary -->
<RemoveDir
Condition=" '$(OSName)' != 'win' AND '$(OSName)' != 'osx' "
Directories="/tmp/NuGet" />
<DotNetRestore WorkingDirectory="$(RepoRoot)/src" ToolPath="$(DotNetPath)" /> <DotNetRestore WorkingDirectory="$(RepoRoot)/src" ToolPath="$(DotNetPath)" />
<DotNetRestore WorkingDirectory="$(RepoRoot)/tools" ToolPath="$(DotNetPath)" /> <DotNetRestore WorkingDirectory="$(RepoRoot)/tools" ToolPath="$(DotNetPath)" />
</Target> </Target>
</Project> </Project>

4
build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs
View file

@ -22,7 +22,7 @@ namespace Microsoft.DotNet.Cli.Build
public string CommitHash { get; set; } public string CommitHash { get; set; }
[Output] [Output]
public int CommitCount { get; set; } public string CommitCount { get; set; }
[Output] [Output]
public string ReleaseSuffix { get; set; } public string ReleaseSuffix { get; set; }
@ -68,7 +68,7 @@ namespace Microsoft.DotNet.Cli.Build
VersionMinor = buildVersion.Minor; VersionMinor = buildVersion.Minor;
VersionPatch = buildVersion.Patch; VersionPatch = buildVersion.Patch;
CommitHash = commitHash; CommitHash = commitHash;
CommitCount = commitCount; CommitCount = buildVersion.CommitCountString;
ReleaseSuffix = buildVersion.ReleaseSuffix; ReleaseSuffix = buildVersion.ReleaseSuffix;
VersionSuffix = buildVersion.VersionSuffix; VersionSuffix = buildVersion.VersionSuffix;
SimpleVersion = buildVersion.SimpleVersion; SimpleVersion = buildVersion.SimpleVersion;