NH-3807 - Develop AppVeyor and CircleCI builds.

Author: ngbrown

build.cake

@@ -38,6 +38,7 @@ Setup(context =>
             var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest;
 
             CiNonTagBuildVersion(buildNumber, branch, isPullRequest ? AppVeyor.Environment.PullRequest.Number.ToString() : null);
+            buildVersion = versionSuffix;
         }
 
         AppVeyor.UpdateBuildVersion(buildVersion);
@@ -58,6 +59,7 @@ Setup(context =>
             var isPullRequest = pullRequestNumber != null;
 
             CiNonTagBuildVersion(buildNumber, branch, isPullRequest ? pullRequestNumber : null);
+            buildVersion = versionSuffix;
         }
     }
 
@@ -224,10 +226,10 @@ void CiNonTagBuildVersion(int buildNumber, string branch, string pullRequestNumb
             suffix += "-" + System.Text.RegularExpressions.Regex.Replace(branch, "[^0-9A-Za-z-]+", "-");
 
         // Nuget limits "special version part" to 20 chars. Add one for the hyphen.
-        if (suffix.Length > 21)
-            suffix = suffix.Substring(0, 21);
+        if (suffix.Length > 20)
+            suffix = suffix.Substring(0, 20);
 
-        versionSuffix = suffix + dbgSuffix;
+        versionSuffix = suffix;
     }
 }