From 8a5c27872d6159b8667491ad138594ad2a47ad6b Mon Sep 17 00:00:00 2001
From: Sean Fausett <sean@jellyfish.co.nz>
Date: Fri, 8 Dec 2023 11:41:58 +1300
Subject: [PATCH 1/4] Fix populate info race conditions

Target conditions and git info cache sufficient for incremental build.
---
 src/GitInfo/build/GitInfo.targets | 46 +++++++++++++------------------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/src/GitInfo/build/GitInfo.targets b/src/GitInfo/build/GitInfo.targets
index cb53e20..524a03f 100644
--- a/src/GitInfo/build/GitInfo.targets
+++ b/src/GitInfo/build/GitInfo.targets
@@ -12,17 +12,17 @@
 
 	Customization:
 
-  $(GitVersion): set to 'false' to avoid setting Version and PackageVersion 
-                 to a default version with format: 
+  $(GitVersion): set to 'false' to avoid setting Version and PackageVersion
+                 to a default version with format:
                  $(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)$(GitSemVerDashLabel)+$(GitBranch).$(GitCommit)
 
 	$(GitThisAssembly): set to 'false' to prevent assembly
 						metadata and constants generation.
 
-  $(GitThisAssemblyMetadata): set to 'false' to prevent assembly 
-                              metadata generation only. Defaults 
-                              to 'false'. If 'true', it will also 
-                              provide assembly metadata attributes 
+  $(GitThisAssemblyMetadata): set to 'false' to prevent assembly
+                              metadata generation only. Defaults
+                              to 'false'. If 'true', it will also
+                              provide assembly metadata attributes
                               for each of the populated values.
 
 	$(ThisAssemblyNamespace): allows overriding the namespace
@@ -70,7 +70,7 @@
 					 in a previous build in a GitInfo.cache for
 					 performance reasons.
 					 Defaults to empty value (no ignoring).
-					 
+
   $(GitCachePath): where to cache the determined Git information
 				   gives the chance to use a shared location
 				   for different projects. this can improve
@@ -78,19 +78,19 @@
 				   has to end with a path seperator
 				   Defaults to empty value ('$(IntermediateOutputPath)').
 
-	$(GitTagRegex): Regular expression used with git describe to filter the tags 
+	$(GitTagRegex): Regular expression used with git describe to filter the tags
 					to consider for base version lookup.
 					Defaults to * (all)
-           
+
 	$(GitBaseVersionRegex): Regular expression used to match and validate valid base versions
-							in branch, tag or file sources. By default, matches any string that 
+							in branch, tag or file sources. By default, matches any string that
 							*ends* in a valid SemVer2 string.
 							Defaults to 'v?(?<MAJOR>\d+)\.(?<MINOR>\d+)\.(?<PATCH>\d+)(?:\-(?<LABEL>[\dA-Za-z\-\.]+))?$|^(?<LABEL>[\dA-Za-z\-\.]+)\-v?(?<MAJOR>\d+)\.(?<MINOR>\d+)\.(?<PATCH>\d+)$'
-	
+
 	$(GitCommitDateFormat): The value passed as the format option when trying to retrieve
 							the git commit date
 							Defaults to %%cI (windows) or %cI (non windows)
-           
+
 	==============================================================
 	-->
 
@@ -414,9 +414,7 @@
   </Target>
 
   <Target Name="_GitRepositoryUrl" Returns="$(GitRepositoryUrl)" DependsOnTargets="_GitRoot"
-			Condition="'$(GitRoot)' != '' and '$(GitRepositoryUrl)' == ''"
-			Inputs="@(_GitInput)"
-			Outputs="$(_GitInfoFile)">
+			Condition="'$(GitRoot)' != '' and '$(GitRepositoryUrl)' == ''">
 
     <Exec Command="$(GitExe) config --get remote.$(GitRemote).url"
 			  Condition="'$(GitRepositoryUrl)' == ''"
@@ -444,8 +442,6 @@
 
   <Target Name="_GitCommitDate" Returns="$(GitCommitDate)"
 			DependsOnTargets="_GitRoot"
-			Inputs="@(_GitInput)"
-			Outputs="$(_GitInfoFile)"
 			Condition="'$(GitRoot)' != '' And '$(GitCommitDate)' == ''">
 
     <Exec Command='$(GitExe) -c log.showSignature=false show --format=$(GitCommitDateFormat) -s'
@@ -467,10 +463,8 @@
   </Target>
 
   <Target Name="_GitBranch" Returns="$(GitBranch)"
-					  DependsOnTargets="_GitInputs"
-			Condition="'$(GitBranch)' == ''"
-			Inputs="@(_GitInput)"
-			Outputs="$(_GitInfoFile)">
+			DependsOnTargets="_GitInputs"
+			Condition="'$(GitBranch)' == ''">
 
     <Exec Command='$(GitExe) rev-parse --abbrev-ref HEAD'
 			Condition="'$(GitRoot)' != ''"
