Skip to content
This repository has been archived by the owner on Jul 27, 2019. It is now read-only.

Commit

Permalink
Prepare for 0.3 release
Browse files Browse the repository at this point in the history
  • Loading branch information
CharliePoole committed Jan 2, 2017
1 parent b6d3c22 commit 796aa8e
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 26 deletions.
18 changes: 17 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
@@ -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

Expand Down
47 changes: 22 additions & 25 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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(() =>
Expand Down Expand Up @@ -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
//////////////////////////////////////////////////////////////////////
Expand All @@ -189,7 +187,6 @@ Task("Rebuild")
.IsDependentOn("Build");

Task("Package")
.IsDependentOn("PackageSource")
.IsDependentOn("PackageZip");

Task("Appveyor")
Expand Down
4 changes: 4 additions & 0 deletions src/mock-assembly/MockAssembly.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 796aa8e

Please sign in to comment.