From 796aa8e8b1c17390aed9eaec3961f734c0cf4a39 Mon Sep 17 00:00:00 2001
From: Charlie Poole <charliepoole@gmail.com>
Date: Sun, 1 Jan 2017 21:30:19 -0800
Subject: [PATCH] Prepare for 0.3 release

---
 CHANGES.txt                       | 18 +++++++++++-
 build.cake                        | 47 +++++++++++++++----------------
 src/mock-assembly/MockAssembly.cs |  4 +++
 3 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 2a298fb..19d9586 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,20 @@
-NUnit-Gui 0.2 - April 12, 2016
+NUnit-Gui 0.3 - January 1, 2017
+
+Issues Resolved
+
+ * 61     When loading tests using an agent, a cmd window is opened
+ * 86     Review and Revise Settings Panels
+ * 101    Bug Fix when viewing by category
+ * 102    Add Extension Manager dialog
+ * 117    System.FormatException on parsing duration
+ * 122    Update package references to latest versions
+ * 123    Create temporary thread to run tests
+ * 126    Need an easier way to make Engine changes for the Gui
+ * 133    Initial NUnit Tree display should show top of tree
+ * 134    File Exit command doesn't work
+ * 146    Remove additional unused settings
+
+NUnit-Gui 0.2 - April 12, 2016
 
 Issues Resolved
 
diff --git a/build.cake b/build.cake
index 2e144ad..10c2d3a 100644
--- a/build.cake
+++ b/build.cake
@@ -78,12 +78,29 @@ Task("InitializeBuild")
 		}
 		else
 		{
-			var buildNumber = AppVeyor.Environment.Build.Number;
-			packageVersion = version + "-CI-" + buildNumber + dbgSuffix;
-			if (AppVeyor.Environment.PullRequest.IsPullRequest)
-				packageVersion += "-PR-" + AppVeyor.Environment.PullRequest.Number;
+			var buildNumber = AppVeyor.Environment.Build.Number.ToString("00000");
+			var branch = AppVeyor.Environment.Repository.Branch;
+			var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest;
+
+			if (branch == "master" && !isPullRequest)
+			{
+				packageVersion = version + "-dev-" + buildNumber + dbgSuffix;
+			}
 			else
-				packageVersion += "-" + AppVeyor.Environment.Repository.Branch;
+			{
+                var suffix = "-ci-" + buildNumber + dbgSuffix;
+
+                if (isPullRequest)
+                    suffix += "-pr-" + AppVeyor.Environment.PullRequest.Number;
+                else
+                    suffix += "-" + branch;
+
+                // Nuget limits "special version part" to 20 chars. Add one for the hyphen.
+                if (suffix.Length > 21)
+                    suffix = suffix.Substring(0, 21);
+
+                packageVersion = version + suffix;
+			}
 		}
 
 		AppVeyor.UpdateBuildVersion(packageVersion);
@@ -134,13 +151,6 @@ Task("Test")
 // PACKAGE
 //////////////////////////////////////////////////////////////////////
 
-Task("PackageSource")
-  .Does(() =>
-	{
-		CreateDirectory(PACKAGE_DIR);
-		RunGitCommand(string.Format("archive -o {0} HEAD", SRC_PACKAGE));
-	});
-
 Task("PackageZip")
 	.IsDependentOn("Build")
 	.Does(() =>
@@ -168,18 +178,6 @@ Task("PackageZip")
 		Zip(BIN_DIR, File(ZIP_PACKAGE), zipFiles);
 	});
 
-//////////////////////////////////////////////////////////////////////
-// HELPER METHODS
-//////////////////////////////////////////////////////////////////////
-
-void RunGitCommand(string arguments)
-{
-	StartProcess("git", new ProcessSettings()
-	{
-		Arguments = arguments
-	});
-}
-
 //////////////////////////////////////////////////////////////////////
 // TASK TARGETS
 //////////////////////////////////////////////////////////////////////
@@ -189,7 +187,6 @@ Task("Rebuild")
 	.IsDependentOn("Build");
 
 Task("Package")
-	.IsDependentOn("PackageSource")
 	.IsDependentOn("PackageZip");
 
 Task("Appveyor")
diff --git a/src/mock-assembly/MockAssembly.cs b/src/mock-assembly/MockAssembly.cs
index 23a717b..4f81a6a 100644
--- a/src/mock-assembly/MockAssembly.cs
+++ b/src/mock-assembly/MockAssembly.cs
@@ -79,6 +79,8 @@ public class MockAssembly
             public const int Failed_NotRunnable = MockTestFixture.Failed_NotRunnable + BadFixture.Tests;
             public const int Failed = Failed_Errors + Failed_Failures + Failed_NotRunnable;
 
+            public const int Warnings = MockTestFixture.Warnings;
+
             public const int Inconclusive = MockTestFixture.Inconclusive;
 
             public const int Categories = MockTestFixture.Categories;
@@ -101,6 +103,8 @@ public class MockTestFixture
             public const int Failed_NotRunnable = 2;
             public const int Failed = Failed_Errors + Failed_Failures + Failed_NotRunnable;
 
+            public const int Warnings = 1;
+
             public const int Inconclusive = 1;
 
             public const int Categories = 5;