From e025e4cebe1688691eaed3894a518c3d39e8eac0 Mon Sep 17 00:00:00 2001 From: Marcos Meli Date: Tue, 16 Feb 2016 15:28:25 -0300 Subject: [PATCH 1/5] Fix invalid path in some references Did not work on a clean clone --- src/DocNet/Docnet.csproj | 2 +- src/MarkdownDeepTests/MarkdownDeepTests.csproj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DocNet/Docnet.csproj b/src/DocNet/Docnet.csproj index 416afce..062811f 100644 --- a/src/DocNet/Docnet.csproj +++ b/src/DocNet/Docnet.csproj @@ -34,7 +34,7 @@ - ..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll True diff --git a/src/MarkdownDeepTests/MarkdownDeepTests.csproj b/src/MarkdownDeepTests/MarkdownDeepTests.csproj index bce03b3..b6f60b0 100644 --- a/src/MarkdownDeepTests/MarkdownDeepTests.csproj +++ b/src/MarkdownDeepTests/MarkdownDeepTests.csproj @@ -42,13 +42,13 @@ - ..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll + ..\..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll - ..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll + ..\..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll - ..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll + ..\..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll From 64f680241446e4a8396b8003ed012f226e3340b1 Mon Sep 17 00:00:00 2001 From: Marcos Meli Date: Tue, 16 Feb 2016 15:31:41 -0300 Subject: [PATCH 2/5] Add Travis CI integration --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..d170ca9 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,9 @@ +sudo: false +language: csharp +solution: Docnet.sln +install: + - nuget restore Docnet.sln + - nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner +script: + - xbuild /p:Configuration=Debug Docnet.sln + - mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./src/MarkdownDeepTests/bin/Debug/MarkdownDeepTests.dll From ae2a49d613c86e61295ab54bc0fe034f14159b32 Mon Sep 17 00:00:00 2001 From: Marcos Meli Date: Tue, 16 Feb 2016 15:39:19 -0300 Subject: [PATCH 3/5] Using New Nunit Runners --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d170ca9..6a7db3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: csharp solution: Docnet.sln install: - nuget restore Docnet.sln - - nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner + - nuget install NUnit.Runners -Version 3.0.1 -OutputDirectory testrunner script: - xbuild /p:Configuration=Debug Docnet.sln - - mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./src/MarkdownDeepTests/bin/Debug/MarkdownDeepTests.dll + - mono ./testrunner/NUnit.Runners.3.0.1/tools/nunit-console.exe ./src/MarkdownDeepTests/bin/Debug/MarkdownDeepTests.dll From 4901f4a82a9969761b76985684ef7042842abafe Mon Sep 17 00:00:00 2001 From: Marcos Meli Date: Tue, 16 Feb 2016 15:47:02 -0300 Subject: [PATCH 4/5] Change the Target Framework to 4.5.2 to allow travis build --- src/DocNet/App.config | 6 +++--- src/DocNet/Docnet.csproj | 3 ++- src/MarkdownDeep/MarkdownDeep.csproj | 2 +- src/MarkdownDeepTests/MarkdownDeepTests.csproj | 2 +- src/MarkdownDeepTests/app.config | 8 ++++---- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/DocNet/App.config b/src/DocNet/App.config index 731f6de..8227adb 100644 --- a/src/DocNet/App.config +++ b/src/DocNet/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/src/DocNet/Docnet.csproj b/src/DocNet/Docnet.csproj index 062811f..c481ea9 100644 --- a/src/DocNet/Docnet.csproj +++ b/src/DocNet/Docnet.csproj @@ -9,9 +9,10 @@ Properties Docnet Docnet - v4.6.1 + v4.5.2 512 true + AnyCPU diff --git a/src/MarkdownDeep/MarkdownDeep.csproj b/src/MarkdownDeep/MarkdownDeep.csproj index aca5ccb..79b4a2b 100644 --- a/src/MarkdownDeep/MarkdownDeep.csproj +++ b/src/MarkdownDeep/MarkdownDeep.csproj @@ -10,7 +10,7 @@ Properties MarkdownDeep MarkdownDeep - v4.6.1 + v4.5.2 512 diff --git a/src/MarkdownDeepTests/MarkdownDeepTests.csproj b/src/MarkdownDeepTests/MarkdownDeepTests.csproj index b6f60b0..015c691 100644 --- a/src/MarkdownDeepTests/MarkdownDeepTests.csproj +++ b/src/MarkdownDeepTests/MarkdownDeepTests.csproj @@ -10,7 +10,7 @@ Properties MarkdownDeepTests MarkdownDeepTests - v4.6.1 + v4.5.2 512 diff --git a/src/MarkdownDeepTests/app.config b/src/MarkdownDeepTests/app.config index 4c17769..b477210 100644 --- a/src/MarkdownDeepTests/app.config +++ b/src/MarkdownDeepTests/app.config @@ -1,13 +1,13 @@ - + -
+
- + - \ No newline at end of file + From cf2d2f3d0aafc25affe3f656f2a8e5edc1761ac2 Mon Sep 17 00:00:00 2001 From: Marcos Meli Date: Tue, 16 Feb 2016 15:51:50 -0300 Subject: [PATCH 5/5] Change to Framework 4.5.1 to allow mono build --- src/DocNet/App.config | 2 +- src/DocNet/Docnet.csproj | 2 +- src/MarkdownDeep/MarkdownDeep.csproj | 2 +- src/MarkdownDeepTests/MarkdownDeepTests.csproj | 2 +- src/MarkdownDeepTests/app.config | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/DocNet/App.config b/src/DocNet/App.config index 8227adb..d0feca6 100644 --- a/src/DocNet/App.config +++ b/src/DocNet/App.config @@ -1,6 +1,6 @@ - + diff --git a/src/DocNet/Docnet.csproj b/src/DocNet/Docnet.csproj index c481ea9..ddf4452 100644 --- a/src/DocNet/Docnet.csproj +++ b/src/DocNet/Docnet.csproj @@ -9,7 +9,7 @@ Properties Docnet Docnet - v4.5.2 + v4.5.1 512 true diff --git a/src/MarkdownDeep/MarkdownDeep.csproj b/src/MarkdownDeep/MarkdownDeep.csproj index 79b4a2b..5835b29 100644 --- a/src/MarkdownDeep/MarkdownDeep.csproj +++ b/src/MarkdownDeep/MarkdownDeep.csproj @@ -10,7 +10,7 @@ Properties MarkdownDeep MarkdownDeep - v4.5.2 + v4.5.1 512 diff --git a/src/MarkdownDeepTests/MarkdownDeepTests.csproj b/src/MarkdownDeepTests/MarkdownDeepTests.csproj index 015c691..bd8066b 100644 --- a/src/MarkdownDeepTests/MarkdownDeepTests.csproj +++ b/src/MarkdownDeepTests/MarkdownDeepTests.csproj @@ -10,7 +10,7 @@ Properties MarkdownDeepTests MarkdownDeepTests - v4.5.2 + v4.5.1 512 diff --git a/src/MarkdownDeepTests/app.config b/src/MarkdownDeepTests/app.config index b477210..d0d241d 100644 --- a/src/MarkdownDeepTests/app.config +++ b/src/MarkdownDeepTests/app.config @@ -10,4 +10,4 @@ - +