@@ -76,14 +76,19 @@ public static bool IsEnabled(this ICakeContext context, string envVar, bool null
76
76
return string . IsNullOrWhiteSpace ( value ) ? nullOrEmptyAsEnabled : bool . Parse ( value ) ;
77
77
}
78
78
79
- public static List < string > ExecGitCmd ( this ICakeContext context , string cmd )
79
+ public static List < string > ExecuteCommand ( this ICakeContext context , FilePath exe , string args )
80
80
{
81
- var gitPath = context . Tools . Resolve ( context . IsRunningOnWindows ( ) ? "git.exe" : "git" ) ;
82
- context . StartProcess ( gitPath , new ProcessSettings { Arguments = cmd , RedirectStandardOutput = true } , out var redirectedOutput ) ;
81
+ context . StartProcess ( exe , new ProcessSettings { Arguments = args , RedirectStandardOutput = true } , out var redirectedOutput ) ;
83
82
84
83
return redirectedOutput . ToList ( ) ;
85
84
}
86
85
86
+ public static List < string > ExecGitCmd ( this ICakeContext context , string cmd )
87
+ {
88
+ var gitExe = context . Tools . Resolve ( context . IsRunningOnWindows ( ) ? "git.exe" : "git" ) ;
89
+ return context . ExecuteCommand ( gitExe , cmd ) ;
90
+ }
91
+
87
92
DirectoryPath HomePath ( )
88
93
{
89
94
return IsRunningOnWindows ( )
@@ -124,16 +129,9 @@ GitVersion GetVersion(BuildParameters parameters)
124
129
void ValidateVersion ( BuildParameters parameters )
125
130
{
126
131
var gitVersionTool = GetFiles ( $ "artifacts/**/bin/{ parameters . CoreFxVersion31 } /gitversion.dll") . FirstOrDefault ( ) ;
127
- IEnumerable < string > output ;
128
- var fullFxResult = StartProcess (
129
- "dotnet" ,
130
- new ProcessSettings {
131
- Arguments = $ "\" { gitVersionTool } \" -version",
132
- RedirectStandardOutput = true ,
133
- } ,
134
- out output
135
- ) ;
132
+ var dotnetExe = Context . Tools . Resolve ( "dotnet" ) ;
136
133
134
+ var output = Context . ExecuteCommand ( "dotnet" , $ "\" { gitVersionTool } \" -version") ;
137
135
var outputStr = string . Concat ( output ) ;
138
136
139
137
Assert . Equal ( parameters . Version . GitVersion . InformationalVersion , outputStr ) ;
0 commit comments