Merge pull request #549 from TestCentric/issue-534e

Add upload of rc packages and refactor
TestCentric · Mar 15, 2020 · 30beaa1 · 30beaa1
2 parents 93db577 + 87ce98d
commit 30beaa1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/build/parameters.cake b/build/parameters.cake
@@ -13,9 +13,14 @@ public class BuildParameters
 		_buildSystem = _context.BuildSystem();
 
 		Configuration = context.Argument("configuration", DEFAULT_CONFIGURATION);
-		Versions = new BuildVersion(context, this);
 		ProjectDirectory = context.Environment.WorkingDirectory.FullPath + "/";
 
+		Versions = new BuildVersion(context, this);
+
+		bool publishAllowed = IsRunningOnAppVeyor || IsLocalBuild && Versions.HasPublishArgument;
+		ShouldPublishToMyGet = publishAllowed && Versions.IsPreRelease && (Versions.PreReleaseLabel == "dev" || Versions.PreReleaseLabel == "rc");
+		ShouldPublishToNuGet = ShouldPublishToChocolatey = publishAllowed && !Versions.IsPreRelease;
+
 		MyGetApiKey = _context.EnvironmentVariable("MYGET_API_KEY");
 		NuGetApiKey = _context.EnvironmentVariable("NUGET_API_KEY");
 		ChocolateyApiKey = _context.EnvironmentVariable("CHOCO_API_KEY");
@@ -91,10 +96,9 @@ public class BuildParameters
 	public string NuGetApiKey { get; }
 	public string ChocolateyApiKey { get; }
 
-	public bool ShouldPublishPackages => ShouldPublishToMyGet || ShouldPublishToNuGet || ShouldPublishToChocolatey;
-	public bool ShouldPublishToMyGet =>	IsRunningOnAppVeyor && Versions.PreReleaseLabel == "dev";
-	public bool ShouldPublishToNuGet => false;
-	public bool ShouldPublishToChocolatey => false;
+	public bool ShouldPublishToMyGet { get; }
+	public bool ShouldPublishToNuGet { get; }
+	public bool ShouldPublishToChocolatey { get; }
 
 	public bool UsingXBuild { get; }
 	public MSBuildSettings MSBuildSettings { get; }

diff --git a/build/versioning.cake b/build/versioning.cake
@@ -15,11 +15,13 @@ public class BuildVersion
 	{
         _parameters = parameters;
 
-		bool hasVersionArgument = context.HasArgument("packageVersion");
+		HasVersionArgument = context.HasArgument("packageVersion");
+        HasPublishArgument = context.HasArgument("publish");
+
 		bool onWindows = context.IsRunningOnWindows();
 
 		// TODO: Get GitVersion to work on Linux
-		string packageVersion = hasVersionArgument || !onWindows
+		string packageVersion = HasVersionArgument || !onWindows
 			? context.Argument("packageVersion", DEFAULT_VERSION)
 			: GetPackageVersion(context.GitVersion());
 
@@ -52,6 +54,9 @@ public class BuildVersion
 		AssemblyInformationalVersion = packageVersion;
 	}
 
+    public bool HasVersionArgument { get; }
+    public bool HasPublishArgument { get; }
+
 	public string PackageVersion { get; }
 	public string AssemblyVersion { get; }
 	public string AssemblyFileVersion { get; }

diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs
@@ -23,4 +23,4 @@
 
 [assembly: AssemblyVersion("1.3.2.0")]
 [assembly: AssemblyFileVersion("1.3.2")]
-[assembly: AssemblyInformationalVersion("1.3.2-ci00015-issue-534d")]
+[assembly: AssemblyInformationalVersion("1.3.2-rc999-testing")]
diff --git a/src/TestEngine/CommonEngineAssemblyInfo.cs b/src/TestEngine/CommonEngineAssemblyInfo.cs
@@ -23,4 +23,4 @@
 
 [assembly: AssemblyVersion("1.3.2.0")]
 [assembly: AssemblyFileVersion("1.3.2")]
-[assembly: AssemblyInformationalVersion("1.3.2-ci00015-issue-534d")]
+[assembly: AssemblyInformationalVersion("1.3.2-rc999-testing")]
diff --git a/src/TestEngine/testcentric.engine.api/Properties/AssemblyInfo.cs b/src/TestEngine/testcentric.engine.api/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@
 
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.3.2")]
-[assembly: AssemblyInformationalVersion("1.3.2-ci00015-issue-534d")]
+[assembly: AssemblyInformationalVersion("1.3.2-rc999-testing")]