@@ -487,7 +481,7 @@
 
     <!-- CI systems may checkout the specific commit, rather than the branch, so we need to fallback -->
     <Exec Command='$(GitExe) name-rev --name-only $(GitNameRevOptions) HEAD'
-			  Condition=" '$(GitBranch)' == '' "
+			  Condition="'$(GitRoot)' != '' and '$(GitBranch)' == ''"
 			  EchoOff='true'
 			  StandardErrorImportance="low"
 			  StandardOutputImportance="low"
@@ -506,8 +500,6 @@
 
   <Target Name="_GitCommit" Returns="$(GitCommit)"
 			DependsOnTargets="_GitRoot"
-			Inputs="@(_GitInput)"
-			Outputs="$(_GitInfoFile)"
 			Condition="'$(GitRoot)' != '' And '$(GitCommit)' == ''">
 
     <Exec Command='$(GitExe) -c log.showSignature=false log --format=format:$(_ShortShaFormat) -n 1'
@@ -578,7 +570,7 @@
           <Version>$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)$(GitSemVerDashLabel)+$([System.Text.RegularExpressions.Regex]::Replace($(GitBranch), "[^0-9A-Za-z-]", "-")).$(GitCommit)</Version>
           <PackageVersion>$(Version)</PackageVersion>
       </PropertyGroup>
-  </Target>  
+  </Target>
 
   <Target Name="_GitBaseVersionFile" Returns="$(GitBaseVersion)"
 			Inputs="@(_GitInput)"
@@ -998,8 +990,8 @@
     <UpToDateCheckInput Condition="'$(_GitHeadPath)' != '' and Exists('$(_GitHeadPath)')" Include="$(_GitHeadPath)" />
   </ItemGroup>
 
-  <!-- NOTE: we write the path to HEAD after first calculating a version, since we can be anywhere in 
-       the solution structure. This file will only be written if there's a change in the git root, 
+  <!-- NOTE: we write the path to HEAD after first calculating a version, since we can be anywhere in
+       the solution structure. This file will only be written if there's a change in the git root,
        which should never happen. -->
   <Target Name="_GitWriteHeadPath" AfterTargets="GitVersion">
     <WriteLinesToFile Lines="$(GitRoot).git\HEAD"

From e26688b35a60ac517cc9874f697977e60f47aaeb Mon Sep 17 00:00:00 2001
From: Sean Fausett <sean@jellyfish.co.nz>
Date: Wed, 7 Feb 2024 10:15:28 +1300
Subject: [PATCH 2/4] Fix git head cache race condition

Continue on error as eventually successful.
---
 src/GitInfo/build/GitInfo.targets | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/GitInfo/build/GitInfo.targets b/src/GitInfo/build/GitInfo.targets
index 524a03f..6537cc1 100644
--- a/src/GitInfo/build/GitInfo.targets
+++ b/src/GitInfo/build/GitInfo.targets
@@ -150,8 +150,11 @@
     <!-- Cache file used to avoid running all git commands. Only GitRoot will be retrieved to determine the path of this cache file. -->
     <_GitInfoFile>$(GitCachePath)GitInfo.cache</_GitInfoFile>
 
-    <!-- Stores value of GitIsDirty variable from last execution, file is changed when the value changes betwee runs. -->
+    <!-- Stores value of GitIsDirty variable from last execution. File is changed when the value changes between runs. -->
     <_GitIsDirtyFile>$(GitCachePath)GitIsDirty.cache</_GitIsDirtyFile>
+
+    <!-- Stores value of _GitHeadPath variable from last execution. Added as an input for the fast up-to-date check VS performs. -->
+    <_GitHeadFile>$(GitCachePath)GitHead.cache</_GitHeadFile>
   </PropertyGroup>
 
   <Target Name="GitInfoReport" DependsOnTargets="GitInfo;GitVersion">
@@ -978,25 +981,23 @@
 
   </Target>
 
-  <!-- This combination of prop/item/target fix incremental builds after HEAD changes. -->
-  <PropertyGroup>
-    <_GitCacheFullPath>$([System.IO.Path]::Combine($(MSBuildProjectDirectory), $(GitCachePath)))</_GitCacheFullPath>
-    <!-- We read the path to the HEAD file, written in a previously run _GitWriteHeadPath target -->
-    <_GitHeadPath Condition="Exists('$(_GitCacheFullPath)GitHead.cache')">$([System.IO.File]::ReadAllText('$(_GitCacheFullPath)GitHead.cache').Trim())</_GitHeadPath>
-  </PropertyGroup>
+  <!-- This combination of target/item/target fixes incremental builds after HEAD changes. -->
+  <Target Name="_GitReadHeadPath" AfterTargets="GitVersion">
+    <ReadLinesFromFile File="$(_GitHeadFile)" ContinueOnError="true">
+      <Output TaskParameter="Lines" ItemName="_GitHeadPath" />
+    </ReadLinesFromFile>
+  </Target>
 
   <ItemGroup>
     <!-- And if the HEAD path exists, we add it as an input for the fast up-to-date check VS performs -->
