Skip to content

Commit ef7694a

Browse files
authored
Fix version calculation on non windows (#621)
+semver:patch
1 parent 0dddee2 commit ef7694a

File tree

1 file changed

+22
-25
lines changed

1 file changed

+22
-25
lines changed

Diff for: build/version.cake

+22-25
Original file line numberDiff line numberDiff line change
@@ -21,37 +21,34 @@ public class BuildVersion
2121
string informationalVersion = null;
2222
string milestone = null;
2323

24-
if (context.IsRunningOnWindows())
24+
context.Information("Calculating Semantic Version");
25+
if (!parameters.IsLocalBuild || parameters.IsPublishBuild || parameters.IsReleaseBuild)
2526
{
26-
context.Information("Calculating Semantic Version");
27-
if (!parameters.IsLocalBuild || parameters.IsPublishBuild || parameters.IsReleaseBuild)
28-
{
29-
context.GitVersion(new GitVersionSettings{
30-
UpdateAssemblyInfo = false,
31-
OutputType = GitVersionOutput.BuildServer
32-
});
33-
34-
version = context.EnvironmentVariable("GitVersion_MajorMinorPatch");
35-
semVersion = context.EnvironmentVariable("GitVersion_LegacySemVerPadded");
36-
assemblyVersion = context.EnvironmentVariable("GitVersion_AssemblySemVer");
37-
informationalVersion = context.EnvironmentVariable("GitVersion_InformationalVersion");
38-
milestone = string.Concat("v", version);
39-
}
40-
41-
GitVersion assertedVersions = context.GitVersion(new GitVersionSettings
42-
{
43-
OutputType = GitVersionOutput.Json,
27+
context.GitVersion(new GitVersionSettings{
28+
UpdateAssemblyInfo = false,
29+
OutputType = GitVersionOutput.BuildServer
4430
});
4531

46-
version = assertedVersions.MajorMinorPatch;
47-
semVersion = assertedVersions.LegacySemVerPadded;
48-
assemblyVersion = assertedVersions.AssemblySemVer;
49-
informationalVersion = assertedVersions.InformationalVersion;
32+
version = context.EnvironmentVariable("GitVersion_MajorMinorPatch");
33+
semVersion = context.EnvironmentVariable("GitVersion_LegacySemVerPadded");
34+
assemblyVersion = context.EnvironmentVariable("GitVersion_AssemblySemVer");
35+
informationalVersion = context.EnvironmentVariable("GitVersion_InformationalVersion");
5036
milestone = string.Concat("v", version);
51-
52-
context.Information("Calculated Semantic Version: {0}", semVersion);
5337
}
5438

39+
GitVersion assertedVersions = context.GitVersion(new GitVersionSettings
40+
{
41+
OutputType = GitVersionOutput.Json,
42+
});
43+
44+
version = assertedVersions.MajorMinorPatch;
45+
semVersion = assertedVersions.LegacySemVerPadded;
46+
assemblyVersion = assertedVersions.AssemblySemVer;
47+
informationalVersion = assertedVersions.InformationalVersion;
48+
milestone = string.Concat("v", version);
49+
50+
context.Information("Calculated Semantic Version: {0}", semVersion);
51+
5552
var appVersion = typeof(ICakeContext).Assembly.GetName().Version.ToString();
5653

5754
return new BuildVersion

0 commit comments

Comments
 (0)