Skip to content

Commit b10f4ee

Browse files
committed
small improvement
1 parent 021985b commit b10f4ee

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

build/pack.cake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,5 @@ void PackPrepareNative(ICakeContext context, BuildParameters parameters)
148148
context.Information("Validating native lib:");
149149

150150
var nativeExe = outputPath.CombineWithFilePath(IsRunningOnWindows() ? "gitversion.exe" : "gitversion");
151-
var output = context.ExecuteCommand(nativeExe, "/showvariable FullSemver");
152-
var outputStr = string.Concat(output);
153-
154-
Assert.Equal(parameters.Version.GitVersion.FullSemVer, outputStr);
151+
ValidateOutput(nativeExe.FullPath, "/showvariable FullSemver", parameters.Version.GitVersion.FullSemVer);
155152
}

build/utils/utils.cake

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,17 @@ GitVersion GetVersion(BuildParameters parameters)
129129
void ValidateVersion(BuildParameters parameters)
130130
{
131131
var gitVersionTool = GetFiles($"artifacts/**/bin/{parameters.CoreFxVersion31}/gitversion.dll").FirstOrDefault();
132-
var dotnetExe = Context.Tools.Resolve("dotnet");
133132

134-
var output = Context.ExecuteCommand("dotnet", $"\"{gitVersionTool}\" -version");
133+
ValidateOutput("dotnet", $"\"{gitVersionTool}\" -version", parameters.Version.GitVersion.InformationalVersion);
134+
}
135+
136+
void ValidateOutput(string cmd, string args, string expected)
137+
{
138+
var output = Context.ExecuteCommand(cmd, args);
135139
var outputStr = string.Concat(output);
140+
Information(outputStr);
136141

137-
Assert.Equal(parameters.Version.GitVersion.InformationalVersion, outputStr);
142+
Assert.Equal(expected, outputStr);
138143
}
139144

140145
void RunGitVersionOnCI(BuildParameters parameters)

0 commit comments

Comments
 (0)