Skip to content

Commit

Permalink
Merge branch 'hotfix/1.1.1'
Browse files Browse the repository at this point in the history
* hotfix/1.1.1:
  (GH-476) Include AssemblySemVer in Parameters
  • Loading branch information
gep13 committed Oct 21, 2019
2 parents ef4c7f9 + 2a31f49 commit 07bac31
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion Cake.Recipe/Content/gitversion.cake
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ public class BuildVersion
public string CakeVersion { get; private set; }
public string InformationalVersion { get; private set; }
public string FullSemVersion { get; private set; }
public string AssemblySemVer { get; private set; }

public static BuildVersion CalculatingSemanticVersion(
ICakeContext context)
Expand All @@ -19,6 +20,7 @@ public class BuildVersion
string semVersion = null;
string milestone = null;
string informationalVersion = null;
string assemblySemVer = null;
string fullSemVersion = null;
GitVersion assertedVersions = null;

Expand Down Expand Up @@ -50,7 +52,9 @@ public class BuildVersion
version = context.EnvironmentVariable("GitVersion_MajorMinorPatch");
semVersion = context.EnvironmentVariable("GitVersion_LegacySemVerPadded");
informationalVersion = context.EnvironmentVariable("GitVersion_InformationalVersion");
assemblySemVer = context.EnvironmentVariable("GitVersion_AssemblySemVer");
milestone = string.Concat(version);
fullSemVersion = context.EnvironmentVariable("GitVersion_FullSemVer");
}

if(!BuildParameters.IsPublicRepository && BuildParameters.IsRunningOnAppVeyor)
Expand All @@ -68,6 +72,7 @@ public class BuildVersion
version = assertedVersions.MajorMinorPatch;
semVersion = assertedVersions.LegacySemVerPadded;
informationalVersion = assertedVersions.InformationalVersion;
assemblySemVer = assertedVersions.AssemblySemVer;
milestone = string.Concat(version);
fullSemVersion = assertedVersions.FullSemVer;

Expand All @@ -93,7 +98,8 @@ public class BuildVersion
Milestone = milestone,
CakeVersion = cakeVersion,
InformationalVersion = informationalVersion,
FullSemVersion = fullSemVersion
FullSemVersion = fullSemVersion,
AssemblySemVer = assemblySemVer
};
}

Expand Down

0 comments on commit 07bac31

Please sign in to comment.