From bf172df39b2877f075b4a4096aefa34439272e5d Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Tue, 28 Jun 2016 18:59:15 -0500
Subject: [PATCH] Respond to PR feedback and fix CommitCount not being padded
 with zeros.

---
 build/Microsoft.DotNet.Cli.Prepare.targets                | 8 +-------
 .../dotnet-cli-build/GenerateBuildVersionInfo.cs          | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index 32321e43d..b53cfcd3c 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -103,15 +103,9 @@
 
   <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)/tools" ToolPath="$(DotNetPath)" />
-
+    
   </Target>
 
 </Project>
diff --git a/build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs b/build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs
index 1328998aa..2be4c2a5c 100644
--- a/build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs
+++ b/build_projects/dotnet-cli-build/GenerateBuildVersionInfo.cs
@@ -22,7 +22,7 @@ namespace Microsoft.DotNet.Cli.Build
         public string CommitHash { get; set; }
 
         [Output]
-        public int CommitCount { get; set; }
+        public string CommitCount { get; set; }
 
         [Output]
         public string ReleaseSuffix { get; set; }
@@ -68,7 +68,7 @@ namespace Microsoft.DotNet.Cli.Build
             VersionMinor = buildVersion.Minor;
             VersionPatch = buildVersion.Patch;
             CommitHash = commitHash;
-            CommitCount = commitCount;
+            CommitCount = buildVersion.CommitCountString;
             ReleaseSuffix = buildVersion.ReleaseSuffix;
             VersionSuffix = buildVersion.VersionSuffix;
             SimpleVersion = buildVersion.SimpleVersion;