-    <UpToDateCheckInput Condition="'$(_GitHeadPath)' != '' and Exists('$(_GitHeadPath)')" Include="$(_GitHeadPath)" />
+    <UpToDateCheckInput Condition="'@(_GitHeadPath)' != '' and Exists('@(_GitHeadPath)')" Include="@(_GitHeadPath)" />
   </ItemGroup>
 
   <!-- NOTE: we write the path to HEAD after first calculating a version, since we can be anywhere in
        the solution structure. This file will only be written if there's a change in the git root,
        which should never happen. -->
   <Target Name="_GitWriteHeadPath" AfterTargets="GitVersion">
-    <WriteLinesToFile Lines="$(GitRoot).git\HEAD"
-						  File="$(GitCachePath)GitHead.cache"
-						  Overwrite="true" WriteOnlyWhenDifferent="true" />
+    <WriteLinesToFile File="$(_GitHeadFile)" Lines="$(GitRoot).git\HEAD" Overwrite="true" WriteOnlyWhenDifferent="true" ContinueOnError="true" />
   </Target>
 
   <!--

From 8490a53b1d8f61a60ef89c79a247f381d80e24eb Mon Sep 17 00:00:00 2001
From: Sean Fausett <sean@jellyfish.co.nz>
Date: Tue, 6 Feb 2024 16:21:54 +1300
Subject: [PATCH 3/4] Fix git dirty cache race condition

Continue on error as eventually successful.
---
 src/GitInfo/build/GitInfo.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitInfo/build/GitInfo.targets b/src/GitInfo/build/GitInfo.targets
index 6537cc1..c5b075c 100644
--- a/src/GitInfo/build/GitInfo.targets
+++ b/src/GitInfo/build/GitInfo.targets
@@ -354,7 +354,7 @@
       <GitIsDirty>0</GitIsDirty>
     </PropertyGroup>
 
-    <WriteLinesToFile File="$(_GitIsDirtyFile)" Lines="$(GitIsDirty)" Overwrite="true" WriteOnlyWhenDifferent="true"/>
+    <WriteLinesToFile File="$(_GitIsDirtyFile)" Lines="$(GitIsDirty)" Overwrite="true" WriteOnlyWhenDifferent="true" ContinueOnError="true" />
   </Target>
 
   <Target Name="_GitInputs" DependsOnTargets="_GitRoot" Returns="@(_GitInput)">

From 06626f6f981dc016eda42281946065d3ec104f08 Mon Sep 17 00:00:00 2001
From: Sean Fausett <sean@jellyfish.co.nz>
Date: Wed, 7 Feb 2024 12:03:48 +1300
Subject: [PATCH 4/4] Fix git read cache race condition

Continue on error as same as no cache.
---
 src/GitInfo/build/GitInfo.targets | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/GitInfo/build/GitInfo.targets b/src/GitInfo/build/GitInfo.targets
index c5b075c..0f82e3c 100644
--- a/src/GitInfo/build/GitInfo.targets
+++ b/src/GitInfo/build/GitInfo.targets
@@ -384,12 +384,12 @@
     <Delete Files="$(_GitInfoFile)" />
   </Target>
 
-  <Target Name="_GitReadCache" Condition="Exists('$(_GitInfoFile)') And '$(SkipReadGitCache)' != 'true' ">
-    <PropertyGroup>
-      <_GitCachedInfo>$([System.IO.File]::ReadAllText('$(_GitInfoFile)'))</_GitCachedInfo>
-    </PropertyGroup>
+  <Target Name="_GitReadCache" Condition="Exists('$(_GitInfoFile)') And '$(SkipReadGitCache)' != 'true'">
+    <ReadLinesFromFile File="$(_GitInfoFile)" ContinueOnError="true">
+      <Output TaskParameter="Lines" ItemName="_GitCachedInfo" />
+    </ReadLinesFromFile>
 
-    <CreateItem Include="GitInfo" AdditionalMetadata="$(_GitCachedInfo.Split(';'))">
+    <CreateItem Include="GitInfo" AdditionalMetadata="@(_GitCachedInfo -> TrimEnd(';'))">
       <Output TaskParameter="Include" ItemName="GitInfo" />
     </CreateItem>