From a004e8ebc089d90612e1166d477f7b52aa27adce Mon Sep 17 00:00:00 2001
From: Sean Fausett <sean@jellyfish.co.nz>
Date: Fri, 17 May 2024 11:23:31 +1200
Subject: [PATCH 1/2] Disable rogue command echo

Also removes redundant condition.
---
 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 0f82e3c..185e2af 100644
--- a/src/GitInfo/build/GitInfo.targets
+++ b/src/GitInfo/build/GitInfo.targets
@@ -420,7 +420,7 @@
 			Condition="'$(GitRoot)' != '' and '$(GitRepositoryUrl)' == ''">
 
     <Exec Command="$(GitExe) config --get remote.$(GitRemote).url"
-			  Condition="'$(GitRepositoryUrl)' == ''"
+			  EchoOff="true"
 			  StandardErrorImportance="low"
 			  StandardOutputImportance="low"
 			  ConsoleToMSBuild="true"

From 250e0e34c4f16f7d7d6f97ead4137d84eba16a54 Mon Sep 17 00:00:00 2001
From: Sean Fausett <sean@jellyfish.co.nz>
Date: Fri, 17 May 2024 11:25:54 +1200
Subject: [PATCH 2/2] Reorder command condition

Better for code search.
---
 src/GitInfo/build/GitInfo.targets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/GitInfo/build/GitInfo.targets b/src/GitInfo/build/GitInfo.targets
index 185e2af..009aa39 100644
--- a/src/GitInfo/build/GitInfo.targets
+++ b/src/GitInfo/build/GitInfo.targets
@@ -280,8 +280,8 @@
       <_IsGitFile>$([System.IO.File]::Exists('$(GitDir)'))</_IsGitFile>
     </PropertyGroup>
 
-    <Exec Condition="'$(_IsGitFile)' == 'true'"
-			  Command='$(GitExe) rev-parse --is-inside-work-tree'
+    <Exec Command='$(GitExe) rev-parse --is-inside-work-tree'
+			  Condition="'$(_IsGitFile)' == 'true'"
 			  EchoOff='true'
 			  StandardErrorImportance='high'
 			  StandardOutputImportance='low'
@@ -297,8 +297,8 @@
       <_IsGitWorkTree>$(_GitIsWorkTree.Trim())</_IsGitWorkTree>
     </PropertyGroup>
 
-    <Exec Condition="'$(_IsGitFile)' == 'true' and '$(_IsGitWorkTree)' == 'true'"
-			  Command='$(GitExe) rev-parse --git-common-dir'
+    <Exec Command='$(GitExe) rev-parse --git-common-dir'
+			  Condition="'$(_IsGitFile)' == 'true' and '$(_IsGitWorkTree)' == 'true'"
 			  EchoOff='true'
 			  StandardErrorImportance='high'
 			  StandardOutputImportance='low'
@@ -1036,8 +1036,8 @@
     </PropertyGroup>
 
     <!-- If we didn't find it in the PATH nor the above locations, check for git installed in WSL -->
-    <Exec Condition="'$(GitExe)' == ''"
-			  Command='"$(MSBuildThisFileDirectory)wslrun.cmd" git --version'
+    <Exec Command='"$(MSBuildThisFileDirectory)wslrun.cmd" git --version'
+			  Condition="'$(GitExe)' == ''"
 			  EchoOff='true'
 			  ContinueOnError='true'
 			  StandardErrorImportance='high'