Merge branch 'master' into TrackPackRefs

devlooped · May 15, 2017 · 8c47df3 · 8c47df3
2 parents 1a566b8 + 7995fda
commit 8c47df3
Show file tree

Hide file tree

Showing 5 changed files with 876 additions and 818 deletions.
diff --git a/GitInfo.txt b/GitInfo.txt
@@ -1 +1 @@
-v1.1.1
+v1.1.59
diff --git a/src/GitInfo/GitInfo.nuspec b/src/GitInfo/GitInfo.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
 	<metadata>
-		<id>GitInfo</id>
+		<id>GitInfo-zap</id>
 		<version>$version$</version>
 		<title>Git and SemVer info for MSBuild/C#/VB</title>
 		<authors>Daniel Cazzulino</authors>

diff --git a/src/GitInfo/build/GitInfo.cache.pp b/src/GitInfo/build/GitInfo.cache.pp
@@ -1,4 +1,6 @@
 GitBranch=$GitBranch$;
+GitFullBranch=$GitFullBranch$;
+GitBranchEscaped=$GitBranchEscaped$;
 GitCommit=$GitCommit$;
 GitSha=$GitSha$;
 GitBaseVersion=$GitBaseVersion$;
@@ -14,4 +16,4 @@
 GitSemVerPatch=$GitSemVerPatch$;
 GitSemVerLabel=$GitSemVerLabel$;
 GitSemVerDashLabel=$GitSemVerDashLabel$;
-GitSemVerSource=$GitSemVerSource$
+GitSemVerSource=$GitSemVerSource$
diff --git a/src/GitInfo/build/GitInfo.cs.pp b/src/GitInfo/build/GitInfo.cs.pp
@@ -36,6 +36,12 @@
 
       /// <summary>Branch: $GitBranch$</summary>
       public const string Branch = "$GitBranch$";
+
+	  /// <summary>Branch with folder path: $FullBranch$</summary>
+      public const string FullBranch = "$GitFullBranch$";
+
+	  /// <summary>Branch: $GitBranchEscaped$</summary>
+      public const string BranchEscaped = "$GitBranchEscaped$";
 
       /// <summary>Commit: $GitCommit$</summary>
       public const string Commit = "$GitCommit$";