Skip to content
This repository has been archived by the owner on May 21, 2022. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/dev-pomma89'
Browse files Browse the repository at this point in the history
  • Loading branch information
pomma89 committed Jun 24, 2017
2 parents 5e0b131 + a0ab7e4 commit 8c144fe
Show file tree
Hide file tree
Showing 22 changed files with 2,613 additions and 164 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -215,3 +215,9 @@ pip-log.txt

#Mr Developer
.mr.developer.cfg

#############
## Rider
#############

.idea
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog for CodeProject.ObjectPool #

### v3.0.4 (2017-06-24) ###

* Removed dependency on Thrower.

### v3.0.3 (2017-04-08) ###

* Added a timed object pool (issue #1).
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

## Summary ##

* Latest release version: `v3.0.3`
* Latest release version: `v3.0.4`
* Build status on [AppVeyor](https://ci.appveyor.com): [![Build status](https://ci.appveyor.com/api/projects/status/r4qnqaqj9ri6cicn?svg=true)](https://ci.appveyor.com/project/pomma89/objectpool)
* [Doxygen](http://www.stack.nl/~dimitri/doxygen/index.html) documentation:
+ [HTML](http://pomma89.altervista.org/objectpool/doc/html/index.html)
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#---------------------------------#

# version format
version: 3.0.3.{build}
version: 3.0.4.{build}

# branches to build
branches:
Expand All @@ -25,7 +25,7 @@ branches:
assembly_info:
patch: true
file: AssemblyInfo.*
assembly_version: "3.0.3.{build}"
assembly_version: "3.0.4.{build}"
assembly_file_version: "{version}"
assembly_informational_version: "{version}"

Expand Down
34 changes: 17 additions & 17 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -37,40 +37,40 @@ Task("Build-Debug")
Build("Debug");
});

Task("Test-Debug")
Task("Build-Release")
.IsDependentOn("Build-Debug")
.Does(() =>
.Does(() =>
{
Test("Debug");
Build("Release");
});

Task("Build-Release")
.IsDependentOn("Test-Debug")
Task("Pack-Release")
.IsDependentOn("Build-Release")
.Does(() =>
{
Build("Release");
Pack("Release");
});

Task("Test-Release")
.IsDependentOn("Build-Release")
Task("Test-Debug")
.IsDependentOn("Pack-Release")
.Does(() =>
{
Test("Release");
Test("Debug");
});

Task("Pack-Release")
.IsDependentOn("Test-Release")
.Does(() =>
Task("Test-Release")
.IsDependentOn("Test-Debug")
.Does(() =>
{
Pack("Release");
Test("Release");
});

//////////////////////////////////////////////////////////////////////
// TASK TARGETS
//////////////////////////////////////////////////////////////////////

Task("Default")
.IsDependentOn("Pack-Release");
.IsDependentOn("Test-Release");

//////////////////////////////////////////////////////////////////////
// EXECUTION
Expand Down Expand Up @@ -107,18 +107,18 @@ private void Test(string cfg)
// NoResults = true
//});

const string flags = "--noheader --noresult";
const string flags = "--noheader --noresult --stoponerror";
const string errMsg = " - Unit test failure - ";

Parallel.ForEach(GetFiles("./test/**/bin/{cfg}/*/*.UnitTests.exe".Replace("{cfg}", cfg)), netExe =>
Parallel.ForEach(GetFiles("./test/*.UnitTests/**/bin/{cfg}/*/*.UnitTests.exe".Replace("{cfg}", cfg)), netExe =>
{
if (StartProcess(netExe, flags) != 0)
{
throw new Exception(cfg + errMsg + netExe);
}
});

Parallel.ForEach(GetFiles("./test/**/bin/{cfg}/*/*.UnitTests.dll".Replace("{cfg}", cfg)), netCoreDll =>
Parallel.ForEach(GetFiles("./test/*.UnitTests/**/bin/{cfg}/*/*.UnitTests.dll".Replace("{cfg}", cfg)), netCoreDll =>
{
DotNetCoreExecute(netCoreDll, flags);
});
Expand Down
Loading

0 comments on commit 8c144fe

Please sign in to comment.