(cake-contribGH-738) added resolving of "git.exe"

to all cases of resolving "git" to make them work on windows.
nils-a · Jan 5, 2021 · 193c545 · 193c545
1 parent 91213ea
commit 193c545
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/Cake.Recipe/Content/github-actions.cake b/Cake.Recipe/Content/github-actions.cake
@@ -40,6 +40,10 @@ public class GitHubActionRepositoryInfo : IRepositoryInfo
                 else if (tempName.StartsWith(tagPrefix))
                 {
                     var gitTool = context.Tools.Resolve("git");
+                    if (gitTool == null)
+                    {
+                        gitTool = context.Tools.Resolve("git.exe");
+                    }
 
                     if (gitTool != null)
                     {

diff --git a/Cake.Recipe/Content/localbuild.cake b/Cake.Recipe/Content/localbuild.cake
@@ -63,7 +63,11 @@ public class LocalBuildRepositoryInfo : IRepositoryInfo
             var rootPath = context.GitFindRootFromPath(context.MakeAbsolute(context.Environment.WorkingDirectory));
 
             var gitTool = context.Tools.Resolve("git");
-
+            if (gitTool == null)
+            {
+                gitTool = context.Tools.Resolve("git.exe");
+            }
+
             if (gitTool == null)
             {
                 context.Warning("Unable to find git, setting default values for repository properties...");

diff --git a/Cake.Recipe/Content/parameters.cake b/Cake.Recipe/Content/parameters.cake
@@ -555,7 +555,11 @@ public static class BuildParameters
         {
             BranchType = BranchType.Unknown;
             var gitTool = context.Tools.Resolve("git");
-
+            if (gitTool == null)
+            {
+                gitTool = context.Tools.Resolve("git.exe");
+            }
+
             if (gitTool != null)
             {
                 IEnumerable<string> redirectedStandardOutput;