Skip to content
This repository has been archived by the owner on Jul 27, 2019. It is now read-only.

Initial use of GitVersion #226

Merged
merged 13 commits into from
Sep 8, 2017
Merged

Initial use of GitVersion #226

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
aa54405
Initial use of GitVersion
CharliePoole Sep 2, 2017
975875c
Extract PR number
CharliePoole Sep 3, 2017
b486c27
Add branch name to ci builds
CharliePoole Sep 5, 2017
10abbd8
Fix errors and refactor so properties are all set in constructor
CharliePoole Sep 6, 2017
d261fec
Use GitVer version for packaging locally and on Travis
CharliePoole Sep 6, 2017
87bb6ca
Use GitVer version for packaging on AppVeyor
CharliePoole Sep 6, 2017
a0ef16a
Exclude pdb files from zip for now
CharliePoole Sep 6, 2017
d9606c0
Update CommonAssemblyInfo for CI builds
CharliePoole Sep 7, 2017
e08bac4
Remove Debugging info from script
CharliePoole Sep 7, 2017
c3e8757
Merge branch 'master' into issue-206
CharliePoole Sep 7, 2017
68781f8
Ignore files in .vscode dir
CharliePoole Sep 8, 2017
924e2f5
Merge branch 'issue-206' of https://github.com/CharliePoole/nunit-gui…
CharliePoole Sep 8, 2017
62a1cfd
Fix build.sh arguments
CharliePoole Sep 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 39 additions & 11 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#tool nuget:?package=GitVersion.CommandLine
#addin "Cake.Incubator"

using System.Text.RegularExpressions;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this necessary ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had a regular expression at one point but it's gone now.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The regex is back for parsing whether it is a PR or not, so we should keep this.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exactly.


//////////////////////////////////////////////////////////////////////
// ARGUMENTS
//////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -233,30 +235,56 @@ Task("PackageChocolatey")

class BuildInfo
{
private GitVersion _gitVersion;

public BuildInfo(GitVersion gitVersion)
{
BranchName = gitVersion.BranchName;
PreReleaseLabel = gitVersion.PreReleaseLabel;
AssemblyVersion = gitVersion.AssemblySemVer;
AssemblyFileVersion = PackageVersion =
gitVersion.MajorMinorPatch + "-" + PreReleaseLabel + "-" + gitVersion.CommitsSinceVersionSourcePadded;
_gitVersion = gitVersion;
}

public string BranchName
{
get { return _gitVersion.BranchName; }
}

public string AssemblyVersion
{
get { return _gitVersion.AssemblySemVer; }
}
public string AssemblyFileVersion
{
get { return PackageVersion; }
}

public string BranchName { get; set; }
public string PreReleaseLabel
{
get { return _gitVersion.PreReleaseLabel; }
}

public string PackageVersion
{
get { return _gitVersion.MajorMinorPatch + "-" + PreReleaseLabel + "-" + _gitVersion.PreReleaseNumber.PadLeft(4, '0'); }
}

public string AssemblyVersion { get; set; }
public string AssemblyFileVersion { get; set; }
public bool IsPullRequest
{
// Requires correct setup of GitVersion.yml
get { return PreReleaseLabel == "pr"; }
}

public string PreReleaseLabel { get; set; }
public string PackageVersion { get; set; }
public string PullRequestNumber
{
get { return IsPullRequest ? _gitVersion.PreReleaseNumber : string.Empty; }
}

public string Dump()
{
var NL = Environment.NewLine;
return " BranchName: " + BranchName + NL +
" IsPullRequest: " + IsPullRequest.ToString() + NL +
" PullRequestNumber: " + PullRequestNumber + NL +
" AssemblyVersion: " + AssemblyVersion + NL +
" AssemblyFileVersion: " + AssemblyFileVersion + NL +
" PreReleaseLabel: " + PreReleaseLabel + NL +
" Package Version: " + PackageVersion + NL;
}
}
Expand Down