Merge remote-tracking branch 'upstream/support/3.6.0'

Author: JakeGinnivan

deploy.cake

@@ -63,6 +63,14 @@ Task("DownloadGitHubReleaseArtifacts")
             .ReadAllLines("./releaseArtifacts/artifacts")
             .Select(l => l.Split(':'))
             .ToDictionary(v => v[0], v => v[1]);
+
+        // Have had missing artifacts before, lets fail early in that scenario
+        if (!artifactLookup.ContainsKey("NuGetRefBuild")) { throw new Exception("NuGetRefBuild" artifact missing); }
+        if (!artifactLookup.ContainsKey("NuGetCommandLineBuild")) { throw new Exception("NuGetCommandLineBuild" artifact missing); }
+        if (!artifactLookup.ContainsKey("NuGetTaskBuild")) { throw new Exception("NuGetTaskBuild" artifact missing); }
+        if (!artifactLookup.ContainsKey("NuGetExeBuild")) { throw new Exception("NuGetExeBuild" artifact missing); }
+        if (!artifactLookup.ContainsKey("GemBuild")) { throw new Exception("GemBuild" artifact missing); }
+        if (!artifactLookup.ContainsKey("GitVersionTfsTaskBuild")) { throw new Exception("GitVersionTfsTaskBuild" artifact missing); }
     });
 
 Task("Publish-NuGetPackage")
@@ -152,6 +160,7 @@ Task("Publish-Gem")
 
 Task("Publish-VstsTask")
     .IsDependentOn("DownloadGitHubReleaseArtifacts")
+    .WithCriteria(() => !tag.Contains("-")) // Do not release pre-release to VSTS
     .Does(() =>
 {
     var returnCode = StartProcess("cmd", new ProcessSettings