Use prefix for NuGet releases.

ejball · ejball · commit 77aa0b8e77d6 · 2018-04-22T20:05:37.000-07:00
diff --git a/build.cake b/build.cake
@@ -53,7 +53,7 @@ Task("Test")
 	.IsDependentOn("VerifyCodeGen")
 	.Does(() =>
 	{
-		foreach (var projectPath in GetFiles("tests/**/*Tests.csproj").Select(x => x.FullPath))
+		foreach (var projectPath in GetFiles("tests/**/*.csproj").Select(x => x.FullPath))
 			DotNetCoreTest(projectPath, new DotNetCoreTestSettings { Configuration = configuration });
 	});
 
@@ -80,7 +80,7 @@ Task("UpdateDocs")
 
 		var outputPath = $"release/{docsRepoBranch}/reference";
 		var buildBranch = EnvironmentVariable("APPVEYOR_REPO_BRANCH");
-		var isPreview = buildBranch != "master" || !Regex.IsMatch(trigger, @"^(v[0-9]+\.[0-9]+\.[0-9]+|update-docs)$");
+		var isPreview = buildBranch != "master" || !Regex.IsMatch(trigger, @"^(nuget-v[0-9]+\.[0-9]+\.[0-9]+|update-docs)$");
 		if (isPreview)
 			outputPath += $"/preview/{buildBranch}";
 
@@ -127,9 +127,9 @@ Task("NuGetPublish")
 				throw new InvalidOperationException($"Mismatched package versions '{version}' and '{nupkgVersion}'.");
 		}
 
-		if (!string.IsNullOrEmpty(nugetApiKey) && (trigger == null || Regex.IsMatch(trigger, "^v[0-9]")))
+		if (!string.IsNullOrEmpty(nugetApiKey) && (trigger == null || Regex.IsMatch(trigger, "^nuget-v[0-9]")))
 		{
-			if (trigger != null && trigger != $"v{version}")
+			if (trigger != null && trigger != $"nuget-v{version}")
 				throw new InvalidOperationException($"Trigger '{trigger}' doesn't match package version '{version}'.");
 
 			var pushSettings = new NuGetPushSettings { ApiKey = nugetApiKey, Source = nugetSource };
@@ -138,7 +138,7 @@ Task("NuGetPublish")
 		}
 		else
 		{
-			Information("To publish NuGet packages, push this git tag: v" + version);
+			Information("To publish NuGet packages, push this git tag: nuget-v" + version);
 		}
 	});
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ Task("Test")`
`53`	`53`	`.IsDependentOn("VerifyCodeGen")`
`54`	`54`	`.Does(() =>`
`55`	`55`	`{`
`56`		`- foreach (var projectPath in GetFiles("tests/*/Tests.csproj").Select(x => x.FullPath))`
	`56`	`+ foreach (var projectPath in GetFiles("tests/*/.csproj").Select(x => x.FullPath))`
`57`	`57`	`DotNetCoreTest(projectPath, new DotNetCoreTestSettings { Configuration = configuration });`
`58`	`58`	`});`
`59`	`59`
`@@ -80,7 +80,7 @@ Task("UpdateDocs")`
`80`	`80`
`81`	`81`	`var outputPath = $"release/{docsRepoBranch}/reference";`
`82`	`82`	`var buildBranch = EnvironmentVariable("APPVEYOR_REPO_BRANCH");`
`83`		`- var isPreview = buildBranch != "master" \|\| !Regex.IsMatch(trigger, @"^(v[0-9]+\.[0-9]+\.[0-9]+\|update-docs)$");`
	`83`	`+ var isPreview = buildBranch != "master" \|\| !Regex.IsMatch(trigger, @"^(nuget-v[0-9]+\.[0-9]+\.[0-9]+\|update-docs)$");`
`84`	`84`	`if (isPreview)`
`85`	`85`	`outputPath += $"/preview/{buildBranch}";`
`86`	`86`
`@@ -127,9 +127,9 @@ Task("NuGetPublish")`
`127`	`127`	`throw new InvalidOperationException($"Mismatched package versions '{version}' and '{nupkgVersion}'.");`
`128`	`128`	`}`
`129`	`129`
`130`		`- if (!string.IsNullOrEmpty(nugetApiKey) && (trigger == null \|\| Regex.IsMatch(trigger, "^v[0-9]")))`
	`130`	`+ if (!string.IsNullOrEmpty(nugetApiKey) && (trigger == null \|\| Regex.IsMatch(trigger, "^nuget-v[0-9]")))`
`131`	`131`	`{`
`132`		`- if (trigger != null && trigger != $"v{version}")`
	`132`	`+ if (trigger != null && trigger != $"nuget-v{version}")`
`133`	`133`	`throw new InvalidOperationException($"Trigger '{trigger}' doesn't match package version '{version}'.");`
`134`	`134`
`135`	`135`	`var pushSettings = new NuGetPushSettings { ApiKey = nugetApiKey, Source = nugetSource };`
`@@ -138,7 +138,7 @@ Task("NuGetPublish")`
`138`	`138`	`}`
`139`	`139`	`else`
`140`	`140`	`{`
`141`		`- Information("To publish NuGet packages, push this git tag: v" + version);`
	`141`	`+ Information("To publish NuGet packages, push this git tag: nuget-v" + version);`
`142`	`142`	`}`
`143`	`143`	`});`
`144`	`144`