From c1d4cda5b251880c8cd521fd48c443ba27b0facf Mon Sep 17 00:00:00 2001 From: Andreas Hakansson Date: Thu, 3 May 2012 10:55:33 +0200 Subject: [PATCH 1/3] Excluded self hosting tests on Mono They are a bit brittle and needs some loving --- src/Nancy.sln | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Nancy.sln b/src/Nancy.sln index c829d691ba..d60ce6ff42 100644 --- a/src/Nancy.sln +++ b/src/Nancy.sln @@ -657,10 +657,8 @@ Global {CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.Debug|Any CPU.Build.0 = Debug|Any CPU {CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.Debug|x86.ActiveCfg = Debug|Any CPU {CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.MonoDebug|Any CPU.ActiveCfg = MonoDebug|Any CPU - {CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.MonoDebug|Any CPU.Build.0 = MonoDebug|Any CPU {CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.MonoDebug|x86.ActiveCfg = Debug|Any CPU {CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.MonoRelease|Any CPU.ActiveCfg = MonoRelease|Any CPU - {CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.MonoRelease|Any CPU.Build.0 = MonoRelease|Any CPU {CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.MonoRelease|x86.ActiveCfg = Release|Any CPU {CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.Release|Any CPU.ActiveCfg = Release|Any CPU {CA24ED85-DD68-4C10-B80A-D81C6745FCB8}.Release|Any CPU.Build.0 = Release|Any CPU From 3d7990f9626b85fdcfd955aa7581d684d21020b3 Mon Sep 17 00:00:00 2001 From: Andreas Hakansson Date: Thu, 3 May 2012 11:24:06 +0200 Subject: [PATCH 2/3] Removed dependency on Nancy.Tests There was a reference to the Nancy.Tests project from the Nancy.Hosting.Self.Tests project, this meant that the rake would execute the Nancy.Tests tests twice --- .../Nancy.Hosting.Self.Tests.csproj | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.csproj b/src/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.csproj index f6f6123618..4c5ca1af31 100644 --- a/src/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.csproj +++ b/src/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.csproj @@ -83,6 +83,15 @@ + + ShouldExtensions.cs + + + SkipException.cs + + + SkippableFactAttribute.cs + Properties\SharedAssemblyInfo.cs @@ -96,10 +105,6 @@ {AA7F66EB-EC2C-47DE-855F-30B3E6EF2134} Nancy.Hosting.Self - - {776D244D-BC4D-4BBB-A478-CAF2D04520E1} - Nancy.Tests - {34576216-0DCA-4B0F-A0DC-9075E75A676F} Nancy From 09dfef341ae9d83245f658423375ff8d39e4397d Mon Sep 17 00:00:00 2001 From: Andreas Hakansson Date: Thu, 3 May 2012 11:25:59 +0200 Subject: [PATCH 3/3] Removed old NDjango engine reference --- .../Nancy.Demo.Hosting.Aspnet.csproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Nancy.Demo.Hosting.Aspnet/Nancy.Demo.Hosting.Aspnet.csproj b/src/Nancy.Demo.Hosting.Aspnet/Nancy.Demo.Hosting.Aspnet.csproj index 842e6aa32e..fa3e3b9c6f 100644 --- a/src/Nancy.Demo.Hosting.Aspnet/Nancy.Demo.Hosting.Aspnet.csproj +++ b/src/Nancy.Demo.Hosting.Aspnet/Nancy.Demo.Hosting.Aspnet.csproj @@ -149,10 +149,6 @@ {B795886D-9D70-45B1-BFB5-AD54CBC9A447} Nancy.ViewEngines.DotLiquid - - {D403684D-D1E1-43B4-B6D5-F67A85F85830} - Nancy.ViewEngines.NDjango - {A1A9E636-A37C-4170-B2E4-99D4F69B415D} Nancy.ViewEngines.Nustache