Skip to content

Commit 0d366d9

Browse files
committed
Merge branch 'develop'
2 parents ad15d08 + c0b4944 commit 0d366d9

File tree

7 files changed

+4
-167
lines changed

7 files changed

+4
-167
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ cache: apt
66

77
script:
88
- xbuild /p:Configuration=Release IntegrationEngine.sln
9-
- mono ./packages/NUnit.Runners.2.6.4/tools/nunit-console.exe ./IntegrationEngine.Model.Tests/bin/Debug/IntegrationEngine.Model.Tests.dll
10-
- mono ./packages/NUnit.Runners.2.6.4/tools/nunit-console.exe ./IntegrationEngine.Tests/bin/Debug/IntegrationEngine.Tests.dll
9+
- mono ./packages/NUnit.Runners.2.6.4/tools/nunit-console.exe ./IntegrationEngine.Model.Tests/bin/Release/IntegrationEngine.Model.Tests.dll
10+
- mono ./packages/NUnit.Runners.2.6.4/tools/nunit-console.exe ./IntegrationEngine.Tests/bin/Release/IntegrationEngine.Tests.dll

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,5 @@
1515
[travis]: https://travis-ci.org/ethanhann/InEngine.NET
1616
[masterWindows]: https://ci.appveyor.com/api/projects/status/github/ethanhann/inengine.net?branch=master&svg=true
1717
[developWindows]: https://ci.appveyor.com/api/projects/status/github/ethanhann/inengine.net?branch=develop&svg=true
18-
[masterLinux]: https://travis-ci.org/ethanhann/InEngine.NET.svg?branch=master?style=flat-square
19-
[developLinux]: https://travis-ci.org/ethanhann/InEngine.NET.svg?branch=develop?style=flat-square
20-
21-
18+
[masterLinux]: https://travis-ci.org/ethanhann/InEngine.NET.svg?branch=master&style=flat-square
19+
[developLinux]: https://travis-ci.org/ethanhann/InEngine.NET.svg?branch=develop&style=flat-square

UnitTesting/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

UnitTesting/TestBase.cs

Lines changed: 0 additions & 38 deletions
This file was deleted.

UnitTesting/TestBaseT.cs

Lines changed: 0 additions & 20 deletions
This file was deleted.

UnitTesting/UnitTesting.csproj

Lines changed: 0 additions & 63 deletions
This file was deleted.

UnitTesting/packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)