From 814ffaf007867e6b0033a4d530c811853b391692 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Mon, 21 Sep 2015 08:51:45 -0400
Subject: [PATCH] Attempt to fix #646

---
 .../NugetAssets/GitVersionTask.targets        | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/GitVersionTask/NugetAssets/GitVersionTask.targets b/src/GitVersionTask/NugetAssets/GitVersionTask.targets
index 26bba17ff7..c2a4adb725 100644
--- a/src/GitVersionTask/NugetAssets/GitVersionTask.targets
+++ b/src/GitVersionTask/NugetAssets/GitVersionTask.targets
@@ -18,25 +18,8 @@
 
   <Target Name="UpdateAssemblyInfo"
           BeforeTargets="CoreCompile">
-    <WriteVersionInfoToBuildLog
-      SolutionDirectory="$(SolutionDir)"
-        />
-    <UpdateAssemblyInfo
-      SolutionDirectory="$(SolutionDir)"
-      ProjectFile="$(MSBuildProjectFullPath)"
-      IntermediateOutputPath="$(IntermediateOutputPath)"
-      RootNamespace="$(RootNamespace)"
-      CompileFiles ="@(Compile)">
-      <Output
-        TaskParameter="AssemblyInfoTempFilePath"
-        PropertyName="AssemblyInfoTempFilePath" />
-    </UpdateAssemblyInfo>
-
-    <ItemGroup>
-      <Compile Include="$(AssemblyInfoTempFilePath)" />
-    </ItemGroup>
-
 
+    <!-- Call GetVersion first as it accepts the NoFetch parameter, future calls will use the cached value -->          
     <GetVersion SolutionDirectory="$(SolutionDir)" NoFetch="$(GitVersion_NoFetchEnabled)">
       <Output TaskParameter="Major" PropertyName="GitVersion_Major" />
       <Output TaskParameter="Minor" PropertyName="GitVersion_Minor" />
@@ -59,6 +42,24 @@
       <Output TaskParameter="CommitDate" PropertyName="GitVersion_CommitDate" />
     </GetVersion>
 
+    
+    <WriteVersionInfoToBuildLog
+      SolutionDirectory="$(SolutionDir)"
+        />
+    <UpdateAssemblyInfo
+      SolutionDirectory="$(SolutionDir)"
+      ProjectFile="$(MSBuildProjectFullPath)"
+      IntermediateOutputPath="$(IntermediateOutputPath)"
+      RootNamespace="$(RootNamespace)"
+      CompileFiles ="@(Compile)">
+      <Output
+        TaskParameter="AssemblyInfoTempFilePath"
+        PropertyName="AssemblyInfoTempFilePath" />
+    </UpdateAssemblyInfo>
+
+    <ItemGroup>
+      <Compile Include="$(AssemblyInfoTempFilePath)" />
+    </ItemGroup>
   </Target>
 
   <!--Support for ncrunch-->