diff --git a/.gitignore b/.gitignore index 6b50213ac2..5eab063435 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,7 @@ build/ [Dd]ebug/ [Oo]bj/ [Rr]elease/ -_[Rr]e[Ss]harper.*/ +_[Rr]e[Ss]harper*/ *.docstates *.tss *.ncrunchproject diff --git a/src/Nancy.Authentication.Basic.Tests/BasicAuthenticationConfigurationFixture.cs b/src/Nancy.Authentication.Basic.Tests/BasicAuthenticationConfigurationFixture.cs index b0b9b54242..164fe06f08 100644 --- a/src/Nancy.Authentication.Basic.Tests/BasicAuthenticationConfigurationFixture.cs +++ b/src/Nancy.Authentication.Basic.Tests/BasicAuthenticationConfigurationFixture.cs @@ -1,11 +1,14 @@ -using System; -using FakeItEasy; -using Nancy.Tests; -using Xunit; - -namespace Nancy.Authentication.Basic.Tests +namespace Nancy.Authentication.Basic.Tests { - public class BasicAuthenticationConfigurationFixture + using System; + + using FakeItEasy; + + using Nancy.Tests; + + using Xunit; + + public class BasicAuthenticationConfigurationFixture { [Fact] public void Should_throw_with_null_user_validator() diff --git a/src/Nancy.Authentication.Basic.Tests/BasicAuthenticationFixture.cs b/src/Nancy.Authentication.Basic.Tests/BasicAuthenticationFixture.cs index 71b83a5966..49f0e77db3 100644 --- a/src/Nancy.Authentication.Basic.Tests/BasicAuthenticationFixture.cs +++ b/src/Nancy.Authentication.Basic.Tests/BasicAuthenticationFixture.cs @@ -4,13 +4,16 @@ using System.Collections.Generic; using System.Text; using System.Threading; + using FakeItEasy; + + using Nancy.Bootstrapper; using Nancy.Security; using Nancy.Tests; - using Xunit; - using Nancy.Bootstrapper; using Nancy.Tests.Fakes; + using Xunit; + public class BasicAuthenticationFixture { private readonly BasicAuthenticationConfiguration config; diff --git a/src/Nancy.Authentication.Basic/BasicAuthentication.cs b/src/Nancy.Authentication.Basic/BasicAuthentication.cs index bb628fa5e3..89ddc9be87 100644 --- a/src/Nancy.Authentication.Basic/BasicAuthentication.cs +++ b/src/Nancy.Authentication.Basic/BasicAuthentication.cs @@ -2,6 +2,7 @@ { using System; using System.Text; + using Nancy.Bootstrapper; using Nancy.Extensions; using Nancy.Security; diff --git a/src/Nancy.Authentication.Basic/BasicAuthenticationConfiguration.cs b/src/Nancy.Authentication.Basic/BasicAuthenticationConfiguration.cs index fdea6dc2ab..046ed0afc5 100644 --- a/src/Nancy.Authentication.Basic/BasicAuthenticationConfiguration.cs +++ b/src/Nancy.Authentication.Basic/BasicAuthenticationConfiguration.cs @@ -1,7 +1,7 @@ namespace Nancy.Authentication.Basic { using System; - + /// /// Configuration options for forms authentication /// @@ -13,7 +13,7 @@ public class BasicAuthenticationConfiguration /// A valid instance of class /// Basic authentication realm /// Control when the browser should be instructed to prompt for credentials - public BasicAuthenticationConfiguration(IUserValidator userValidator, string realm, UserPromptBehaviour userPromptBehaviour = Basic.UserPromptBehaviour.NonAjax) + public BasicAuthenticationConfiguration(IUserValidator userValidator, string realm, UserPromptBehaviour userPromptBehaviour = UserPromptBehaviour.NonAjax) { if (userValidator == null) { diff --git a/src/Nancy.Authentication.Basic/BasicHttpExtensions.cs b/src/Nancy.Authentication.Basic/BasicHttpExtensions.cs index 94b9d47644..c386e50b08 100644 --- a/src/Nancy.Authentication.Basic/BasicHttpExtensions.cs +++ b/src/Nancy.Authentication.Basic/BasicHttpExtensions.cs @@ -1,7 +1,7 @@ namespace Nancy.Authentication.Basic { using Nancy.Bootstrapper; - + /// /// Some simple helpers give some nice authentication syntax in the modules. /// diff --git a/src/Nancy.Authentication.Basic/IUserValidator.cs b/src/Nancy.Authentication.Basic/IUserValidator.cs index f2a676e85c..4149bc27e7 100644 --- a/src/Nancy.Authentication.Basic/IUserValidator.cs +++ b/src/Nancy.Authentication.Basic/IUserValidator.cs @@ -1,11 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -namespace Nancy.Authentication.Basic +namespace Nancy.Authentication.Basic { using Nancy.Security; - /// + /// /// Provides a way to validate the username and password /// public interface IUserValidator diff --git a/src/Nancy.Authentication.Forms.Tests/Fakes/FakeUserIdentity.cs b/src/Nancy.Authentication.Forms.Tests/Fakes/FakeUserIdentity.cs index aa385a3c6e..55538f7cde 100644 --- a/src/Nancy.Authentication.Forms.Tests/Fakes/FakeUserIdentity.cs +++ b/src/Nancy.Authentication.Forms.Tests/Fakes/FakeUserIdentity.cs @@ -1,7 +1,8 @@ namespace Nancy.Authentication.Forms.Tests.Fakes { using System.Collections.Generic; - using Security; + + using Nancy.Security; public class FakeUserIdentity : IUserIdentity { diff --git a/src/Nancy.Authentication.Forms.Tests/FormsAuthenticationConfigurationFixture.cs b/src/Nancy.Authentication.Forms.Tests/FormsAuthenticationConfigurationFixture.cs index 1acbb55521..776fcc92c5 100644 --- a/src/Nancy.Authentication.Forms.Tests/FormsAuthenticationConfigurationFixture.cs +++ b/src/Nancy.Authentication.Forms.Tests/FormsAuthenticationConfigurationFixture.cs @@ -4,6 +4,7 @@ namespace Nancy.Authentication.Forms.Tests using Nancy.Cryptography; using Nancy.Tests; + using Xunit; public class FormsAuthenticationConfigurationFixture diff --git a/src/Nancy.Authentication.Forms.Tests/FormsAuthenticationFixture.cs b/src/Nancy.Authentication.Forms.Tests/FormsAuthenticationFixture.cs index 89a6edcc29..cc4830ab78 100644 --- a/src/Nancy.Authentication.Forms.Tests/FormsAuthenticationFixture.cs +++ b/src/Nancy.Authentication.Forms.Tests/FormsAuthenticationFixture.cs @@ -3,14 +3,16 @@ namespace Nancy.Authentication.Forms.Tests using System; using System.Linq; using System.Threading; - using Bootstrapper; - using Cryptography; + using FakeItEasy; - using Fakes; - using Helpers; - using Nancy.Security; + + using Nancy.Authentication.Forms.Tests.Fakes; + using Nancy.Bootstrapper; + using Nancy.Cryptography; + using Nancy.Helpers; using Nancy.Tests; using Nancy.Tests.Fakes; + using Xunit; public class FormsAuthenticationFixture diff --git a/src/Nancy.Authentication.Forms/FormsAuthentication.cs b/src/Nancy.Authentication.Forms/FormsAuthentication.cs index f185e55e20..0b1e3861e0 100644 --- a/src/Nancy.Authentication.Forms/FormsAuthentication.cs +++ b/src/Nancy.Authentication.Forms/FormsAuthentication.cs @@ -1,11 +1,12 @@ namespace Nancy.Authentication.Forms { using System; - using Bootstrapper; - using Cookies; - using Cryptography; - using Helpers; + + using Nancy.Bootstrapper; + using Nancy.Cookies; + using Nancy.Cryptography; using Nancy.Extensions; + using Nancy.Helpers; using Nancy.Security; /// @@ -355,7 +356,7 @@ private static byte[] GenerateHmac(string encryptedCookie, FormsAuthenticationCo public static string DecryptAndValidateAuthenticationCookie(string cookieValue, FormsAuthenticationConfiguration configuration) { // TODO - shouldn't this be automatically decoded by nancy cookie when that change is made? - var decodedCookie = Helpers.HttpUtility.UrlDecode(cookieValue); + var decodedCookie = HttpUtility.UrlDecode(cookieValue); var hmacStringLength = Base64Helpers.GetBase64Length(configuration.CryptographyConfiguration.HmacProvider.HmacLength); diff --git a/src/Nancy.Authentication.Forms/FormsAuthenticationConfiguration.cs b/src/Nancy.Authentication.Forms/FormsAuthenticationConfiguration.cs index 35b1d50d6a..6236aacf85 100644 --- a/src/Nancy.Authentication.Forms/FormsAuthenticationConfiguration.cs +++ b/src/Nancy.Authentication.Forms/FormsAuthenticationConfiguration.cs @@ -1,6 +1,6 @@ namespace Nancy.Authentication.Forms { - using Cryptography; + using Nancy.Cryptography; /// /// Configuration options for forms authentication diff --git a/src/Nancy.Authentication.Forms/IUserMapper.cs b/src/Nancy.Authentication.Forms/IUserMapper.cs index 28f8834953..c0a66e6cb6 100644 --- a/src/Nancy.Authentication.Forms/IUserMapper.cs +++ b/src/Nancy.Authentication.Forms/IUserMapper.cs @@ -1,6 +1,7 @@ namespace Nancy.Authentication.Forms { using System; + using Nancy.Security; /// diff --git a/src/Nancy.Authentication.Forms/ModuleExtensions.cs b/src/Nancy.Authentication.Forms/ModuleExtensions.cs index 2a5ec70a3b..7dfddb47ff 100644 --- a/src/Nancy.Authentication.Forms/ModuleExtensions.cs +++ b/src/Nancy.Authentication.Forms/ModuleExtensions.cs @@ -1,7 +1,8 @@ namespace Nancy.Authentication.Forms { using System; - using Extensions; + + using Nancy.Extensions; /// /// Module extensions for login/logout of forms auth diff --git a/src/Nancy.Authentication.Stateless/StatelessAuthentication.cs b/src/Nancy.Authentication.Stateless/StatelessAuthentication.cs index 59b51a771c..65d48def64 100644 --- a/src/Nancy.Authentication.Stateless/StatelessAuthentication.cs +++ b/src/Nancy.Authentication.Stateless/StatelessAuthentication.cs @@ -1,6 +1,7 @@ namespace Nancy.Authentication.Stateless { using System; + using Nancy.Bootstrapper; /// diff --git a/src/Nancy.Authentication.Stateless/StatelessAuthenticationConfiguration.cs b/src/Nancy.Authentication.Stateless/StatelessAuthenticationConfiguration.cs index 69ca95355c..a1f1af6fe8 100644 --- a/src/Nancy.Authentication.Stateless/StatelessAuthenticationConfiguration.cs +++ b/src/Nancy.Authentication.Stateless/StatelessAuthenticationConfiguration.cs @@ -1,6 +1,7 @@ namespace Nancy.Authentication.Stateless { using System; + using Nancy.Security; /// diff --git a/src/Nancy.Authentication.Token.Tests/Storage/FileSystemTokenKeyStoreFixture.cs b/src/Nancy.Authentication.Token.Tests/Storage/FileSystemTokenKeyStoreFixture.cs index 66e110dfa3..d047db4c09 100644 --- a/src/Nancy.Authentication.Token.Tests/Storage/FileSystemTokenKeyStoreFixture.cs +++ b/src/Nancy.Authentication.Token.Tests/Storage/FileSystemTokenKeyStoreFixture.cs @@ -5,8 +5,10 @@ using System.IO; using System.Linq; using System.Text; + using Nancy.Authentication.Token.Storage; using Nancy.Testing.Fakes; + using Xunit; public class FileSystemTokenKeyStoreFixture diff --git a/src/Nancy.Authentication.Token.Tests/TokenAuthenticationConfigurationFixture.cs b/src/Nancy.Authentication.Token.Tests/TokenAuthenticationConfigurationFixture.cs index eab1fc55f4..65999ee00a 100644 --- a/src/Nancy.Authentication.Token.Tests/TokenAuthenticationConfigurationFixture.cs +++ b/src/Nancy.Authentication.Token.Tests/TokenAuthenticationConfigurationFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Authentication.Token.Tests { using System; + using Nancy.Tests; + using Xunit; public class TokenAuthenticationConfigurationFixture diff --git a/src/Nancy.Authentication.Token.Tests/TokenAuthenticationFixture.cs b/src/Nancy.Authentication.Token.Tests/TokenAuthenticationFixture.cs index 9b23e88f87..4e39b760f9 100644 --- a/src/Nancy.Authentication.Token.Tests/TokenAuthenticationFixture.cs +++ b/src/Nancy.Authentication.Token.Tests/TokenAuthenticationFixture.cs @@ -3,12 +3,14 @@ using System; using System.Collections.Generic; using System.Threading; + using FakeItEasy; + using Nancy.Bootstrapper; using Nancy.Security; using Nancy.Tests; - using Nancy.Bootstrapper; using Nancy.Tests.Fakes; + using Xunit; public class TokenAuthenticationFixture diff --git a/src/Nancy.Authentication.Token.Tests/TokenizerFixture.cs b/src/Nancy.Authentication.Token.Tests/TokenizerFixture.cs index a85590dfd5..b708c0b8c0 100644 --- a/src/Nancy.Authentication.Token.Tests/TokenizerFixture.cs +++ b/src/Nancy.Authentication.Token.Tests/TokenizerFixture.cs @@ -4,11 +4,14 @@ using System.Collections.Generic; using System.Text; using System.Threading; + + using FakeItEasy; + using Nancy.Authentication.Token.Storage; using Nancy.Security; using Nancy.Tests; using Nancy.Tests.Fakes; - using FakeItEasy; + using Xunit; public class TokenizerFixture diff --git a/src/Nancy.Authentication.Token/ITokenizer.cs b/src/Nancy.Authentication.Token/ITokenizer.cs index bc84a06b77..2d6655d940 100644 --- a/src/Nancy.Authentication.Token/ITokenizer.cs +++ b/src/Nancy.Authentication.Token/ITokenizer.cs @@ -1,6 +1,6 @@ namespace Nancy.Authentication.Token { - using Security; + using Nancy.Security; /// /// Encodes and decodes authorization tokens. diff --git a/src/Nancy.Authentication.Token/TokenAuthentication.cs b/src/Nancy.Authentication.Token/TokenAuthentication.cs index 78691bf6b8..040c27e008 100644 --- a/src/Nancy.Authentication.Token/TokenAuthentication.cs +++ b/src/Nancy.Authentication.Token/TokenAuthentication.cs @@ -1,6 +1,7 @@ namespace Nancy.Authentication.Token { using System; + using Nancy.Bootstrapper; using Nancy.Security; diff --git a/src/Nancy.Authentication.Token/Tokenizer.cs b/src/Nancy.Authentication.Token/Tokenizer.cs index 01e7c85ac8..062ab003c2 100644 --- a/src/Nancy.Authentication.Token/Tokenizer.cs +++ b/src/Nancy.Authentication.Token/Tokenizer.cs @@ -8,8 +8,8 @@ using System.Text; using Nancy.Authentication.Token.Storage; - using Nancy.Security; using Nancy.ErrorHandling; + using Nancy.Security; /// /// Default implementation of diff --git a/src/Nancy.Demo.Authentication.Basic/AuthenticationBootstrapper.cs b/src/Nancy.Demo.Authentication.Basic/AuthenticationBootstrapper.cs index d50a575fab..55163368a9 100644 --- a/src/Nancy.Demo.Authentication.Basic/AuthenticationBootstrapper.cs +++ b/src/Nancy.Demo.Authentication.Basic/AuthenticationBootstrapper.cs @@ -1,7 +1,7 @@ namespace Nancy.Demo.Authentication.Basic { using Nancy.Authentication.Basic; - using Bootstrapper; + using Nancy.Bootstrapper; using Nancy.TinyIoc; public class AuthenticationBootstrapper : DefaultNancyBootstrapper diff --git a/src/Nancy.Demo.Authentication.Basic/DemoUserIdentity.cs b/src/Nancy.Demo.Authentication.Basic/DemoUserIdentity.cs index af6e88f446..8c952c7161 100644 --- a/src/Nancy.Demo.Authentication.Basic/DemoUserIdentity.cs +++ b/src/Nancy.Demo.Authentication.Basic/DemoUserIdentity.cs @@ -1,6 +1,7 @@ namespace Nancy.Demo.Authentication.Basic { using System.Collections.Generic; + using Nancy.Security; public class DemoUserIdentity : IUserIdentity diff --git a/src/Nancy.Demo.Authentication.Forms.TestingDemo/LoginFixture.cs b/src/Nancy.Demo.Authentication.Forms.TestingDemo/LoginFixture.cs index 93dd22daf5..a2f126ce4a 100644 --- a/src/Nancy.Demo.Authentication.Forms.TestingDemo/LoginFixture.cs +++ b/src/Nancy.Demo.Authentication.Forms.TestingDemo/LoginFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Demo.Authentication.Forms.TestingDemo { using System; - using Testing; + + using Nancy.Testing; + using Xunit; public class LoginFixture diff --git a/src/Nancy.Demo.Authentication.Forms.TestingDemo/TestBootstrapper.cs b/src/Nancy.Demo.Authentication.Forms.TestingDemo/TestBootstrapper.cs index dd9e96c6c5..5fc52bf911 100644 --- a/src/Nancy.Demo.Authentication.Forms.TestingDemo/TestBootstrapper.cs +++ b/src/Nancy.Demo.Authentication.Forms.TestingDemo/TestBootstrapper.cs @@ -2,8 +2,9 @@ namespace Nancy.Demo.Authentication.Forms.TestingDemo { using System; using System.IO; + + using Nancy.Testing; using Nancy.Testing.Fakes; - using Testing; public class TestBootstrapper : FormsAuthBootstrapper { diff --git a/src/Nancy.Demo.Authentication.Forms/DemoUserIdentity.cs b/src/Nancy.Demo.Authentication.Forms/DemoUserIdentity.cs index 7319c073a1..6dbac58ae3 100644 --- a/src/Nancy.Demo.Authentication.Forms/DemoUserIdentity.cs +++ b/src/Nancy.Demo.Authentication.Forms/DemoUserIdentity.cs @@ -1,6 +1,7 @@ namespace Nancy.Demo.Authentication.Forms { using System.Collections.Generic; + using Nancy.Security; public class DemoUserIdentity : IUserIdentity diff --git a/src/Nancy.Demo.Authentication.Forms/FormsAuthBootstrapper.cs b/src/Nancy.Demo.Authentication.Forms/FormsAuthBootstrapper.cs index 3b9b121d89..3165a1037c 100644 --- a/src/Nancy.Demo.Authentication.Forms/FormsAuthBootstrapper.cs +++ b/src/Nancy.Demo.Authentication.Forms/FormsAuthBootstrapper.cs @@ -1,6 +1,5 @@ namespace Nancy.Demo.Authentication.Forms { - using Nancy; using Nancy.Authentication.Forms; using Nancy.Bootstrapper; using Nancy.TinyIoc; diff --git a/src/Nancy.Demo.Authentication.Forms/MainModule.cs b/src/Nancy.Demo.Authentication.Forms/MainModule.cs index fa0a1472a2..ff1a697cd7 100644 --- a/src/Nancy.Demo.Authentication.Forms/MainModule.cs +++ b/src/Nancy.Demo.Authentication.Forms/MainModule.cs @@ -2,7 +2,7 @@ namespace Nancy.Demo.Authentication.Forms { using System; using System.Dynamic; - using Nancy; + using Nancy.Authentication.Forms; using Nancy.Extensions; diff --git a/src/Nancy.Demo.Authentication.Forms/PartlySecureModule.cs b/src/Nancy.Demo.Authentication.Forms/PartlySecureModule.cs index 5bca6b051b..799422611e 100644 --- a/src/Nancy.Demo.Authentication.Forms/PartlySecureModule.cs +++ b/src/Nancy.Demo.Authentication.Forms/PartlySecureModule.cs @@ -1,6 +1,5 @@ namespace Nancy.Demo.Authentication.Forms { - using Nancy; using Nancy.Demo.Authentication.Forms.Models; using Nancy.Security; diff --git a/src/Nancy.Demo.Authentication.Forms/SecureModule.cs b/src/Nancy.Demo.Authentication.Forms/SecureModule.cs index d577d72bd5..057095646b 100644 --- a/src/Nancy.Demo.Authentication.Forms/SecureModule.cs +++ b/src/Nancy.Demo.Authentication.Forms/SecureModule.cs @@ -1,6 +1,5 @@ namespace Nancy.Demo.Authentication.Forms { - using Nancy; using Nancy.Demo.Authentication.Forms.Models; using Nancy.Security; diff --git a/src/Nancy.Demo.Authentication.Forms/UserDatabase.cs b/src/Nancy.Demo.Authentication.Forms/UserDatabase.cs index 9c91175245..fedd7247f1 100644 --- a/src/Nancy.Demo.Authentication.Forms/UserDatabase.cs +++ b/src/Nancy.Demo.Authentication.Forms/UserDatabase.cs @@ -3,6 +3,7 @@ namespace Nancy.Demo.Authentication.Forms using System; using System.Collections.Generic; using System.Linq; + using Nancy.Authentication.Forms; using Nancy.Security; diff --git a/src/Nancy.Demo.Authentication.Stateless/DemoUserIdentity.cs b/src/Nancy.Demo.Authentication.Stateless/DemoUserIdentity.cs index 18b66a6c94..703a41cb88 100644 --- a/src/Nancy.Demo.Authentication.Stateless/DemoUserIdentity.cs +++ b/src/Nancy.Demo.Authentication.Stateless/DemoUserIdentity.cs @@ -1,6 +1,7 @@ namespace Nancy.Demo.Authentication.Stateless { using System.Collections.Generic; + using Nancy.Security; public class DemoUserIdentity : IUserIdentity diff --git a/src/Nancy.Demo.Authentication.Stateless/StatelessAuthBootstrapper.cs b/src/Nancy.Demo.Authentication.Stateless/StatelessAuthBootstrapper.cs index a0df8adede..dd57c9154e 100644 --- a/src/Nancy.Demo.Authentication.Stateless/StatelessAuthBootstrapper.cs +++ b/src/Nancy.Demo.Authentication.Stateless/StatelessAuthBootstrapper.cs @@ -2,7 +2,6 @@ namespace Nancy.Demo.Authentication.Stateless { using Nancy.Authentication.Stateless; using Nancy.Bootstrapper; - using Nancy.Conventions; using Nancy.TinyIoc; public class StatelessAuthBootstrapper : DefaultNancyBootstrapper diff --git a/src/Nancy.Demo.Authentication.Stateless/UserDatabase.cs b/src/Nancy.Demo.Authentication.Stateless/UserDatabase.cs index 0ca2c4c411..ec3831a237 100644 --- a/src/Nancy.Demo.Authentication.Stateless/UserDatabase.cs +++ b/src/Nancy.Demo.Authentication.Stateless/UserDatabase.cs @@ -1,10 +1,11 @@ namespace Nancy.Demo.Authentication.Stateless { - using Nancy.Security; using System; using System.Collections.Generic; using System.Linq; + using Nancy.Security; + public class UserDatabase { static readonly List> ActiveApiKeys = new List>(); diff --git a/src/Nancy.Demo.Authentication.Token.TestingDemo/LoginFixture.cs b/src/Nancy.Demo.Authentication.Token.TestingDemo/LoginFixture.cs index edb31ed1d5..f83af7f801 100644 --- a/src/Nancy.Demo.Authentication.Token.TestingDemo/LoginFixture.cs +++ b/src/Nancy.Demo.Authentication.Token.TestingDemo/LoginFixture.cs @@ -1,8 +1,8 @@ namespace Nancy.Demo.Authentication.Token.TestingDemo { - using System; using Nancy.Testing; using Nancy.Tests; + using Xunit; public class LoginFixture diff --git a/src/Nancy.Demo.Authentication.Token.TestingDemo/TestBootstrapper.cs b/src/Nancy.Demo.Authentication.Token.TestingDemo/TestBootstrapper.cs index c3bed1f31f..ace6cb1cc6 100644 --- a/src/Nancy.Demo.Authentication.Token.TestingDemo/TestBootstrapper.cs +++ b/src/Nancy.Demo.Authentication.Token.TestingDemo/TestBootstrapper.cs @@ -2,15 +2,16 @@ namespace Nancy.Demo.Authentication.Token.TestingDemo { using System; using System.IO; + using Nancy.Authentication.Token; using Nancy.Authentication.Token.Storage; - using Nancy.Demo.Authentication.Token; - using Nancy.Testing.Fakes; using Nancy.Testing; + using Nancy.Testing.Fakes; + using Nancy.TinyIoc; public class TestBootstrapper : TokenAuthBootstrapper { - protected override void ConfigureApplicationContainer(TinyIoc.TinyIoCContainer container) + protected override void ConfigureApplicationContainer(TinyIoCContainer container) { container.Register(new Tokenizer(cfg => cfg.WithKeyCache(new InMemoryTokenKeyStore()))); } diff --git a/src/Nancy.Demo.Authentication.Token/AuthModule.cs b/src/Nancy.Demo.Authentication.Token/AuthModule.cs index 31997d9f03..9ab2aeb47a 100644 --- a/src/Nancy.Demo.Authentication.Token/AuthModule.cs +++ b/src/Nancy.Demo.Authentication.Token/AuthModule.cs @@ -1,7 +1,7 @@ namespace Nancy.Demo.Authentication.Token { using Nancy.Authentication.Token; - using Security; + using Nancy.Security; public class AuthModule : NancyModule { diff --git a/src/Nancy.Demo.Authentication.Token/DemoUserIdentity.cs b/src/Nancy.Demo.Authentication.Token/DemoUserIdentity.cs index db5d95807d..f8be8595b4 100644 --- a/src/Nancy.Demo.Authentication.Token/DemoUserIdentity.cs +++ b/src/Nancy.Demo.Authentication.Token/DemoUserIdentity.cs @@ -1,7 +1,8 @@ namespace Nancy.Demo.Authentication.Token { using System.Collections.Generic; - using Security; + + using Nancy.Security; public class DemoUserIdentity : IUserIdentity { diff --git a/src/Nancy.Demo.Authentication.Token/Program.cs b/src/Nancy.Demo.Authentication.Token/Program.cs index 79d83a9fdb..21893aa7cc 100644 --- a/src/Nancy.Demo.Authentication.Token/Program.cs +++ b/src/Nancy.Demo.Authentication.Token/Program.cs @@ -1,7 +1,8 @@ namespace Nancy.Demo.Authentication.Token { using System; - using Hosting.Self; + + using Nancy.Hosting.Self; class Program { diff --git a/src/Nancy.Demo.Authentication.Token/TokenAuthBootstrapper.cs b/src/Nancy.Demo.Authentication.Token/TokenAuthBootstrapper.cs index 9e48710989..1bf0be96d3 100644 --- a/src/Nancy.Demo.Authentication.Token/TokenAuthBootstrapper.cs +++ b/src/Nancy.Demo.Authentication.Token/TokenAuthBootstrapper.cs @@ -1,10 +1,8 @@ namespace Nancy.Demo.Authentication.Token { - using System.Linq; - using Nancy; using Nancy.Authentication.Token; using Nancy.Bootstrapper; - using TinyIoc; + using Nancy.TinyIoc; public class TokenAuthBootstrapper : DefaultNancyBootstrapper { diff --git a/src/Nancy.Demo.Authentication.Token/UserDatabase.cs b/src/Nancy.Demo.Authentication.Token/UserDatabase.cs index f8a141ba39..59e7008819 100644 --- a/src/Nancy.Demo.Authentication.Token/UserDatabase.cs +++ b/src/Nancy.Demo.Authentication.Token/UserDatabase.cs @@ -3,7 +3,8 @@ using System; using System.Collections.Generic; using System.Linq; - using Security; + + using Nancy.Security; public class UserDatabase { diff --git a/src/Nancy.Demo.Authentication/AnotherVerySecureModule.cs b/src/Nancy.Demo.Authentication/AnotherVerySecureModule.cs index ad3a1fe471..08d8530af1 100644 --- a/src/Nancy.Demo.Authentication/AnotherVerySecureModule.cs +++ b/src/Nancy.Demo.Authentication/AnotherVerySecureModule.cs @@ -1,6 +1,5 @@ namespace Nancy.Demo.Authentication { - using Nancy; using Nancy.Demo.Authentication.Models; using Nancy.Security; diff --git a/src/Nancy.Demo.Authentication/AuthenticationBootstrapper.cs b/src/Nancy.Demo.Authentication/AuthenticationBootstrapper.cs index 3a7503b3f5..8502e51a08 100644 --- a/src/Nancy.Demo.Authentication/AuthenticationBootstrapper.cs +++ b/src/Nancy.Demo.Authentication/AuthenticationBootstrapper.cs @@ -2,8 +2,8 @@ namespace Nancy.Demo.Authentication { using System; using System.Collections.Generic; - using Bootstrapper; - using Nancy; + + using Nancy.Bootstrapper; using Nancy.Responses; using Nancy.TinyIoc; diff --git a/src/Nancy.Demo.Authentication/DemoUserIdentity.cs b/src/Nancy.Demo.Authentication/DemoUserIdentity.cs index 65fe701242..f98f01798a 100644 --- a/src/Nancy.Demo.Authentication/DemoUserIdentity.cs +++ b/src/Nancy.Demo.Authentication/DemoUserIdentity.cs @@ -1,6 +1,7 @@ namespace Nancy.Demo.Authentication { using System.Collections.Generic; + using Nancy.Security; public class DemoUserIdentity : IUserIdentity diff --git a/src/Nancy.Demo.Authentication/MainModule.cs b/src/Nancy.Demo.Authentication/MainModule.cs index 39af68c4e2..b7ace73db9 100644 --- a/src/Nancy.Demo.Authentication/MainModule.cs +++ b/src/Nancy.Demo.Authentication/MainModule.cs @@ -1,7 +1,5 @@ namespace Nancy.Demo.Authentication { - using Nancy; - public class MainModule : NancyModule { public MainModule() diff --git a/src/Nancy.Demo.Authentication/SecureModule.cs b/src/Nancy.Demo.Authentication/SecureModule.cs index 5e490df161..e2f371ee58 100644 --- a/src/Nancy.Demo.Authentication/SecureModule.cs +++ b/src/Nancy.Demo.Authentication/SecureModule.cs @@ -1,6 +1,5 @@ namespace Nancy.Demo.Authentication { - using Nancy; using Nancy.Demo.Authentication.Models; using Nancy.Security; diff --git a/src/Nancy.Demo.Authentication/VerySecureModule.cs b/src/Nancy.Demo.Authentication/VerySecureModule.cs index 4df52f9f98..793695318f 100644 --- a/src/Nancy.Demo.Authentication/VerySecureModule.cs +++ b/src/Nancy.Demo.Authentication/VerySecureModule.cs @@ -1,7 +1,7 @@ namespace Nancy.Demo.Authentication { using System.Linq; - using Nancy; + using Nancy.Demo.Authentication.Models; using Nancy.Security; diff --git a/src/Nancy.Demo.Bootstrapper.Aspnet/Bootstrapper.cs b/src/Nancy.Demo.Bootstrapper.Aspnet/Bootstrapper.cs index 6b96b71138..1b030c8cb2 100644 --- a/src/Nancy.Demo.Bootstrapper.Aspnet/Bootstrapper.cs +++ b/src/Nancy.Demo.Bootstrapper.Aspnet/Bootstrapper.cs @@ -1,7 +1,5 @@ namespace Nancy.AspNetBootstrapperDemo { - using System; - using Nancy.Demo.Bootstrapping.Aspnet; using Nancy.Hosting.Aspnet; using Nancy.TinyIoc; diff --git a/src/Nancy.Demo.Bootstrapper.Aspnet/DependencyModule.cs b/src/Nancy.Demo.Bootstrapper.Aspnet/DependencyModule.cs index a1b72babda..8bb6f55bc7 100644 --- a/src/Nancy.Demo.Bootstrapper.Aspnet/DependencyModule.cs +++ b/src/Nancy.Demo.Bootstrapper.Aspnet/DependencyModule.cs @@ -1,6 +1,5 @@ namespace Nancy.Demo.Bootstrapping.Aspnet { - using Nancy.AspNetBootstrapperDemo; using Nancy.Demo.Bootstrapping.Aspnet.Models; public class DependencyModule : NancyModule diff --git a/src/Nancy.Demo.Caching/CachedResponse.cs b/src/Nancy.Demo.Caching/CachedResponse.cs index 8663d31892..2ab0011bd0 100644 --- a/src/Nancy.Demo.Caching/CachedResponse.cs +++ b/src/Nancy.Demo.Caching/CachedResponse.cs @@ -3,7 +3,6 @@ using System; using System.IO; using System.Text; - using Nancy; /// /// Wraps a regular response in a cached response diff --git a/src/Nancy.Demo.Caching/CachingBootstrapper.cs b/src/Nancy.Demo.Caching/CachingBootstrapper.cs index c3560ce7f0..01e6d65dfa 100644 --- a/src/Nancy.Demo.Caching/CachingBootstrapper.cs +++ b/src/Nancy.Demo.Caching/CachingBootstrapper.cs @@ -2,8 +2,8 @@ namespace Nancy.Demo.Caching { using System; using System.Collections.Generic; - using Bootstrapper; - using Nancy; + + using Nancy.Bootstrapper; using Nancy.Demo.Caching.CachingExtensions; using Nancy.TinyIoc; diff --git a/src/Nancy.Demo.Caching/CachingExtensions/ContextExtensions.cs b/src/Nancy.Demo.Caching/CachingExtensions/ContextExtensions.cs index 7be9140247..f70649c48d 100644 --- a/src/Nancy.Demo.Caching/CachingExtensions/ContextExtensions.cs +++ b/src/Nancy.Demo.Caching/CachingExtensions/ContextExtensions.cs @@ -1,7 +1,5 @@ namespace Nancy.Demo.Caching.CachingExtensions { - using Nancy; - public static class ContextExtensions { public const string OUTPUT_CACHE_TIME_KEY = "OUTPUT_CACHE_TIME"; diff --git a/src/Nancy.Demo.Caching/MainModule.cs b/src/Nancy.Demo.Caching/MainModule.cs index 15f9fa8bc0..a92f8d8a05 100644 --- a/src/Nancy.Demo.Caching/MainModule.cs +++ b/src/Nancy.Demo.Caching/MainModule.cs @@ -1,7 +1,7 @@ namespace Nancy.Demo.Caching { using System; - using Nancy; + using Nancy.Demo.Caching.CachingExtensions; public class MainModule : NancyModule diff --git a/src/Nancy.Demo.CustomModule/UglifiedNancyModule.cs b/src/Nancy.Demo.CustomModule/UglifiedNancyModule.cs index 9b30d5f5eb..323388e842 100644 --- a/src/Nancy.Demo.CustomModule/UglifiedNancyModule.cs +++ b/src/Nancy.Demo.CustomModule/UglifiedNancyModule.cs @@ -2,9 +2,7 @@ { using System; using System.Collections.Generic; - using System.IO; using System.Linq; - using System.Linq.Expressions; using System.Reflection; using System.Threading; using System.Threading.Tasks; diff --git a/src/Nancy.Demo.Hosting.Aspnet/DefaultRouteMetadataProvider.cs b/src/Nancy.Demo.Hosting.Aspnet/DefaultRouteMetadataProvider.cs index 2cd4d2660b..39104f0707 100644 --- a/src/Nancy.Demo.Hosting.Aspnet/DefaultRouteMetadataProvider.cs +++ b/src/Nancy.Demo.Hosting.Aspnet/DefaultRouteMetadataProvider.cs @@ -1,6 +1,7 @@ namespace Nancy.Demo.Hosting.Aspnet { using System.Collections.Generic; + using Nancy.Routing; public class DefaultRouteMetadataProvider : RouteMetadataProvider diff --git a/src/Nancy.Demo.Hosting.Aspnet/DemoBootstrapper.cs b/src/Nancy.Demo.Hosting.Aspnet/DemoBootstrapper.cs index 9c80b025f4..bb13551732 100644 --- a/src/Nancy.Demo.Hosting.Aspnet/DemoBootstrapper.cs +++ b/src/Nancy.Demo.Hosting.Aspnet/DemoBootstrapper.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; - using Bootstrapper; - using Conventions; + + using Nancy.Bootstrapper; + using Nancy.Conventions; using Nancy.Diagnostics; using Nancy.Security; using Nancy.Session; diff --git a/src/Nancy.Demo.Hosting.Aspnet/MainModule.cs b/src/Nancy.Demo.Hosting.Aspnet/MainModule.cs index 3886bfeeb3..de88e8bbcc 100644 --- a/src/Nancy.Demo.Hosting.Aspnet/MainModule.cs +++ b/src/Nancy.Demo.Hosting.Aspnet/MainModule.cs @@ -6,7 +6,7 @@ namespace Nancy.Demo.Hosting.Aspnet using Nancy.Demo.Hosting.Aspnet.Metadata; using Nancy.Demo.Hosting.Aspnet.Models; using Nancy.Routing; - using Security; + using Nancy.Security; public class MainModule : NancyModule { diff --git a/src/Nancy.Demo.Hosting.Aspnet/Resources/Menu.Designer.cs b/src/Nancy.Demo.Hosting.Aspnet/Resources/Menu.Designer.cs index 05de51d259..a49d560513 100644 --- a/src/Nancy.Demo.Hosting.Aspnet/Resources/Menu.Designer.cs +++ b/src/Nancy.Demo.Hosting.Aspnet/Resources/Menu.Designer.cs @@ -9,9 +9,14 @@ //------------------------------------------------------------------------------ namespace Nancy.Demo.Hosting.Aspnet.Resources { - using System; - - + using System.CodeDom.Compiler; + using System.ComponentModel; + using System.Diagnostics; + using System.Diagnostics.CodeAnalysis; + using System.Globalization; + using System.Resources; + using System.Runtime.CompilerServices; + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,27 +24,27 @@ namespace Nancy.Demo.Hosting.Aspnet.Resources { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [DebuggerNonUserCode()] + [CompilerGenerated()] internal class Menu { - private static global::System.Resources.ResourceManager resourceMan; + private static ResourceManager resourceMan; - private static global::System.Globalization.CultureInfo resourceCulture; + private static CultureInfo resourceCulture; - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Menu() { } /// /// Returns the cached ResourceManager instance used by this class. /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { + [EditorBrowsable(EditorBrowsableState.Advanced)] + internal static ResourceManager ResourceManager { get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Nancy.Demo.Hosting.Aspnet.Resources.Menu", typeof(Menu).Assembly); + if (ReferenceEquals(resourceMan, null)) { + ResourceManager temp = new ResourceManager("Nancy.Demo.Hosting.Aspnet.Resources.Menu", typeof(Menu).Assembly); resourceMan = temp; } return resourceMan; @@ -50,8 +55,8 @@ internal Menu() { /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { + [EditorBrowsable(EditorBrowsableState.Advanced)] + internal static CultureInfo Culture { get { return resourceCulture; } diff --git a/src/Nancy.Demo.Hosting.Aspnet/Views/meta.cshtml b/src/Nancy.Demo.Hosting.Aspnet/Views/meta.cshtml index 2e349b7aa9..3900cc1b66 100644 --- a/src/Nancy.Demo.Hosting.Aspnet/Views/meta.cshtml +++ b/src/Nancy.Demo.Hosting.Aspnet/Views/meta.cshtml @@ -1,5 +1,4 @@ -@using Nancy.Demo.Hosting.Aspnet -@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase> +@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase> diff --git a/src/Nancy.Demo.Hosting.Aspnet/Views/uber-meta.cshtml b/src/Nancy.Demo.Hosting.Aspnet/Views/uber-meta.cshtml index f073ccf8ef..7810eb68a4 100644 --- a/src/Nancy.Demo.Hosting.Aspnet/Views/uber-meta.cshtml +++ b/src/Nancy.Demo.Hosting.Aspnet/Views/uber-meta.cshtml @@ -1,5 +1,4 @@ -@using Nancy.Demo.Hosting.Aspnet.Metadata -@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase> +@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase> diff --git a/src/Nancy.Demo.Hosting.Wcf/MainModule.cs b/src/Nancy.Demo.Hosting.Wcf/MainModule.cs index cd8c474564..d664159ef2 100644 --- a/src/Nancy.Demo.Hosting.Wcf/MainModule.cs +++ b/src/Nancy.Demo.Hosting.Wcf/MainModule.cs @@ -1,7 +1,5 @@ namespace Nancy.Demo.Hosting.Wcf { - using Nancy; - public class MainModule : NancyModule { public MainModule() diff --git a/src/Nancy.Demo.Hosting.Wcf/Program.cs b/src/Nancy.Demo.Hosting.Wcf/Program.cs index 121a2f6fce..517df96e25 100644 --- a/src/Nancy.Demo.Hosting.Wcf/Program.cs +++ b/src/Nancy.Demo.Hosting.Wcf/Program.cs @@ -3,6 +3,7 @@ using System; using System.ServiceModel; using System.ServiceModel.Web; + using Nancy.Hosting.Wcf; class Program diff --git a/src/Nancy.Demo.MarkdownViewEngine/Model/BlogModel.cs b/src/Nancy.Demo.MarkdownViewEngine/Model/BlogModel.cs index 93c1bb81e4..a570893d7a 100644 --- a/src/Nancy.Demo.MarkdownViewEngine/Model/BlogModel.cs +++ b/src/Nancy.Demo.MarkdownViewEngine/Model/BlogModel.cs @@ -4,7 +4,9 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; + using System.Text; using System.Text.RegularExpressions; + using MarkdownSharp; [Serializable] @@ -36,8 +38,8 @@ public string FriendlyDate public BlogModel(string markdown) { string metadata = markdown.Contains("@Tags") - ? markdown.Substring(markdown.IndexOf("@Tags", System.StringComparison.Ordinal) + 5, - markdown.IndexOf("@EndTags", System.StringComparison.Ordinal) - 7) + ? markdown.Substring(markdown.IndexOf("@Tags", StringComparison.Ordinal) + 5, + markdown.IndexOf("@EndTags", StringComparison.Ordinal) - 7) : string.Empty; var metadataSplit = metadata.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries); @@ -94,14 +96,14 @@ private string GetAbstract(string content) if (content.Contains("@Tags")) { - content = content.Substring(content.IndexOf("@EndTags", System.StringComparison.Ordinal) + 8); + content = content.Substring(content.IndexOf("@EndTags", StringComparison.Ordinal) + 8); } string ssveRemoved = SSVESubstitution.Replace(content, "").Trim(); var abstractpost = ssveRemoved.Substring(0, 175).Trim(); var html = parser.Transform(abstractpost); html = html + "

Read More..."; - return html.Substring(html.IndexOf("

", System.StringComparison.Ordinal)); + return html.Substring(html.IndexOf("

", StringComparison.Ordinal)); } private string GenerateSlug(char spacer = '-', bool removeStopWords = false) @@ -124,8 +126,8 @@ private string GenerateSlug(char spacer = '-', bool removeStopWords = false) public string RemoveAccent(string txt) { - byte[] bytes = System.Text.Encoding.GetEncoding("Cyrillic").GetBytes(txt); - return System.Text.Encoding.ASCII.GetString(bytes); + byte[] bytes = Encoding.GetEncoding("Cyrillic").GetBytes(txt); + return Encoding.ASCII.GetString(bytes); } } } \ No newline at end of file diff --git a/src/Nancy.Demo.MarkdownViewEngine/Modules/HomeModule.cs b/src/Nancy.Demo.MarkdownViewEngine/Modules/HomeModule.cs index a0541b7f88..6f6efbaaa7 100644 --- a/src/Nancy.Demo.MarkdownViewEngine/Modules/HomeModule.cs +++ b/src/Nancy.Demo.MarkdownViewEngine/Modules/HomeModule.cs @@ -4,7 +4,8 @@ namespace Nancy.Demo.MarkdownViewEngine.Modules using System.Collections.Generic; using System.Dynamic; using System.Linq; - using ViewEngines; + + using Nancy.ViewEngines; public class HomeModule : NancyModule { diff --git a/src/Nancy.Demo.ModelBinding/CustomersModule.cs b/src/Nancy.Demo.ModelBinding/CustomersModule.cs index 3a91f67f80..d4289eb231 100644 --- a/src/Nancy.Demo.ModelBinding/CustomersModule.cs +++ b/src/Nancy.Demo.ModelBinding/CustomersModule.cs @@ -1,9 +1,10 @@ namespace Nancy.BindingDemo { using System.Linq; - using Demo.ModelBinding.Database; - using Demo.ModelBinding.Models; - using ModelBinding; + + using Nancy.Demo.ModelBinding.Database; + using Nancy.Demo.ModelBinding.Models; + using Nancy.ModelBinding; public class CustomersModule : NancyModule { diff --git a/src/Nancy.Demo.ModelBinding/Database/DB.cs b/src/Nancy.Demo.ModelBinding/Database/DB.cs index cc6713a560..8864f19728 100644 --- a/src/Nancy.Demo.ModelBinding/Database/DB.cs +++ b/src/Nancy.Demo.ModelBinding/Database/DB.cs @@ -1,7 +1,8 @@ namespace Nancy.Demo.ModelBinding.Database { using System.Collections.Generic; - using Models; + + using Nancy.Demo.ModelBinding.Models; public static class DB { diff --git a/src/Nancy.Demo.ModelBinding/EventsModule.cs b/src/Nancy.Demo.ModelBinding/EventsModule.cs index 035fd7aed4..e8c953ef53 100644 --- a/src/Nancy.Demo.ModelBinding/EventsModule.cs +++ b/src/Nancy.Demo.ModelBinding/EventsModule.cs @@ -1,8 +1,9 @@ namespace Nancy.Demo.ModelBinding { using System.Linq; - using Database; - using Models; + + using Nancy.Demo.ModelBinding.Database; + using Nancy.Demo.ModelBinding.Models; using Nancy.ModelBinding; public class EventsModule : NancyModule diff --git a/src/Nancy.Demo.ModelBinding/JsonModule.cs b/src/Nancy.Demo.ModelBinding/JsonModule.cs index bf1977e4e7..b436d0dd6d 100644 --- a/src/Nancy.Demo.ModelBinding/JsonModule.cs +++ b/src/Nancy.Demo.ModelBinding/JsonModule.cs @@ -1,7 +1,8 @@ namespace Nancy.Demo.ModelBinding { using System.Text; - using Models; + + using Nancy.Demo.ModelBinding.Models; using Nancy.ModelBinding; public class JsonModule : NancyModule diff --git a/src/Nancy.Demo.ModelBinding/ModelBinders/CustomerModelBinder.cs b/src/Nancy.Demo.ModelBinding/ModelBinders/CustomerModelBinder.cs index 8323513cbd..e97cb2b673 100644 --- a/src/Nancy.Demo.ModelBinding/ModelBinders/CustomerModelBinder.cs +++ b/src/Nancy.Demo.ModelBinding/ModelBinders/CustomerModelBinder.cs @@ -1,7 +1,8 @@ namespace Nancy.Demo.ModelBinding.ModelBinders { using System; - using Models; + + using Nancy.Demo.ModelBinding.Models; using Nancy.ModelBinding; ///

diff --git a/src/Nancy.Demo.ModelBinding/ModelBindingBootstrapper.cs b/src/Nancy.Demo.ModelBinding/ModelBindingBootstrapper.cs index 7e3543a265..b3242b40b9 100644 --- a/src/Nancy.Demo.ModelBinding/ModelBindingBootstrapper.cs +++ b/src/Nancy.Demo.ModelBinding/ModelBindingBootstrapper.cs @@ -1,8 +1,5 @@ namespace Nancy.Demo.ModelBinding { - using Nancy.Demo.ModelBinding.ModelBinders; - using Nancy.ModelBinding; - public class ModelBindingBootstrapper : DefaultNancyBootstrapper { } diff --git a/src/Nancy.Demo.ModelBinding/XmlModule.cs b/src/Nancy.Demo.ModelBinding/XmlModule.cs index bef68f6e53..3935c633be 100644 --- a/src/Nancy.Demo.ModelBinding/XmlModule.cs +++ b/src/Nancy.Demo.ModelBinding/XmlModule.cs @@ -1,7 +1,8 @@ namespace Nancy.Demo.ModelBinding { using System.Text; - using Models; + + using Nancy.Demo.ModelBinding.Models; using Nancy.ModelBinding; public class XmlModule : NancyModule diff --git a/src/Nancy.Demo.Razor.Localization/CustomResourceAssemblyProvider.cs b/src/Nancy.Demo.Razor.Localization/CustomResourceAssemblyProvider.cs index 28ea3e2e5e..24f6905c1b 100644 --- a/src/Nancy.Demo.Razor.Localization/CustomResourceAssemblyProvider.cs +++ b/src/Nancy.Demo.Razor.Localization/CustomResourceAssemblyProvider.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; - using Bootstrapper; + + using Nancy.Bootstrapper; /// /// Use a custom because the default one ignores any diff --git a/src/Nancy.Demo.Razor.Localization/DemoBoostrapper.cs b/src/Nancy.Demo.Razor.Localization/DemoBoostrapper.cs index c0e05df367..6dd78d2f37 100644 --- a/src/Nancy.Demo.Razor.Localization/DemoBoostrapper.cs +++ b/src/Nancy.Demo.Razor.Localization/DemoBoostrapper.cs @@ -1,6 +1,6 @@ namespace Nancy.Demo.Razor.Localization { - using Bootstrapper; + using Nancy.Bootstrapper; public class DemoBoostrapper : DefaultNancyBootstrapper { diff --git a/src/Nancy.Demo.Razor.Localization/Resources/Text.Designer.cs b/src/Nancy.Demo.Razor.Localization/Resources/Text.Designer.cs index 9aca5e1d44..539bec79ac 100644 --- a/src/Nancy.Demo.Razor.Localization/Resources/Text.Designer.cs +++ b/src/Nancy.Demo.Razor.Localization/Resources/Text.Designer.cs @@ -9,9 +9,14 @@ //------------------------------------------------------------------------------ namespace Nancy.Demo.Razor.Localization.Resources { - using System; - - + using System.CodeDom.Compiler; + using System.ComponentModel; + using System.Diagnostics; + using System.Diagnostics.CodeAnalysis; + using System.Globalization; + using System.Resources; + using System.Runtime.CompilerServices; + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,27 +24,27 @@ namespace Nancy.Demo.Razor.Localization.Resources { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [DebuggerNonUserCode()] + [CompilerGenerated()] public class Text { - private static global::System.Resources.ResourceManager resourceMan; + private static ResourceManager resourceMan; - private static global::System.Globalization.CultureInfo resourceCulture; + private static CultureInfo resourceCulture; - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Text() { } /// /// Returns the cached ResourceManager instance used by this class. /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { + [EditorBrowsable(EditorBrowsableState.Advanced)] + public static ResourceManager ResourceManager { get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Nancy.Demo.Razor.Localization.Resources.Text", typeof(Text).Assembly); + if (ReferenceEquals(resourceMan, null)) { + ResourceManager temp = new ResourceManager("Nancy.Demo.Razor.Localization.Resources.Text", typeof(Text).Assembly); resourceMan = temp; } return resourceMan; @@ -50,8 +55,8 @@ internal Text() { /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { + [EditorBrowsable(EditorBrowsableState.Advanced)] + public static CultureInfo Culture { get { return resourceCulture; } diff --git a/src/Nancy.Demo.SuperSimpleViewEngine/Models/MainModel.cs b/src/Nancy.Demo.SuperSimpleViewEngine/Models/MainModel.cs index 4de399e2b1..d0bc46bb19 100644 --- a/src/Nancy.Demo.SuperSimpleViewEngine/Models/MainModel.cs +++ b/src/Nancy.Demo.SuperSimpleViewEngine/Models/MainModel.cs @@ -1,6 +1,5 @@ namespace Nancy.Demo.SuperSimpleViewEngine.Models { - using System; using System.Collections.Generic; public class MainModel diff --git a/src/Nancy.Demo.Validation/CustomersModule.cs b/src/Nancy.Demo.Validation/CustomersModule.cs index 5a4f59d8db..92bb6c9c04 100644 --- a/src/Nancy.Demo.Validation/CustomersModule.cs +++ b/src/Nancy.Demo.Validation/CustomersModule.cs @@ -1,10 +1,11 @@ namespace Nancy.Demo.Validation { using System.Linq; - using ModelBinding; + + using Nancy.Demo.Validation.Database; + using Nancy.Demo.Validation.Models; + using Nancy.ModelBinding; using Nancy.Validation; - using Database; - using Models; public class CustomersModule : NancyModule { diff --git a/src/Nancy.Demo.Validation/Database/DB.cs b/src/Nancy.Demo.Validation/Database/DB.cs index 95e25f1563..1deddaea69 100644 --- a/src/Nancy.Demo.Validation/Database/DB.cs +++ b/src/Nancy.Demo.Validation/Database/DB.cs @@ -1,7 +1,8 @@ namespace Nancy.Demo.Validation.Database { using System.Collections.Generic; - using Models; + + using Nancy.Demo.Validation.Models; public static class DB { diff --git a/src/Nancy.Demo.Validation/Models/OddLengthStringAttributeAdapter.cs b/src/Nancy.Demo.Validation/Models/OddLengthStringAttributeAdapter.cs index 181857cff0..91c35f98e3 100644 --- a/src/Nancy.Demo.Validation/Models/OddLengthStringAttributeAdapter.cs +++ b/src/Nancy.Demo.Validation/Models/OddLengthStringAttributeAdapter.cs @@ -1,6 +1,7 @@ namespace Nancy.Demo.Validation.Models { using System.ComponentModel.DataAnnotations; + using Nancy.Validation.DataAnnotations; public class OddLengthStringAttributeAdapter : DataAnnotationsValidatorAdapter diff --git a/src/Nancy.Demo.Validation/Models/Product.cs b/src/Nancy.Demo.Validation/Models/Product.cs index bb393dcbf7..435b9b5215 100644 --- a/src/Nancy.Demo.Validation/Models/Product.cs +++ b/src/Nancy.Demo.Validation/Models/Product.cs @@ -2,9 +2,11 @@ { using System; using System.Collections.Generic; + using FluentValidation; using FluentValidation.Internal; using FluentValidation.Validators; + using Nancy.Validation; using Nancy.Validation.FluentValidation; diff --git a/src/Nancy.Demo.Validation/ProductsModule.cs b/src/Nancy.Demo.Validation/ProductsModule.cs index 03d14476a1..c41753a196 100644 --- a/src/Nancy.Demo.Validation/ProductsModule.cs +++ b/src/Nancy.Demo.Validation/ProductsModule.cs @@ -1,7 +1,7 @@ namespace Nancy.Demo.Validation { - using ModelBinding; - using Models; + using Nancy.Demo.Validation.Models; + using Nancy.ModelBinding; using Nancy.Validation; public class ProductsModule : NancyModule diff --git a/src/Nancy.Embedded.Tests/Unit/EmbeddedStaticContentConventionBuilderFixture.cs b/src/Nancy.Embedded.Tests/Unit/EmbeddedStaticContentConventionBuilderFixture.cs index 8796013cb5..0a70bb6690 100644 --- a/src/Nancy.Embedded.Tests/Unit/EmbeddedStaticContentConventionBuilderFixture.cs +++ b/src/Nancy.Embedded.Tests/Unit/EmbeddedStaticContentConventionBuilderFixture.cs @@ -1,15 +1,14 @@ namespace Nancy.Embedded.Tests.Unit { - using System; using System.IO; - using System.Linq; using System.Reflection; using System.Text; - using Conventions; using Nancy.Diagnostics; + using Nancy.Embedded.Conventions; + using Nancy.Responses; using Nancy.Tests; - using Responses; + using Xunit; public class EmbeddedStaticContentConventionBuilderFixture diff --git a/src/Nancy.Embedded/Conventions/EmbeddedStaticContentConventionBuilder.cs b/src/Nancy.Embedded/Conventions/EmbeddedStaticContentConventionBuilder.cs index 904396dddb..b47acd2ddd 100644 --- a/src/Nancy.Embedded/Conventions/EmbeddedStaticContentConventionBuilder.cs +++ b/src/Nancy.Embedded/Conventions/EmbeddedStaticContentConventionBuilder.cs @@ -6,8 +6,9 @@ using System.Linq; using System.Reflection; using System.Text.RegularExpressions; - using Helpers; - using Responses; + + using Nancy.Helpers; + using Nancy.Responses; public class EmbeddedStaticContentConventionBuilder { diff --git a/src/Nancy.Encryption.MachineKey/MachineKeyHmacProvider.cs b/src/Nancy.Encryption.MachineKey/MachineKeyHmacProvider.cs index 6ac1cfb8e6..77d197ae40 100644 --- a/src/Nancy.Encryption.MachineKey/MachineKeyHmacProvider.cs +++ b/src/Nancy.Encryption.MachineKey/MachineKeyHmacProvider.cs @@ -2,6 +2,7 @@ { using System; using System.Configuration; + using System.Globalization; using System.Linq; using System.Reflection; using System.Text; @@ -94,7 +95,7 @@ private static byte[] HexStringToByteArray(string data) { var numberString = new string(new[] { data[2 * i], data[2 * i + 1] }); - var value = byte.Parse(numberString, System.Globalization.NumberStyles.HexNumber); + var value = byte.Parse(numberString, NumberStyles.HexNumber); output[i] = value; } diff --git a/src/Nancy.Hosting.Aspnet.Tests/NancyHandlerFixture.cs b/src/Nancy.Hosting.Aspnet.Tests/NancyHandlerFixture.cs index 85ad227327..986c3f2297 100644 --- a/src/Nancy.Hosting.Aspnet.Tests/NancyHandlerFixture.cs +++ b/src/Nancy.Hosting.Aspnet.Tests/NancyHandlerFixture.cs @@ -5,11 +5,12 @@ namespace Nancy.Hosting.Aspnet.Tests using System.IO; using System.Threading; using System.Web; - using Nancy.Cookies; + using FakeItEasy; + using Nancy.Cookies; using Nancy.Helpers; - using Nancy.Hosting.Aspnet; + using Xunit; public class NancyHandlerFixture diff --git a/src/Nancy.Hosting.Aspnet/DefaultNancyAspNetBootstrapper.cs b/src/Nancy.Hosting.Aspnet/DefaultNancyAspNetBootstrapper.cs index c81a19c1e4..a571d58d93 100644 --- a/src/Nancy.Hosting.Aspnet/DefaultNancyAspNetBootstrapper.cs +++ b/src/Nancy.Hosting.Aspnet/DefaultNancyAspNetBootstrapper.cs @@ -1,12 +1,11 @@ -using Nancy.Diagnostics; - -namespace Nancy.Hosting.Aspnet +namespace Nancy.Hosting.Aspnet { using System; using System.Collections.Generic; using System.Linq; - using Bootstrapper; + using Nancy.Bootstrapper; + using Nancy.Diagnostics; using Nancy.TinyIoc; /// @@ -84,7 +83,7 @@ public override sealed IEnumerable GetAllModules(NancyContext cont /// Module type /// The current context /// The instance - public override INancyModule GetModule(System.Type moduleType, NancyContext context) + public override INancyModule GetModule(Type moduleType, NancyContext context) { return this.ApplicationContainer.Resolve(moduleType.FullName); } diff --git a/src/Nancy.Hosting.Aspnet/NancyHandler.cs b/src/Nancy.Hosting.Aspnet/NancyHandler.cs index 2078851f1e..7fb8b69284 100644 --- a/src/Nancy.Hosting.Aspnet/NancyHandler.cs +++ b/src/Nancy.Hosting.Aspnet/NancyHandler.cs @@ -6,8 +6,9 @@ namespace Nancy.Hosting.Aspnet using System.Linq; using System.Threading.Tasks; using System.Web; - using IO; + using Nancy.Extensions; + using Nancy.IO; /// /// Bridges the communication between Nancy and ASP.NET based hosting. @@ -61,7 +62,7 @@ public static void EndProcessRequest(Task> var nancyContext = task.Result.Item1; var httpContext = task.Result.Item2; - NancyHandler.SetNancyResponseToHttpResponse(httpContext, nancyContext.Response); + SetNancyResponseToHttpResponse(httpContext, nancyContext.Response); nancyContext.Dispose(); } diff --git a/src/Nancy.Hosting.Aspnet/NancyHttpRequestHandler.cs b/src/Nancy.Hosting.Aspnet/NancyHttpRequestHandler.cs index b41dcc7710..cc1443ec1f 100644 --- a/src/Nancy.Hosting.Aspnet/NancyHttpRequestHandler.cs +++ b/src/Nancy.Hosting.Aspnet/NancyHttpRequestHandler.cs @@ -1,9 +1,10 @@ namespace Nancy.Hosting.Aspnet { + using System; using System.Configuration; using System.Threading.Tasks; using System.Web; - using System; + using Nancy.Bootstrapper; public class NancyHttpRequestHandler : IHttpAsyncHandler diff --git a/src/Nancy.Hosting.Aspnet/TinyIoCAspNetExtensions.cs b/src/Nancy.Hosting.Aspnet/TinyIoCAspNetExtensions.cs index beef27793b..b0591d3e20 100644 --- a/src/Nancy.Hosting.Aspnet/TinyIoCAspNetExtensions.cs +++ b/src/Nancy.Hosting.Aspnet/TinyIoCAspNetExtensions.cs @@ -2,6 +2,7 @@ { using System; using System.Web; + using Nancy.TinyIoc; public class HttpContextLifetimeProvider : TinyIoCContainer.ITinyIoCObjectLifetimeProvider diff --git a/src/Nancy.Hosting.Self.Tests/IsCaseInstensitiveBaseOfFixture.cs b/src/Nancy.Hosting.Self.Tests/IsCaseInstensitiveBaseOfFixture.cs index a934c29402..95f16caa5a 100644 --- a/src/Nancy.Hosting.Self.Tests/IsCaseInstensitiveBaseOfFixture.cs +++ b/src/Nancy.Hosting.Self.Tests/IsCaseInstensitiveBaseOfFixture.cs @@ -1,9 +1,11 @@ namespace Nancy.Hosting.Self.Tests { using System; - using Xunit; + using Nancy.Tests; + using Xunit; + public class IsCaseInstensitiveBaseOfFixture { private readonly Uri baseUri = new Uri("http://host/path/path/file"); diff --git a/src/Nancy.Hosting.Self.Tests/NancySelfHostFixture.cs b/src/Nancy.Hosting.Self.Tests/NancySelfHostFixture.cs index fe54db5153..68de71a5f5 100644 --- a/src/Nancy.Hosting.Self.Tests/NancySelfHostFixture.cs +++ b/src/Nancy.Hosting.Self.Tests/NancySelfHostFixture.cs @@ -5,13 +5,14 @@ namespace Nancy.Hosting.Self.Tests using System.IO; using System.Net; using System.Threading; - using System.Threading.Tasks; using FakeItEasy; + using Nancy.Bootstrapper; using Nancy.Helpers; using Nancy.Tests; using Nancy.Tests.xUnitExtensions; + using Xunit; /// diff --git a/src/Nancy.Hosting.Self.Tests/TestModule.cs b/src/Nancy.Hosting.Self.Tests/TestModule.cs index 90aac0c129..463fb0eb32 100644 --- a/src/Nancy.Hosting.Self.Tests/TestModule.cs +++ b/src/Nancy.Hosting.Self.Tests/TestModule.cs @@ -1,10 +1,9 @@ -using System; - -namespace Nancy.Hosting.Self.Tests +namespace Nancy.Hosting.Self.Tests { + using System; using System.IO; - public class TestModule : NancyModule + public class TestModule : NancyModule { public TestModule() { diff --git a/src/Nancy.Hosting.Self/FileSystemRootPathProvider.cs b/src/Nancy.Hosting.Self/FileSystemRootPathProvider.cs index 1233f882e8..9fbf119cdb 100644 --- a/src/Nancy.Hosting.Self/FileSystemRootPathProvider.cs +++ b/src/Nancy.Hosting.Self/FileSystemRootPathProvider.cs @@ -1,9 +1,8 @@ namespace Nancy.Hosting.Self { - using System; using System.IO; using System.Reflection; - + public class FileSystemRootPathProvider : IRootPathProvider { public string GetRootPath() diff --git a/src/Nancy.Hosting.Self/IgnoredHeaders.cs b/src/Nancy.Hosting.Self/IgnoredHeaders.cs index b32f144b45..6b7aeaa518 100644 --- a/src/Nancy.Hosting.Self/IgnoredHeaders.cs +++ b/src/Nancy.Hosting.Self/IgnoredHeaders.cs @@ -1,6 +1,5 @@ namespace Nancy.Hosting.Self { - using System; using System.Collections.Generic; diff --git a/src/Nancy.Hosting.Self/NancyHost.cs b/src/Nancy.Hosting.Self/NancyHost.cs index a3b17ee4fd..7735914c22 100644 --- a/src/Nancy.Hosting.Self/NancyHost.cs +++ b/src/Nancy.Hosting.Self/NancyHost.cs @@ -4,13 +4,14 @@ using System.Collections.Generic; using System.Globalization; using System.IO; - using System.Net; using System.Linq; + using System.Net; using System.Security.Principal; - using IO; + using Nancy.Bootstrapper; using Nancy.Extensions; using Nancy.Helpers; + using Nancy.IO; /// /// Allows to host Nancy server inside any application - console or windows service. diff --git a/src/Nancy.Hosting.Self/UacHelper.cs b/src/Nancy.Hosting.Self/UacHelper.cs index 2d6feba009..844a070358 100644 --- a/src/Nancy.Hosting.Self/UacHelper.cs +++ b/src/Nancy.Hosting.Self/UacHelper.cs @@ -1,6 +1,5 @@ namespace Nancy.Hosting.Self { - using System; using System.Diagnostics; /// diff --git a/src/Nancy.Hosting.Wcf.Tests/NancyWcfGenericServiceFixture.cs b/src/Nancy.Hosting.Wcf.Tests/NancyWcfGenericServiceFixture.cs index 4902b04bbf..1cfa03637c 100644 --- a/src/Nancy.Hosting.Wcf.Tests/NancyWcfGenericServiceFixture.cs +++ b/src/Nancy.Hosting.Wcf.Tests/NancyWcfGenericServiceFixture.cs @@ -1,11 +1,5 @@ namespace Nancy.Hosting.Wcf.Tests { - using Bootstrapper; - using FakeItEasy; - - using Nancy.Helpers; - using Nancy.Tests; - using Nancy.Tests.xUnitExtensions; using System; using System.IO; using System.Linq; @@ -14,8 +8,17 @@ namespace Nancy.Hosting.Wcf.Tests using System.ServiceModel.Web; using System.Threading; + using FakeItEasy; + + using Nancy.Bootstrapper; + using Nancy.Helpers; + using Nancy.Tests; + using Nancy.Tests.xUnitExtensions; + using Xunit; + using HttpStatusCode = Nancy.HttpStatusCode; + /// /// These tests attempt to listen on port 56297, and so require either administrative /// privileges or that a command similar to the following has been run with @@ -203,7 +206,7 @@ public void Should_not_have_content_type_header_for_not_modified_responses() Response = new Response { ContentType = null, - StatusCode = Nancy.HttpStatusCode.NotModified + StatusCode = HttpStatusCode.NotModified } }; diff --git a/src/Nancy.Hosting.Wcf/NancyWcfGenericService.cs b/src/Nancy.Hosting.Wcf/NancyWcfGenericService.cs index e64463330c..7e1bd008df 100644 --- a/src/Nancy.Hosting.Wcf/NancyWcfGenericService.cs +++ b/src/Nancy.Hosting.Wcf/NancyWcfGenericService.cs @@ -3,16 +3,17 @@ using System; using System.Collections.Generic; using System.Globalization; + using System.IdentityModel.Claims; using System.IO; using System.Linq; + using System.Net; using System.ServiceModel; using System.ServiceModel.Channels; using System.ServiceModel.Web; - using System.IdentityModel.Claims; - - using IO; + using Nancy.Bootstrapper; using Nancy.Extensions; + using Nancy.IO; /// /// Host for running Nancy ontop of WCF. @@ -180,7 +181,7 @@ private static void SetNancyResponseToOutgoingWebResponse(OutgoingWebResponseCon webResponse.StatusDescription = nancyResponse.ReasonPhrase; } - webResponse.StatusCode = (System.Net.HttpStatusCode)nancyResponse.StatusCode; + webResponse.StatusCode = (HttpStatusCode)nancyResponse.StatusCode; } private static void SetHttpResponseHeaders(OutgoingWebResponseContext context, Response response) diff --git a/src/Nancy.Metadata.Modules.Tests/DefaultMetadataModuleConventionsFixture.cs b/src/Nancy.Metadata.Modules.Tests/DefaultMetadataModuleConventionsFixture.cs index 621bc91fca..efd38764c0 100644 --- a/src/Nancy.Metadata.Modules.Tests/DefaultMetadataModuleConventionsFixture.cs +++ b/src/Nancy.Metadata.Modules.Tests/DefaultMetadataModuleConventionsFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Metadata.Modules.Tests { - using Nancy.Tests; using System.Linq; + + using Nancy.Tests; + using Xunit; public class DefaultMetadataModuleConventionsFixture diff --git a/src/Nancy.Metadata.Modules.Tests/FakeNancyMetadataModule.cs b/src/Nancy.Metadata.Modules.Tests/FakeNancyMetadataModule.cs index b6132c25be..7dd1e66048 100644 --- a/src/Nancy.Metadata.Modules.Tests/FakeNancyMetadataModule.cs +++ b/src/Nancy.Metadata.Modules.Tests/FakeNancyMetadataModule.cs @@ -1,7 +1,5 @@ namespace Nancy.Metadata.Modules.Tests { - using Nancy.Metadata.Modules; - public class FakeNancyMetadataModule : MetadataModule { } diff --git a/src/Nancy.Metadata.Modules.Tests/Metadata/FakeNancyMetadataModule.cs b/src/Nancy.Metadata.Modules.Tests/Metadata/FakeNancyMetadataModule.cs index 5d2bdee949..c6f344fde0 100644 --- a/src/Nancy.Metadata.Modules.Tests/Metadata/FakeNancyMetadataModule.cs +++ b/src/Nancy.Metadata.Modules.Tests/Metadata/FakeNancyMetadataModule.cs @@ -1,7 +1,5 @@ namespace Nancy.Metadata.Modules.Tests.Metadata { - using Nancy.Metadata.Modules; - public class FakeNancyMetadataModule : MetadataModule { } diff --git a/src/Nancy.Metadata.Modules.Tests/MetadataModuleFixture.cs b/src/Nancy.Metadata.Modules.Tests/MetadataModuleFixture.cs index 80544aee05..5fdbaaea05 100644 --- a/src/Nancy.Metadata.Modules.Tests/MetadataModuleFixture.cs +++ b/src/Nancy.Metadata.Modules.Tests/MetadataModuleFixture.cs @@ -2,6 +2,7 @@ { using Nancy.Routing; using Nancy.Tests; + using Xunit; public class MetadataModuleFixture diff --git a/src/Nancy.Metadata.Modules.Tests/MetadataModuleRouteMetadataProviderFixture.cs b/src/Nancy.Metadata.Modules.Tests/MetadataModuleRouteMetadataProviderFixture.cs index b332b819e7..a1a4e08be0 100644 --- a/src/Nancy.Metadata.Modules.Tests/MetadataModuleRouteMetadataProviderFixture.cs +++ b/src/Nancy.Metadata.Modules.Tests/MetadataModuleRouteMetadataProviderFixture.cs @@ -1,8 +1,10 @@ namespace Nancy.Metadata.Modules.Tests { using FakeItEasy; + using Nancy.Routing; using Nancy.Tests; + using Xunit; public class MetadataModuleRouteMetadataProviderFixture diff --git a/src/Nancy.Owin.Tests/AppBuilderExtensionsFixture.cs b/src/Nancy.Owin.Tests/AppBuilderExtensionsFixture.cs index f2558dc2c4..f0760cc62a 100644 --- a/src/Nancy.Owin.Tests/AppBuilderExtensionsFixture.cs +++ b/src/Nancy.Owin.Tests/AppBuilderExtensionsFixture.cs @@ -10,6 +10,8 @@ using Xunit; + using HttpStatusCode = Nancy.HttpStatusCode; + public class AppBuilderExtensionsFixture { #if !__MonoCS__ diff --git a/src/Nancy.Owin.Tests/NancyMiddlewareFixture.cs b/src/Nancy.Owin.Tests/NancyMiddlewareFixture.cs index aa1b8b2487..473bc5079c 100644 --- a/src/Nancy.Owin.Tests/NancyMiddlewareFixture.cs +++ b/src/Nancy.Owin.Tests/NancyMiddlewareFixture.cs @@ -15,16 +15,11 @@ namespace Nancy.Owin.Tests using Xunit; - using AppFunc = System.Func< - System.Collections.Generic.IDictionary, + using AppFunc = System.Func, System.Threading.Tasks.Task>; - using MidFunc = System.Func< - System.Func< - System.Collections.Generic.IDictionary, - System.Threading.Tasks.Task>, - System.Func< - System.Collections.Generic.IDictionary, + using MidFunc = System.Func, + System.Threading.Tasks.Task>, System.Func, System.Threading.Tasks.Task>>; public class NancyMiddlewareFixture diff --git a/src/Nancy.Testing.Tests/AndConnectorTests.cs b/src/Nancy.Testing.Tests/AndConnectorTests.cs index 686e2bb51a..43800293f1 100644 --- a/src/Nancy.Testing.Tests/AndConnectorTests.cs +++ b/src/Nancy.Testing.Tests/AndConnectorTests.cs @@ -1,9 +1,8 @@ namespace Nancy.Testing.Tests { using System.Text; - using Nancy.Testing; + using Xunit; - using Xunit.Sdk; public class AndConnectorTests { @@ -43,7 +42,7 @@ public void Should_allow_chaining_of_asserts_and_fail_where_appropriate() document["#testId"].ShouldExist().And.ShouldBeOfClass("myClass"); }); - Assert.IsType(result); + Assert.IsType(result); } } } diff --git a/src/Nancy.Testing.Tests/AssertEqualityComparerFixture.cs b/src/Nancy.Testing.Tests/AssertEqualityComparerFixture.cs index adadae6c58..9fc7bfb99e 100644 --- a/src/Nancy.Testing.Tests/AssertEqualityComparerFixture.cs +++ b/src/Nancy.Testing.Tests/AssertEqualityComparerFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Testing.Tests { using System; + using Nancy.Tests; + using Xunit; using Xunit.Extensions; diff --git a/src/Nancy.Testing.Tests/AssertExtensionsTests.cs b/src/Nancy.Testing.Tests/AssertExtensionsTests.cs index 626c2922fb..7ba8e747e3 100644 --- a/src/Nancy.Testing.Tests/AssertExtensionsTests.cs +++ b/src/Nancy.Testing.Tests/AssertExtensionsTests.cs @@ -2,8 +2,9 @@ namespace Nancy.Testing.Tests { using System; using System.Linq; + using CsQuery; - using Nancy.Testing; + using Xunit; public class AssertExtensionsTests diff --git a/src/Nancy.Testing.Tests/BrowserContextExtensionsFixture.cs b/src/Nancy.Testing.Tests/BrowserContextExtensionsFixture.cs index dab051a835..bd37fa8f9d 100644 --- a/src/Nancy.Testing.Tests/BrowserContextExtensionsFixture.cs +++ b/src/Nancy.Testing.Tests/BrowserContextExtensionsFixture.cs @@ -1,9 +1,11 @@ namespace Nancy.Testing.Tests { using System.Linq; - using Xunit; + using Nancy.Tests; + using Xunit; + public class BrowserContextExtensionsFixture { [Fact] diff --git a/src/Nancy.Testing.Tests/BrowserFixture.cs b/src/Nancy.Testing.Tests/BrowserFixture.cs index 6635c9e653..4b7fb25790 100644 --- a/src/Nancy.Testing.Tests/BrowserFixture.cs +++ b/src/Nancy.Testing.Tests/BrowserFixture.cs @@ -4,19 +4,19 @@ namespace Nancy.Testing.Tests using System; using System.Collections.Generic; using System.IO; + using System.Linq; using System.Security.Cryptography.X509Certificates; using System.Text; - using System.Linq; + using FakeItEasy; + + using Nancy.Authentication.Forms; using Nancy.Extensions; - using Nancy.Tests; using Nancy.Helpers; using Nancy.Session; - using Xunit; - using FakeItEasy; - using Nancy.Authentication.Forms; + using Nancy.Tests; - using Xunit.Extensions; + using Xunit; public class BrowserFixture { diff --git a/src/Nancy.Testing.Tests/BrowserResponseBodyWrapperExtensionsFixture.cs b/src/Nancy.Testing.Tests/BrowserResponseBodyWrapperExtensionsFixture.cs index 981fcfac7a..2f32c9c8c5 100644 --- a/src/Nancy.Testing.Tests/BrowserResponseBodyWrapperExtensionsFixture.cs +++ b/src/Nancy.Testing.Tests/BrowserResponseBodyWrapperExtensionsFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Testing.Tests { using System.IO; + using Nancy.Tests; + using Xunit; public class BrowserResponseBodyWrapperExtensionsFixture diff --git a/src/Nancy.Testing.Tests/BrowserResponseBodyWrapperFixture.cs b/src/Nancy.Testing.Tests/BrowserResponseBodyWrapperFixture.cs index d5a1e8a514..b5289d82b3 100644 --- a/src/Nancy.Testing.Tests/BrowserResponseBodyWrapperFixture.cs +++ b/src/Nancy.Testing.Tests/BrowserResponseBodyWrapperFixture.cs @@ -3,8 +3,9 @@ using System.IO; using System.Linq; using System.Text; - using Nancy; + using Nancy.Tests; + using Xunit; public class BrowserResponseBodyWrapperFixture diff --git a/src/Nancy.Testing.Tests/BrowserResponseExtensionsTests.cs b/src/Nancy.Testing.Tests/BrowserResponseExtensionsTests.cs index 567c94e06b..c419c4e5e5 100644 --- a/src/Nancy.Testing.Tests/BrowserResponseExtensionsTests.cs +++ b/src/Nancy.Testing.Tests/BrowserResponseExtensionsTests.cs @@ -1,10 +1,12 @@ namespace Nancy.Testing.Tests { -using System.Xml; -using FakeItEasy; -using Xunit; + using System.Xml; - public class BrowserResponseExtensionsTests + using FakeItEasy; + + using Xunit; + + public class BrowserResponseExtensionsTests { private BrowserResponse sut; diff --git a/src/Nancy.Testing.Tests/CaseSensitivityFixture.cs b/src/Nancy.Testing.Tests/CaseSensitivityFixture.cs index a1770c2278..fad90cb23b 100644 --- a/src/Nancy.Testing.Tests/CaseSensitivityFixture.cs +++ b/src/Nancy.Testing.Tests/CaseSensitivityFixture.cs @@ -1,8 +1,9 @@ namespace Nancy.Testing.Tests { - using Xunit; - using Nancy.Tests; using Nancy.ModelBinding; + using Nancy.Tests; + + using Xunit; public class CaseSensitivityFixture { diff --git a/src/Nancy.Testing.Tests/ConfigurableBootstrapperDependenciesTests.cs b/src/Nancy.Testing.Tests/ConfigurableBootstrapperDependenciesTests.cs index 2983b84a4f..f978a4761f 100644 --- a/src/Nancy.Testing.Tests/ConfigurableBootstrapperDependenciesTests.cs +++ b/src/Nancy.Testing.Tests/ConfigurableBootstrapperDependenciesTests.cs @@ -1,7 +1,9 @@ namespace Nancy.Testing.Tests { using System; + using FakeItEasy; + using Xunit; public class ConfigurableBootstrapperDependenciesTests diff --git a/src/Nancy.Testing.Tests/ConfigurableBootstrapperFixture.cs b/src/Nancy.Testing.Tests/ConfigurableBootstrapperFixture.cs index 552b097d28..c4646e1031 100644 --- a/src/Nancy.Testing.Tests/ConfigurableBootstrapperFixture.cs +++ b/src/Nancy.Testing.Tests/ConfigurableBootstrapperFixture.cs @@ -8,8 +8,10 @@ using System.Threading.Tasks; using FakeItEasy; + using Nancy.Bootstrapper; using Nancy.Tests; + using Xunit; using Xunit.Sdk; diff --git a/src/Nancy.Testing.Tests/ContextExtensionsTests.cs b/src/Nancy.Testing.Tests/ContextExtensionsTests.cs index 95ebb27896..d057d8de02 100644 --- a/src/Nancy.Testing.Tests/ContextExtensionsTests.cs +++ b/src/Nancy.Testing.Tests/ContextExtensionsTests.cs @@ -3,8 +3,10 @@ namespace Nancy.Testing.Tests using System; using System.IO; using System.Text; + using Nancy.Responses; using Nancy.Tests; + using Xunit; public class ContextExtensionsTests diff --git a/src/Nancy.Testing.Tests/DocumentWrapperTests.cs b/src/Nancy.Testing.Tests/DocumentWrapperTests.cs index 6e6bca628a..a0da804f76 100644 --- a/src/Nancy.Testing.Tests/DocumentWrapperTests.cs +++ b/src/Nancy.Testing.Tests/DocumentWrapperTests.cs @@ -1,7 +1,7 @@ namespace Nancy.Testing.Tests { using System.Text; - using Nancy.Testing; + using Xunit; public class DocumentWrapperTests diff --git a/src/Nancy.Testing.Tests/PathHelperTests.cs b/src/Nancy.Testing.Tests/PathHelperTests.cs index 8598c38515..277d8d8caa 100644 --- a/src/Nancy.Testing.Tests/PathHelperTests.cs +++ b/src/Nancy.Testing.Tests/PathHelperTests.cs @@ -2,7 +2,9 @@ namespace Nancy.Testing.Tests { using System; using System.IO; + using Nancy.Tests; + using Xunit; public class PathHelperTests diff --git a/src/Nancy.Testing.Tests/QueryWrapperTests.cs b/src/Nancy.Testing.Tests/QueryWrapperTests.cs index 390152b0e8..1f81f428fc 100644 --- a/src/Nancy.Testing.Tests/QueryWrapperTests.cs +++ b/src/Nancy.Testing.Tests/QueryWrapperTests.cs @@ -1,9 +1,10 @@ namespace Nancy.Testing.Tests { using System.Linq; + using CsQuery; using CsQuery.Implementation; - using Nancy.Testing; + using Xunit; public class QueryWrapperTests diff --git a/src/Nancy.Testing/AndConnector.cs b/src/Nancy.Testing/AndConnector.cs index 2bf0bcba3e..f57d5e61ea 100644 --- a/src/Nancy.Testing/AndConnector.cs +++ b/src/Nancy.Testing/AndConnector.cs @@ -1,7 +1,5 @@ namespace Nancy.Testing { - using Nancy; - public class AndConnector : IHideObjectMembers { private TSource source; diff --git a/src/Nancy.Testing/Asserts.cs b/src/Nancy.Testing/Asserts.cs index b527a69e0b..6ac1a23f2c 100644 --- a/src/Nancy.Testing/Asserts.cs +++ b/src/Nancy.Testing/Asserts.cs @@ -96,7 +96,7 @@ public static void Null(object actual) public static void Same(T actual, T expected) { var isTheSameInstance = - Object.ReferenceEquals(actual, expected); + ReferenceEquals(actual, expected); if (!isTheSameInstance) { diff --git a/src/Nancy.Testing/Browser.cs b/src/Nancy.Testing/Browser.cs index a7267230e2..727a976da4 100644 --- a/src/Nancy.Testing/Browser.cs +++ b/src/Nancy.Testing/Browser.cs @@ -5,9 +5,10 @@ namespace Nancy.Testing using System.IO; using System.Linq; using System.Text; + using Nancy.Bootstrapper; using Nancy.Helpers; - using IO; + using Nancy.IO; /// /// Provides the capability of executing a request with Nancy, using a specific configuration provided by an instance. diff --git a/src/Nancy.Testing/BrowserContext.cs b/src/Nancy.Testing/BrowserContext.cs index a5c18c0937..b4ee579168 100644 --- a/src/Nancy.Testing/BrowserContext.cs +++ b/src/Nancy.Testing/BrowserContext.cs @@ -2,7 +2,6 @@ { using System; using System.Collections.Generic; - using System.Configuration; using System.IO; using System.Reflection; using System.Security.Cryptography.X509Certificates; diff --git a/src/Nancy.Testing/BrowserContextExtensions.cs b/src/Nancy.Testing/BrowserContextExtensions.cs index 9e452c2e27..d6429b6102 100644 --- a/src/Nancy.Testing/BrowserContextExtensions.cs +++ b/src/Nancy.Testing/BrowserContextExtensions.cs @@ -2,17 +2,17 @@ namespace Nancy.Testing { using System; + using System.Collections.Generic; using System.Globalization; - using System.Text; using System.IO; - using System.Collections.Generic; using System.Linq; + using System.Text; using Nancy.Authentication.Forms; using Nancy.Extensions; using Nancy.Helpers; using Nancy.Responses; - using Responses.Negotiation; + using Nancy.Responses.Negotiation; /// /// Defines extensions for the type. diff --git a/src/Nancy.Testing/BrowserResponseExtensions.cs b/src/Nancy.Testing/BrowserResponseExtensions.cs index 99e1a55476..5ab3bbb585 100644 --- a/src/Nancy.Testing/BrowserResponseExtensions.cs +++ b/src/Nancy.Testing/BrowserResponseExtensions.cs @@ -4,7 +4,7 @@ namespace Nancy.Testing using System.IO; using System.Linq; using System.Xml.Linq; - + /// /// Defines extensions for the type. /// diff --git a/src/Nancy.Testing/ConfigurableBootstrapper.cs b/src/Nancy.Testing/ConfigurableBootstrapper.cs index b4f050a35b..041cdd9bd1 100644 --- a/src/Nancy.Testing/ConfigurableBootstrapper.cs +++ b/src/Nancy.Testing/ConfigurableBootstrapper.cs @@ -5,21 +5,22 @@ namespace Nancy.Testing using System.IO; using System.Linq; using System.Reflection; - using Localization; + using Nancy.Bootstrapper; using Nancy.Conventions; using Nancy.Culture; using Nancy.Diagnostics; using Nancy.ErrorHandling; + using Nancy.Localization; using Nancy.ModelBinding; + using Nancy.Responses.Negotiation; using Nancy.Routing; using Nancy.Routing.Constraints; using Nancy.Routing.Trie; using Nancy.Security; using Nancy.TinyIoc; - using Nancy.ViewEngines; - using Responses.Negotiation; using Nancy.Validation; + using Nancy.ViewEngines; /// /// A Nancy bootstrapper that can be configured with either Type or Instance overrides for all Nancy types. diff --git a/src/Nancy.Testing/DocumentWrapper.cs b/src/Nancy.Testing/DocumentWrapper.cs index f1807672a5..a99ce652bc 100644 --- a/src/Nancy.Testing/DocumentWrapper.cs +++ b/src/Nancy.Testing/DocumentWrapper.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; + using CsQuery; /// diff --git a/src/Nancy.Testing/NancyContextExtensions.cs b/src/Nancy.Testing/NancyContextExtensions.cs index 8aecf885fb..a81a18c41d 100644 --- a/src/Nancy.Testing/NancyContextExtensions.cs +++ b/src/Nancy.Testing/NancyContextExtensions.cs @@ -1,10 +1,11 @@ namespace Nancy.Testing { - using System; - using System.IO; - using System.Xml.Serialization; - using Nancy.Json; + using System; + using System.IO; + using System.Xml.Serialization; + + using Nancy.Json; /// /// Defines extensions for the type. diff --git a/src/Nancy.Testing/PassThroughStatusHandler.cs b/src/Nancy.Testing/PassThroughStatusHandler.cs index 96cc7e6cae..0e8bfa16b7 100644 --- a/src/Nancy.Testing/PassThroughStatusHandler.cs +++ b/src/Nancy.Testing/PassThroughStatusHandler.cs @@ -1,8 +1,8 @@ -using System; -using Nancy.ErrorHandling; - namespace Nancy.Testing { + using System; + + using Nancy.ErrorHandling; using Nancy.Extensions; public class PassThroughStatusCodeHandler : IStatusCodeHandler diff --git a/src/Nancy.Testing/Properties/Resources.Designer.cs b/src/Nancy.Testing/Properties/Resources.Designer.cs index 7c95c28f5e..1d9c2467ff 100644 --- a/src/Nancy.Testing/Properties/Resources.Designer.cs +++ b/src/Nancy.Testing/Properties/Resources.Designer.cs @@ -9,9 +9,14 @@ //------------------------------------------------------------------------------ namespace Nancy.Testing.Properties { - using System; - - + using System.CodeDom.Compiler; + using System.ComponentModel; + using System.Diagnostics; + using System.Diagnostics.CodeAnalysis; + using System.Globalization; + using System.Resources; + using System.Runtime.CompilerServices; + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,27 +24,27 @@ namespace Nancy.Testing.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [DebuggerNonUserCode()] + [CompilerGenerated()] internal class Resources { - private static global::System.Resources.ResourceManager resourceMan; + private static ResourceManager resourceMan; - private static global::System.Globalization.CultureInfo resourceCulture; + private static CultureInfo resourceCulture; - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } /// /// Returns the cached ResourceManager instance used by this class. /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { + [EditorBrowsable(EditorBrowsableState.Advanced)] + internal static ResourceManager ResourceManager { get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Nancy.Testing.Properties.Resources", typeof(Resources).Assembly); + if (ReferenceEquals(resourceMan, null)) { + ResourceManager temp = new ResourceManager("Nancy.Testing.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -50,8 +55,8 @@ internal Resources() { /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { + [EditorBrowsable(EditorBrowsableState.Advanced)] + internal static CultureInfo Culture { get { return resourceCulture; } diff --git a/src/Nancy.Testing/QueryWrapper.cs b/src/Nancy.Testing/QueryWrapper.cs index 69e61dbfd9..1ab3fbde63 100644 --- a/src/Nancy.Testing/QueryWrapper.cs +++ b/src/Nancy.Testing/QueryWrapper.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; + using CsQuery; using CsQuery.Implementation; diff --git a/src/Nancy.Tests.Functional/Modules/JsonpTestModule.cs b/src/Nancy.Tests.Functional/Modules/JsonpTestModule.cs index bdd1c28853..2bc26e3400 100644 --- a/src/Nancy.Tests.Functional/Modules/JsonpTestModule.cs +++ b/src/Nancy.Tests.Functional/Modules/JsonpTestModule.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Nancy.Tests.Functional.Modules +namespace Nancy.Tests.Functional.Modules { public class JsonpTestModule : NancyModule { diff --git a/src/Nancy.Tests.Functional/Modules/RazorTestModule.cs b/src/Nancy.Tests.Functional/Modules/RazorTestModule.cs index d4d14049c4..b47d65da2d 100644 --- a/src/Nancy.Tests.Functional/Modules/RazorTestModule.cs +++ b/src/Nancy.Tests.Functional/Modules/RazorTestModule.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Nancy.Tests.Functional.Modules +namespace Nancy.Tests.Functional.Modules { public class RazorTestModule : NancyModule { diff --git a/src/Nancy.Tests.Functional/Modules/RazorWithTracingTestModule.cs b/src/Nancy.Tests.Functional/Modules/RazorWithTracingTestModule.cs index 6fa86034e8..21de20344c 100644 --- a/src/Nancy.Tests.Functional/Modules/RazorWithTracingTestModule.cs +++ b/src/Nancy.Tests.Functional/Modules/RazorWithTracingTestModule.cs @@ -1,10 +1,5 @@ namespace Nancy.Tests.Functional.Modules { - using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; - public class RazorWithTracingTestModule : NancyModule { public RazorWithTracingTestModule() diff --git a/src/Nancy.Tests.Functional/Tests/AbsoluteUrlTests.cs b/src/Nancy.Tests.Functional/Tests/AbsoluteUrlTests.cs index 748b0845b9..571ee6ab71 100644 --- a/src/Nancy.Tests.Functional/Tests/AbsoluteUrlTests.cs +++ b/src/Nancy.Tests.Functional/Tests/AbsoluteUrlTests.cs @@ -4,6 +4,7 @@ using Nancy.Testing; using Nancy.Tests.Functional.Modules; + using Xunit; public class AbsoluteUrlTests diff --git a/src/Nancy.Tests.Functional/Tests/BasicRouteInvocationsFixture.cs b/src/Nancy.Tests.Functional/Tests/BasicRouteInvocationsFixture.cs index eeb4a4d8c7..d599ba8ed3 100644 --- a/src/Nancy.Tests.Functional/Tests/BasicRouteInvocationsFixture.cs +++ b/src/Nancy.Tests.Functional/Tests/BasicRouteInvocationsFixture.cs @@ -1,6 +1,7 @@ namespace Nancy.Tests.Functional.Tests { using Nancy.Testing; + using Xunit; public class BasicRouteInvocationsFixture diff --git a/src/Nancy.Tests.Functional/Tests/ContentNegotiationFixture.cs b/src/Nancy.Tests.Functional/Tests/ContentNegotiationFixture.cs index 28574a33f1..8bc6ffb370 100644 --- a/src/Nancy.Tests.Functional/Tests/ContentNegotiationFixture.cs +++ b/src/Nancy.Tests.Functional/Tests/ContentNegotiationFixture.cs @@ -4,7 +4,8 @@ namespace Nancy.Tests.Functional.Tests using System.Collections.Generic; using System.IO; using System.Linq; - using Cookies; + + using Nancy.Cookies; using Nancy.IO; using Nancy.Responses.Negotiation; using Nancy.Testing; diff --git a/src/Nancy.Tests.Functional/Tests/JsonpTests.cs b/src/Nancy.Tests.Functional/Tests/JsonpTests.cs index 5b1743d8b5..188d9ce307 100644 --- a/src/Nancy.Tests.Functional/Tests/JsonpTests.cs +++ b/src/Nancy.Tests.Functional/Tests/JsonpTests.cs @@ -1,14 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Nancy.Bootstrapper; -using Nancy.Testing; -using Nancy.Tests.Functional.Modules; -using Xunit; - -namespace Nancy.Tests.Functional.Tests +namespace Nancy.Tests.Functional.Tests { + using System; + + using Nancy.Bootstrapper; + using Nancy.Testing; + using Nancy.Tests.Functional.Modules; + + using Xunit; + public class JsonpTests { private readonly INancyBootstrapper bootstrapper; diff --git a/src/Nancy.Tests.Functional/Tests/MethodRewriteFixture.cs b/src/Nancy.Tests.Functional/Tests/MethodRewriteFixture.cs index 6ea8894d53..a69c2440d5 100644 --- a/src/Nancy.Tests.Functional/Tests/MethodRewriteFixture.cs +++ b/src/Nancy.Tests.Functional/Tests/MethodRewriteFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Functional.Tests { using System; - using Testing; + + using Nancy.Testing; + using Xunit; public class MethodRewriteFixture diff --git a/src/Nancy.Tests.Functional/Tests/ModelBindingTests.cs b/src/Nancy.Tests.Functional/Tests/ModelBindingTests.cs index e48536b3bc..c5428e83bd 100644 --- a/src/Nancy.Tests.Functional/Tests/ModelBindingTests.cs +++ b/src/Nancy.Tests.Functional/Tests/ModelBindingTests.cs @@ -1,10 +1,11 @@ namespace Nancy.Tests.Functional.Tests { using System.Collections.Generic; - using System.Linq; - using Bootstrapper; - using ModelBinding; - using Testing; + + using Nancy.Bootstrapper; + using Nancy.ModelBinding; + using Nancy.Testing; + using Xunit; public class ModelBindingFixture diff --git a/src/Nancy.Tests.Functional/Tests/PartialViewTests.cs b/src/Nancy.Tests.Functional/Tests/PartialViewTests.cs index 98c2de7f78..d77af88963 100644 --- a/src/Nancy.Tests.Functional/Tests/PartialViewTests.cs +++ b/src/Nancy.Tests.Functional/Tests/PartialViewTests.cs @@ -1,9 +1,11 @@ namespace Nancy.Tests.Functional.Tests { using System; - using Bootstrapper; - using Modules; - using Testing; + + using Nancy.Bootstrapper; + using Nancy.Testing; + using Nancy.Tests.Functional.Modules; + using Xunit; public class PartialViewTests diff --git a/src/Nancy.Tests.Functional/Tests/PerRouteAuthFixture.cs b/src/Nancy.Tests.Functional/Tests/PerRouteAuthFixture.cs index 76cb7df4ea..4dbfa1932d 100644 --- a/src/Nancy.Tests.Functional/Tests/PerRouteAuthFixture.cs +++ b/src/Nancy.Tests.Functional/Tests/PerRouteAuthFixture.cs @@ -1,9 +1,11 @@ namespace Nancy.Tests.Functional.Tests { using System.Collections.Generic; + using Nancy.Security; using Nancy.Testing; using Nancy.Tests.Functional.Modules; + using Xunit; using Xunit.Extensions; diff --git a/src/Nancy.Tests.Functional/Tests/SerializeTests.cs b/src/Nancy.Tests.Functional/Tests/SerializeTests.cs index 388b5e97f5..f5ab4dea65 100644 --- a/src/Nancy.Tests.Functional/Tests/SerializeTests.cs +++ b/src/Nancy.Tests.Functional/Tests/SerializeTests.cs @@ -1,6 +1,7 @@ namespace Nancy.Tests.Functional.Tests { using System; + using Nancy.Bootstrapper; using Nancy.Testing; using Nancy.Tests.Functional.Modules; diff --git a/src/Nancy.Tests.Functional/Tests/SerializerTests.cs b/src/Nancy.Tests.Functional/Tests/SerializerTests.cs index ec63fa5a73..d885d2dcb5 100644 --- a/src/Nancy.Tests.Functional/Tests/SerializerTests.cs +++ b/src/Nancy.Tests.Functional/Tests/SerializerTests.cs @@ -2,9 +2,9 @@ { using System; - using Nancy.Json; using Nancy.Testing; using Nancy.Tests.Functional.Modules; + using Xunit; public class SerializerTests diff --git a/src/Nancy.Tests.Functional/Tests/TracingSmokeTests.cs b/src/Nancy.Tests.Functional/Tests/TracingSmokeTests.cs index d0c67df38c..88ead1673f 100644 --- a/src/Nancy.Tests.Functional/Tests/TracingSmokeTests.cs +++ b/src/Nancy.Tests.Functional/Tests/TracingSmokeTests.cs @@ -1,9 +1,11 @@ namespace Nancy.Tests.Functional.Tests { using System; - using Bootstrapper; - using Modules; - using Testing; + + using Nancy.Bootstrapper; + using Nancy.Testing; + using Nancy.Tests.Functional.Modules; + using Xunit; public class TracingSmokeTests diff --git a/src/Nancy.Tests.Functional/Tests/ViewBagTests.cs b/src/Nancy.Tests.Functional/Tests/ViewBagTests.cs index dcee7fc09b..9751ecb581 100644 --- a/src/Nancy.Tests.Functional/Tests/ViewBagTests.cs +++ b/src/Nancy.Tests.Functional/Tests/ViewBagTests.cs @@ -1,9 +1,11 @@ namespace Nancy.Tests.Functional.Tests { using System; - using Bootstrapper; - using Modules; - using Testing; + + using Nancy.Bootstrapper; + using Nancy.Testing; + using Nancy.Tests.Functional.Modules; + using Xunit; public class ViewBagTests diff --git a/src/Nancy.Tests/Fakes/FakeDefaultNancyBootstrapper.cs b/src/Nancy.Tests/Fakes/FakeDefaultNancyBootstrapper.cs index 0a89254207..f42bf6caef 100644 --- a/src/Nancy.Tests/Fakes/FakeDefaultNancyBootstrapper.cs +++ b/src/Nancy.Tests/Fakes/FakeDefaultNancyBootstrapper.cs @@ -5,8 +5,7 @@ using System.Linq; using System.Reflection; - using Bootstrapper; - + using Nancy.Bootstrapper; using Nancy.ErrorHandling; using Nancy.TinyIoc; @@ -16,7 +15,7 @@ public class FakeDefaultNancyBootstrapper : DefaultNancyBootstrapper private NancyInternalConfiguration configuration; - protected override System.Collections.Generic.IEnumerable Modules + protected override IEnumerable Modules { get { diff --git a/src/Nancy.Tests/Fakes/FakeModuleCatalog.cs b/src/Nancy.Tests/Fakes/FakeModuleCatalog.cs index 8fb386eaf7..ce3159e9e7 100755 --- a/src/Nancy.Tests/Fakes/FakeModuleCatalog.cs +++ b/src/Nancy.Tests/Fakes/FakeModuleCatalog.cs @@ -1,9 +1,9 @@ -using System; - namespace Nancy.Tests.Fakes { + using System; using System.Collections.Generic; using System.Linq; + public class FakeModuleCatalog : INancyModuleCatalog { private Dictionary _Modules; diff --git a/src/Nancy.Tests/Fakes/FakeNancyModuleNoRoutes.cs b/src/Nancy.Tests/Fakes/FakeNancyModuleNoRoutes.cs index 562f32e8e0..3699041e7d 100644 --- a/src/Nancy.Tests/Fakes/FakeNancyModuleNoRoutes.cs +++ b/src/Nancy.Tests/Fakes/FakeNancyModuleNoRoutes.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Nancy.Tests.Fakes +namespace Nancy.Tests.Fakes { public class FakeNancyModuleNoRoutes : NancyModule { diff --git a/src/Nancy.Tests/Fakes/FakeNancyModuleWithBasePath.cs b/src/Nancy.Tests/Fakes/FakeNancyModuleWithBasePath.cs index ddd2ebf191..b0c7fb7e87 100644 --- a/src/Nancy.Tests/Fakes/FakeNancyModuleWithBasePath.cs +++ b/src/Nancy.Tests/Fakes/FakeNancyModuleWithBasePath.cs @@ -1,7 +1,6 @@ namespace Nancy.Tests.Fakes { using System; - using Nancy; public class FakeNancyModuleWithBasePath : NancyModule { diff --git a/src/Nancy.Tests/Fakes/FakeNancyModuleWithDependency.cs b/src/Nancy.Tests/Fakes/FakeNancyModuleWithDependency.cs index 5cc0730173..327d2b0b7b 100755 --- a/src/Nancy.Tests/Fakes/FakeNancyModuleWithDependency.cs +++ b/src/Nancy.Tests/Fakes/FakeNancyModuleWithDependency.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Nancy.Tests.Fakes +namespace Nancy.Tests.Fakes { public interface IFoo { diff --git a/src/Nancy.Tests/Fakes/FakeObjectSerializer.cs b/src/Nancy.Tests/Fakes/FakeObjectSerializer.cs index f43d27d86f..97cecc18d2 100644 --- a/src/Nancy.Tests/Fakes/FakeObjectSerializer.cs +++ b/src/Nancy.Tests/Fakes/FakeObjectSerializer.cs @@ -1,9 +1,5 @@ namespace Nancy.Tests.Fakes { - using System; - - using Nancy.Session; - public class FakeObjectSerializer : IObjectSerializer { /// diff --git a/src/Nancy.Tests/Fakes/FakeRequest.cs b/src/Nancy.Tests/Fakes/FakeRequest.cs index 5d7ad4b75e..9bc055816f 100644 --- a/src/Nancy.Tests/Fakes/FakeRequest.cs +++ b/src/Nancy.Tests/Fakes/FakeRequest.cs @@ -2,7 +2,8 @@ { using System.Collections.Generic; using System.IO; - using IO; + + using Nancy.IO; public class FakeRequest : Request { diff --git a/src/Nancy.Tests/Fakes/FakeRouteCache.cs b/src/Nancy.Tests/Fakes/FakeRouteCache.cs index 8211f71b92..ceec8e49e8 100644 --- a/src/Nancy.Tests/Fakes/FakeRouteCache.cs +++ b/src/Nancy.Tests/Fakes/FakeRouteCache.cs @@ -1,10 +1,9 @@ namespace Nancy.Tests.Fakes { using System; - using System.Collections; using System.Collections.Generic; - using System.ComponentModel; using System.Linq; + using Nancy.Routing; public class FakeRouteCache : Dictionary>>, IRouteCache diff --git a/src/Nancy.Tests/Fakes/FakeRoutePatternMatchResult.cs b/src/Nancy.Tests/Fakes/FakeRoutePatternMatchResult.cs index 7c020235bd..fbe5c0793c 100644 --- a/src/Nancy.Tests/Fakes/FakeRoutePatternMatchResult.cs +++ b/src/Nancy.Tests/Fakes/FakeRoutePatternMatchResult.cs @@ -1,6 +1,7 @@ namespace Nancy.Tests.Fakes { using System; + using Nancy.Routing; public class FakeRoutePatternMatchResult : IRoutePatternMatchResult diff --git a/src/Nancy.Tests/Fakes/FakeUserIdentity.cs b/src/Nancy.Tests/Fakes/FakeUserIdentity.cs index d1eed6a7b8..6e66448a81 100644 --- a/src/Nancy.Tests/Fakes/FakeUserIdentity.cs +++ b/src/Nancy.Tests/Fakes/FakeUserIdentity.cs @@ -1,7 +1,8 @@ namespace Nancy.Tests.Fakes { using System.Collections.Generic; - using Security; + + using Nancy.Security; public class FakeUserIdentity : IUserIdentity { diff --git a/src/Nancy.Tests/Fakes/FakeViewEngine.cs b/src/Nancy.Tests/Fakes/FakeViewEngine.cs index 374cd2458c..b0ada28e49 100644 --- a/src/Nancy.Tests/Fakes/FakeViewEngine.cs +++ b/src/Nancy.Tests/Fakes/FakeViewEngine.cs @@ -1,8 +1,9 @@ namespace Nancy.Tests.Fakes { using System.Collections.Generic; + + using Nancy.Responses; using Nancy.ViewEngines; - using Responses; public class FakeViewEngine : IViewEngine { diff --git a/src/Nancy.Tests/Fakes/PersonWithAgeField.cs b/src/Nancy.Tests/Fakes/PersonWithAgeField.cs index 3b4507247d..c552724b7e 100644 --- a/src/Nancy.Tests/Fakes/PersonWithAgeField.cs +++ b/src/Nancy.Tests/Fakes/PersonWithAgeField.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Nancy.Tests.Fakes +namespace Nancy.Tests.Fakes { public class PersonWithAgeField : Person { diff --git a/src/Nancy.Tests/NoAppStartupsFixture.cs b/src/Nancy.Tests/NoAppStartupsFixture.cs index 6eb94ffb82..fb07fa5822 100644 --- a/src/Nancy.Tests/NoAppStartupsFixture.cs +++ b/src/Nancy.Tests/NoAppStartupsFixture.cs @@ -2,6 +2,7 @@ { using System; using System.Collections.Generic; + using System.Diagnostics; using System.Linq; using Nancy.Bootstrapper; @@ -43,7 +44,7 @@ public IEnumerable InstanceRegistrations private static void ThrowWhenNoAppStartupsFixtureRuns() { - var frames = new System.Diagnostics.StackTrace().GetFrames(); + var frames = new StackTrace().GetFrames(); if (frames != null && frames.Select(f => f.GetMethod().DeclaringType).Any(t => t == typeof(NoAppStartupsFixture))) { diff --git a/src/Nancy.Tests/Resources/Views/SuperSimpleViewEngineSampleContent.cs b/src/Nancy.Tests/Resources/Views/SuperSimpleViewEngineSampleContent.cs index dc7d9c4d17..522fb87972 100644 --- a/src/Nancy.Tests/Resources/Views/SuperSimpleViewEngineSampleContent.cs +++ b/src/Nancy.Tests/Resources/Views/SuperSimpleViewEngineSampleContent.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Nancy.Tests.Resources.Views +namespace Nancy.Tests.Resources.Views { public static class SuperSimpleViewEngineSampleContent { diff --git a/src/Nancy.Tests/ShouldExtensions.cs b/src/Nancy.Tests/ShouldExtensions.cs index 0c78f57ce6..33d3c5e0cf 100644 --- a/src/Nancy.Tests/ShouldExtensions.cs +++ b/src/Nancy.Tests/ShouldExtensions.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; + using Xunit; public static class ShouldAssertExtensions diff --git a/src/Nancy.Tests/Unit/AfterPipelineFixture.cs b/src/Nancy.Tests/Unit/AfterPipelineFixture.cs index 0c70e09530..12c0cf5e6e 100644 --- a/src/Nancy.Tests/Unit/AfterPipelineFixture.cs +++ b/src/Nancy.Tests/Unit/AfterPipelineFixture.cs @@ -3,6 +3,7 @@ using System; using System.Linq; using System.Threading; + using Xunit; public class AfterPipelineFixture diff --git a/src/Nancy.Tests/Unit/BeforePipelineFixture.cs b/src/Nancy.Tests/Unit/BeforePipelineFixture.cs index b981bfe996..cd4dfaa215 100644 --- a/src/Nancy.Tests/Unit/BeforePipelineFixture.cs +++ b/src/Nancy.Tests/Unit/BeforePipelineFixture.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; + using Xunit; public class BeforePipelineFixture diff --git a/src/Nancy.Tests/Unit/Bootstrapper/Base/BootstrapperBaseFixtureBase.cs b/src/Nancy.Tests/Unit/Bootstrapper/Base/BootstrapperBaseFixtureBase.cs index e41fe3085d..5693b3ded6 100644 --- a/src/Nancy.Tests/Unit/Bootstrapper/Base/BootstrapperBaseFixtureBase.cs +++ b/src/Nancy.Tests/Unit/Bootstrapper/Base/BootstrapperBaseFixtureBase.cs @@ -8,6 +8,7 @@ namespace Nancy.Tests.Unit.Bootstrapper.Base using Nancy.Bootstrapper; using Nancy.Routing; + using Xunit; /// diff --git a/src/Nancy.Tests/Unit/Bootstrapper/Base/ModuleCatalogFixtureBase.cs b/src/Nancy.Tests/Unit/Bootstrapper/Base/ModuleCatalogFixtureBase.cs index baa2b141ea..26fb2fe178 100644 --- a/src/Nancy.Tests/Unit/Bootstrapper/Base/ModuleCatalogFixtureBase.cs +++ b/src/Nancy.Tests/Unit/Bootstrapper/Base/ModuleCatalogFixtureBase.cs @@ -2,7 +2,9 @@ namespace Nancy.Tests.Unit.Bootstrapper.Base { using System.Collections.Generic; using System.Linq; + using Nancy.Bootstrapper; + using Xunit; public abstract class ModuleCatalogFixtureBase diff --git a/src/Nancy.Tests/Unit/Bootstrapper/CollectionTypeRegistrationFixture.cs b/src/Nancy.Tests/Unit/Bootstrapper/CollectionTypeRegistrationFixture.cs index 5e6bd8b7f5..b1d863f639 100644 --- a/src/Nancy.Tests/Unit/Bootstrapper/CollectionTypeRegistrationFixture.cs +++ b/src/Nancy.Tests/Unit/Bootstrapper/CollectionTypeRegistrationFixture.cs @@ -1,8 +1,10 @@ namespace Nancy.Tests.Unit.Bootstrapper { using System; + using Nancy.Bootstrapper; using Nancy.Responses.Negotiation; + using Xunit; public class CollectionTypeRegistrationFixture diff --git a/src/Nancy.Tests/Unit/Bootstrapper/InstanceRegistrationFixture.cs b/src/Nancy.Tests/Unit/Bootstrapper/InstanceRegistrationFixture.cs index 010969c598..5f4dfad9b9 100644 --- a/src/Nancy.Tests/Unit/Bootstrapper/InstanceRegistrationFixture.cs +++ b/src/Nancy.Tests/Unit/Bootstrapper/InstanceRegistrationFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Unit.Bootstrapper { using System; + using Nancy.Bootstrapper; + using Xunit; public class InstanceRegistrationFixture diff --git a/src/Nancy.Tests/Unit/Bootstrapper/NancyBootstrapperBaseFixture.cs b/src/Nancy.Tests/Unit/Bootstrapper/NancyBootstrapperBaseFixture.cs index 1194217681..189866d309 100644 --- a/src/Nancy.Tests/Unit/Bootstrapper/NancyBootstrapperBaseFixture.cs +++ b/src/Nancy.Tests/Unit/Bootstrapper/NancyBootstrapperBaseFixture.cs @@ -1,15 +1,17 @@ -using Nancy.Diagnostics; - -namespace Nancy.Tests.Unit.Bootstrapper +namespace Nancy.Tests.Unit.Bootstrapper { using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading; + using FakeItEasy; + using Nancy.Bootstrapper; + using Nancy.Diagnostics; using Nancy.Tests.Fakes; + using Xunit; public class NancyBootstrapperBaseFixture @@ -70,8 +72,8 @@ public void GetEngine_Calls_RegisterModules_With_Assembly_Modules() // Then this.bootstrapper.PassedModules.ShouldNotBeNull(); - this.bootstrapper.PassedModules.Where(mr => mr.ModuleType == typeof(Fakes.FakeNancyModuleWithBasePath)).FirstOrDefault().ShouldNotBeNull(); - this.bootstrapper.PassedModules.Where(mr => mr.ModuleType == typeof(Fakes.FakeNancyModuleWithoutBasePath)).FirstOrDefault().ShouldNotBeNull(); + this.bootstrapper.PassedModules.Where(mr => mr.ModuleType == typeof(FakeNancyModuleWithBasePath)).FirstOrDefault().ShouldNotBeNull(); + this.bootstrapper.PassedModules.Where(mr => mr.ModuleType == typeof(FakeNancyModuleWithoutBasePath)).FirstOrDefault().ShouldNotBeNull(); } [Fact] diff --git a/src/Nancy.Tests/Unit/Bootstrapper/NancyInternalConfigurationFixture.cs b/src/Nancy.Tests/Unit/Bootstrapper/NancyInternalConfigurationFixture.cs index 7018e47dd1..050ac12d6b 100644 --- a/src/Nancy.Tests/Unit/Bootstrapper/NancyInternalConfigurationFixture.cs +++ b/src/Nancy.Tests/Unit/Bootstrapper/NancyInternalConfigurationFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Unit.Bootstrapper { using System.Linq; + using FakeItEasy; + using Nancy.Bootstrapper; using Nancy.ModelBinding; diff --git a/src/Nancy.Tests/Unit/Bootstrapper/PipelinesFixture.cs b/src/Nancy.Tests/Unit/Bootstrapper/PipelinesFixture.cs index dbc0411aaa..4dd7b0c9d6 100644 --- a/src/Nancy.Tests/Unit/Bootstrapper/PipelinesFixture.cs +++ b/src/Nancy.Tests/Unit/Bootstrapper/PipelinesFixture.cs @@ -2,7 +2,9 @@ { using System; using System.Linq; + using Nancy.Bootstrapper; + using Xunit; public class PipelinesFixture diff --git a/src/Nancy.Tests/Unit/Bootstrapper/TypeRegistrationFixture.cs b/src/Nancy.Tests/Unit/Bootstrapper/TypeRegistrationFixture.cs index b620377a5d..ab784a7086 100644 --- a/src/Nancy.Tests/Unit/Bootstrapper/TypeRegistrationFixture.cs +++ b/src/Nancy.Tests/Unit/Bootstrapper/TypeRegistrationFixture.cs @@ -2,8 +2,10 @@ namespace Nancy.Tests.Unit.Bootstrapper { using System; using System.Collections.Generic; + using Nancy.Bootstrapper; using Nancy.Diagnostics; + using Xunit; public class TypeRegistrationFixture diff --git a/src/Nancy.Tests/Unit/Conventions/DefaultAcceptHeaderCoercionConventionsFixture.cs b/src/Nancy.Tests/Unit/Conventions/DefaultAcceptHeaderCoercionConventionsFixture.cs index d93d9ac857..af93da37ae 100644 --- a/src/Nancy.Tests/Unit/Conventions/DefaultAcceptHeaderCoercionConventionsFixture.cs +++ b/src/Nancy.Tests/Unit/Conventions/DefaultAcceptHeaderCoercionConventionsFixture.cs @@ -1,10 +1,7 @@ namespace Nancy.Tests.Unit.Conventions { - using System; - using System.Collections.Generic; - using System.Globalization; using Nancy.Conventions; - using Nancy.Testing; + using Xunit; public class DefaultAcceptHeaderCoercionConventionsFixture diff --git a/src/Nancy.Tests/Unit/Conventions/DefaultCultureConventionsFixture.cs b/src/Nancy.Tests/Unit/Conventions/DefaultCultureConventionsFixture.cs index ac4bc7e4ef..dba0233e62 100644 --- a/src/Nancy.Tests/Unit/Conventions/DefaultCultureConventionsFixture.cs +++ b/src/Nancy.Tests/Unit/Conventions/DefaultCultureConventionsFixture.cs @@ -2,11 +2,11 @@ { using System; using System.Collections.Generic; - using System.Linq; - using System.Text; + using System.Globalization; + using Nancy.Conventions; + using Xunit; - using System.Globalization; public class DefaultCultureConventionsFixture { diff --git a/src/Nancy.Tests/Unit/Conventions/DefaultStaticContentsConventionsFixture.cs b/src/Nancy.Tests/Unit/Conventions/DefaultStaticContentsConventionsFixture.cs index dc08a71560..2535fa355a 100644 --- a/src/Nancy.Tests/Unit/Conventions/DefaultStaticContentsConventionsFixture.cs +++ b/src/Nancy.Tests/Unit/Conventions/DefaultStaticContentsConventionsFixture.cs @@ -2,8 +2,9 @@ { using System; using System.Collections.Generic; - using System.IO; + using Nancy.Conventions; + using Xunit; public class DefaultStaticContentsConventionsFixture diff --git a/src/Nancy.Tests/Unit/Conventions/DefaultViewLocationConventionsFixture.cs b/src/Nancy.Tests/Unit/Conventions/DefaultViewLocationConventionsFixture.cs index dcf1f3a20e..622627530b 100644 --- a/src/Nancy.Tests/Unit/Conventions/DefaultViewLocationConventionsFixture.cs +++ b/src/Nancy.Tests/Unit/Conventions/DefaultViewLocationConventionsFixture.cs @@ -2,10 +2,12 @@ namespace Nancy.Tests.Unit.Conventions { using System; using System.Collections.Generic; + using System.Globalization; + using Nancy.Conventions; using Nancy.ViewEngines; + using Xunit; - using System.Globalization; using Xunit.Extensions; public class DefaultViewLocationConventionsFixture diff --git a/src/Nancy.Tests/Unit/Culture/BuiltInCultureConventionFixture.cs b/src/Nancy.Tests/Unit/Culture/BuiltInCultureConventionFixture.cs index 7dfe6c60f6..ca7e699008 100644 --- a/src/Nancy.Tests/Unit/Culture/BuiltInCultureConventionFixture.cs +++ b/src/Nancy.Tests/Unit/Culture/BuiltInCultureConventionFixture.cs @@ -2,14 +2,16 @@ { using System; using System.Collections.Generic; + using System.Globalization; using System.IO; using System.Threading; using Nancy.Conventions; using Nancy.IO; + using Nancy.Session; + using Xunit; using Xunit.Extensions; - using System.Globalization; public class BuiltInCultureConventionFixture { @@ -198,7 +200,7 @@ public void Should_throw_exception_if_invalid_session_value(string cultureName) { "CurrentCulture", cultureName } }; - context.Request.Session = new Session.Session(new Dictionary(sessionValues)); + context.Request.Session = new Session(new Dictionary(sessionValues)); //When var exception = @@ -219,7 +221,7 @@ public void Should_return_culture_if_session_populated() { "CurrentCulture", new CultureInfo("en-GB") } }; - context.Request.Session = new Session.Session(new Dictionary(sessionValues)); + context.Request.Session = new Session(new Dictionary(sessionValues)); //When var culture = BuiltInCultureConventions.SessionCulture(context); diff --git a/src/Nancy.Tests/Unit/DefaultNancyBootstrapperBootstrapperBaseFixture.cs b/src/Nancy.Tests/Unit/DefaultNancyBootstrapperBootstrapperBaseFixture.cs index 68d9b63226..5dda3b9f7f 100644 --- a/src/Nancy.Tests/Unit/DefaultNancyBootstrapperBootstrapperBaseFixture.cs +++ b/src/Nancy.Tests/Unit/DefaultNancyBootstrapperBootstrapperBaseFixture.cs @@ -4,10 +4,8 @@ namespace Nancy.Tests.Unit using System; using System.Collections.Generic; - using FakeItEasy; - using Nancy.Bootstrapper; - using Bootstrapper.Base; + using Nancy.Tests.Unit.Bootstrapper.Base; using Nancy.TinyIoc; public class DefaultNancyBootstrapperBootstrapperBaseFixture : BootstrapperBaseFixtureBase diff --git a/src/Nancy.Tests/Unit/DefaultNancyBootstrapperFixture.cs b/src/Nancy.Tests/Unit/DefaultNancyBootstrapperFixture.cs index 097567e629..4b66d1ca5a 100644 --- a/src/Nancy.Tests/Unit/DefaultNancyBootstrapperFixture.cs +++ b/src/Nancy.Tests/Unit/DefaultNancyBootstrapperFixture.cs @@ -1,18 +1,15 @@ namespace Nancy.Tests.Unit { - using System; + using System.CodeDom.Compiler; using System.Collections.Generic; using System.Linq; - using System.CodeDom.Compiler; - - using FakeItEasy; using Microsoft.CSharp; using Nancy.Bootstrapper; using Nancy.Tests.Fakes; using Nancy.TinyIoc; - + using Xunit; public class DefaultNancyBootstrapperFixture diff --git a/src/Nancy.Tests/Unit/DefaultNancyBootstrapperModuleCatalogFixture.cs b/src/Nancy.Tests/Unit/DefaultNancyBootstrapperModuleCatalogFixture.cs index f3292f5bbc..7d249a5745 100644 --- a/src/Nancy.Tests/Unit/DefaultNancyBootstrapperModuleCatalogFixture.cs +++ b/src/Nancy.Tests/Unit/DefaultNancyBootstrapperModuleCatalogFixture.cs @@ -1,8 +1,9 @@ namespace Nancy.Tests.Unit { using System.Collections.Generic; - using Bootstrapper.Base; + using Nancy.Bootstrapper; + using Nancy.Tests.Unit.Bootstrapper.Base; public class DefaultNancyBootstrapperModuleCatalogFixture : ModuleCatalogFixtureBase { diff --git a/src/Nancy.Tests/Unit/DefaultResponseFormatterFactoryFixture.cs b/src/Nancy.Tests/Unit/DefaultResponseFormatterFactoryFixture.cs index 361f8ac2b2..d6b5a98aac 100644 --- a/src/Nancy.Tests/Unit/DefaultResponseFormatterFactoryFixture.cs +++ b/src/Nancy.Tests/Unit/DefaultResponseFormatterFactoryFixture.cs @@ -1,6 +1,7 @@ namespace Nancy.Tests.Unit { using FakeItEasy; + using Xunit; public class DefaultResponseFormatterFactoryFixture diff --git a/src/Nancy.Tests/Unit/DefaultResponseFormatterFixture.cs b/src/Nancy.Tests/Unit/DefaultResponseFormatterFixture.cs index 856010318f..939d415e3c 100644 --- a/src/Nancy.Tests/Unit/DefaultResponseFormatterFixture.cs +++ b/src/Nancy.Tests/Unit/DefaultResponseFormatterFixture.cs @@ -1,6 +1,7 @@ namespace Nancy.Tests.Unit { using FakeItEasy; + using Xunit; public class DefaultResponseFormatterFixture diff --git a/src/Nancy.Tests/Unit/Diagnostics/ConcurrentLimitedCollectionFixture.cs b/src/Nancy.Tests/Unit/Diagnostics/ConcurrentLimitedCollectionFixture.cs index 70f4a0153f..5d5ebff979 100644 --- a/src/Nancy.Tests/Unit/Diagnostics/ConcurrentLimitedCollectionFixture.cs +++ b/src/Nancy.Tests/Unit/Diagnostics/ConcurrentLimitedCollectionFixture.cs @@ -26,8 +26,8 @@ public void Should_be_able_to_add_items() this.collection.Add(obj); this.collection.Add(obj2); - this.collection.Any(o => object.ReferenceEquals(obj, o)).ShouldBeTrue(); - this.collection.Any(o => object.ReferenceEquals(obj2, o)).ShouldBeTrue(); + this.collection.Any(o => ReferenceEquals(obj, o)).ShouldBeTrue(); + this.collection.Any(o => ReferenceEquals(obj2, o)).ShouldBeTrue(); } [Fact] @@ -92,7 +92,7 @@ public void First_element_should_drop_off_when_over_limit() this.collection.Add(obj5); this.collection.Add(obj6); - this.collection.Any(o => object.ReferenceEquals(obj, o)).ShouldBeFalse(); + this.collection.Any(o => ReferenceEquals(obj, o)).ShouldBeFalse(); } } } \ No newline at end of file diff --git a/src/Nancy.Tests/Unit/Diagnostics/CustomInteractiveDiagnosticsFixture.cs b/src/Nancy.Tests/Unit/Diagnostics/CustomInteractiveDiagnosticsFixture.cs index e32162a13c..9b4c5a39f1 100644 --- a/src/Nancy.Tests/Unit/Diagnostics/CustomInteractiveDiagnosticsFixture.cs +++ b/src/Nancy.Tests/Unit/Diagnostics/CustomInteractiveDiagnosticsFixture.cs @@ -3,8 +3,8 @@ using System; using System.Collections.Generic; using System.Linq; + using Nancy.Bootstrapper; - using Nancy.Cookies; using Nancy.Cryptography; using Nancy.Culture; using Nancy.Diagnostics; @@ -14,8 +14,9 @@ using Nancy.Routing; using Nancy.Routing.Constraints; using Nancy.Testing; - using Nancy.Tests; //While this directive is redundant, it's required to build on mono 2.x to allow it to resolve the Should* extension methods + using Xunit; +//While this directive is redundant, it's required to build on mono 2.x to allow it to resolve the Should* extension methods public class CustomInteractiveDiagnosticsHookFixture { diff --git a/src/Nancy.Tests/Unit/Diagnostics/DefaultRequestTraceFactoryFixture.cs b/src/Nancy.Tests/Unit/Diagnostics/DefaultRequestTraceFactoryFixture.cs index cb25799f37..afc366cb96 100644 --- a/src/Nancy.Tests/Unit/Diagnostics/DefaultRequestTraceFactoryFixture.cs +++ b/src/Nancy.Tests/Unit/Diagnostics/DefaultRequestTraceFactoryFixture.cs @@ -2,6 +2,7 @@ { using System.Collections.Generic; using System.IO; + using Nancy.Diagnostics; using Nancy.IO; using Nancy.Testing; diff --git a/src/Nancy.Tests/Unit/Diagnostics/DiagnosticsHookFixture.cs b/src/Nancy.Tests/Unit/Diagnostics/DiagnosticsHookFixture.cs index c94540d61e..bdf7f30a16 100644 --- a/src/Nancy.Tests/Unit/Diagnostics/DiagnosticsHookFixture.cs +++ b/src/Nancy.Tests/Unit/Diagnostics/DiagnosticsHookFixture.cs @@ -2,10 +2,12 @@ { using System; using System.Linq; + using Nancy.Cookies; using Nancy.Cryptography; using Nancy.Diagnostics; using Nancy.Testing; + using Xunit; public class DiagnosticsHookFixture diff --git a/src/Nancy.Tests/Unit/DynamicDictionaryFixture.cs b/src/Nancy.Tests/Unit/DynamicDictionaryFixture.cs index 688b689932..539645f126 100755 --- a/src/Nancy.Tests/Unit/DynamicDictionaryFixture.cs +++ b/src/Nancy.Tests/Unit/DynamicDictionaryFixture.cs @@ -4,6 +4,9 @@ namespace Nancy.Tests.Unit using System.Collections.Generic; using System.Globalization; using System.Linq; + + using Nancy.Json; + using Xunit; using Xunit.Extensions; @@ -794,7 +797,7 @@ public void String_dictionary_values_are_Json_serialized_as_strings() dynamic value = "42"; var input = new DynamicDictionaryValue(value); - var sut = new Nancy.Json.JavaScriptSerializer(); + var sut = new JavaScriptSerializer(); var actual = sut.Serialize(input); actual.ShouldEqual(@"""42"""); @@ -806,7 +809,7 @@ public void Integer_dictionary_values_are_Json_serialized_as_integers() dynamic value = 42; var input = new DynamicDictionaryValue(value); - var sut = new Nancy.Json.JavaScriptSerializer(); + var sut = new JavaScriptSerializer(); var actual = sut.Serialize(input); actual.ShouldEqual(@"42"); diff --git a/src/Nancy.Tests/Unit/ErrorHandling/DefaultStatusCodeHandlerFixture.cs b/src/Nancy.Tests/Unit/ErrorHandling/DefaultStatusCodeHandlerFixture.cs index 8d0fa0bd18..7af7ca9519 100644 --- a/src/Nancy.Tests/Unit/ErrorHandling/DefaultStatusCodeHandlerFixture.cs +++ b/src/Nancy.Tests/Unit/ErrorHandling/DefaultStatusCodeHandlerFixture.cs @@ -2,7 +2,9 @@ namespace Nancy.Tests.Unit.ErrorHandling { using System; using System.IO; + using Nancy.ErrorHandling; + using Xunit; using Xunit.Extensions; diff --git a/src/Nancy.Tests/Unit/ErrorPipelineFixture.cs b/src/Nancy.Tests/Unit/ErrorPipelineFixture.cs index 44edddeabb..a7540d60ac 100644 --- a/src/Nancy.Tests/Unit/ErrorPipelineFixture.cs +++ b/src/Nancy.Tests/Unit/ErrorPipelineFixture.cs @@ -2,7 +2,7 @@ { using System; using System.Linq; - using System.Threading; + using Xunit; public class ErrorPipelineFixture diff --git a/src/Nancy.Tests/Unit/Extensions/RequestExtensionsFixture.cs b/src/Nancy.Tests/Unit/Extensions/RequestExtensionsFixture.cs index 49ab9792e7..11c9f827ae 100644 --- a/src/Nancy.Tests/Unit/Extensions/RequestExtensionsFixture.cs +++ b/src/Nancy.Tests/Unit/Extensions/RequestExtensionsFixture.cs @@ -1,8 +1,10 @@ namespace Nancy.Tests.Unit.Extensions { using System.Collections.Generic; + using Nancy.Extensions; - using Fakes; + using Nancy.Tests.Fakes; + using Xunit; public class RequestExtensionsFixture diff --git a/src/Nancy.Tests/Unit/Extensions/StringExtensionsFixture.cs b/src/Nancy.Tests/Unit/Extensions/StringExtensionsFixture.cs index 4f6169c0b6..2d6a175c76 100644 --- a/src/Nancy.Tests/Unit/Extensions/StringExtensionsFixture.cs +++ b/src/Nancy.Tests/Unit/Extensions/StringExtensionsFixture.cs @@ -1,8 +1,7 @@ namespace Nancy.Tests.Unit.Extensions { - using System; - using System.Linq; using Nancy.Extensions; + using Xunit; public class StringExtensionsFixture diff --git a/src/Nancy.Tests/Unit/Extensions/TypeExtensionsFixture.cs b/src/Nancy.Tests/Unit/Extensions/TypeExtensionsFixture.cs index c390756cd5..45121c5dfd 100644 --- a/src/Nancy.Tests/Unit/Extensions/TypeExtensionsFixture.cs +++ b/src/Nancy.Tests/Unit/Extensions/TypeExtensionsFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Unit.Extensions { using System; + using Nancy.Extensions; + using Xunit; public class TypeExtensionsFixture diff --git a/src/Nancy.Tests/Unit/FormatterExtensionsFixture.cs b/src/Nancy.Tests/Unit/FormatterExtensionsFixture.cs index 9155c6475f..732889c3c4 100644 --- a/src/Nancy.Tests/Unit/FormatterExtensionsFixture.cs +++ b/src/Nancy.Tests/Unit/FormatterExtensionsFixture.cs @@ -1,6 +1,7 @@ namespace Nancy.Tests.Unit { using FakeItEasy; + using Xunit; public class FormatterExtensionsFixture diff --git a/src/Nancy.Tests/Unit/HeadResponseFixture.cs b/src/Nancy.Tests/Unit/HeadResponseFixture.cs index cca961a7d0..a34c0bb375 100644 --- a/src/Nancy.Tests/Unit/HeadResponseFixture.cs +++ b/src/Nancy.Tests/Unit/HeadResponseFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Unit { using System.Collections.Generic; - using Tests.Extensions; + + using Nancy.Tests.Extensions; + using Xunit; public class HeadResponseFixture diff --git a/src/Nancy.Tests/Unit/Helpers/HttpUtilityFixture.cs b/src/Nancy.Tests/Unit/Helpers/HttpUtilityFixture.cs index 36b187219f..1f5ae8aa59 100644 --- a/src/Nancy.Tests/Unit/Helpers/HttpUtilityFixture.cs +++ b/src/Nancy.Tests/Unit/Helpers/HttpUtilityFixture.cs @@ -1,10 +1,11 @@ namespace Nancy.Tests.Unit.Helpers { using Nancy.Helpers; + using Xunit; using Xunit.Extensions; - public class HttpUtilityFixture + public class HttpUtilityFixture { [Fact] public void ParseQueryString_respects_case_insensitive_setting() diff --git a/src/Nancy.Tests/Unit/HttpMultipartBoundaryFixture.cs b/src/Nancy.Tests/Unit/HttpMultipartBoundaryFixture.cs index dec796e67b..f8dc72a77d 100644 --- a/src/Nancy.Tests/Unit/HttpMultipartBoundaryFixture.cs +++ b/src/Nancy.Tests/Unit/HttpMultipartBoundaryFixture.cs @@ -2,7 +2,7 @@ { using System.IO; using System.Text; - using Nancy; + using Xunit; public class HttpMultipartBoundaryFixture diff --git a/src/Nancy.Tests/Unit/HttpMultipartBufferFixture.cs b/src/Nancy.Tests/Unit/HttpMultipartBufferFixture.cs index ebdca49137..5f9b9cb387 100644 --- a/src/Nancy.Tests/Unit/HttpMultipartBufferFixture.cs +++ b/src/Nancy.Tests/Unit/HttpMultipartBufferFixture.cs @@ -1,7 +1,7 @@ namespace Nancy.Tests.Unit { using System.Text; - using Nancy; + using Xunit; public class HttpMultipartBufferFixture diff --git a/src/Nancy.Tests/Unit/HttpMultipartFixture.cs b/src/Nancy.Tests/Unit/HttpMultipartFixture.cs index 1e7c227c0a..0491337391 100644 --- a/src/Nancy.Tests/Unit/HttpMultipartFixture.cs +++ b/src/Nancy.Tests/Unit/HttpMultipartFixture.cs @@ -1,13 +1,13 @@ -using System.Collections.Generic; -using Nancy.IO; - namespace Nancy.Tests.Unit { using System; + using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; - using Nancy; + + using Nancy.IO; + using Xunit; public class HttpMultipartFixture diff --git a/src/Nancy.Tests/Unit/IO/RequestStreamFixture.cs b/src/Nancy.Tests/Unit/IO/RequestStreamFixture.cs index 3dfbf06681..c2148b4157 100644 --- a/src/Nancy.Tests/Unit/IO/RequestStreamFixture.cs +++ b/src/Nancy.Tests/Unit/IO/RequestStreamFixture.cs @@ -2,10 +2,12 @@ namespace Nancy.Tests.Unit.IO { using System; using System.IO; + using FakeItEasy; + using Nancy.IO; + using Xunit; - using Xunit.Extensions; public class RequestStreamFixture { diff --git a/src/Nancy.Tests/Unit/Json/JavaScriptSerializerFixture.cs b/src/Nancy.Tests/Unit/Json/JavaScriptSerializerFixture.cs index 31a3a5143e..afd50876de 100644 --- a/src/Nancy.Tests/Unit/Json/JavaScriptSerializerFixture.cs +++ b/src/Nancy.Tests/Unit/Json/JavaScriptSerializerFixture.cs @@ -1,16 +1,13 @@ namespace Nancy.Tests.Unit.Json { - using System; - using System.Collections.Generic; - using System.IO; - using FakeItEasy; - using Nancy.IO; - using Nancy.Json; - using Xunit; - using Xunit.Extensions; - using Xunit.Sdk; - - public class JavaScriptSerializerFixture + using System; + + using Nancy.Json; + + using Xunit; + using Xunit.Sdk; + + public class JavaScriptSerializerFixture { [Fact] public void Should_register_converters_when_asked() diff --git a/src/Nancy.Tests/Unit/Json/TestConverter.cs b/src/Nancy.Tests/Unit/Json/TestConverter.cs index 8dc79c2b10..6dffe3145c 100644 --- a/src/Nancy.Tests/Unit/Json/TestConverter.cs +++ b/src/Nancy.Tests/Unit/Json/TestConverter.cs @@ -1,10 +1,11 @@ namespace Nancy.Tests.Unit.Json { - using System; - using System.Collections.Generic; - using Nancy.Json; + using System; + using System.Collections.Generic; - public class TestConverter : JavaScriptConverter + using Nancy.Json; + + public class TestConverter : JavaScriptConverter { public override IEnumerable SupportedTypes { diff --git a/src/Nancy.Tests/Unit/Json/TestConverterType.cs b/src/Nancy.Tests/Unit/Json/TestConverterType.cs index 60dd111754..f5b3887d35 100644 --- a/src/Nancy.Tests/Unit/Json/TestConverterType.cs +++ b/src/Nancy.Tests/Unit/Json/TestConverterType.cs @@ -1,8 +1,8 @@ namespace Nancy.Tests.Unit.Json { - using System; + using System; - public class TestConverterType : IEquatable + public class TestConverterType : IEquatable { public int Data; diff --git a/src/Nancy.Tests/Unit/Json/TestData.cs b/src/Nancy.Tests/Unit/Json/TestData.cs index c09298d106..1fd9c203f6 100644 --- a/src/Nancy.Tests/Unit/Json/TestData.cs +++ b/src/Nancy.Tests/Unit/Json/TestData.cs @@ -1,8 +1,8 @@ namespace Nancy.Tests.Unit.Json { - using System; + using System; - public class TestData : IEquatable + public class TestData : IEquatable { public TestConverterType ConverterData; public TestPrimitiveConverterType PrimitiveConverterData; diff --git a/src/Nancy.Tests/Unit/Json/TestPrimitiveConverter.cs b/src/Nancy.Tests/Unit/Json/TestPrimitiveConverter.cs index ca856fc5bd..4507dff57a 100644 --- a/src/Nancy.Tests/Unit/Json/TestPrimitiveConverter.cs +++ b/src/Nancy.Tests/Unit/Json/TestPrimitiveConverter.cs @@ -1,10 +1,11 @@ namespace Nancy.Tests.Unit.Json { - using System; - using System.Collections.Generic; - using Nancy.Json; + using System; + using System.Collections.Generic; - public class TestPrimitiveConverter : JavaScriptPrimitiveConverter + using Nancy.Json; + + public class TestPrimitiveConverter : JavaScriptPrimitiveConverter { public override IEnumerable SupportedTypes { diff --git a/src/Nancy.Tests/Unit/Json/TestPrimitiveConverterType.cs b/src/Nancy.Tests/Unit/Json/TestPrimitiveConverterType.cs index 3c246737c3..db19044ad0 100644 --- a/src/Nancy.Tests/Unit/Json/TestPrimitiveConverterType.cs +++ b/src/Nancy.Tests/Unit/Json/TestPrimitiveConverterType.cs @@ -1,8 +1,8 @@ namespace Nancy.Tests.Unit.Json { - using System; + using System; - public class TestPrimitiveConverterType : IEquatable + public class TestPrimitiveConverterType : IEquatable { public int Data; diff --git a/src/Nancy.Tests/Unit/JsonFormatterExtensionsFixtures.cs b/src/Nancy.Tests/Unit/JsonFormatterExtensionsFixtures.cs index 97b044f9f3..a3c0928c78 100644 --- a/src/Nancy.Tests/Unit/JsonFormatterExtensionsFixtures.cs +++ b/src/Nancy.Tests/Unit/JsonFormatterExtensionsFixtures.cs @@ -2,10 +2,12 @@ namespace Nancy.Tests.Unit { using System.IO; using System.Text; + using FakeItEasy; using Nancy.Responses; using Nancy.Tests.Fakes; + using Xunit; public class JsonFormatterExtensionsFixtures diff --git a/src/Nancy.Tests/Unit/Localization/ResourceBasedTextResourceFixture.cs b/src/Nancy.Tests/Unit/Localization/ResourceBasedTextResourceFixture.cs index 971ad47350..81e0f1846c 100644 --- a/src/Nancy.Tests/Unit/Localization/ResourceBasedTextResourceFixture.cs +++ b/src/Nancy.Tests/Unit/Localization/ResourceBasedTextResourceFixture.cs @@ -1,9 +1,11 @@ namespace Nancy.Tests.Unit.Localization { using FakeItEasy; - using Xunit; + using Nancy.Localization; + using Xunit; + public class ResourceBasedTextResourceFixture { [Fact] diff --git a/src/Nancy.Tests/Unit/ModelBinding/BindingMemberInfoFixture.cs b/src/Nancy.Tests/Unit/ModelBinding/BindingMemberInfoFixture.cs index 12c2574409..0c565f5842 100644 --- a/src/Nancy.Tests/Unit/ModelBinding/BindingMemberInfoFixture.cs +++ b/src/Nancy.Tests/Unit/ModelBinding/BindingMemberInfoFixture.cs @@ -1,10 +1,11 @@ namespace Nancy.Tests.Unit.ModelBinding { - using System; using System.Collections.Generic; using System.Linq; using System.Xml.Serialization; + using Nancy.ModelBinding; + using Xunit; using Xunit.Sdk; diff --git a/src/Nancy.Tests/Unit/ModelBinding/DefaultBinderFixture.cs b/src/Nancy.Tests/Unit/ModelBinding/DefaultBinderFixture.cs index 62b8ae066e..7a34a41ee1 100644 --- a/src/Nancy.Tests/Unit/ModelBinding/DefaultBinderFixture.cs +++ b/src/Nancy.Tests/Unit/ModelBinding/DefaultBinderFixture.cs @@ -2,21 +2,24 @@ namespace Nancy.Tests.Unit.ModelBinding { using System; using System.Collections.Generic; + using System.Globalization; using System.IO; using System.Linq; using System.Text; - using System.Globalization; using System.Xml.Serialization; + using FakeItEasy; - using Fakes; + using Nancy.IO; using Nancy.Json; using Nancy.ModelBinding; using Nancy.ModelBinding.DefaultBodyDeserializers; using Nancy.ModelBinding.DefaultConverters; + using Nancy.Tests.Fakes; using Nancy.Tests.Unit.ModelBinding.DefaultBodyDeserializers; - using Xunit.Extensions; + using Xunit; + using Xunit.Extensions; public class DefaultBinderFixture { diff --git a/src/Nancy.Tests/Unit/ModelBinding/DefaultBodyDeserializers/JsonBodyDeserializerFixture.cs b/src/Nancy.Tests/Unit/ModelBinding/DefaultBodyDeserializers/JsonBodyDeserializerFixture.cs index a8425c4a16..cdd9af37a8 100644 --- a/src/Nancy.Tests/Unit/ModelBinding/DefaultBodyDeserializers/JsonBodyDeserializerFixture.cs +++ b/src/Nancy.Tests/Unit/ModelBinding/DefaultBodyDeserializers/JsonBodyDeserializerFixture.cs @@ -2,9 +2,9 @@ namespace Nancy.Tests.Unit.ModelBinding.DefaultBodyDeserializers { using System; using System.Collections.Generic; + using System.Globalization; using System.IO; using System.Linq; - using System.Globalization; using System.Text; using System.Threading; diff --git a/src/Nancy.Tests/Unit/ModelBinding/DefaultBodyDeserializers/XmlBodyDeserializerfixture.cs b/src/Nancy.Tests/Unit/ModelBinding/DefaultBodyDeserializers/XmlBodyDeserializerfixture.cs index eba0ac7ac9..51ec84e231 100644 --- a/src/Nancy.Tests/Unit/ModelBinding/DefaultBodyDeserializers/XmlBodyDeserializerfixture.cs +++ b/src/Nancy.Tests/Unit/ModelBinding/DefaultBodyDeserializers/XmlBodyDeserializerfixture.cs @@ -4,9 +4,12 @@ namespace Nancy.Tests.Unit.ModelBinding.DefaultBodyDeserializers using System.Linq; using System.Text; using System.Xml.Serialization; + using FakeItEasy; + using Nancy.ModelBinding; using Nancy.ModelBinding.DefaultBodyDeserializers; + using Xunit; public class XmlBodyDeserializerFixture diff --git a/src/Nancy.Tests/Unit/ModelBinding/DefaultConverters/CollectionConverterFixture.cs b/src/Nancy.Tests/Unit/ModelBinding/DefaultConverters/CollectionConverterFixture.cs index d6de40b856..efa273b529 100644 --- a/src/Nancy.Tests/Unit/ModelBinding/DefaultConverters/CollectionConverterFixture.cs +++ b/src/Nancy.Tests/Unit/ModelBinding/DefaultConverters/CollectionConverterFixture.cs @@ -2,7 +2,9 @@ namespace Nancy.Tests.Unit.ModelBinding.DefaultConverters { using System.Collections.Generic; using System.Linq; + using FakeItEasy; + using Nancy.ModelBinding; using Nancy.ModelBinding.DefaultConverters; diff --git a/src/Nancy.Tests/Unit/ModelBinding/DefaultModelBinderLocatorFixture.cs b/src/Nancy.Tests/Unit/ModelBinding/DefaultModelBinderLocatorFixture.cs index d059883f0a..abafb2eb64 100644 --- a/src/Nancy.Tests/Unit/ModelBinding/DefaultModelBinderLocatorFixture.cs +++ b/src/Nancy.Tests/Unit/ModelBinding/DefaultModelBinderLocatorFixture.cs @@ -1,9 +1,12 @@ namespace Nancy.Tests.Unit.ModelBinding { using System; + using FakeItEasy; + using Nancy.ModelBinding; using Nancy.Tests.Fakes; + using Xunit; public class DefaultModelBinderLocatorFixture diff --git a/src/Nancy.Tests/Unit/ModelBinding/DynamicModelBinderAdapterFixture.cs b/src/Nancy.Tests/Unit/ModelBinding/DynamicModelBinderAdapterFixture.cs index d65d2c8d26..c22f2be80d 100644 --- a/src/Nancy.Tests/Unit/ModelBinding/DynamicModelBinderAdapterFixture.cs +++ b/src/Nancy.Tests/Unit/ModelBinding/DynamicModelBinderAdapterFixture.cs @@ -1,8 +1,11 @@ namespace Nancy.Tests.Unit.ModelBinding { using System; + using FakeItEasy; + using Nancy.ModelBinding; + using Xunit; public class DynamicModelBinderAdapterFixture diff --git a/src/Nancy.Tests/Unit/ModelBinding/ModelBindingExceptionFixture.cs b/src/Nancy.Tests/Unit/ModelBinding/ModelBindingExceptionFixture.cs index fd6a421e1c..416502a2db 100644 --- a/src/Nancy.Tests/Unit/ModelBinding/ModelBindingExceptionFixture.cs +++ b/src/Nancy.Tests/Unit/ModelBinding/ModelBindingExceptionFixture.cs @@ -3,7 +3,9 @@ using System; using System.Collections.Generic; using System.Linq; + using Nancy.ModelBinding; + using Xunit; public class ModelBindingExceptionFixture diff --git a/src/Nancy.Tests/Unit/ModelBinding/PropertyBindingExceptionFixture.cs b/src/Nancy.Tests/Unit/ModelBinding/PropertyBindingExceptionFixture.cs index e15b1a2f1e..b4309efc62 100644 --- a/src/Nancy.Tests/Unit/ModelBinding/PropertyBindingExceptionFixture.cs +++ b/src/Nancy.Tests/Unit/ModelBinding/PropertyBindingExceptionFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Unit.ModelBinding { using System; + using Nancy.ModelBinding; + using Xunit; public class PropertyBindingExceptionFixture diff --git a/src/Nancy.Tests/Unit/ModuleNameFixture.cs b/src/Nancy.Tests/Unit/ModuleNameFixture.cs index 9d2bc4280e..1e53fe5880 100644 --- a/src/Nancy.Tests/Unit/ModuleNameFixture.cs +++ b/src/Nancy.Tests/Unit/ModuleNameFixture.cs @@ -1,8 +1,9 @@ namespace Nancy.Tests.Unit { - using Xunit; using Nancy.Extensions; + using Xunit; + public class ModuleNameFixture { class FakeModule : NancyModule diff --git a/src/Nancy.Tests/Unit/NamedPipelineBaseFixture.cs b/src/Nancy.Tests/Unit/NamedPipelineBaseFixture.cs index 7c70f9600f..50b479db08 100644 --- a/src/Nancy.Tests/Unit/NamedPipelineBaseFixture.cs +++ b/src/Nancy.Tests/Unit/NamedPipelineBaseFixture.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; + using Xunit; public class NamedPipelineBaseFixture diff --git a/src/Nancy.Tests/Unit/NancyContextFixture.cs b/src/Nancy.Tests/Unit/NancyContextFixture.cs index e6adfdc86f..6a82cdeb60 100644 --- a/src/Nancy.Tests/Unit/NancyContextFixture.cs +++ b/src/Nancy.Tests/Unit/NancyContextFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Unit { using System; + using FakeItEasy; + using Xunit; public class NancyContextFixture diff --git a/src/Nancy.Tests/Unit/NancyCookieFixture.cs b/src/Nancy.Tests/Unit/NancyCookieFixture.cs index 18f76f3f18..65fc7e36b0 100644 --- a/src/Nancy.Tests/Unit/NancyCookieFixture.cs +++ b/src/Nancy.Tests/Unit/NancyCookieFixture.cs @@ -2,7 +2,10 @@ namespace Nancy.Tests.Unit { using System; using System.Globalization; - using Cookies; + using System.Threading; + + using Nancy.Cookies; + using Xunit; public class NancyCookieFixture @@ -36,11 +39,11 @@ public void Should_stringify_an_expiry_to_gmt_and_stupid_format() [Fact] public void Should_stringify_an_expiry_to_english() { - var originalCulture = System.Threading.Thread.CurrentThread.CurrentCulture; + var originalCulture = Thread.CurrentThread.CurrentCulture; try { // Given - System.Threading.Thread.CurrentThread.CurrentCulture = new CultureInfo("fr-FR"); + Thread.CurrentThread.CurrentCulture = new CultureInfo("fr-FR"); var date = new DateTime(2015, 10, 8, 9, 10, 11, DateTimeKind.Utc); // When @@ -51,7 +54,7 @@ public void Should_stringify_an_expiry_to_english() } finally { - System.Threading.Thread.CurrentThread.CurrentCulture = originalCulture; + Thread.CurrentThread.CurrentCulture = originalCulture; } } diff --git a/src/Nancy.Tests/Unit/NancyEngineFixture.cs b/src/Nancy.Tests/Unit/NancyEngineFixture.cs index 5af41bc07b..86d036253a 100644 --- a/src/Nancy.Tests/Unit/NancyEngineFixture.cs +++ b/src/Nancy.Tests/Unit/NancyEngineFixture.cs @@ -6,6 +6,7 @@ namespace Nancy.Tests.Unit using System.Threading.Tasks; using FakeItEasy; + using Nancy.Bootstrapper; using Nancy.Diagnostics; using Nancy.ErrorHandling; @@ -13,8 +14,8 @@ namespace Nancy.Tests.Unit using Nancy.Helpers; using Nancy.Routing; using Nancy.Tests.Fakes; + using Xunit; - using Nancy.Culture; public class NancyEngineFixture { diff --git a/src/Nancy.Tests/Unit/NancyModuleFixture.cs b/src/Nancy.Tests/Unit/NancyModuleFixture.cs index 6eac149283..532205e9b5 100644 --- a/src/Nancy.Tests/Unit/NancyModuleFixture.cs +++ b/src/Nancy.Tests/Unit/NancyModuleFixture.cs @@ -2,7 +2,9 @@ namespace Nancy.Tests.Unit { using System; using System.Linq; - using Fakes; + + using Nancy.Tests.Fakes; + using Xunit; public class NancyModuleFixture diff --git a/src/Nancy.Tests/Unit/RequestFixture.cs b/src/Nancy.Tests/Unit/RequestFixture.cs index 445c4a1ab5..2f2dfab6be 100644 --- a/src/Nancy.Tests/Unit/RequestFixture.cs +++ b/src/Nancy.Tests/Unit/RequestFixture.cs @@ -5,8 +5,11 @@ namespace Nancy.Tests.Unit using System.IO; using System.Linq; using System.Text; + using FakeItEasy; + using Nancy.IO; + using Xunit; using Xunit.Extensions; diff --git a/src/Nancy.Tests/Unit/RequestHeadersFixture.cs b/src/Nancy.Tests/Unit/RequestHeadersFixture.cs index d3550333e0..0358a611bb 100644 --- a/src/Nancy.Tests/Unit/RequestHeadersFixture.cs +++ b/src/Nancy.Tests/Unit/RequestHeadersFixture.cs @@ -3,8 +3,9 @@ using System; using System.Collections.Generic; using System.Linq; - using Nancy; + using Nancy.Cookies; + using Xunit; using Xunit.Extensions; diff --git a/src/Nancy.Tests/Unit/ResponseFixture.cs b/src/Nancy.Tests/Unit/ResponseFixture.cs index d1479edba9..4b397cd513 100644 --- a/src/Nancy.Tests/Unit/ResponseFixture.cs +++ b/src/Nancy.Tests/Unit/ResponseFixture.cs @@ -2,9 +2,9 @@ { using System; - using Nancy; - using Nancy.Cookies; + using Nancy.Cookies; using Nancy.Tests.Extensions; + using Xunit; public class ResponseFixture diff --git a/src/Nancy.Tests/Unit/Responses/DefaultJsonSerializerFixture.cs b/src/Nancy.Tests/Unit/Responses/DefaultJsonSerializerFixture.cs index 60143f5c84..c7743ef09f 100644 --- a/src/Nancy.Tests/Unit/Responses/DefaultJsonSerializerFixture.cs +++ b/src/Nancy.Tests/Unit/Responses/DefaultJsonSerializerFixture.cs @@ -7,7 +7,6 @@ using Nancy.Json; using Nancy.Responses; - using Nancy.Tests.xUnitExtensions; using Xunit; diff --git a/src/Nancy.Tests/Unit/Responses/EmbeddedFileResponseFixture.cs b/src/Nancy.Tests/Unit/Responses/EmbeddedFileResponseFixture.cs index 9ea9abdf71..da22ad80de 100644 --- a/src/Nancy.Tests/Unit/Responses/EmbeddedFileResponseFixture.cs +++ b/src/Nancy.Tests/Unit/Responses/EmbeddedFileResponseFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Unit.Responses { using System.IO; + using Nancy.Responses; + using Xunit; public class EmbeddedFileResponseFixture diff --git a/src/Nancy.Tests/Unit/Responses/GenericFileResponseFixture.cs b/src/Nancy.Tests/Unit/Responses/GenericFileResponseFixture.cs index 21f7744189..da8aee9ed1 100644 --- a/src/Nancy.Tests/Unit/Responses/GenericFileResponseFixture.cs +++ b/src/Nancy.Tests/Unit/Responses/GenericFileResponseFixture.cs @@ -2,7 +2,9 @@ { using System.Collections.Generic; using System.IO; + using Nancy.Responses; + using Xunit; public class GenericFileResponseFixture diff --git a/src/Nancy.Tests/Unit/Responses/RedirectResponseFixture.cs b/src/Nancy.Tests/Unit/Responses/RedirectResponseFixture.cs index 24b137a505..04b1f40a3b 100644 --- a/src/Nancy.Tests/Unit/Responses/RedirectResponseFixture.cs +++ b/src/Nancy.Tests/Unit/Responses/RedirectResponseFixture.cs @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Xunit; -using Nancy.Responses; - -namespace Nancy.Tests.Unit.Responses +namespace Nancy.Tests.Unit.Responses { + using Nancy.Responses; + + using Xunit; + public class RedirectResponseFixture { [Fact] diff --git a/src/Nancy.Tests/Unit/Responses/StreamResponseFixture.cs b/src/Nancy.Tests/Unit/Responses/StreamResponseFixture.cs index 6406f08a72..50170d55b1 100644 --- a/src/Nancy.Tests/Unit/Responses/StreamResponseFixture.cs +++ b/src/Nancy.Tests/Unit/Responses/StreamResponseFixture.cs @@ -1,8 +1,11 @@ namespace Nancy.Tests.Unit.Responses { using System.IO; + using FakeItEasy; + using Nancy.Responses; + using Xunit; public class StreamResponseFixture diff --git a/src/Nancy.Tests/Unit/Responses/TextResponseFixture.cs b/src/Nancy.Tests/Unit/Responses/TextResponseFixture.cs index 7792189446..fefce9c7de 100644 --- a/src/Nancy.Tests/Unit/Responses/TextResponseFixture.cs +++ b/src/Nancy.Tests/Unit/Responses/TextResponseFixture.cs @@ -2,7 +2,9 @@ { using System.IO; using System.Text; + using Nancy.Responses; + using Xunit; public class TextResponseFixture diff --git a/src/Nancy.Tests/Unit/Routing/ConstraintNodeRouteResolverFixture.cs b/src/Nancy.Tests/Unit/Routing/ConstraintNodeRouteResolverFixture.cs index e3865a3029..aafad42719 100644 --- a/src/Nancy.Tests/Unit/Routing/ConstraintNodeRouteResolverFixture.cs +++ b/src/Nancy.Tests/Unit/Routing/ConstraintNodeRouteResolverFixture.cs @@ -2,8 +2,10 @@ { using System; using System.Globalization; + using Nancy.Helpers; using Nancy.Testing; + using Xunit; public class ConstraintNodeRouteResolverFixture diff --git a/src/Nancy.Tests/Unit/Routing/ConstraintNodeRouteScoringFixture.cs b/src/Nancy.Tests/Unit/Routing/ConstraintNodeRouteScoringFixture.cs index 6eb2dde212..b7b5b59fb8 100644 --- a/src/Nancy.Tests/Unit/Routing/ConstraintNodeRouteScoringFixture.cs +++ b/src/Nancy.Tests/Unit/Routing/ConstraintNodeRouteScoringFixture.cs @@ -1,6 +1,7 @@ namespace Nancy.Tests.Unit.Routing { using Nancy.Testing; + using Xunit; public class ConstraintNodeRouteScoringFixture diff --git a/src/Nancy.Tests/Unit/Routing/DefaultNancyModuleBuilderFixture.cs b/src/Nancy.Tests/Unit/Routing/DefaultNancyModuleBuilderFixture.cs index 2c15931ca1..fb2b435b9d 100644 --- a/src/Nancy.Tests/Unit/Routing/DefaultNancyModuleBuilderFixture.cs +++ b/src/Nancy.Tests/Unit/Routing/DefaultNancyModuleBuilderFixture.cs @@ -1,14 +1,14 @@ namespace Nancy.Tests.Unit.Routing { using FakeItEasy; - using Fakes; - using Nancy.Localization; using Nancy.ModelBinding; using Nancy.Routing; + using Nancy.Tests.Fakes; + using Nancy.Validation; using Nancy.ViewEngines; + using Xunit; - using Nancy.Validation; public class DefaultNancyModuleBuilderFixture { diff --git a/src/Nancy.Tests/Unit/Routing/DefaultRequestDispatcherFixture.cs b/src/Nancy.Tests/Unit/Routing/DefaultRequestDispatcherFixture.cs index 517c236838..5fb5e79ff0 100644 --- a/src/Nancy.Tests/Unit/Routing/DefaultRequestDispatcherFixture.cs +++ b/src/Nancy.Tests/Unit/Routing/DefaultRequestDispatcherFixture.cs @@ -7,11 +7,12 @@ namespace Nancy.Tests.Unit.Routing using System.Threading.Tasks; using FakeItEasy; - using Fakes; using Nancy.Helpers; using Nancy.Responses.Negotiation; using Nancy.Routing; + using Nancy.Tests.Fakes; + using Xunit; public class DefaultRequestDispatcherFixture diff --git a/src/Nancy.Tests/Unit/Routing/DefaultRouteCacheProviderFixture.cs b/src/Nancy.Tests/Unit/Routing/DefaultRouteCacheProviderFixture.cs index 5a7f9d52ef..4803a3537c 100755 --- a/src/Nancy.Tests/Unit/Routing/DefaultRouteCacheProviderFixture.cs +++ b/src/Nancy.Tests/Unit/Routing/DefaultRouteCacheProviderFixture.cs @@ -1,24 +1,23 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Xunit; -using FakeItEasy; - -namespace Nancy.Tests.Unit.Routing +namespace Nancy.Tests.Unit.Routing { + using FakeItEasy; + + using Nancy.Routing; + + using Xunit; + public class DefaultRouteCacheProviderFixture { - private Nancy.Routing.IRouteCacheProvider _Provider; - private Nancy.Routing.IRouteCache _RouteCache; + private IRouteCacheProvider _Provider; + private IRouteCache _RouteCache; /// /// Initializes a new instance of the DefaultRouteCacheProviderFixture class. /// public DefaultRouteCacheProviderFixture() { - _RouteCache = A.Fake(); - _Provider = new Nancy.Routing.DefaultRouteCacheProvider(() => _RouteCache); + _RouteCache = A.Fake(); + _Provider = new DefaultRouteCacheProvider(() => _RouteCache); } [Fact] diff --git a/src/Nancy.Tests/Unit/Routing/DefaultRouteInvokerFixture.cs b/src/Nancy.Tests/Unit/Routing/DefaultRouteInvokerFixture.cs index 62f4a1ed65..1f983c41e4 100644 --- a/src/Nancy.Tests/Unit/Routing/DefaultRouteInvokerFixture.cs +++ b/src/Nancy.Tests/Unit/Routing/DefaultRouteInvokerFixture.cs @@ -11,7 +11,6 @@ using Nancy.Tests.Fakes; using Xunit; - using Xunit.Extensions; public class DefaultRouteInvokerFixture { diff --git a/src/Nancy.Tests/Unit/Routing/DefaultRoutePatternMatcherFixture.cs b/src/Nancy.Tests/Unit/Routing/DefaultRoutePatternMatcherFixture.cs index 229c440a11..63a9b9cd86 100644 --- a/src/Nancy.Tests/Unit/Routing/DefaultRoutePatternMatcherFixture.cs +++ b/src/Nancy.Tests/Unit/Routing/DefaultRoutePatternMatcherFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Unit.Routing { using System; + using Nancy.Routing; + using Xunit; public class DefaultRoutePatternMatcherFixture diff --git a/src/Nancy.Tests/Unit/Routing/DefaultRouteResolverFixture.cs b/src/Nancy.Tests/Unit/Routing/DefaultRouteResolverFixture.cs index db2b1372fc..d9af3469dc 100644 --- a/src/Nancy.Tests/Unit/Routing/DefaultRouteResolverFixture.cs +++ b/src/Nancy.Tests/Unit/Routing/DefaultRouteResolverFixture.cs @@ -1,6 +1,7 @@ namespace Nancy.Tests.Unit.Routing { using Nancy.Testing; + using Xunit; using Xunit.Extensions; diff --git a/src/Nancy.Tests/Unit/Routing/DefaultRouteSegmentExtractorFixture.cs b/src/Nancy.Tests/Unit/Routing/DefaultRouteSegmentExtractorFixture.cs index 886dc22d22..ed15baf014 100644 --- a/src/Nancy.Tests/Unit/Routing/DefaultRouteSegmentExtractorFixture.cs +++ b/src/Nancy.Tests/Unit/Routing/DefaultRouteSegmentExtractorFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Unit.Routing { using System.Linq; + using Nancy.Routing; + using Xunit; public class DefaultRouteSegmentExtractorFixture diff --git a/src/Nancy.Tests/Unit/Routing/NotFoundRouteFixture.cs b/src/Nancy.Tests/Unit/Routing/NotFoundRouteFixture.cs index 5f47108f10..37f611ca25 100644 --- a/src/Nancy.Tests/Unit/Routing/NotFoundRouteFixture.cs +++ b/src/Nancy.Tests/Unit/Routing/NotFoundRouteFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Unit.Routing { using System.Threading; + using Nancy.Routing; + using Xunit; public class NotFoundRouteFixture diff --git a/src/Nancy.Tests/Unit/Routing/RouteCacheFixture.cs b/src/Nancy.Tests/Unit/Routing/RouteCacheFixture.cs index 015f4d65b6..90f340167c 100755 --- a/src/Nancy.Tests/Unit/Routing/RouteCacheFixture.cs +++ b/src/Nancy.Tests/Unit/Routing/RouteCacheFixture.cs @@ -2,11 +2,14 @@ { using System.Collections.Generic; using System.Linq; - using Nancy.Tests.Fakes; - using Xunit; + using FakeItEasy; - using Nancy.Routing; + using Nancy.Culture; + using Nancy.Routing; + using Nancy.Tests.Fakes; + + using Xunit; public class RouteCacheFixture { diff --git a/src/Nancy.Tests/Unit/Routing/RouteDescriptionFixture.cs b/src/Nancy.Tests/Unit/Routing/RouteDescriptionFixture.cs index a19f67a0f2..5c38004d26 100644 --- a/src/Nancy.Tests/Unit/Routing/RouteDescriptionFixture.cs +++ b/src/Nancy.Tests/Unit/Routing/RouteDescriptionFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Unit.Routing { using System; + using Nancy.Routing; + using Xunit; public class RouteDescriptionFixture diff --git a/src/Nancy.Tests/Unit/Routing/RouteFixture.cs b/src/Nancy.Tests/Unit/Routing/RouteFixture.cs index b1e58faf51..02e9b9ef37 100644 --- a/src/Nancy.Tests/Unit/Routing/RouteFixture.cs +++ b/src/Nancy.Tests/Unit/Routing/RouteFixture.cs @@ -3,8 +3,8 @@ using System; using System.Threading; - using Fakes; using Nancy.Routing; + using Xunit; public class RouteFixture diff --git a/src/Nancy.Tests/Unit/Security/CsrfFixture.cs b/src/Nancy.Tests/Unit/Security/CsrfFixture.cs index 4749fa6b98..205bfb1f7a 100644 --- a/src/Nancy.Tests/Unit/Security/CsrfFixture.cs +++ b/src/Nancy.Tests/Unit/Security/CsrfFixture.cs @@ -2,6 +2,7 @@ { using System.Linq; using System.Threading; + using FakeItEasy; using Nancy.Bootstrapper; diff --git a/src/Nancy.Tests/Unit/Security/DefaultCsrfTokenValidatorFixture.cs b/src/Nancy.Tests/Unit/Security/DefaultCsrfTokenValidatorFixture.cs index 462dc4140f..c7a3565656 100644 --- a/src/Nancy.Tests/Unit/Security/DefaultCsrfTokenValidatorFixture.cs +++ b/src/Nancy.Tests/Unit/Security/DefaultCsrfTokenValidatorFixture.cs @@ -1,8 +1,10 @@ namespace Nancy.Tests.Unit.Security { using System; + using Nancy.Cryptography; using Nancy.Security; + using Xunit; public class DefaultCsrfTokenValidatorFixture diff --git a/src/Nancy.Tests/Unit/Security/ModuleSecurityFixture.cs b/src/Nancy.Tests/Unit/Security/ModuleSecurityFixture.cs index 1c8691bc65..adb41252b4 100644 --- a/src/Nancy.Tests/Unit/Security/ModuleSecurityFixture.cs +++ b/src/Nancy.Tests/Unit/Security/ModuleSecurityFixture.cs @@ -4,7 +4,9 @@ namespace Nancy.Tests.Unit.Security using System; using System.Collections.Generic; using System.Threading; + using FakeItEasy; + using Nancy.Responses; using Nancy.Security; using Nancy.Tests.Fakes; diff --git a/src/Nancy.Tests/Unit/Security/SSLProxyFixture.cs b/src/Nancy.Tests/Unit/Security/SSLProxyFixture.cs index a5793ed3d1..8d2e4d8d5f 100644 --- a/src/Nancy.Tests/Unit/Security/SSLProxyFixture.cs +++ b/src/Nancy.Tests/Unit/Security/SSLProxyFixture.cs @@ -1,10 +1,12 @@ namespace Nancy.Tests.Unit.Security { + using System.Collections.Generic; + using System.Threading; + using Nancy.Bootstrapper; using Nancy.Security; using Nancy.Tests.Fakes; - using System.Collections.Generic; - using System.Threading; + using Xunit; public class SSLProxyFixture diff --git a/src/Nancy.Tests/Unit/Security/UserIdentityExtensionsFixture.cs b/src/Nancy.Tests/Unit/Security/UserIdentityExtensionsFixture.cs index 5ec4cb003c..e4d486b6a4 100644 --- a/src/Nancy.Tests/Unit/Security/UserIdentityExtensionsFixture.cs +++ b/src/Nancy.Tests/Unit/Security/UserIdentityExtensionsFixture.cs @@ -2,10 +2,7 @@ namespace Nancy.Tests.Unit.Security { using System; using System.Collections.Generic; - using System.Linq; - using FakeItEasy; - using Nancy.Responses; using Nancy.Security; using Nancy.Tests.Fakes; diff --git a/src/Nancy.Tests/Unit/Sessions/CookieBasedSessionsConfigurationFixture.cs b/src/Nancy.Tests/Unit/Sessions/CookieBasedSessionsConfigurationFixture.cs index 45f0115654..f5b0099f04 100644 --- a/src/Nancy.Tests/Unit/Sessions/CookieBasedSessionsConfigurationFixture.cs +++ b/src/Nancy.Tests/Unit/Sessions/CookieBasedSessionsConfigurationFixture.cs @@ -5,6 +5,7 @@ namespace Nancy.Testing.Tests using Nancy.Cryptography; using Nancy.Session; using Nancy.Tests; + using Xunit; public class CookieBasesSessionsConfigurationFixture diff --git a/src/Nancy.Tests/Unit/Sessions/CookieBasedSessionsFixture.cs b/src/Nancy.Tests/Unit/Sessions/CookieBasedSessionsFixture.cs index 1b1a7b1b2b..f13a5ad7e5 100644 --- a/src/Nancy.Tests/Unit/Sessions/CookieBasedSessionsFixture.cs +++ b/src/Nancy.Tests/Unit/Sessions/CookieBasedSessionsFixture.cs @@ -6,18 +6,16 @@ namespace Nancy.Tests.Unit.Sessions using System.Threading; using System.Web; - using Nancy.Cryptography; - using FakeItEasy; using Nancy.Bootstrapper; + using Nancy.Cryptography; using Nancy.IO; using Nancy.Session; + using Nancy.Tests.Fakes; using Xunit; - using Helpers = Nancy.Helpers; - public class CookieBasedSessionsFixture { private const string ValidData = "VgPJvXYwcXkn0gxDvg84tsfV9F5he1ZxhjsTZK1UZHVqWk7izPd9XsWnuFMrtQNRJEfyiqU2J7tAZDQvdKjQij9wUO6mOTCyZ7HPHK/pEnkgDFMXbHDctGQZSbb2WZZxola+Q3nP2tlQ+Tx//N6YyK7BwpsNPrvyHAvU1z5YzHfPT6HEowIl8mz/uUL6o+FME/Goi7RN2getMeYaPCs0fJkiMCAomnnagAy4aXN0Ak/p7Y3K/kpNAS6PvNu4aok0zVpfo1utP84GyyLomfr4urmDNFIe8PBVoKhuomxjsUOddaarHqqmN3PXOp15SPXPDxEKfpuLzhmqXnStiB8nH9qMBYI/AuLHMckDzkeESH5rQ2q2+1RgCN82PujzGhhVnBMk95ZS9k9zKCvKQa2yzVkaHqwSESyOFboU89kLAEQ0h48dtoJ2FTBs9GjsL3Z4fGogeLwjIvP8I8JF39HI+9U3PC2KnicA/bgUL/Z1paDzZYTrqQS4QSyFgy4DOxYz"; @@ -38,7 +36,7 @@ public CookieBasedSessionsFixture() { this.fakeEncryptionProvider = A.Fake(); this.fakeHmacProvider = A.Fake(); - this.fakeObjectSerializer = new Fakes.FakeObjectSerializer(); + this.fakeObjectSerializer = new FakeObjectSerializer(); this.cookieStore = new CookieBasedSessions(this.fakeEncryptionProvider, this.fakeHmacProvider, this.fakeObjectSerializer); this.rijndaelEncryptionProvider = new RijndaelEncryptionProvider(new PassphraseKeyGenerator("password", new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 }, 1000)); @@ -308,7 +306,7 @@ public void Should_be_able_to_load_an_object_previously_saved_to_session() session["testObject"] = payload; store.Save(session, response); var request = new Request("GET", "/", "http"); - request.Cookies.Add(Helpers.HttpUtility.UrlEncode(response.Cookies.First().Name), Helpers.HttpUtility.UrlEncode(response.Cookies.First().Value)); + request.Cookies.Add(Nancy.Helpers.HttpUtility.UrlEncode(response.Cookies.First().Name), Nancy.Helpers.HttpUtility.UrlEncode(response.Cookies.First().Value)); var result = store.Load(request); diff --git a/src/Nancy.Tests/Unit/Sessions/DefaultSessionObjectFormatterFixture.cs b/src/Nancy.Tests/Unit/Sessions/DefaultSessionObjectFormatterFixture.cs index 57ede79d07..cf353f6006 100644 --- a/src/Nancy.Tests/Unit/Sessions/DefaultSessionObjectFormatterFixture.cs +++ b/src/Nancy.Tests/Unit/Sessions/DefaultSessionObjectFormatterFixture.cs @@ -2,8 +2,6 @@ namespace Nancy.Tests.Unit.Sessions { using System; - using Nancy.Session; - using Xunit; public class DefaultSessionObjectFormatterFixture diff --git a/src/Nancy.Tests/Unit/Sessions/NullSessionProviderFixture.cs b/src/Nancy.Tests/Unit/Sessions/NullSessionProviderFixture.cs index b3da0fa225..5a67afe877 100644 --- a/src/Nancy.Tests/Unit/Sessions/NullSessionProviderFixture.cs +++ b/src/Nancy.Tests/Unit/Sessions/NullSessionProviderFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Unit.Sessions { using System; - using Session; + + using Nancy.Session; + using Xunit; public class NullSessionProviderFixture diff --git a/src/Nancy.Tests/Unit/Sessions/SessionFixture.cs b/src/Nancy.Tests/Unit/Sessions/SessionFixture.cs index 8617594e31..688d8cebcf 100644 --- a/src/Nancy.Tests/Unit/Sessions/SessionFixture.cs +++ b/src/Nancy.Tests/Unit/Sessions/SessionFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests { using System.Collections.Generic; - using Session; + + using Nancy.Session; + using Xunit; public class SessionFixture diff --git a/src/Nancy.Tests/Unit/StaticContentConventionBuilderFixture.cs b/src/Nancy.Tests/Unit/StaticContentConventionBuilderFixture.cs index fcd627bc07..dae583db56 100644 --- a/src/Nancy.Tests/Unit/StaticContentConventionBuilderFixture.cs +++ b/src/Nancy.Tests/Unit/StaticContentConventionBuilderFixture.cs @@ -5,10 +5,11 @@ using System.Globalization; using System.IO; using System.Text; + using Nancy.Conventions; using Nancy.Diagnostics; - using Nancy.IO; using Nancy.Responses; + using Xunit; using Xunit.Extensions; diff --git a/src/Nancy.Tests/Unit/TextFormatterFixture.cs b/src/Nancy.Tests/Unit/TextFormatterFixture.cs index 3dbd0fa267..9d3b82c616 100644 --- a/src/Nancy.Tests/Unit/TextFormatterFixture.cs +++ b/src/Nancy.Tests/Unit/TextFormatterFixture.cs @@ -2,7 +2,9 @@ { using System.IO; using System.Text; + using FakeItEasy; + using Xunit; public class TextFormatterFixture diff --git a/src/Nancy.Tests/Unit/UrlFixture.cs b/src/Nancy.Tests/Unit/UrlFixture.cs index 145a894e51..a4192c3c8d 100644 --- a/src/Nancy.Tests/Unit/UrlFixture.cs +++ b/src/Nancy.Tests/Unit/UrlFixture.cs @@ -1,8 +1,7 @@ -using System.Net; - -namespace Nancy.Tests.Unit +namespace Nancy.Tests.Unit { using System; + using Xunit; using Xunit.Extensions; diff --git a/src/Nancy.Tests/Unit/Validation/CompositeValidatorFixture.cs b/src/Nancy.Tests/Unit/Validation/CompositeValidatorFixture.cs index 58d8f3ee92..530753268a 100644 --- a/src/Nancy.Tests/Unit/Validation/CompositeValidatorFixture.cs +++ b/src/Nancy.Tests/Unit/Validation/CompositeValidatorFixture.cs @@ -1,8 +1,11 @@ namespace Nancy.Tests.Unit.Validation { using System.Linq; + using FakeItEasy; + using Nancy.Validation; + using Xunit; public class CompositeValidatorFixture diff --git a/src/Nancy.Tests/Unit/Validation/DefaultValidatorLocatorFixture.cs b/src/Nancy.Tests/Unit/Validation/DefaultValidatorLocatorFixture.cs index 3af7440660..b4d9a56fff 100644 --- a/src/Nancy.Tests/Unit/Validation/DefaultValidatorLocatorFixture.cs +++ b/src/Nancy.Tests/Unit/Validation/DefaultValidatorLocatorFixture.cs @@ -1,9 +1,11 @@ namespace Nancy.Tests.Unit.Validation { using System; - using System.Linq; + using FakeItEasy; + using Nancy.Validation; + using Xunit; public class DefaultValidatorLocatorFixture diff --git a/src/Nancy.Tests/Unit/Validation/ModuleExtensionsFixture.cs b/src/Nancy.Tests/Unit/Validation/ModuleExtensionsFixture.cs index 02400bcf0d..a4649e060b 100644 --- a/src/Nancy.Tests/Unit/Validation/ModuleExtensionsFixture.cs +++ b/src/Nancy.Tests/Unit/Validation/ModuleExtensionsFixture.cs @@ -1,10 +1,13 @@ namespace Nancy.Tests.Unit.Validation { using System; + using FakeItEasy; + + using Nancy.Tests.Fakes; using Nancy.Validation; + using Xunit; - using Nancy.Tests.Fakes; public class ModuleExtensionsFixture { diff --git a/src/Nancy.Tests/Unit/Validation/ValidationResultFixture.cs b/src/Nancy.Tests/Unit/Validation/ValidationResultFixture.cs index b8165e61b2..2ce72c7a40 100644 --- a/src/Nancy.Tests/Unit/Validation/ValidationResultFixture.cs +++ b/src/Nancy.Tests/Unit/Validation/ValidationResultFixture.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using Nancy.Validation; + using Xunit; public class ModelValidationResultFixture diff --git a/src/Nancy.Tests/Unit/ViewEngines/DefaultViewFactoryFixture.cs b/src/Nancy.Tests/Unit/ViewEngines/DefaultViewFactoryFixture.cs index 7628f3e930..2edaa4c013 100644 --- a/src/Nancy.Tests/Unit/ViewEngines/DefaultViewFactoryFixture.cs +++ b/src/Nancy.Tests/Unit/ViewEngines/DefaultViewFactoryFixture.cs @@ -3,15 +3,16 @@ namespace Nancy.Tests.Unit.ViewEngines using System; using System.Dynamic; using System.IO; + using System.Linq; + using FakeItEasy; + using Nancy.Conventions; using Nancy.Diagnostics; - using Nancy.ViewEngines; using Nancy.Tests.Fakes; - using Xunit; - using System.Linq; - using Nancy.Conventions; + using Nancy.ViewEngines; + using Xunit; public class DefaultViewFactoryFixture { diff --git a/src/Nancy.Tests/Unit/ViewEngines/DefaultViewLocatorFixture.cs b/src/Nancy.Tests/Unit/ViewEngines/DefaultViewLocatorFixture.cs index 9f7255d6df..720bac21eb 100644 --- a/src/Nancy.Tests/Unit/ViewEngines/DefaultViewLocatorFixture.cs +++ b/src/Nancy.Tests/Unit/ViewEngines/DefaultViewLocatorFixture.cs @@ -1,16 +1,15 @@ namespace Nancy.Tests.Unit.ViewEngines { using System.Collections.Generic; + using System.Linq; using FakeItEasy; - using Fakes; using Nancy.ViewEngines; + using Xunit; using Xunit.Extensions; - using System.Linq; - public class DefaultViewLocatorFixture { private readonly ViewLocationResult viewLocation; diff --git a/src/Nancy.Tests/Unit/ViewEngines/DefaultViewRendererFixture.cs b/src/Nancy.Tests/Unit/ViewEngines/DefaultViewRendererFixture.cs index f7bb69bb5f..719795331d 100644 --- a/src/Nancy.Tests/Unit/ViewEngines/DefaultViewRendererFixture.cs +++ b/src/Nancy.Tests/Unit/ViewEngines/DefaultViewRendererFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Unit.ViewEngines { using FakeItEasy; + using Nancy.ViewEngines; + using Xunit; public class DefaultViewRendererFixture diff --git a/src/Nancy.Tests/Unit/ViewEngines/DefaultViewResolverFixture.cs b/src/Nancy.Tests/Unit/ViewEngines/DefaultViewResolverFixture.cs index b47d8ba959..e446e82cb5 100644 --- a/src/Nancy.Tests/Unit/ViewEngines/DefaultViewResolverFixture.cs +++ b/src/Nancy.Tests/Unit/ViewEngines/DefaultViewResolverFixture.cs @@ -3,11 +3,13 @@ using System; using System.IO; using System.Linq; + using FakeItEasy; using Nancy.Conventions; using Nancy.Diagnostics; using Nancy.ViewEngines; + using Xunit; public class DefaultViewResolverFixture diff --git a/src/Nancy.Tests/Unit/ViewEngines/FileSystemViewLocationProviderFixture.cs b/src/Nancy.Tests/Unit/ViewEngines/FileSystemViewLocationProviderFixture.cs index ae25323a3d..d7d219e2bc 100644 --- a/src/Nancy.Tests/Unit/ViewEngines/FileSystemViewLocationProviderFixture.cs +++ b/src/Nancy.Tests/Unit/ViewEngines/FileSystemViewLocationProviderFixture.cs @@ -4,8 +4,11 @@ namespace Nancy.Tests.Unit.ViewEngines using System.Collections.Generic; using System.IO; using System.Linq; + using FakeItEasy; + using Nancy.ViewEngines; + using Xunit; public class FileSystemViewLocationProviderFixture diff --git a/src/Nancy.Tests/Unit/ViewEngines/ResourceViewLocationProviderFixture.cs b/src/Nancy.Tests/Unit/ViewEngines/ResourceViewLocationProviderFixture.cs index 953b990fdb..ece4eb691c 100644 --- a/src/Nancy.Tests/Unit/ViewEngines/ResourceViewLocationProviderFixture.cs +++ b/src/Nancy.Tests/Unit/ViewEngines/ResourceViewLocationProviderFixture.cs @@ -5,8 +5,11 @@ namespace Nancy.Tests.Unit.ViewEngines using System.IO; using System.Linq; using System.Reflection; + using FakeItEasy; + using Nancy.ViewEngines; + using Xunit; public class ResourceViewLocationProviderFixture diff --git a/src/Nancy.Tests/Unit/ViewEngines/SuperSimpleViewEngineTests.cs b/src/Nancy.Tests/Unit/ViewEngines/SuperSimpleViewEngineTests.cs index cf377ea445..64c527ce40 100644 --- a/src/Nancy.Tests/Unit/ViewEngines/SuperSimpleViewEngineTests.cs +++ b/src/Nancy.Tests/Unit/ViewEngines/SuperSimpleViewEngineTests.cs @@ -4,7 +4,9 @@ using System.Collections.Generic; using System.Dynamic; using System.Linq; + using FakeItEasy; + using Nancy.Tests.Fakes; using Nancy.ViewEngines.SuperSimpleViewEngine; diff --git a/src/Nancy.Tests/Unit/ViewEngines/ViewEngineStartupFixture.cs b/src/Nancy.Tests/Unit/ViewEngines/ViewEngineStartupFixture.cs index 50ab355e79..12f0aaee63 100644 --- a/src/Nancy.Tests/Unit/ViewEngines/ViewEngineStartupFixture.cs +++ b/src/Nancy.Tests/Unit/ViewEngines/ViewEngineStartupFixture.cs @@ -1,10 +1,11 @@ namespace Nancy.Tests.Unit.ViewEngines { - using System; using System.Collections.Generic; - using System.Linq; + using FakeItEasy; + using Nancy.ViewEngines; + using Xunit; public class ViewEngineStartupFixture diff --git a/src/Nancy.Tests/Unit/ViewEngines/ViewNotFoundExceptionFixture.cs b/src/Nancy.Tests/Unit/ViewEngines/ViewNotFoundExceptionFixture.cs index 4977c92fb4..df8bc017b7 100644 --- a/src/Nancy.Tests/Unit/ViewEngines/ViewNotFoundExceptionFixture.cs +++ b/src/Nancy.Tests/Unit/ViewEngines/ViewNotFoundExceptionFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.Tests.Unit.ViewEngines { using FakeItEasy; + using Nancy.ViewEngines; + using Xunit; public class ViewNotFoundExceptionFixture diff --git a/src/Nancy.Tests/Unit/XmlFormatterExtensionsFixtures.cs b/src/Nancy.Tests/Unit/XmlFormatterExtensionsFixtures.cs index b00e037d76..f235c2e8dd 100644 --- a/src/Nancy.Tests/Unit/XmlFormatterExtensionsFixtures.cs +++ b/src/Nancy.Tests/Unit/XmlFormatterExtensionsFixtures.cs @@ -2,10 +2,12 @@ namespace Nancy.Tests.Unit { using System.IO; using System.Xml; + using FakeItEasy; using Nancy.Responses; using Nancy.Tests.Fakes; + using Xunit; public class XmlFormatterExtensionsFixtures diff --git a/src/Nancy.Tests/xUnitExtensions/SkipException.cs b/src/Nancy.Tests/xUnitExtensions/SkipException.cs index 486bf9d91d..af6b88caef 100644 --- a/src/Nancy.Tests/xUnitExtensions/SkipException.cs +++ b/src/Nancy.Tests/xUnitExtensions/SkipException.cs @@ -1,10 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Nancy.Tests.xUnitExtensions +namespace Nancy.Tests.xUnitExtensions { + using System; + public class SkipException : Exception { public SkipException(string reason) diff --git a/src/Nancy.Tests/xUnitExtensions/SkippableFactAttribute.cs b/src/Nancy.Tests/xUnitExtensions/SkippableFactAttribute.cs index 82bab42c91..9d3c45fd89 100644 --- a/src/Nancy.Tests/xUnitExtensions/SkippableFactAttribute.cs +++ b/src/Nancy.Tests/xUnitExtensions/SkippableFactAttribute.cs @@ -1,12 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Xunit; -using Xunit.Sdk; - -namespace Nancy.Tests.xUnitExtensions +namespace Nancy.Tests.xUnitExtensions { + using System.Collections.Generic; + + using Xunit; + using Xunit.Sdk; + public class SkippableFactAttribute : FactAttribute { protected override IEnumerable EnumerateTestCommands(IMethodInfo method) diff --git a/src/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationValidatorFactoryFixture.cs b/src/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationValidatorFactoryFixture.cs index 57e334944b..0e55518d2a 100644 --- a/src/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationValidatorFactoryFixture.cs +++ b/src/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationValidatorFactoryFixture.cs @@ -1,8 +1,9 @@ namespace Nancy.Validation.DataAnnotations.Tests { using FakeItEasy; + using Nancy.Tests; - using Nancy.Validation.DataAnnotations; + using Xunit; public class DataAnnotationValidatorFactoryFixture diff --git a/src/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationValidatorFixture.cs b/src/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationValidatorFixture.cs index d7ab77b6ba..4bd123739e 100644 --- a/src/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationValidatorFixture.cs +++ b/src/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationValidatorFixture.cs @@ -1,15 +1,15 @@ namespace Nancy.Validation.DataAnnotations.Tests { using System; + using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using FakeItEasy; using Nancy.Tests; - using Nancy.Validation.DataAnnotations; + using Xunit; - using System.Collections.Generic; public class DataAnnotationValidatorFixture { diff --git a/src/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationsValidatorFixture.cs b/src/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationsValidatorFixture.cs index 4167a6b142..38253551b9 100644 --- a/src/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationsValidatorFixture.cs +++ b/src/Nancy.Validation.DataAnnotatioins.Tests/DataAnnotationsValidatorFixture.cs @@ -1,9 +1,11 @@ namespace Nancy.Validation.DataAnnotations.Tests { using System.Linq; + using FakeItEasy; + using Nancy.Tests; - using Nancy.Validation.DataAnnotations; + using Xunit; public class DataAnnotationsValidatorFixture diff --git a/src/Nancy.Validation.DataAnnotatioins.Tests/DefaultValidatableObjectAdapterFixture.cs b/src/Nancy.Validation.DataAnnotatioins.Tests/DefaultValidatableObjectAdapterFixture.cs index 92ba3b75ef..7862f2daa8 100644 --- a/src/Nancy.Validation.DataAnnotatioins.Tests/DefaultValidatableObjectAdapterFixture.cs +++ b/src/Nancy.Validation.DataAnnotatioins.Tests/DefaultValidatableObjectAdapterFixture.cs @@ -5,7 +5,6 @@ using System.Linq; using Nancy.Tests; - using Nancy.Validation.DataAnnotations; using Xunit; diff --git a/src/Nancy.Validation.DataAnnotatioins.Tests/PropertyValidatorFixture.cs b/src/Nancy.Validation.DataAnnotatioins.Tests/PropertyValidatorFixture.cs index c1deb9069b..88399d14c8 100644 --- a/src/Nancy.Validation.DataAnnotatioins.Tests/PropertyValidatorFixture.cs +++ b/src/Nancy.Validation.DataAnnotatioins.Tests/PropertyValidatorFixture.cs @@ -4,10 +4,11 @@ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.Linq; + using FakeItEasy; using Nancy.Tests; - using Nancy.Validation.DataAnnotations; + using Xunit; public class PropertyValidatorFixture diff --git a/src/Nancy.Validation.DataAnnotations/DataAnnotationsRegistrations.cs b/src/Nancy.Validation.DataAnnotations/DataAnnotationsRegistrations.cs index 4e36b03e4e..a0a5c1f1d8 100644 --- a/src/Nancy.Validation.DataAnnotations/DataAnnotationsRegistrations.cs +++ b/src/Nancy.Validation.DataAnnotations/DataAnnotationsRegistrations.cs @@ -1,6 +1,6 @@ namespace Nancy.Validation.DataAnnotations { - using Bootstrapper; + using Nancy.Bootstrapper; /// /// Application registrations for Data Annotations validation types. diff --git a/src/Nancy.Validation.DataAnnotations/DataAnnotationsValidatorAdapter.cs b/src/Nancy.Validation.DataAnnotations/DataAnnotationsValidatorAdapter.cs index 8f3c123f92..0d5be24252 100644 --- a/src/Nancy.Validation.DataAnnotations/DataAnnotationsValidatorAdapter.cs +++ b/src/Nancy.Validation.DataAnnotations/DataAnnotationsValidatorAdapter.cs @@ -1,6 +1,5 @@ namespace Nancy.Validation.DataAnnotations { - using System; using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; diff --git a/src/Nancy.Validation.DataAnnotations/DefaultValidatableObjectAdapter.cs b/src/Nancy.Validation.DataAnnotations/DefaultValidatableObjectAdapter.cs index eb0db7354b..a51c47fd9a 100644 --- a/src/Nancy.Validation.DataAnnotations/DefaultValidatableObjectAdapter.cs +++ b/src/Nancy.Validation.DataAnnotations/DefaultValidatableObjectAdapter.cs @@ -1,8 +1,8 @@ namespace Nancy.Validation.DataAnnotations { using System.Collections.Generic; - using System.Linq; using System.ComponentModel.DataAnnotations; + using System.Linq; /// /// Default adapter for models that implements the interface. diff --git a/src/Nancy.Validation.DataAnnotations/RegexValidatorAdapter.cs b/src/Nancy.Validation.DataAnnotations/RegexValidatorAdapter.cs index 69bf3490e1..d8ebe82b62 100644 --- a/src/Nancy.Validation.DataAnnotations/RegexValidatorAdapter.cs +++ b/src/Nancy.Validation.DataAnnotations/RegexValidatorAdapter.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; + using Nancy.Validation.Rules; /// diff --git a/src/Nancy.Validation.DataAnnotations/RequiredValidatorAdapter.cs b/src/Nancy.Validation.DataAnnotations/RequiredValidatorAdapter.cs index ff96e95e51..23e2b4e661 100644 --- a/src/Nancy.Validation.DataAnnotations/RequiredValidatorAdapter.cs +++ b/src/Nancy.Validation.DataAnnotations/RequiredValidatorAdapter.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; + using Nancy.Validation.Rules; /// diff --git a/src/Nancy.Validation.DataAnnotations/StringLengthValidatorAdapter.cs b/src/Nancy.Validation.DataAnnotations/StringLengthValidatorAdapter.cs index 05185d3cbe..abf3961686 100644 --- a/src/Nancy.Validation.DataAnnotations/StringLengthValidatorAdapter.cs +++ b/src/Nancy.Validation.DataAnnotations/StringLengthValidatorAdapter.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; + using Nancy.Validation.Rules; /// diff --git a/src/Nancy.Validation.FluentValidation.Tests/DefaultFluentAdapterFactoryFixture.cs b/src/Nancy.Validation.FluentValidation.Tests/DefaultFluentAdapterFactoryFixture.cs index 9d7fd6d613..0efdb1361c 100644 --- a/src/Nancy.Validation.FluentValidation.Tests/DefaultFluentAdapterFactoryFixture.cs +++ b/src/Nancy.Validation.FluentValidation.Tests/DefaultFluentAdapterFactoryFixture.cs @@ -1,9 +1,12 @@ namespace Nancy.Validation.FluentValidation.Tests { using FakeItEasy; + + using global::FluentValidation.Validators; + using Nancy.Tests; + using Xunit; - using global::FluentValidation.Validators; public class DefaultFluentAdapterFactoryFixture { diff --git a/src/Nancy.Validation.FluentValidation.Tests/FluentValidationValidatorFactoryFixture.cs b/src/Nancy.Validation.FluentValidation.Tests/FluentValidationValidatorFactoryFixture.cs index 6981215f33..b5b29a65b3 100644 --- a/src/Nancy.Validation.FluentValidation.Tests/FluentValidationValidatorFactoryFixture.cs +++ b/src/Nancy.Validation.FluentValidation.Tests/FluentValidationValidatorFactoryFixture.cs @@ -1,9 +1,12 @@ namespace Nancy.Validation.FluentValidation.Tests { using FakeItEasy; + + using global::FluentValidation; + using Nancy.Tests; + using Xunit; - using global::FluentValidation; public class FluentValidationValidatorFactoryFixture { diff --git a/src/Nancy.Validation.FluentValidation/AdapterBase.cs b/src/Nancy.Validation.FluentValidation/AdapterBase.cs index 2993564877..0034a85214 100644 --- a/src/Nancy.Validation.FluentValidation/AdapterBase.cs +++ b/src/Nancy.Validation.FluentValidation/AdapterBase.cs @@ -2,6 +2,7 @@ { using System; using System.Collections.Generic; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; diff --git a/src/Nancy.Validation.FluentValidation/DefaultFluentAdapterFactory.cs b/src/Nancy.Validation.FluentValidation/DefaultFluentAdapterFactory.cs index aad50e1c73..5f13924786 100644 --- a/src/Nancy.Validation.FluentValidation/DefaultFluentAdapterFactory.cs +++ b/src/Nancy.Validation.FluentValidation/DefaultFluentAdapterFactory.cs @@ -2,6 +2,7 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; using System.Linq; + using global::FluentValidation.Validators; /// diff --git a/src/Nancy.Validation.FluentValidation/EmailAdapter.cs b/src/Nancy.Validation.FluentValidation/EmailAdapter.cs index 4c3b9221c5..b92b81378b 100644 --- a/src/Nancy.Validation.FluentValidation/EmailAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/EmailAdapter.cs @@ -1,10 +1,12 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; - using Nancy.Validation.Rules; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; + using Nancy.Validation.Rules; + /// /// Adapter between the Fluent Validation and the Nancy validation rules. /// diff --git a/src/Nancy.Validation.FluentValidation/EqualAdapter.cs b/src/Nancy.Validation.FluentValidation/EqualAdapter.cs index d9b8f09432..c0cef3741f 100644 --- a/src/Nancy.Validation.FluentValidation/EqualAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/EqualAdapter.cs @@ -1,10 +1,12 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; - using Nancy.Validation.Rules; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; + using Nancy.Validation.Rules; + /// /// Adapter between the Fluent Validation and the Nancy validation rules. /// diff --git a/src/Nancy.Validation.FluentValidation/ExactLengthAdapater.cs b/src/Nancy.Validation.FluentValidation/ExactLengthAdapater.cs index 76d57660a3..01c1502826 100644 --- a/src/Nancy.Validation.FluentValidation/ExactLengthAdapater.cs +++ b/src/Nancy.Validation.FluentValidation/ExactLengthAdapater.cs @@ -1,10 +1,12 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; - using Nancy.Validation.Rules; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; + using Nancy.Validation.Rules; + /// /// Adapter between the Fluent Validation and the Nancy validation rules. /// diff --git a/src/Nancy.Validation.FluentValidation/ExclusiveBetweenAdapter.cs b/src/Nancy.Validation.FluentValidation/ExclusiveBetweenAdapter.cs index 99509e5f07..737524855b 100644 --- a/src/Nancy.Validation.FluentValidation/ExclusiveBetweenAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/ExclusiveBetweenAdapter.cs @@ -1,10 +1,12 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; - using Nancy.Validation.Rules; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; + using Nancy.Validation.Rules; + /// /// Adapter between the Fluent Validation and the Nancy validation rules. /// diff --git a/src/Nancy.Validation.FluentValidation/FallbackAdapter.cs b/src/Nancy.Validation.FluentValidation/FallbackAdapter.cs index 4b78843c8a..8107a83c23 100644 --- a/src/Nancy.Validation.FluentValidation/FallbackAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/FallbackAdapter.cs @@ -1,6 +1,7 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; diff --git a/src/Nancy.Validation.FluentValidation/FluentValidationRegistrations.cs b/src/Nancy.Validation.FluentValidation/FluentValidationRegistrations.cs index 36289c7832..366b9daf96 100644 --- a/src/Nancy.Validation.FluentValidation/FluentValidationRegistrations.cs +++ b/src/Nancy.Validation.FluentValidation/FluentValidationRegistrations.cs @@ -1,13 +1,13 @@ namespace Nancy.Validation.FluentValidation { - using Bootstrapper; - using global::FluentValidation; + using Nancy.Bootstrapper; + /// /// Application registrations for Fluent Validation types. /// - public class FluentValidationRegistrations : Bootstrapper.Registrations + public class FluentValidationRegistrations : Registrations { /// /// Creates a new instance of the class, that performs diff --git a/src/Nancy.Validation.FluentValidation/FluentValidationValidator.cs b/src/Nancy.Validation.FluentValidation/FluentValidationValidator.cs index aecd89ae12..88c21d60fb 100644 --- a/src/Nancy.Validation.FluentValidation/FluentValidationValidator.cs +++ b/src/Nancy.Validation.FluentValidation/FluentValidationValidator.cs @@ -3,6 +3,7 @@ namespace Nancy.Validation.FluentValidation using System; using System.Collections.Generic; using System.Linq; + using global::FluentValidation; using global::FluentValidation.Internal; using global::FluentValidation.Results; diff --git a/src/Nancy.Validation.FluentValidation/FluentValidationValidatorFactory.cs b/src/Nancy.Validation.FluentValidation/FluentValidationValidatorFactory.cs index 291cac2543..91eed752a1 100644 --- a/src/Nancy.Validation.FluentValidation/FluentValidationValidatorFactory.cs +++ b/src/Nancy.Validation.FluentValidation/FluentValidationValidatorFactory.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; + using global::FluentValidation; /// diff --git a/src/Nancy.Validation.FluentValidation/GreaterThanAdapter.cs b/src/Nancy.Validation.FluentValidation/GreaterThanAdapter.cs index 7189d470e5..8df676a3a3 100644 --- a/src/Nancy.Validation.FluentValidation/GreaterThanAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/GreaterThanAdapter.cs @@ -1,10 +1,12 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; - using Nancy.Validation.Rules; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; + using Nancy.Validation.Rules; + /// /// Adapter between the Fluent Validation and the Nancy validation rules. /// diff --git a/src/Nancy.Validation.FluentValidation/GreaterThanOrEqualAdapter.cs b/src/Nancy.Validation.FluentValidation/GreaterThanOrEqualAdapter.cs index 0cfb05f67a..a557ddd85c 100644 --- a/src/Nancy.Validation.FluentValidation/GreaterThanOrEqualAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/GreaterThanOrEqualAdapter.cs @@ -1,10 +1,12 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; - using Nancy.Validation.Rules; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; + using Nancy.Validation.Rules; + /// /// Adapter between the Fluent Validation and the Nancy validation rules. /// diff --git a/src/Nancy.Validation.FluentValidation/IFluentAdapter.cs b/src/Nancy.Validation.FluentValidation/IFluentAdapter.cs index e98cc3d3d5..7f26cb7734 100644 --- a/src/Nancy.Validation.FluentValidation/IFluentAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/IFluentAdapter.cs @@ -1,6 +1,7 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; diff --git a/src/Nancy.Validation.FluentValidation/InclusiveBetweenAdapter.cs b/src/Nancy.Validation.FluentValidation/InclusiveBetweenAdapter.cs index 8c6b6fa10b..f0422c507f 100644 --- a/src/Nancy.Validation.FluentValidation/InclusiveBetweenAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/InclusiveBetweenAdapter.cs @@ -1,10 +1,12 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; - using Nancy.Validation.Rules; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; + using Nancy.Validation.Rules; + /// /// Adapter between the Fluent Validation and the Nancy validation rules. /// diff --git a/src/Nancy.Validation.FluentValidation/LengthAdapter.cs b/src/Nancy.Validation.FluentValidation/LengthAdapter.cs index 8e328d1d66..d08830241f 100644 --- a/src/Nancy.Validation.FluentValidation/LengthAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/LengthAdapter.cs @@ -1,10 +1,12 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; - using Nancy.Validation.Rules; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; + using Nancy.Validation.Rules; + /// /// Adapter between the Fluent Validation and the Nancy validation rules. /// diff --git a/src/Nancy.Validation.FluentValidation/LessThanAdapter.cs b/src/Nancy.Validation.FluentValidation/LessThanAdapter.cs index 932ca53dbf..f65076e035 100644 --- a/src/Nancy.Validation.FluentValidation/LessThanAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/LessThanAdapter.cs @@ -1,10 +1,12 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; - using Nancy.Validation.Rules; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; + using Nancy.Validation.Rules; + /// /// Adapter between the Fluent Validation and the Nancy validation rules. /// diff --git a/src/Nancy.Validation.FluentValidation/LessThanOrEqualAdapter.cs b/src/Nancy.Validation.FluentValidation/LessThanOrEqualAdapter.cs index 04a9eda25b..c9fdcc4f8b 100644 --- a/src/Nancy.Validation.FluentValidation/LessThanOrEqualAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/LessThanOrEqualAdapter.cs @@ -1,10 +1,12 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; - using Nancy.Validation.Rules; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; + using Nancy.Validation.Rules; + /// /// Adapter between the Fluent Validation and the Nancy validation rules. /// diff --git a/src/Nancy.Validation.FluentValidation/NotEmptyAdapter.cs b/src/Nancy.Validation.FluentValidation/NotEmptyAdapter.cs index 37bfa723e6..ab5a7343d0 100644 --- a/src/Nancy.Validation.FluentValidation/NotEmptyAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/NotEmptyAdapter.cs @@ -1,10 +1,12 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; - using Nancy.Validation.Rules; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; + using Nancy.Validation.Rules; + /// /// Adapter between the Fluent Validation and the Nancy validation rules. /// diff --git a/src/Nancy.Validation.FluentValidation/NotEqualAdapter.cs b/src/Nancy.Validation.FluentValidation/NotEqualAdapter.cs index b8aac8a99a..d0327a39f0 100644 --- a/src/Nancy.Validation.FluentValidation/NotEqualAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/NotEqualAdapter.cs @@ -1,10 +1,12 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; - using Nancy.Validation.Rules; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; + using Nancy.Validation.Rules; + /// /// Adapter between the Fluent Validation and the Nancy validation rules. /// diff --git a/src/Nancy.Validation.FluentValidation/NotNullAdapter.cs b/src/Nancy.Validation.FluentValidation/NotNullAdapter.cs index 8b4cd3f30c..8c400f777f 100644 --- a/src/Nancy.Validation.FluentValidation/NotNullAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/NotNullAdapter.cs @@ -1,10 +1,12 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; - using Nancy.Validation.Rules; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; + using Nancy.Validation.Rules; + /// /// Adapter between the Fluent Validation and the Nancy validation rules. /// diff --git a/src/Nancy.Validation.FluentValidation/RegularExpressionAdapter.cs b/src/Nancy.Validation.FluentValidation/RegularExpressionAdapter.cs index 581f716dce..ae9a75ff3e 100644 --- a/src/Nancy.Validation.FluentValidation/RegularExpressionAdapter.cs +++ b/src/Nancy.Validation.FluentValidation/RegularExpressionAdapter.cs @@ -1,10 +1,12 @@ namespace Nancy.Validation.FluentValidation { using System.Collections.Generic; - using Nancy.Validation.Rules; + using global::FluentValidation.Internal; using global::FluentValidation.Validators; + using Nancy.Validation.Rules; + /// /// Adapter between the Fluent Validation and the Nancy validation rules. /// diff --git a/src/Nancy.ViewEngines.DotLiquid.Tests/DotLiquidViewEngineFixture.cs b/src/Nancy.ViewEngines.DotLiquid.Tests/DotLiquidViewEngineFixture.cs index 5b2a362c86..695c3e238d 100644 --- a/src/Nancy.ViewEngines.DotLiquid.Tests/DotLiquidViewEngineFixture.cs +++ b/src/Nancy.ViewEngines.DotLiquid.Tests/DotLiquidViewEngineFixture.cs @@ -1,13 +1,17 @@ namespace Nancy.ViewEngines.DotLiquid.Tests { using System; + using System.Collections.Generic; using System.IO; + using FakeItEasy; + using global::DotLiquid; using global::DotLiquid.NamingConventions; + using Nancy.Tests; + using Xunit; - using System.Collections.Generic; public class DotLiquidViewEngineFixture { diff --git a/src/Nancy.ViewEngines.DotLiquid.Tests/DynamicDropFixture.cs b/src/Nancy.ViewEngines.DotLiquid.Tests/DynamicDropFixture.cs index c86ae9f854..19b29e15fc 100644 --- a/src/Nancy.ViewEngines.DotLiquid.Tests/DynamicDropFixture.cs +++ b/src/Nancy.ViewEngines.DotLiquid.Tests/DynamicDropFixture.cs @@ -1,7 +1,9 @@ namespace Nancy.ViewEngines.DotLiquid.Tests { using System.Dynamic; + using Nancy.Tests; + using Xunit; public class DynamicDropFixture diff --git a/src/Nancy.ViewEngines.DotLiquid.Tests/Functional/PartialRenderingFixture.cs b/src/Nancy.ViewEngines.DotLiquid.Tests/Functional/PartialRenderingFixture.cs index e9559a91d1..a312524a03 100644 --- a/src/Nancy.ViewEngines.DotLiquid.Tests/Functional/PartialRenderingFixture.cs +++ b/src/Nancy.ViewEngines.DotLiquid.Tests/Functional/PartialRenderingFixture.cs @@ -1,6 +1,7 @@ namespace Nancy.ViewEngines.DotLiquid.Tests.Functional { - using Testing; + using Nancy.Testing; + using Xunit; public class PartialRenderingFixture diff --git a/src/Nancy.ViewEngines.DotLiquid.Tests/Functional/RootPathProvider.cs b/src/Nancy.ViewEngines.DotLiquid.Tests/Functional/RootPathProvider.cs index 367e00fd15..c60a6694fe 100644 --- a/src/Nancy.ViewEngines.DotLiquid.Tests/Functional/RootPathProvider.cs +++ b/src/Nancy.ViewEngines.DotLiquid.Tests/Functional/RootPathProvider.cs @@ -1,7 +1,9 @@ namespace Nancy.ViewEngines.DotLiquid.Tests.Functional { using System; - using Testing; + using System.IO; + + using Nancy.Testing; public class RootPathProvider : IRootPathProvider { @@ -15,7 +17,7 @@ public string GetRootPath() new Uri(typeof (RootPathProvider).Assembly.CodeBase).LocalPath; var assemblyPath = - System.IO.Path.GetDirectoryName(assemblyFilePath); + Path.GetDirectoryName(assemblyFilePath); return PathHelper.GetParent(assemblyPath, 2); } diff --git a/src/Nancy.ViewEngines.DotLiquid.Tests/LiquidNancyFileSystemFixture.cs b/src/Nancy.ViewEngines.DotLiquid.Tests/LiquidNancyFileSystemFixture.cs index cff521be7c..3aea77da84 100644 --- a/src/Nancy.ViewEngines.DotLiquid.Tests/LiquidNancyFileSystemFixture.cs +++ b/src/Nancy.ViewEngines.DotLiquid.Tests/LiquidNancyFileSystemFixture.cs @@ -1,10 +1,13 @@ namespace Nancy.ViewEngines.DotLiquid.Tests { - using System.IO; using System.Collections.Generic; + using System.IO; + using FakeItEasy; + using global::DotLiquid; using global::DotLiquid.Exceptions; + using Nancy.Tests; using Xunit; diff --git a/src/Nancy.ViewEngines.DotLiquid/DotLiquidRegistrations.cs b/src/Nancy.ViewEngines.DotLiquid/DotLiquidRegistrations.cs index 2278863f95..38125c7a3e 100644 --- a/src/Nancy.ViewEngines.DotLiquid/DotLiquidRegistrations.cs +++ b/src/Nancy.ViewEngines.DotLiquid/DotLiquidRegistrations.cs @@ -1,8 +1,9 @@ namespace Nancy.ViewEngines.DotLiquid { - using Nancy.Bootstrapper; using global::DotLiquid.NamingConventions; + using Nancy.Bootstrapper; + /// /// Used to register the default naming conventions for the ViewEngine. The naming convention affects DotLiquid Drops and filters. /// See DotLiquid's documentation on the subject for more information. diff --git a/src/Nancy.ViewEngines.DotLiquid/DotLiquidViewEngine.cs b/src/Nancy.ViewEngines.DotLiquid/DotLiquidViewEngine.cs index ce9b685458..17b7680dc9 100644 --- a/src/Nancy.ViewEngines.DotLiquid/DotLiquidViewEngine.cs +++ b/src/Nancy.ViewEngines.DotLiquid/DotLiquidViewEngine.cs @@ -1,14 +1,15 @@ namespace Nancy.ViewEngines.DotLiquid { - using Responses; using System; using System.Collections.Generic; - using System.Dynamic; using System.IO; + using global::DotLiquid; + using global::DotLiquid.Exceptions; using global::DotLiquid.FileSystems; using global::DotLiquid.NamingConventions; - using global::DotLiquid.Exceptions; + + using Nancy.Responses; /// /// View engine for rendering dotLiquid views. diff --git a/src/Nancy.ViewEngines.DotLiquid/DynamicDrop.cs b/src/Nancy.ViewEngines.DotLiquid/DynamicDrop.cs index 28893554b0..09230ede42 100644 --- a/src/Nancy.ViewEngines.DotLiquid/DynamicDrop.cs +++ b/src/Nancy.ViewEngines.DotLiquid/DynamicDrop.cs @@ -1,9 +1,6 @@ -using System; -using System.Runtime.CompilerServices; -using Microsoft.CSharp.RuntimeBinder; - -namespace Nancy.ViewEngines.DotLiquid +namespace Nancy.ViewEngines.DotLiquid { + using System; using System.Collections.Generic; using System.Dynamic; diff --git a/src/Nancy.ViewEngines.DotLiquid/LiquidNancyFileSystem.cs b/src/Nancy.ViewEngines.DotLiquid/LiquidNancyFileSystem.cs index 2fddd55eb9..4a34381a4b 100644 --- a/src/Nancy.ViewEngines.DotLiquid/LiquidNancyFileSystem.cs +++ b/src/Nancy.ViewEngines.DotLiquid/LiquidNancyFileSystem.cs @@ -2,11 +2,13 @@ { using System; using System.Collections.Generic; - using System.Text.RegularExpressions; + using System.Linq; + using global::DotLiquid; + using global::DotLiquid.Exceptions; using global::DotLiquid.FileSystems; - using liquid = global::DotLiquid; - using System.Linq; + + using liquid = global::DotLiquid; /// /// implementation around the Nancy templates. @@ -36,7 +38,7 @@ public LiquidNancyFileSystem(ViewEngineStartupContext context, IEnumerableThe name of the template to read. /// The specified template could not be located. /// The content of the template. - public string ReadTemplateFile(Context context, string templateName) + public string ReadTemplateFile(liquid.Context context, string templateName) { IRenderContext renderContext = context.Registers["nancy"] as IRenderContext; if (renderContext != null) @@ -71,7 +73,7 @@ public string ReadTemplateFile(Context context, string templateName) return reader.ReadToEnd(); } } - throw new liquid.Exceptions.FileSystemException("Template file {0} not found", new[] { templateName }); + throw new FileSystemException("Template file {0} not found", new[] { templateName }); } private string GetCleanTemplateName(string templateName) diff --git a/src/Nancy.ViewEngines.Markdown.Tests/MarkdownViewEngineFixture.cs b/src/Nancy.ViewEngines.Markdown.Tests/MarkdownViewEngineFixture.cs index 2c257d012f..2b3b6380f8 100644 --- a/src/Nancy.ViewEngines.Markdown.Tests/MarkdownViewEngineFixture.cs +++ b/src/Nancy.ViewEngines.Markdown.Tests/MarkdownViewEngineFixture.cs @@ -3,9 +3,12 @@ using System; using System.IO; using System.Linq; + using FakeItEasy; + using Nancy.Tests; - using SuperSimpleViewEngine; + using Nancy.ViewEngines.SuperSimpleViewEngine; + using Xunit; public class MarkdownViewEngineFixture diff --git a/src/Nancy.ViewEngines.Markdown.Tests/MarkdownViewengineRenderFixture.cs b/src/Nancy.ViewEngines.Markdown.Tests/MarkdownViewengineRenderFixture.cs index 82995dc109..6c41177dc9 100644 --- a/src/Nancy.ViewEngines.Markdown.Tests/MarkdownViewengineRenderFixture.cs +++ b/src/Nancy.ViewEngines.Markdown.Tests/MarkdownViewengineRenderFixture.cs @@ -1,7 +1,7 @@ namespace Nancy.ViewEngines.Markdown.Tests { - using System; using Nancy.Tests; + using Xunit; public class MarkdownViewengineRenderFixture diff --git a/src/Nancy.ViewEngines.Markdown/MarkDownViewEngine.cs b/src/Nancy.ViewEngines.Markdown/MarkDownViewEngine.cs index 9ec509c32d..1ea6ee631a 100644 --- a/src/Nancy.ViewEngines.Markdown/MarkDownViewEngine.cs +++ b/src/Nancy.ViewEngines.Markdown/MarkDownViewEngine.cs @@ -1,15 +1,14 @@ namespace Nancy.ViewEngines.Markdown { - using System; - using System.Linq; - using ViewEngines; using System.Collections.Generic; - using Responses; using System.IO; - using MarkdownSharp; - using SuperSimpleViewEngine; using System.Text.RegularExpressions; + using MarkdownSharp; + + using Nancy.Responses; + using Nancy.ViewEngines.SuperSimpleViewEngine; + /// /// Viewengine for rendering Markdown /// diff --git a/src/Nancy.ViewEngines.Markdown/MarkdownViewEngineHost.cs b/src/Nancy.ViewEngines.Markdown/MarkdownViewEngineHost.cs index 4bd19f95ee..7a3887a94d 100644 --- a/src/Nancy.ViewEngines.Markdown/MarkdownViewEngineHost.cs +++ b/src/Nancy.ViewEngines.Markdown/MarkdownViewEngineHost.cs @@ -1,17 +1,19 @@ namespace Nancy.ViewEngines.Markdown { + using System; using System.Collections.Generic; using System.Linq; - using System.Text.RegularExpressions; - using SuperSimpleViewEngine; - using System; + + using MarkdownSharp; + + using Nancy.ViewEngines.SuperSimpleViewEngine; public class MarkdownViewEngineHost : IViewEngineHost { private readonly IViewEngineHost viewEngineHost; private readonly IRenderContext renderContext; private readonly IEnumerable validExtensions; - private readonly MarkdownSharp.Markdown parser; + private readonly Markdown parser; /// /// Initializes a new instance of the class. @@ -25,7 +27,7 @@ public MarkdownViewEngineHost(IViewEngineHost viewEngineHost, IRenderContext ren this.renderContext = renderContext; this.validExtensions = viewExtensions; this.Context = this.renderContext.Context; - this.parser = new MarkdownSharp.Markdown(); + this.parser = new Markdown(); } /// diff --git a/src/Nancy.ViewEngines.Markdown/MarkdownViewengineRender.cs b/src/Nancy.ViewEngines.Markdown/MarkdownViewengineRender.cs index e126cd6655..56a66b5d0a 100644 --- a/src/Nancy.ViewEngines.Markdown/MarkdownViewengineRender.cs +++ b/src/Nancy.ViewEngines.Markdown/MarkdownViewengineRender.cs @@ -3,6 +3,8 @@ using System; using System.Text.RegularExpressions; + using MarkdownSharp; + public static class MarkdownViewengineRender { /// @@ -43,7 +45,7 @@ public static string RenderMasterPage(string templateContent) var footer = templateContent.Substring(templateContent.IndexOf("", StringComparison.OrdinalIgnoreCase)); - var parser = new MarkdownSharp.Markdown(); + var parser = new Markdown(); var html = parser.Transform(toConvert.Trim()); diff --git a/src/Nancy.ViewEngines.Nustache/NustacheViewEngine.cs b/src/Nancy.ViewEngines.Nustache/NustacheViewEngine.cs index 107df15f83..76d62501d9 100644 --- a/src/Nancy.ViewEngines.Nustache/NustacheViewEngine.cs +++ b/src/Nancy.ViewEngines.Nustache/NustacheViewEngine.cs @@ -3,7 +3,9 @@ using System; using System.Collections.Generic; using System.IO; + using global::Nustache.Core; + using Nancy.Responses; /// diff --git a/src/Nancy.ViewEngines.Razor.BuildProviders/NancyCSharpRazorBuildProvider.cs b/src/Nancy.ViewEngines.Razor.BuildProviders/NancyCSharpRazorBuildProvider.cs index 0533eb0be9..ecd8d69845 100644 --- a/src/Nancy.ViewEngines.Razor.BuildProviders/NancyCSharpRazorBuildProvider.cs +++ b/src/Nancy.ViewEngines.Razor.BuildProviders/NancyCSharpRazorBuildProvider.cs @@ -6,7 +6,6 @@ using System.Globalization; using System.Web.Compilation; using System.Web.Razor; - using Nancy.ViewEngines.Razor; [BuildProviderAppliesTo(BuildProviderAppliesTo.Code | BuildProviderAppliesTo.Web)] public class NancyCSharpRazorBuildProvider : BuildProvider diff --git a/src/Nancy.ViewEngines.Razor.Tests/TextResourceFinderFixture.cs b/src/Nancy.ViewEngines.Razor.Tests/TextResourceFinderFixture.cs index cbc601f8f6..5dfd936b54 100644 --- a/src/Nancy.ViewEngines.Razor.Tests/TextResourceFinderFixture.cs +++ b/src/Nancy.ViewEngines.Razor.Tests/TextResourceFinderFixture.cs @@ -1,9 +1,12 @@ namespace Nancy.ViewEngines.Razor.Tests { using System; + using FakeItEasy; - using Localization; + + using Nancy.Localization; using Nancy.Tests; + using Xunit; using Xunit.Extensions; diff --git a/src/Nancy.ViewEngines.Razor/CSharp/CSharpRazorViewRenderer.cs b/src/Nancy.ViewEngines.Razor/CSharp/CSharpRazorViewRenderer.cs index b2ddf3c3ce..42923c6d53 100644 --- a/src/Nancy.ViewEngines.Razor/CSharp/CSharpRazorViewRenderer.cs +++ b/src/Nancy.ViewEngines.Razor/CSharp/CSharpRazorViewRenderer.cs @@ -5,7 +5,9 @@ using System.Collections.Generic; using System.Web.Razor; using System.Web.Razor.Generator; + using Microsoft.CSharp; + using Microsoft.CSharp.RuntimeBinder; using Nancy.Extensions; @@ -49,7 +51,7 @@ public CSharpRazorViewRenderer() { this.Assemblies = new List { - typeof(Microsoft.CSharp.RuntimeBinder.Binder).GetAssemblyPath() + typeof(Binder).GetAssemblyPath() }; this.ModelCodeGenerator = typeof(CSharpModelCodeGenerator); diff --git a/src/Nancy.ViewEngines.Razor/EncodedHtmlString.cs b/src/Nancy.ViewEngines.Razor/EncodedHtmlString.cs index 53ae9091cc..1185f089c0 100644 --- a/src/Nancy.ViewEngines.Razor/EncodedHtmlString.cs +++ b/src/Nancy.ViewEngines.Razor/EncodedHtmlString.cs @@ -1,7 +1,7 @@ namespace Nancy.ViewEngines.Razor -{ - using Nancy.Helpers; - +{ + using Nancy.Helpers; + /// /// An html string that is encoded. /// diff --git a/src/Nancy.ViewEngines.Razor/HtmlHelpers.cs b/src/Nancy.ViewEngines.Razor/HtmlHelpers.cs index c5a7186137..73e574ee52 100644 --- a/src/Nancy.ViewEngines.Razor/HtmlHelpers.cs +++ b/src/Nancy.ViewEngines.Razor/HtmlHelpers.cs @@ -2,6 +2,7 @@ { using System; using System.IO; + using Nancy.Security; /// diff --git a/src/Nancy.ViewEngines.Razor/NancyRazorEngineHost.cs b/src/Nancy.ViewEngines.Razor/NancyRazorEngineHost.cs index 7207096065..ca61200a53 100644 --- a/src/Nancy.ViewEngines.Razor/NancyRazorEngineHost.cs +++ b/src/Nancy.ViewEngines.Razor/NancyRazorEngineHost.cs @@ -4,9 +4,8 @@ using System.Web.Razor.Generator; using System.Web.Razor.Parser; - using CSharp; - - using VisualBasic; + using Nancy.ViewEngines.Razor.CSharp; + using Nancy.ViewEngines.Razor.VisualBasic; /// /// A custom razor engine host responsible for decorating the existing code generators with nancy versions. diff --git a/src/Nancy.ViewEngines.Razor/NancyRazorViewBase.cs b/src/Nancy.ViewEngines.Razor/NancyRazorViewBase.cs index aa504ac85c..9442a55a16 100644 --- a/src/Nancy.ViewEngines.Razor/NancyRazorViewBase.cs +++ b/src/Nancy.ViewEngines.Razor/NancyRazorViewBase.cs @@ -5,6 +5,7 @@ using System.Globalization; using System.IO; using System.Text; + using Nancy.Helpers; /// diff --git a/src/Nancy.ViewEngines.Razor/RazorViewEngine.cs b/src/Nancy.ViewEngines.Razor/RazorViewEngine.cs index da390b2726..813235fce6 100644 --- a/src/Nancy.ViewEngines.Razor/RazorViewEngine.cs +++ b/src/Nancy.ViewEngines.Razor/RazorViewEngine.cs @@ -7,6 +7,7 @@ using System.IO; using System.Linq; using System.Reflection; + using System.Runtime.CompilerServices; using System.Text; using System.Web.Razor; using System.Web.Razor.Parser.SyntaxTree; @@ -14,6 +15,8 @@ using Nancy.Bootstrapper; using Nancy.Helpers; using Nancy.Responses; + using Nancy.ViewEngines.Razor.CSharp; + using Nancy.ViewEngines.Razor.VisualBasic; /// /// View engine for rendering razor views. @@ -42,8 +45,8 @@ public RazorViewEngine(IRazorConfiguration configuration) { this.viewRenderers = new List { - new CSharp.CSharpRazorViewRenderer(), - new VisualBasic.VisualBasicRazorViewRenderer() + new CSharpRazorViewRenderer(), + new VisualBasicRazorViewRenderer() }; this.razorConfiguration = configuration; @@ -204,7 +207,7 @@ private Func GenerateRazorViewFactory(IRazorViewRenderer viewRe var assemblies = new List { - GetAssemblyPath(typeof(System.Runtime.CompilerServices.CallSite)), + GetAssemblyPath(typeof(CallSite)), GetAssemblyPath(typeof(IHtmlString)), GetAssemblyPath(Assembly.GetExecutingAssembly()), GetAssemblyPath(modelType) @@ -335,7 +338,7 @@ private static string[] GetViewBodyLines(ViewLocationResult viewLocationResult) var currentLine = templateReader.ReadLine(); while (currentLine != null) { - templateLines.Add(Helpers.HttpUtility.HtmlEncode(currentLine)); + templateLines.Add(HttpUtility.HtmlEncode(currentLine)); currentLine = templateReader.ReadLine(); } diff --git a/src/Nancy.ViewEngines.Razor/RazorViewEngineApplicationStartupRegistrations.cs b/src/Nancy.ViewEngines.Razor/RazorViewEngineApplicationStartupRegistrations.cs index 3ee317f555..b38ec1a022 100644 --- a/src/Nancy.ViewEngines.Razor/RazorViewEngineApplicationStartupRegistrations.cs +++ b/src/Nancy.ViewEngines.Razor/RazorViewEngineApplicationStartupRegistrations.cs @@ -1,6 +1,6 @@ namespace Nancy.ViewEngines.Razor { - using Bootstrapper; + using Nancy.Bootstrapper; /// /// Default dependency registrations for the class. diff --git a/src/Nancy.ViewEngines.Razor/VisualBasic/NancyVisualBasicRazorCodeParser.cs b/src/Nancy.ViewEngines.Razor/VisualBasic/NancyVisualBasicRazorCodeParser.cs index 12fb8bd900..4ebef8ef14 100644 --- a/src/Nancy.ViewEngines.Razor/VisualBasic/NancyVisualBasicRazorCodeParser.cs +++ b/src/Nancy.ViewEngines.Razor/VisualBasic/NancyVisualBasicRazorCodeParser.cs @@ -1,6 +1,5 @@ namespace Nancy.ViewEngines.Razor.VisualBasic { - using System; using System.Globalization; using System.Linq; using System.Web.Razor.Generator; diff --git a/src/Nancy.ViewEngines.Razor/VisualBasic/VisualBasicRazorViewRenderer.cs b/src/Nancy.ViewEngines.Razor/VisualBasic/VisualBasicRazorViewRenderer.cs index cd017033b9..22e1733ffb 100644 --- a/src/Nancy.ViewEngines.Razor/VisualBasic/VisualBasicRazorViewRenderer.cs +++ b/src/Nancy.ViewEngines.Razor/VisualBasic/VisualBasicRazorViewRenderer.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Web.Razor; using System.Web.Razor.Generator; + using Microsoft.VisualBasic; /// diff --git a/src/Nancy.ViewEngines.Spark.Tests/NancyViewFolderFixture.cs b/src/Nancy.ViewEngines.Spark.Tests/NancyViewFolderFixture.cs index 373679b0e9..d80fe9a243 100644 --- a/src/Nancy.ViewEngines.Spark.Tests/NancyViewFolderFixture.cs +++ b/src/Nancy.ViewEngines.Spark.Tests/NancyViewFolderFixture.cs @@ -1,12 +1,14 @@ namespace Nancy.ViewEngines.Spark.Tests { - using System; using System.Collections.Generic; using System.IO; + using FakeItEasy; - using Xunit; + using Nancy.Tests; + using Xunit; + public class NancyViewFolderFixture { private readonly IViewCache cache; diff --git a/src/Nancy.ViewEngines.Spark.Tests/SparkViewEngineFixture.cs b/src/Nancy.ViewEngines.Spark.Tests/SparkViewEngineFixture.cs index f7c3a814e7..1f2a52731b 100644 --- a/src/Nancy.ViewEngines.Spark.Tests/SparkViewEngineFixture.cs +++ b/src/Nancy.ViewEngines.Spark.Tests/SparkViewEngineFixture.cs @@ -4,12 +4,15 @@ using System.Globalization; using System.IO; using System.Threading; + using FakeItEasy; + using global::Spark; + using Nancy.Tests; using Nancy.ViewEngines.Spark.Tests.ViewModels; + using Xunit; - using SparkViewEngine = Spark.SparkViewEngine; public class SparkViewEngineFixture { @@ -294,7 +297,7 @@ public void Should_allow_overriding_of_tilde_substitiution_with_resource_paths_f public void Should_support_files_with_the_spark_extensions() { // Given - var engine = new SparkViewEngine(); + var engine = new global::Nancy.ViewEngines.Spark.SparkViewEngine(); //When var extensions = engine.Extensions; @@ -492,7 +495,7 @@ private void FindViewAndRender(string viewName, T viewModel, ViewLocationResu } var stream = new MemoryStream(); - var engine = new SparkViewEngine(); + var engine = new global::Nancy.ViewEngines.Spark.SparkViewEngine(); var locator = new DefaultViewLocator(this.fileSystemViewLocationProvider, new[] { engine }); diff --git a/src/Nancy.ViewEngines.Spark.Tests/ViewModels/FakeViewModel.cs b/src/Nancy.ViewEngines.Spark.Tests/ViewModels/FakeViewModel.cs index 431721d385..7996f03168 100644 --- a/src/Nancy.ViewEngines.Spark.Tests/ViewModels/FakeViewModel.cs +++ b/src/Nancy.ViewEngines.Spark.Tests/ViewModels/FakeViewModel.cs @@ -1,7 +1,7 @@ -using System; - -namespace Nancy.ViewEngines.Spark.Tests.ViewModels +namespace Nancy.ViewEngines.Spark.Tests.ViewModels { + using System; + public class FakeViewModel { public string Text { get; set; } diff --git a/src/Nancy.ViewEngines.Spark/Descriptors/DefaultDescriptorBuilder.cs b/src/Nancy.ViewEngines.Spark/Descriptors/DefaultDescriptorBuilder.cs index 8fffa41a5b..88cfa89fc6 100644 --- a/src/Nancy.ViewEngines.Spark/Descriptors/DefaultDescriptorBuilder.cs +++ b/src/Nancy.ViewEngines.Spark/Descriptors/DefaultDescriptorBuilder.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; - using Spark; + using global::Spark; using global::Spark.Parser; using global::Spark.Parser.Syntax; diff --git a/src/Nancy.ViewEngines.Spark/Descriptors/DescriptorFilterExtensions.cs b/src/Nancy.ViewEngines.Spark/Descriptors/DescriptorFilterExtensions.cs index 392cc2887c..625504f0a7 100644 --- a/src/Nancy.ViewEngines.Spark/Descriptors/DescriptorFilterExtensions.cs +++ b/src/Nancy.ViewEngines.Spark/Descriptors/DescriptorFilterExtensions.cs @@ -1,9 +1,5 @@ namespace Nancy.ViewEngines.Spark.Descriptors { - using System; - using global::Spark; - using SparkViewEngine = Spark.SparkViewEngine; - //public static class DescriptorFilterExtensions //{ // public static void AddFilter(this ISparkServiceContainer target, IDescriptorFilter filter) diff --git a/src/Nancy.ViewEngines.Spark/Descriptors/IDescriptorBuilder.cs b/src/Nancy.ViewEngines.Spark/Descriptors/IDescriptorBuilder.cs index 32d0891b88..329314bcda 100644 --- a/src/Nancy.ViewEngines.Spark/Descriptors/IDescriptorBuilder.cs +++ b/src/Nancy.ViewEngines.Spark/Descriptors/IDescriptorBuilder.cs @@ -1,6 +1,7 @@ namespace Nancy.ViewEngines.Spark.Descriptors { using System.Collections.Generic; + using global::Spark; public interface IDescriptorBuilder diff --git a/src/Nancy.ViewEngines.Spark/NancyBindingProvider.cs b/src/Nancy.ViewEngines.Spark/NancyBindingProvider.cs index e8658ec6ba..9b95413939 100644 --- a/src/Nancy.ViewEngines.Spark/NancyBindingProvider.cs +++ b/src/Nancy.ViewEngines.Spark/NancyBindingProvider.cs @@ -4,6 +4,7 @@ namespace Nancy.ViewEngines.Spark using System.Collections.Generic; using System.IO; using System.Linq; + using global::Spark.Bindings; /// diff --git a/src/Nancy.ViewEngines.Spark/NancySparkView.cs b/src/Nancy.ViewEngines.Spark/NancySparkView.cs index 2700a5b42a..79f0bcb0af 100644 --- a/src/Nancy.ViewEngines.Spark/NancySparkView.cs +++ b/src/Nancy.ViewEngines.Spark/NancySparkView.cs @@ -2,6 +2,7 @@ { using System.IO; using System.Web; + using global::Spark; public abstract class NancySparkView : SparkViewBase diff --git a/src/Nancy.ViewEngines.Spark/NancyViewFolder.cs b/src/Nancy.ViewEngines.Spark/NancyViewFolder.cs index 1882fc36c7..793e4939a3 100644 --- a/src/Nancy.ViewEngines.Spark/NancyViewFolder.cs +++ b/src/Nancy.ViewEngines.Spark/NancyViewFolder.cs @@ -8,10 +8,10 @@ namespace Nancy.ViewEngines.Spark using System.Text; using System.Threading; - using Nancy.Responses.Negotiation; - using global::Spark.FileSystem; + using Nancy.Responses.Negotiation; + /// /// Implementation of the IViewFolder interface to have Spark use views that's been discovered by Nancy's view locator. /// diff --git a/src/Nancy.ViewEngines.Spark/SparkRenderContextWrapper.cs b/src/Nancy.ViewEngines.Spark/SparkRenderContextWrapper.cs index afcc9e4e30..7fd73dbd03 100644 --- a/src/Nancy.ViewEngines.Spark/SparkRenderContextWrapper.cs +++ b/src/Nancy.ViewEngines.Spark/SparkRenderContextWrapper.cs @@ -1,6 +1,7 @@ namespace Nancy.ViewEngines.Spark { using System.Collections.Generic; + using Nancy.Localization; /// diff --git a/src/Nancy.ViewEngines.Spark/SparkViewEngine.cs b/src/Nancy.ViewEngines.Spark/SparkViewEngine.cs index 5c29f5b43b..07c31b6c10 100644 --- a/src/Nancy.ViewEngines.Spark/SparkViewEngine.cs +++ b/src/Nancy.ViewEngines.Spark/SparkViewEngine.cs @@ -4,9 +4,11 @@ using System.Configuration; using System.Dynamic; using System.IO; - using Responses; + using global::Spark; using global::Spark.FileSystem; + + using Nancy.Responses; using Nancy.ViewEngines.Spark.Descriptors; /// diff --git a/src/Nancy.ViewEngines.Spark/SparkViewEngineResult.cs b/src/Nancy.ViewEngines.Spark/SparkViewEngineResult.cs index 2598159eac..5d663b141e 100644 --- a/src/Nancy.ViewEngines.Spark/SparkViewEngineResult.cs +++ b/src/Nancy.ViewEngines.Spark/SparkViewEngineResult.cs @@ -1,9 +1,9 @@ -using CompilerException = Spark.Compiler.CompilerException; - -namespace Nancy.ViewEngines.Spark +namespace Nancy.ViewEngines.Spark { using System.Collections.Generic; + using global::Spark.Compiler; + public class SparkViewEngineResult { public SparkViewEngineResult(NancySparkView view) diff --git a/src/Nancy.sln.DotSettings b/src/Nancy.sln.DotSettings index 6e2e1bf350..048bbb9a77 100644 --- a/src/Nancy.sln.DotSettings +++ b/src/Nancy.sln.DotSettings @@ -1,4 +1,6 @@  + True + DO_NOT_SHOW <?xml version="1.0" encoding="utf-16"?><Profile name="NancyStandard"><CSUseVar><BehavourStyle>CAN_CHANGE_TO_IMPLICIT</BehavourStyle><LocalVariableStyle>ALWAYS_IMPLICIT</LocalVariableStyle><ForeachVariableStyle>ALWAYS_IMPLICIT</ForeachVariableStyle></CSUseVar><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSReformatCode>True</CSReformatCode><CSShortenReferences>True</CSShortenReferences><CSReorderTypeMembers>True</CSReorderTypeMembers><CSMakeFieldReadonly>True</CSMakeFieldReadonly></Profile> NEXT_LINE 1 diff --git a/src/Nancy/Bootstrapper/CollectionTypeRegistration.cs b/src/Nancy/Bootstrapper/CollectionTypeRegistration.cs index 4f4dd39d8d..ef3a10cd09 100644 --- a/src/Nancy/Bootstrapper/CollectionTypeRegistration.cs +++ b/src/Nancy/Bootstrapper/CollectionTypeRegistration.cs @@ -1,8 +1,8 @@ namespace Nancy.Bootstrapper { using System; - using System.Linq; using System.Collections.Generic; + using System.Linq; /// /// Represents a type to be registered multiple times into the diff --git a/src/Nancy/Bootstrapper/ContainerRegistration.cs b/src/Nancy/Bootstrapper/ContainerRegistration.cs index 05c1c2ebd0..5546bf0363 100644 --- a/src/Nancy/Bootstrapper/ContainerRegistration.cs +++ b/src/Nancy/Bootstrapper/ContainerRegistration.cs @@ -2,6 +2,7 @@ namespace Nancy.Bootstrapper { using System; using System.Linq; + using Nancy.Extensions; /// diff --git a/src/Nancy/Bootstrapper/NancyBootstrapperBase.cs b/src/Nancy/Bootstrapper/NancyBootstrapperBase.cs index 6f8093786f..ccb6967fc9 100755 --- a/src/Nancy/Bootstrapper/NancyBootstrapperBase.cs +++ b/src/Nancy/Bootstrapper/NancyBootstrapperBase.cs @@ -4,12 +4,13 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; - using Diagnostics; + + using Nancy.Conventions; using Nancy.Cryptography; + using Nancy.Diagnostics; using Nancy.ModelBinding; - using Nancy.Conventions; - using Nancy.ViewEngines; using Nancy.Validation; + using Nancy.ViewEngines; /// /// Nancy bootstrapper base class diff --git a/src/Nancy/Bootstrapper/NancyBootstrapperWithRequestContainerBase.cs b/src/Nancy/Bootstrapper/NancyBootstrapperWithRequestContainerBase.cs index 8783e02022..8c02497ad8 100644 --- a/src/Nancy/Bootstrapper/NancyBootstrapperWithRequestContainerBase.cs +++ b/src/Nancy/Bootstrapper/NancyBootstrapperWithRequestContainerBase.cs @@ -2,7 +2,6 @@ namespace Nancy.Bootstrapper { using System; using System.Collections.Generic; - using System.ComponentModel; using System.Linq; /// diff --git a/src/Nancy/Bootstrapper/NancyInternalConfiguration.cs b/src/Nancy/Bootstrapper/NancyInternalConfiguration.cs index dc82daa84d..a58e1c84b9 100644 --- a/src/Nancy/Bootstrapper/NancyInternalConfiguration.cs +++ b/src/Nancy/Bootstrapper/NancyInternalConfiguration.cs @@ -3,21 +3,20 @@ namespace Nancy.Bootstrapper using System; using System.Collections.Generic; using System.Linq; - using System.Reflection; + using Nancy.Culture; using Nancy.Diagnostics; using Nancy.ErrorHandling; + using Nancy.Localization; using Nancy.ModelBinding; + using Nancy.Responses; + using Nancy.Responses.Negotiation; using Nancy.Routing; using Nancy.Routing.Constraints; using Nancy.Routing.Trie; - using Nancy.ViewEngines; - using Responses; - using Responses.Negotiation; - using Security; + using Nancy.Security; using Nancy.Validation; - using Nancy.Culture; - using Nancy.Localization; + using Nancy.ViewEngines; /// /// Configuration class for Nancy's internals. diff --git a/src/Nancy/Conventions/BuiltInCultureConventions.cs b/src/Nancy/Conventions/BuiltInCultureConventions.cs index eb52cfbd3b..bd9a2ffec7 100644 --- a/src/Nancy/Conventions/BuiltInCultureConventions.cs +++ b/src/Nancy/Conventions/BuiltInCultureConventions.cs @@ -5,6 +5,7 @@ using System.Globalization; using System.Linq; using System.Threading; + using Nancy.Session; /// diff --git a/src/Nancy/Conventions/CultureConventions.cs b/src/Nancy/Conventions/CultureConventions.cs index 22dfe0158f..5b02b629d9 100644 --- a/src/Nancy/Conventions/CultureConventions.cs +++ b/src/Nancy/Conventions/CultureConventions.cs @@ -4,8 +4,6 @@ using System.Collections; using System.Collections.Generic; using System.Globalization; - using System.Linq; - using System.Text; /// /// Collection class for static culture conventions diff --git a/src/Nancy/Conventions/DefaultViewLocationConventions.cs b/src/Nancy/Conventions/DefaultViewLocationConventions.cs index ca8ecf2776..c9c7bc54a9 100644 --- a/src/Nancy/Conventions/DefaultViewLocationConventions.cs +++ b/src/Nancy/Conventions/DefaultViewLocationConventions.cs @@ -2,7 +2,8 @@ { using System; using System.Collections.Generic; - using ViewEngines; + + using Nancy.ViewEngines; /// /// Defines the default static contents conventions. diff --git a/src/Nancy/Conventions/NancyConventions.cs b/src/Nancy/Conventions/NancyConventions.cs index 88d1108b7b..f57b79c6ba 100644 --- a/src/Nancy/Conventions/NancyConventions.cs +++ b/src/Nancy/Conventions/NancyConventions.cs @@ -2,12 +2,12 @@ { using System; using System.Collections.Generic; + using System.Globalization; using System.Linq; using System.Text; - using System.Globalization; - using Nancy.Bootstrapper; - using ViewEngines; + using Nancy.Bootstrapper; + using Nancy.ViewEngines; /// /// Nancy configurable conventions diff --git a/src/Nancy/Conventions/StaticContentConventionBuilder.cs b/src/Nancy/Conventions/StaticContentConventionBuilder.cs index 8b4e88ef3e..274c15b456 100644 --- a/src/Nancy/Conventions/StaticContentConventionBuilder.cs +++ b/src/Nancy/Conventions/StaticContentConventionBuilder.cs @@ -5,8 +5,9 @@ namespace Nancy.Conventions using System.IO; using System.Linq; using System.Text.RegularExpressions; - using Helpers; - using Responses; + + using Nancy.Helpers; + using Nancy.Responses; /// /// Helper class for defining directory-based conventions for static contents. diff --git a/src/Nancy/Conventions/ViewLocationConventions.cs b/src/Nancy/Conventions/ViewLocationConventions.cs index fc2a91a4d0..896a64200b 100644 --- a/src/Nancy/Conventions/ViewLocationConventions.cs +++ b/src/Nancy/Conventions/ViewLocationConventions.cs @@ -3,6 +3,7 @@ using System; using System.Collections; using System.Collections.Generic; + using Nancy.ViewEngines; /// diff --git a/src/Nancy/Culture/DefaultCultureService.cs b/src/Nancy/Culture/DefaultCultureService.cs index b21ce10ab3..97541a106d 100644 --- a/src/Nancy/Culture/DefaultCultureService.cs +++ b/src/Nancy/Culture/DefaultCultureService.cs @@ -1,8 +1,8 @@ namespace Nancy.Culture { using System.Globalization; + using Nancy.Conventions; - using System.Linq; /// /// Determines current culture for context diff --git a/src/Nancy/DefaultNancyBootstrapper.cs b/src/Nancy/DefaultNancyBootstrapper.cs index 64e1050b58..ac2563ba12 100755 --- a/src/Nancy/DefaultNancyBootstrapper.cs +++ b/src/Nancy/DefaultNancyBootstrapper.cs @@ -1,13 +1,12 @@ -using Nancy.Diagnostics; - -namespace Nancy +namespace Nancy { using System; using System.Collections.Generic; using System.Linq; using System.Reflection; - using Bootstrapper; + using Nancy.Bootstrapper; + using Nancy.Diagnostics; using Nancy.TinyIoc; /// diff --git a/src/Nancy/DefaultStaticContentProvider.cs b/src/Nancy/DefaultStaticContentProvider.cs index f24cccb064..c4cbbc860e 100644 --- a/src/Nancy/DefaultStaticContentProvider.cs +++ b/src/Nancy/DefaultStaticContentProvider.cs @@ -1,7 +1,5 @@ namespace Nancy { - using System.Linq; - using Nancy.Conventions; /// diff --git a/src/Nancy/Diagnostics/DefaultDiagnostics.cs b/src/Nancy/Diagnostics/DefaultDiagnostics.cs index 715683c64c..e286688340 100644 --- a/src/Nancy/Diagnostics/DefaultDiagnostics.cs +++ b/src/Nancy/Diagnostics/DefaultDiagnostics.cs @@ -1,15 +1,15 @@ namespace Nancy.Diagnostics { using System.Collections.Generic; - using ModelBinding; + using Nancy.Bootstrapper; + using Nancy.Culture; using Nancy.Localization; + using Nancy.ModelBinding; + using Nancy.Responses.Negotiation; using Nancy.Routing; using Nancy.Routing.Constraints; - using Responses.Negotiation; - using Nancy.Culture; - /// /// Wires up the diagnostics support at application startup. /// diff --git a/src/Nancy/Diagnostics/DiagnosticsConfiguration.cs b/src/Nancy/Diagnostics/DiagnosticsConfiguration.cs index 859c40fa43..f27f45b61f 100644 --- a/src/Nancy/Diagnostics/DiagnosticsConfiguration.cs +++ b/src/Nancy/Diagnostics/DiagnosticsConfiguration.cs @@ -1,6 +1,6 @@ namespace Nancy.Diagnostics { - using Cryptography; + using Nancy.Cryptography; /// /// Settings for the diagnostics dashboard diff --git a/src/Nancy/Diagnostics/DiagnosticsHook.cs b/src/Nancy/Diagnostics/DiagnosticsHook.cs index 5ce616feae..5c21f13c6c 100644 --- a/src/Nancy/Diagnostics/DiagnosticsHook.cs +++ b/src/Nancy/Diagnostics/DiagnosticsHook.cs @@ -6,21 +6,19 @@ namespace Nancy.Diagnostics using System.Linq; using System.Threading; - using Bootstrapper; - using Cookies; - using Cryptography; - using Helpers; - using ModelBinding; - + using Nancy.Bootstrapper; + using Nancy.Cookies; + using Nancy.Cryptography; + using Nancy.Culture; + using Nancy.Helpers; using Nancy.Localization; + using Nancy.ModelBinding; + using Nancy.Responses; + using Nancy.Responses.Negotiation; + using Nancy.Routing; using Nancy.Routing.Constraints; using Nancy.Routing.Trie; - using Responses; - using Responses.Negotiation; - using Routing; - using Nancy.Culture; - public static class DiagnosticsHook { private static readonly CancellationToken CancellationToken = new CancellationToken(); diff --git a/src/Nancy/Diagnostics/DiagnosticsModuleBuilder.cs b/src/Nancy/Diagnostics/DiagnosticsModuleBuilder.cs index 45af45ae17..e264aaf9c0 100644 --- a/src/Nancy/Diagnostics/DiagnosticsModuleBuilder.cs +++ b/src/Nancy/Diagnostics/DiagnosticsModuleBuilder.cs @@ -1,7 +1,8 @@ namespace Nancy.Diagnostics { using System.Collections.Generic; - using ModelBinding; + + using Nancy.ModelBinding; using Nancy.Responses; using Nancy.Routing; diff --git a/src/Nancy/Diagnostics/DiagnosticsModuleCatalog.cs b/src/Nancy/Diagnostics/DiagnosticsModuleCatalog.cs index 1bd8ce6e71..d208f5b31f 100644 --- a/src/Nancy/Diagnostics/DiagnosticsModuleCatalog.cs +++ b/src/Nancy/Diagnostics/DiagnosticsModuleCatalog.cs @@ -3,10 +3,11 @@ namespace Nancy.Diagnostics using System; using System.Collections.Generic; using System.Linq; - using ModelBinding; + using Nancy.Bootstrapper; + using Nancy.ModelBinding; + using Nancy.Responses; using Nancy.TinyIoc; - using Responses; internal class DiagnosticsModuleCatalog : INancyModuleCatalog { diff --git a/src/Nancy/Diagnostics/DiagnosticsViewRenderer.cs b/src/Nancy/Diagnostics/DiagnosticsViewRenderer.cs index 69f657e94c..be9ef1bcbe 100644 --- a/src/Nancy/Diagnostics/DiagnosticsViewRenderer.cs +++ b/src/Nancy/Diagnostics/DiagnosticsViewRenderer.cs @@ -2,12 +2,12 @@ namespace Nancy.Diagnostics { using System.IO; using System.Linq; - using Nancy.Localization; - using Responses; - using Security; - using ViewEngines; - using ViewEngines.SuperSimpleViewEngine; + using Nancy.Localization; + using Nancy.Responses; + using Nancy.Security; + using Nancy.ViewEngines; + using Nancy.ViewEngines.SuperSimpleViewEngine; /// /// Renders diagnostics views from embedded resources. diff --git a/src/Nancy/Diagnostics/IDiagnostics.cs b/src/Nancy/Diagnostics/IDiagnostics.cs index 965eae262d..57cb66010c 100644 --- a/src/Nancy/Diagnostics/IDiagnostics.cs +++ b/src/Nancy/Diagnostics/IDiagnostics.cs @@ -1,7 +1,7 @@ -using Nancy.Bootstrapper; - namespace Nancy.Diagnostics { + using Nancy.Bootstrapper; + public interface IDiagnostics { /// diff --git a/src/Nancy/Diagnostics/InteractiveDiagnostics.cs b/src/Nancy/Diagnostics/InteractiveDiagnostics.cs index 29c1ad00a1..4b95ef47b6 100644 --- a/src/Nancy/Diagnostics/InteractiveDiagnostics.cs +++ b/src/Nancy/Diagnostics/InteractiveDiagnostics.cs @@ -5,6 +5,8 @@ using System.Linq; using System.Reflection; + using Nancy.Routing; + public class InteractiveDiagnostics : IInteractiveDiagnostics { private readonly IDiagnosticsProvider[] providers; @@ -19,14 +21,14 @@ public InteractiveDiagnostics(IEnumerable providers) { Type providerType = provider.GetType(); - return providerType != typeof(Nancy.Diagnostics.TestingDiagnosticProvider) & - providerType != typeof(Nancy.Routing.DefaultRouteCacheProvider); + return providerType != typeof(TestingDiagnosticProvider) & + providerType != typeof(DefaultRouteCacheProvider); }); if (customProvidersAvailable) { // Exclude only the TestingDiagnosticProvider - this.providers = providers.Where(provider => provider.GetType() != typeof(Nancy.Diagnostics.TestingDiagnosticProvider)).ToArray(); + this.providers = providers.Where(provider => provider.GetType() != typeof(TestingDiagnosticProvider)).ToArray(); } else { diff --git a/src/Nancy/Diagnostics/Modules/InfoModule.cs b/src/Nancy/Diagnostics/Modules/InfoModule.cs index a8d1507ed5..799b2a1f8b 100644 --- a/src/Nancy/Diagnostics/Modules/InfoModule.cs +++ b/src/Nancy/Diagnostics/Modules/InfoModule.cs @@ -6,6 +6,7 @@ using System.Dynamic; using System.Linq; using System.Reflection; + using Nancy.Bootstrapper; using Nancy.ViewEngines; diff --git a/src/Nancy/Diagnostics/Modules/InteractiveModule.cs b/src/Nancy/Diagnostics/Modules/InteractiveModule.cs index 2aaf1a41f9..420bbe85ff 100644 --- a/src/Nancy/Diagnostics/Modules/InteractiveModule.cs +++ b/src/Nancy/Diagnostics/Modules/InteractiveModule.cs @@ -4,7 +4,8 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; - using Helpers; + + using Nancy.Helpers; public class InteractiveModule : DiagnosticModule { diff --git a/src/Nancy/Diagnostics/Modules/SettingsModule.cs b/src/Nancy/Diagnostics/Modules/SettingsModule.cs index 26892f23e3..21665153a1 100644 --- a/src/Nancy/Diagnostics/Modules/SettingsModule.cs +++ b/src/Nancy/Diagnostics/Modules/SettingsModule.cs @@ -5,7 +5,8 @@ using System.Linq; using System.Reflection; using System.Text.RegularExpressions; - using ModelBinding; + + using Nancy.ModelBinding; public class SettingsModule : DiagnosticModule { diff --git a/src/Nancy/DynamicDictionaryValue.cs b/src/Nancy/DynamicDictionaryValue.cs index c072bf9459..20b8b903a4 100644 --- a/src/Nancy/DynamicDictionaryValue.cs +++ b/src/Nancy/DynamicDictionaryValue.cs @@ -5,6 +5,7 @@ using System.Dynamic; using System.Globalization; using System.Linq.Expressions; + using Microsoft.CSharp.RuntimeBinder; public class DynamicDictionaryValue : DynamicObject, IEquatable, IHideObjectMembers, IConvertible diff --git a/src/Nancy/ErrorHandling/DefaultStatusCodeHandler.cs b/src/Nancy/ErrorHandling/DefaultStatusCodeHandler.cs index a9cb2f473a..a51a50c9a2 100644 --- a/src/Nancy/ErrorHandling/DefaultStatusCodeHandler.cs +++ b/src/Nancy/ErrorHandling/DefaultStatusCodeHandler.cs @@ -5,8 +5,9 @@ namespace Nancy.ErrorHandling using System.IO; using System.Linq; using System.Text; - using IO; + using Nancy.Extensions; + using Nancy.IO; /// /// Default error handler diff --git a/src/Nancy/Extensions/ContextExtensions.cs b/src/Nancy/Extensions/ContextExtensions.cs index 12921f411b..5eea3b7763 100644 --- a/src/Nancy/Extensions/ContextExtensions.cs +++ b/src/Nancy/Extensions/ContextExtensions.cs @@ -2,6 +2,7 @@ namespace Nancy.Extensions { using System; using System.Text; + using Nancy.Responses; /// diff --git a/src/Nancy/Extensions/ModelValidationErrorExtensions.cs b/src/Nancy/Extensions/ModelValidationErrorExtensions.cs index 6c1d92c636..c021d202b9 100644 --- a/src/Nancy/Extensions/ModelValidationErrorExtensions.cs +++ b/src/Nancy/Extensions/ModelValidationErrorExtensions.cs @@ -1,6 +1,7 @@ namespace Nancy { using System.Collections.Generic; + using Nancy.Validation; /// diff --git a/src/Nancy/Extensions/ModuleExtensions.cs b/src/Nancy/Extensions/ModuleExtensions.cs index 3420469a11..917ba285ac 100644 --- a/src/Nancy/Extensions/ModuleExtensions.cs +++ b/src/Nancy/Extensions/ModuleExtensions.cs @@ -3,6 +3,7 @@ namespace Nancy.Extensions using System; using System.Diagnostics; using System.Text.RegularExpressions; + using Nancy.ErrorHandling; /// diff --git a/src/Nancy/Extensions/StringExtensions.cs b/src/Nancy/Extensions/StringExtensions.cs index 6f45df8c55..a28d782543 100644 --- a/src/Nancy/Extensions/StringExtensions.cs +++ b/src/Nancy/Extensions/StringExtensions.cs @@ -5,8 +5,9 @@ namespace Nancy.Extensions using System.Diagnostics; using System.Linq; using System.Text.RegularExpressions; + using Nancy.Helpers; - using Routing; + using Nancy.Routing; /// /// Containing extensions for the object. diff --git a/src/Nancy/FormatterExtensions.cs b/src/Nancy/FormatterExtensions.cs index 2adf057569..787034bf0a 100644 --- a/src/Nancy/FormatterExtensions.cs +++ b/src/Nancy/FormatterExtensions.cs @@ -1,10 +1,10 @@ namespace Nancy { using System; - using System.Linq; using System.IO; + using System.Linq; - using Extensions; + using Nancy.Extensions; using Nancy.Responses; public static class FormatterExtensions @@ -48,7 +48,7 @@ public static Response AsJson(this IResponseFormatter formatter, TModel return r; } - public static Response AsRedirect(this IResponseFormatter formatter, string location, Nancy.Responses.RedirectResponse.RedirectType type = RedirectResponse.RedirectType.SeeOther) + public static Response AsRedirect(this IResponseFormatter formatter, string location, RedirectResponse.RedirectType type = RedirectResponse.RedirectType.SeeOther) { return new RedirectResponse(formatter.Context.ToFullPath(location), type); } diff --git a/src/Nancy/Helpers/HttpEncoder.cs b/src/Nancy/Helpers/HttpEncoder.cs index ff130943d4..08d92256c4 100644 --- a/src/Nancy/Helpers/HttpEncoder.cs +++ b/src/Nancy/Helpers/HttpEncoder.cs @@ -30,14 +30,15 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using System; -using System.Collections.Generic; -using System.Globalization; -using System.IO; -using System.Text; namespace Nancy.Helpers { + using System; + using System.Collections.Generic; + using System.Globalization; + using System.IO; + using System.Text; + #if NET_4_0 public #endif diff --git a/src/Nancy/Helpers/HttpUtility.cs b/src/Nancy/Helpers/HttpUtility.cs index 76c63943dd..1fe2f4ed63 100644 --- a/src/Nancy/Helpers/HttpUtility.cs +++ b/src/Nancy/Helpers/HttpUtility.cs @@ -29,15 +29,15 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using System; -using System.Collections; -using System.Collections.Generic; -using System.Collections.Specialized; -using System.IO; -using System.Text; - namespace Nancy.Helpers { + using System; + using System.Collections; + using System.Collections.Generic; + using System.Collections.Specialized; + using System.IO; + using System.Text; + public sealed class HttpUtility { sealed class HttpQSCollection : NameValueCollection diff --git a/src/Nancy/Helpers/ReflectionUtils.cs b/src/Nancy/Helpers/ReflectionUtils.cs index bdbc86dcf4..3f7d4b8499 100644 --- a/src/Nancy/Helpers/ReflectionUtils.cs +++ b/src/Nancy/Helpers/ReflectionUtils.cs @@ -23,13 +23,13 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -using System; -using System.Collections.Generic; -using System.Reflection; -using System.Collections; - namespace Nancy.Helpers -{ +{ + using System; + using System.Collections; + using System.Collections.Generic; + using System.Reflection; + internal static class ReflectionUtils { public static bool IsInstantiatableType(Type t) diff --git a/src/Nancy/HttpMultipart.cs b/src/Nancy/HttpMultipart.cs index bc0d30ca34..27b33196fd 100644 --- a/src/Nancy/HttpMultipart.cs +++ b/src/Nancy/HttpMultipart.cs @@ -1,6 +1,4 @@ -using System; - -namespace Nancy +namespace Nancy { using System.Collections.Generic; using System.IO; diff --git a/src/Nancy/HttpMultipartBuffer.cs b/src/Nancy/HttpMultipartBuffer.cs index d71224f4ca..59ee7ce6ef 100644 --- a/src/Nancy/HttpMultipartBuffer.cs +++ b/src/Nancy/HttpMultipartBuffer.cs @@ -1,6 +1,4 @@ -using System.Text; - -namespace Nancy +namespace Nancy { using System; using System.Linq; diff --git a/src/Nancy/IHideObjectMembers.cs b/src/Nancy/IHideObjectMembers.cs index aa6f90f5d1..12113a6598 100644 --- a/src/Nancy/IHideObjectMembers.cs +++ b/src/Nancy/IHideObjectMembers.cs @@ -4,7 +4,7 @@ namespace Nancy using System.ComponentModel; /// - /// Helper interface used to hide the base members from the fluent API to make it much cleaner + /// Helper interface used to hide the base members from the fluent API to make it much cleaner /// in Visual Studio intellisense. /// /// Created by Daniel Cazzulino http://www.clariusconsulting.net/blogs/kzu/archive/2008/03/10/58301.aspx diff --git a/src/Nancy/INancyEngine.cs b/src/Nancy/INancyEngine.cs index 5bb0b51bef..abdc99397c 100644 --- a/src/Nancy/INancyEngine.cs +++ b/src/Nancy/INancyEngine.cs @@ -4,7 +4,7 @@ namespace Nancy using System.Threading; using System.Threading.Tasks; - using Bootstrapper; + using Nancy.Bootstrapper; /// /// Defines the functionality of an engine that can handle Nancy s. diff --git a/src/Nancy/INancyModule.cs b/src/Nancy/INancyModule.cs index fc96c4f3a1..10fa30a6ea 100644 --- a/src/Nancy/INancyModule.cs +++ b/src/Nancy/INancyModule.cs @@ -2,6 +2,7 @@ namespace Nancy { using System.Collections.Generic; using System.ComponentModel; + using Nancy.ModelBinding; using Nancy.Responses.Negotiation; using Nancy.Routing; diff --git a/src/Nancy/IO/RequestStream.cs b/src/Nancy/IO/RequestStream.cs index b5a0364abf..aa377aca00 100644 --- a/src/Nancy/IO/RequestStream.cs +++ b/src/Nancy/IO/RequestStream.cs @@ -3,6 +3,7 @@ using System; using System.IO; using System.Threading.Tasks; + using Nancy.Extensions; /// diff --git a/src/Nancy/Json/JavaScriptConverter.cs b/src/Nancy/Json/JavaScriptConverter.cs index d314135ef9..d30471c6e3 100644 --- a/src/Nancy/Json/JavaScriptConverter.cs +++ b/src/Nancy/Json/JavaScriptConverter.cs @@ -31,7 +31,7 @@ namespace Nancy.Json using System; using System.Collections.Generic; - public abstract class JavaScriptConverter + public abstract class JavaScriptConverter { protected JavaScriptConverter () { } diff --git a/src/Nancy/Json/JavaScriptPrimitiveConverter.cs b/src/Nancy/Json/JavaScriptPrimitiveConverter.cs index f485807470..0b2d5a06b4 100644 --- a/src/Nancy/Json/JavaScriptPrimitiveConverter.cs +++ b/src/Nancy/Json/JavaScriptPrimitiveConverter.cs @@ -1,11 +1,9 @@ namespace Nancy.Json { - using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; + using System; + using System.Collections.Generic; - public abstract class JavaScriptPrimitiveConverter + public abstract class JavaScriptPrimitiveConverter { public abstract IEnumerable SupportedTypes { get; } diff --git a/src/Nancy/Json/JavaScriptSerializer.cs b/src/Nancy/Json/JavaScriptSerializer.cs index 5a1d1222b4..29b601876c 100644 --- a/src/Nancy/Json/JavaScriptSerializer.cs +++ b/src/Nancy/Json/JavaScriptSerializer.cs @@ -29,13 +29,14 @@ namespace Nancy.Json { using System; + using System.Collections; using System.Collections.Generic; - using System.Linq; - using System.Text; + using System.ComponentModel; using System.IO; - using System.Collections; + using System.Linq; using System.Reflection; - using System.ComponentModel; + using System.Text; + using Nancy.Helpers; public class JavaScriptSerializer @@ -351,7 +352,7 @@ object ConvertToObject(IDictionary dict, Type type) if (target is IDictionary) { Type valueType = ReflectionUtils.GetTypedDictionaryValueType(type); - if (value != null && valueType == typeof(System.Object)) + if (value != null && valueType == typeof(Object)) valueType = value.GetType(); if (isDictionaryWithGuidKey) diff --git a/src/Nancy/Json/JavaScriptTypeResolver.cs b/src/Nancy/Json/JavaScriptTypeResolver.cs index 969ab5b3aa..7166ca2f67 100644 --- a/src/Nancy/Json/JavaScriptTypeResolver.cs +++ b/src/Nancy/Json/JavaScriptTypeResolver.cs @@ -30,8 +30,7 @@ namespace Nancy.Json { using System; - - public abstract class JavaScriptTypeResolver + public abstract class JavaScriptTypeResolver { protected JavaScriptTypeResolver () { } diff --git a/src/Nancy/Json/Json.cs b/src/Nancy/Json/Json.cs index 23c61d4e42..39513f528d 100644 --- a/src/Nancy/Json/Json.cs +++ b/src/Nancy/Json/Json.cs @@ -26,14 +26,14 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using System.Globalization; namespace Nancy.Json { using System; + using System.Globalization; using System.IO; using System.Text; - + internal static class Json { diff --git a/src/Nancy/Json/JsonDeserializer.cs b/src/Nancy/Json/JsonDeserializer.cs index 398165b394..657d618138 100644 --- a/src/Nancy/Json/JsonDeserializer.cs +++ b/src/Nancy/Json/JsonDeserializer.cs @@ -66,7 +66,7 @@ namespace Nancy.Json using Nancy.Extensions; - internal sealed class JsonDeserializer + internal sealed class JsonDeserializer { /* Universal error constant */ const int __ = -1; diff --git a/src/Nancy/Json/JsonSerializer.cs b/src/Nancy/Json/JsonSerializer.cs index bb3f7e0eb1..48124b536a 100644 --- a/src/Nancy/Json/JsonSerializer.cs +++ b/src/Nancy/Json/JsonSerializer.cs @@ -39,7 +39,7 @@ namespace Nancy.Json using Nancy.Extensions; - internal sealed class JsonSerializer + internal sealed class JsonSerializer { internal static readonly long InitialJavaScriptDateTicks = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).Ticks; static readonly DateTime MinimumJavaScriptDate = new DateTime(100, 1, 1, 0, 0, 0, DateTimeKind.Utc); diff --git a/src/Nancy/Json/JsonSettings.cs b/src/Nancy/Json/JsonSettings.cs index bee8bc38cb..054989c8b1 100644 --- a/src/Nancy/Json/JsonSettings.cs +++ b/src/Nancy/Json/JsonSettings.cs @@ -1,7 +1,8 @@ namespace Nancy.Json { using System.Collections.Generic; - using Converters; + + using Nancy.Json.Converters; /// /// Json serializer settings diff --git a/src/Nancy/Json/ScriptIgnoreAttribute.cs b/src/Nancy/Json/ScriptIgnoreAttribute.cs index e2bb5b6fd5..eb90fbfc1f 100644 --- a/src/Nancy/Json/ScriptIgnoreAttribute.cs +++ b/src/Nancy/Json/ScriptIgnoreAttribute.cs @@ -30,7 +30,7 @@ namespace Nancy.Json { using System; - [AttributeUsage (AttributeTargets.Property | AttributeTargets.Field)] + [AttributeUsage (AttributeTargets.Property | AttributeTargets.Field)] public sealed class ScriptIgnoreAttribute : Attribute { } diff --git a/src/Nancy/Jsonp.cs b/src/Nancy/Jsonp.cs index e413276f05..78ad1a0d41 100644 --- a/src/Nancy/Jsonp.cs +++ b/src/Nancy/Jsonp.cs @@ -4,8 +4,8 @@ using System.IO; using System.Linq; - using Nancy.Json; using Nancy.Bootstrapper; + using Nancy.Json; public static class Jsonp { @@ -45,7 +45,7 @@ public static void Disable(IPipelines pipelines) /// Current Nancy Context private static void PrepareJsonp(NancyContext context) { - bool isJson = Nancy.Json.Json.IsJsonContentType(context.Response.ContentType); + bool isJson = Json.Json.IsJsonContentType(context.Response.ContentType); bool hasCallback = context.Request.Query["callback"].HasValue; if (isJson && hasCallback) diff --git a/src/Nancy/Localization/ResourceBasedTextResource.cs b/src/Nancy/Localization/ResourceBasedTextResource.cs index caca76adcb..6c6ffd5ef9 100644 --- a/src/Nancy/Localization/ResourceBasedTextResource.cs +++ b/src/Nancy/Localization/ResourceBasedTextResource.cs @@ -4,7 +4,6 @@ namespace Nancy.Localization using System.Collections.Generic; using System.IO; using System.Linq; - using System.Reflection; using System.Resources; /// diff --git a/src/Nancy/MimeTypes.cs b/src/Nancy/MimeTypes.cs index 71e024165f..3b1f5681f9 100644 --- a/src/Nancy/MimeTypes.cs +++ b/src/Nancy/MimeTypes.cs @@ -28,11 +28,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using System; -using System.Collections.Generic; - namespace Nancy { + using System; + using System.Collections.Generic; + public sealed class MimeTypes { static Dictionary mimeTypes; diff --git a/src/Nancy/ModelBinding/BindingContext.cs b/src/Nancy/ModelBinding/BindingContext.cs index 2b6e65c74a..20183b0b4a 100644 --- a/src/Nancy/ModelBinding/BindingContext.cs +++ b/src/Nancy/ModelBinding/BindingContext.cs @@ -2,7 +2,6 @@ { using System; using System.Collections.Generic; - using System.Reflection; /// /// Model binding context object diff --git a/src/Nancy/ModelBinding/BindingDefaults.cs b/src/Nancy/ModelBinding/BindingDefaults.cs index 2810249bb4..e455264e15 100644 --- a/src/Nancy/ModelBinding/BindingDefaults.cs +++ b/src/Nancy/ModelBinding/BindingDefaults.cs @@ -2,8 +2,8 @@ namespace Nancy.ModelBinding { using System.Collections.Generic; - using DefaultBodyDeserializers; - using DefaultConverters; + using Nancy.ModelBinding.DefaultBodyDeserializers; + using Nancy.ModelBinding.DefaultConverters; /// /// Provides default binding converters/deserializers diff --git a/src/Nancy/ModelBinding/DefaultBinder.cs b/src/Nancy/ModelBinding/DefaultBinder.cs index b6b5c1ebc1..547ec04aad 100644 --- a/src/Nancy/ModelBinding/DefaultBinder.cs +++ b/src/Nancy/ModelBinding/DefaultBinder.cs @@ -1,14 +1,13 @@ namespace Nancy.ModelBinding { using System; + using System.Collections; using System.Collections.Generic; - using System.Collections.ObjectModel; using System.Linq; using System.Reflection; using System.Text.RegularExpressions; using Nancy.Extensions; - using System.Collections; /// /// Default binder - used as a fallback when a specific modelbinder diff --git a/src/Nancy/ModelBinding/DefaultBodyDeserializers/JsonBodyDeserializer.cs b/src/Nancy/ModelBinding/DefaultBodyDeserializers/JsonBodyDeserializer.cs index e4df458fbb..289d2c3762 100644 --- a/src/Nancy/ModelBinding/DefaultBodyDeserializers/JsonBodyDeserializer.cs +++ b/src/Nancy/ModelBinding/DefaultBodyDeserializers/JsonBodyDeserializer.cs @@ -2,7 +2,8 @@ namespace Nancy.ModelBinding.DefaultBodyDeserializers { using System.IO; using System.Reflection; - using Json; + + using Nancy.Json; /// /// Deserializes request bodies in JSON format diff --git a/src/Nancy/ModelBinding/DefaultConverters/CollectionConverter.cs b/src/Nancy/ModelBinding/DefaultConverters/CollectionConverter.cs index ced11c1d59..cff264d952 100644 --- a/src/Nancy/ModelBinding/DefaultConverters/CollectionConverter.cs +++ b/src/Nancy/ModelBinding/DefaultConverters/CollectionConverter.cs @@ -3,7 +3,8 @@ namespace Nancy.ModelBinding.DefaultConverters using System; using System.Linq; using System.Reflection; - using Extensions; + + using Nancy.Extensions; /// /// Converter for handling enumerable types diff --git a/src/Nancy/ModelBinding/DefaultConverters/NumericConverter.cs b/src/Nancy/ModelBinding/DefaultConverters/NumericConverter.cs index 1c6982bcc8..216eed8f10 100644 --- a/src/Nancy/ModelBinding/DefaultConverters/NumericConverter.cs +++ b/src/Nancy/ModelBinding/DefaultConverters/NumericConverter.cs @@ -1,7 +1,8 @@ namespace Nancy.ModelBinding.DefaultConverters { using System; - using Extensions; + + using Nancy.Extensions; /// /// Converter for numeric types diff --git a/src/Nancy/NamedPipelineBase.cs b/src/Nancy/NamedPipelineBase.cs index 0b1b6d93dd..e15a47e2d6 100644 --- a/src/Nancy/NamedPipelineBase.cs +++ b/src/Nancy/NamedPipelineBase.cs @@ -2,9 +2,7 @@ namespace Nancy { using System; using System.Collections.Generic; - using System.IO; using System.Linq; - using System.Runtime.Serialization.Formatters.Binary; public abstract class NamedPipelineBase { diff --git a/src/Nancy/NancyContext.cs b/src/Nancy/NancyContext.cs index 7d90e0e23b..796bdee729 100644 --- a/src/Nancy/NancyContext.cs +++ b/src/Nancy/NancyContext.cs @@ -3,13 +3,14 @@ namespace Nancy { using System; using System.Collections.Generic; + using System.Globalization; using System.Linq; + using Nancy.Diagnostics; using Nancy.Responses.Negotiation; using Nancy.Routing; using Nancy.Security; using Nancy.Validation; - using System.Globalization; /// /// Nancy context. diff --git a/src/Nancy/NancyEngine.cs b/src/Nancy/NancyEngine.cs index f5b010b398..43896922f4 100644 --- a/src/Nancy/NancyEngine.cs +++ b/src/Nancy/NancyEngine.cs @@ -2,18 +2,15 @@ { using System; using System.Collections.Generic; - using System.Linq; using System.Threading; using System.Threading.Tasks; - using Bootstrapper; - + using Nancy.Bootstrapper; using Nancy.Cookies; using Nancy.Diagnostics; using Nancy.ErrorHandling; - using Nancy.Routing; - using Nancy.Helpers; + using Nancy.Routing; /// /// Default engine for handling Nancy s. diff --git a/src/Nancy/NegotiatorExtensions.cs b/src/Nancy/NegotiatorExtensions.cs index 29a655362c..d6cb8f8095 100644 --- a/src/Nancy/NegotiatorExtensions.cs +++ b/src/Nancy/NegotiatorExtensions.cs @@ -3,8 +3,9 @@ using System; using System.Collections.Generic; using System.Linq; + + using Nancy.Cookies; using Nancy.Responses.Negotiation; - using Cookies; public static class NegotiatorExtensions { diff --git a/src/Nancy/Owin/DelegateExtensions.cs b/src/Nancy/Owin/DelegateExtensions.cs index 5e393a21c8..18450bec22 100644 --- a/src/Nancy/Owin/DelegateExtensions.cs +++ b/src/Nancy/Owin/DelegateExtensions.cs @@ -2,16 +2,11 @@ { using System; - using AppFunc = System.Func< - System.Collections.Generic.IDictionary, + using AppFunc = System.Func, System.Threading.Tasks.Task>; - using MidFunc = System.Func< - System.Func< - System.Collections.Generic.IDictionary, - System.Threading.Tasks.Task>, - System.Func< - System.Collections.Generic.IDictionary, + using MidFunc = System.Func, + System.Threading.Tasks.Task>, System.Func, System.Threading.Tasks.Task>>; /// diff --git a/src/Nancy/Owin/NancyMiddleware.cs b/src/Nancy/Owin/NancyMiddleware.cs index 7e82c30954..cb4b0b9eca 100644 --- a/src/Nancy/Owin/NancyMiddleware.cs +++ b/src/Nancy/Owin/NancyMiddleware.cs @@ -6,23 +6,18 @@ using System.IO; using System.Linq; using System.Net; + using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; - using System.Security.Cryptography.X509Certificates; + using Nancy.Helpers; using Nancy.IO; - using Helpers; - using AppFunc = System.Func< - System.Collections.Generic.IDictionary, + using AppFunc = System.Func, System.Threading.Tasks.Task>; - using MidFunc = System.Func< - System.Func< - System.Collections.Generic.IDictionary, - System.Threading.Tasks.Task>, - System.Func< - System.Collections.Generic.IDictionary, + using MidFunc = System.Func, + System.Threading.Tasks.Task>, System.Func, System.Threading.Tasks.Task>>; /// diff --git a/src/Nancy/Owin/NancyOptions.cs b/src/Nancy/Owin/NancyOptions.cs index 23035f8459..5cb3d21014 100644 --- a/src/Nancy/Owin/NancyOptions.cs +++ b/src/Nancy/Owin/NancyOptions.cs @@ -1,6 +1,7 @@ namespace Nancy.Owin { using System; + using Nancy.Bootstrapper; /// diff --git a/src/Nancy/Request.cs b/src/Nancy/Request.cs index 701455b750..4646bbeb0c 100644 --- a/src/Nancy/Request.cs +++ b/src/Nancy/Request.cs @@ -5,12 +5,12 @@ namespace Nancy using System.Collections.Specialized; using System.IO; using System.Linq; - using System.Text.RegularExpressions; using System.Security.Cryptography.X509Certificates; + using System.Text.RegularExpressions; - using IO; using Nancy.Extensions; - using Session; + using Nancy.IO; + using Nancy.Session; /// /// Encapsulates HTTP-request information to an Nancy application. diff --git a/src/Nancy/ResourceAssemblyProvider.cs b/src/Nancy/ResourceAssemblyProvider.cs index 446166a8df..2ff8bb39ec 100644 --- a/src/Nancy/ResourceAssemblyProvider.cs +++ b/src/Nancy/ResourceAssemblyProvider.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; + using Nancy.Bootstrapper; /// diff --git a/src/Nancy/Response.cs b/src/Nancy/Response.cs index 1fddec95b6..57ab2d9075 100644 --- a/src/Nancy/Response.cs +++ b/src/Nancy/Response.cs @@ -3,11 +3,9 @@ namespace Nancy using System; using System.Collections.Generic; using System.IO; - using System.Linq; using System.Threading.Tasks; - using Cookies; - + using Nancy.Cookies; using Nancy.Helpers; /// diff --git a/src/Nancy/ResponseExtensions.cs b/src/Nancy/ResponseExtensions.cs index e55e48797c..d1a508cb03 100644 --- a/src/Nancy/ResponseExtensions.cs +++ b/src/Nancy/ResponseExtensions.cs @@ -3,6 +3,7 @@ namespace Nancy using System; using System.Collections.Generic; using System.Linq; + using Nancy.Cookies; using Nancy.Responses; diff --git a/src/Nancy/Responses/DefaultJsonSerializer.cs b/src/Nancy/Responses/DefaultJsonSerializer.cs index 7099080101..1fcacca115 100644 --- a/src/Nancy/Responses/DefaultJsonSerializer.cs +++ b/src/Nancy/Responses/DefaultJsonSerializer.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; using System.IO; - using Json; using Nancy.IO; + using Nancy.Json; public class DefaultJsonSerializer : ISerializer { diff --git a/src/Nancy/Responses/GenericFileResponse.cs b/src/Nancy/Responses/GenericFileResponse.cs index d0225a55e1..056365abbc 100644 --- a/src/Nancy/Responses/GenericFileResponse.cs +++ b/src/Nancy/Responses/GenericFileResponse.cs @@ -1,10 +1,8 @@ -using System.Collections.Generic; - -namespace Nancy.Responses +namespace Nancy.Responses { using System; + using System.Collections.Generic; using System.IO; - using System.Linq; using Nancy.Helpers; @@ -146,7 +144,7 @@ private void SetResponseValues(string contentType, string fullPath, NancyContext { this.StatusCode = HttpStatusCode.NotModified; this.ContentType = null; - this.Contents = Response.NoBody; + this.Contents = NoBody; return; } diff --git a/src/Nancy/Responses/HtmlResponse.cs b/src/Nancy/Responses/HtmlResponse.cs index 1a309c53d8..12480b1912 100644 --- a/src/Nancy/Responses/HtmlResponse.cs +++ b/src/Nancy/Responses/HtmlResponse.cs @@ -3,7 +3,8 @@ using System; using System.Collections.Generic; using System.IO; - using Cookies; + + using Nancy.Cookies; /// /// Represents a HTML (text/html) response diff --git a/src/Nancy/Responses/JsonResponse.cs b/src/Nancy/Responses/JsonResponse.cs index 6ee5cf26b8..d3dff18a9d 100644 --- a/src/Nancy/Responses/JsonResponse.cs +++ b/src/Nancy/Responses/JsonResponse.cs @@ -2,7 +2,8 @@ { using System; using System.IO; - using Json; + + using Nancy.Json; public class JsonResponse : Response { diff --git a/src/Nancy/Responses/Negotiation/NegotiationContext.cs b/src/Nancy/Responses/Negotiation/NegotiationContext.cs index 3009e8c349..a188385685 100644 --- a/src/Nancy/Responses/Negotiation/NegotiationContext.cs +++ b/src/Nancy/Responses/Negotiation/NegotiationContext.cs @@ -3,7 +3,8 @@ using System; using System.Collections.Generic; using System.Linq; - using Cookies; + + using Nancy.Cookies; /// /// Context for content negotiation. diff --git a/src/Nancy/Responses/Negotiation/ViewProcessor.cs b/src/Nancy/Responses/Negotiation/ViewProcessor.cs index bae6cd1b6f..4d04053a25 100644 --- a/src/Nancy/Responses/Negotiation/ViewProcessor.cs +++ b/src/Nancy/Responses/Negotiation/ViewProcessor.cs @@ -2,6 +2,7 @@ { using System; using System.Collections.Generic; + using Nancy.ViewEngines; /// diff --git a/src/Nancy/Responses/TextResponse.cs b/src/Nancy/Responses/TextResponse.cs index 41d6cb332d..137b35261f 100644 --- a/src/Nancy/Responses/TextResponse.cs +++ b/src/Nancy/Responses/TextResponse.cs @@ -2,7 +2,8 @@ { using System.Collections.Generic; using System.Text; - using Cookies; + + using Nancy.Cookies; /// /// Represents a text (text/plain) response diff --git a/src/Nancy/RootPathApplicationStartup.cs b/src/Nancy/RootPathApplicationStartup.cs index 7e9ac74a80..ce78f639ca 100644 --- a/src/Nancy/RootPathApplicationStartup.cs +++ b/src/Nancy/RootPathApplicationStartup.cs @@ -1,7 +1,7 @@ namespace Nancy { - using Bootstrapper; - using Responses; + using Nancy.Bootstrapper; + using Nancy.Responses; /// /// Assigns the root path of the application whom ever needs it. diff --git a/src/Nancy/Routing/DefaultNancyModuleBuilder.cs b/src/Nancy/Routing/DefaultNancyModuleBuilder.cs index 9fbd8c8593..bfcd0a2d0a 100644 --- a/src/Nancy/Routing/DefaultNancyModuleBuilder.cs +++ b/src/Nancy/Routing/DefaultNancyModuleBuilder.cs @@ -1,10 +1,10 @@ namespace Nancy.Routing { - using ModelBinding; using Nancy.Extensions; + using Nancy.ModelBinding; using Nancy.Responses.Negotiation; - using Nancy.ViewEngines; using Nancy.Validation; + using Nancy.ViewEngines; /// /// Default implementation for building a full configured instance. diff --git a/src/Nancy/Routing/DefaultRequestDispatcher.cs b/src/Nancy/Routing/DefaultRequestDispatcher.cs index b46d259147..bac4f613e8 100644 --- a/src/Nancy/Routing/DefaultRequestDispatcher.cs +++ b/src/Nancy/Routing/DefaultRequestDispatcher.cs @@ -8,8 +8,7 @@ namespace Nancy.Routing using System.Threading.Tasks; using Nancy.Helpers; - - using Responses.Negotiation; + using Nancy.Responses.Negotiation; /// /// Default implementation of a request dispatcher. diff --git a/src/Nancy/Routing/DefaultRouteCacheProvider.cs b/src/Nancy/Routing/DefaultRouteCacheProvider.cs index d29f551737..7870bf6e3c 100755 --- a/src/Nancy/Routing/DefaultRouteCacheProvider.cs +++ b/src/Nancy/Routing/DefaultRouteCacheProvider.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; + using Nancy.Diagnostics; /// diff --git a/src/Nancy/Routing/DefaultRoutePatternMatcher.cs b/src/Nancy/Routing/DefaultRoutePatternMatcher.cs index 5eb2ff4477..b3234a0673 100644 --- a/src/Nancy/Routing/DefaultRoutePatternMatcher.cs +++ b/src/Nancy/Routing/DefaultRoutePatternMatcher.cs @@ -6,6 +6,7 @@ using System.Globalization; using System.Linq; using System.Text.RegularExpressions; + using Nancy.Extensions; /// diff --git a/src/Nancy/Routing/DefaultRouteResolver.cs b/src/Nancy/Routing/DefaultRouteResolver.cs index 64146828f4..6098e60794 100644 --- a/src/Nancy/Routing/DefaultRouteResolver.cs +++ b/src/Nancy/Routing/DefaultRouteResolver.cs @@ -3,11 +3,9 @@ using System; using System.Collections.Generic; using System.Linq; - using Nancy; - using Nancy.Helpers; - using Trie; - using MatchResult = Trie.MatchResult; + using Nancy.Helpers; + using Nancy.Routing.Trie; /// /// Default implementation of the interface. diff --git a/src/Nancy/Routing/NotFoundRoute.cs b/src/Nancy/Routing/NotFoundRoute.cs index f503bdee12..8c3ac694ef 100644 --- a/src/Nancy/Routing/NotFoundRoute.cs +++ b/src/Nancy/Routing/NotFoundRoute.cs @@ -1,7 +1,5 @@ namespace Nancy.Routing { - using System.Threading.Tasks; - using Nancy.Helpers; /// diff --git a/src/Nancy/Routing/Trie/MatchResult.cs b/src/Nancy/Routing/Trie/MatchResult.cs index b1a3bf41ca..258b98ac74 100644 --- a/src/Nancy/Routing/Trie/MatchResult.cs +++ b/src/Nancy/Routing/Trie/MatchResult.cs @@ -79,7 +79,7 @@ public int CompareTo(MatchResult other) return 1; } - if (string.Equals(this.ModuleType, other.ModuleType)) + if (Equals(this.ModuleType, other.ModuleType)) { if (this.RouteIndex < other.RouteIndex) { diff --git a/src/Nancy/Routing/Trie/NodeData.cs b/src/Nancy/Routing/Trie/NodeData.cs index b1a0281723..cfce886673 100644 --- a/src/Nancy/Routing/Trie/NodeData.cs +++ b/src/Nancy/Routing/Trie/NodeData.cs @@ -2,8 +2,6 @@ namespace Nancy.Routing.Trie { using System; - using Nancy; - /// /// Represents a route that ends at a particular node. /// We store/calculate as much as we can at build time to save diff --git a/src/Nancy/Routing/Trie/Nodes/CaptureNodeWithMultipleParameters.cs b/src/Nancy/Routing/Trie/Nodes/CaptureNodeWithMultipleParameters.cs index 96ef501251..3ccfbcd982 100644 --- a/src/Nancy/Routing/Trie/Nodes/CaptureNodeWithMultipleParameters.cs +++ b/src/Nancy/Routing/Trie/Nodes/CaptureNodeWithMultipleParameters.cs @@ -1,8 +1,8 @@ namespace Nancy.Routing.Trie.Nodes { using System.Collections.Generic; - using System.Text.RegularExpressions; using System.Linq; + using System.Text.RegularExpressions; /// /// A node multiple standard captures combined with a literal e.g. {id}.png.{thing}.{otherthing} diff --git a/src/Nancy/Routing/Trie/RouteResolverTrie.cs b/src/Nancy/Routing/Trie/RouteResolverTrie.cs index 9024693c1c..1291f2e531 100644 --- a/src/Nancy/Routing/Trie/RouteResolverTrie.cs +++ b/src/Nancy/Routing/Trie/RouteResolverTrie.cs @@ -4,7 +4,8 @@ namespace Nancy.Routing.Trie using System.Collections.Generic; using System.Linq; using System.Text; - using Nodes; + + using Nancy.Routing.Trie.Nodes; /// /// The default route resolution trie diff --git a/src/Nancy/Routing/Trie/TrieNodeFactory.cs b/src/Nancy/Routing/Trie/TrieNodeFactory.cs index 5e6920df77..11a208d9e9 100644 --- a/src/Nancy/Routing/Trie/TrieNodeFactory.cs +++ b/src/Nancy/Routing/Trie/TrieNodeFactory.cs @@ -1,7 +1,7 @@ namespace Nancy.Routing.Trie { - using System.Linq; using System.Collections.Generic; + using System.Linq; using Nancy.Routing.Constraints; using Nancy.Routing.Trie.Nodes; diff --git a/src/Nancy/Security/Csrf.cs b/src/Nancy/Security/Csrf.cs index 45f36f845a..3d848549b8 100644 --- a/src/Nancy/Security/Csrf.cs +++ b/src/Nancy/Security/Csrf.cs @@ -1,8 +1,9 @@ namespace Nancy.Security { using System; - using Cookies; + using Nancy.Bootstrapper; + using Nancy.Cookies; using Nancy.Cryptography; using Nancy.Helpers; diff --git a/src/Nancy/Security/CsrfApplicationStartup.cs b/src/Nancy/Security/CsrfApplicationStartup.cs index a96ebc1db2..75f55b3b7c 100644 --- a/src/Nancy/Security/CsrfApplicationStartup.cs +++ b/src/Nancy/Security/CsrfApplicationStartup.cs @@ -1,7 +1,7 @@ namespace Nancy.Security { - using Bootstrapper; - using Cryptography; + using Nancy.Bootstrapper; + using Nancy.Cryptography; /// /// Wires up the CSRF (anti-forgety token) support at application startup. diff --git a/src/Nancy/Security/CsrfTokenExtensions.cs b/src/Nancy/Security/CsrfTokenExtensions.cs index 8eff69733e..a17d7e6fef 100644 --- a/src/Nancy/Security/CsrfTokenExtensions.cs +++ b/src/Nancy/Security/CsrfTokenExtensions.cs @@ -3,8 +3,8 @@ using System; using System.Linq; using System.Security.Cryptography; - using System.Text; - using Cryptography; + + using Nancy.Cryptography; public static class CsrfTokenExtensions { diff --git a/src/Nancy/Security/DefaultCsrfTokenValidator.cs b/src/Nancy/Security/DefaultCsrfTokenValidator.cs index b6193e60ee..473e1af7f8 100644 --- a/src/Nancy/Security/DefaultCsrfTokenValidator.cs +++ b/src/Nancy/Security/DefaultCsrfTokenValidator.cs @@ -2,7 +2,8 @@ namespace Nancy.Security { using System; using System.Linq; - using Cryptography; + + using Nancy.Cryptography; /// /// The default implementation of the interface. diff --git a/src/Nancy/Security/SecurityHooks.cs b/src/Nancy/Security/SecurityHooks.cs index 5667a38f96..8cdc0cbeb3 100644 --- a/src/Nancy/Security/SecurityHooks.cs +++ b/src/Nancy/Security/SecurityHooks.cs @@ -2,6 +2,7 @@ { using System; using System.Collections.Generic; + using Nancy.Responses; /// diff --git a/src/Nancy/Session/CookieBasedSessions.cs b/src/Nancy/Session/CookieBasedSessions.cs index 4bf0e21da9..49f33808bb 100644 --- a/src/Nancy/Session/CookieBasedSessions.cs +++ b/src/Nancy/Session/CookieBasedSessions.cs @@ -4,9 +4,10 @@ namespace Nancy.Session using System.Collections.Generic; using System.Linq; using System.Text; - using Bootstrapper; - using Cryptography; + + using Nancy.Bootstrapper; using Nancy.Cookies; + using Nancy.Cryptography; using Nancy.Helpers; /// diff --git a/src/Nancy/Session/CookieBasedSessionsConfiguration.cs b/src/Nancy/Session/CookieBasedSessionsConfiguration.cs index c7b4cb09d1..a1ffedd8cf 100644 --- a/src/Nancy/Session/CookieBasedSessionsConfiguration.cs +++ b/src/Nancy/Session/CookieBasedSessionsConfiguration.cs @@ -1,6 +1,6 @@ namespace Nancy.Session { - using Cryptography; + using Nancy.Cryptography; /// /// Configuration options for cookie based sessions diff --git a/src/Nancy/StaticConfiguration.cs b/src/Nancy/StaticConfiguration.cs index 462810ac34..085068564b 100644 --- a/src/Nancy/StaticConfiguration.cs +++ b/src/Nancy/StaticConfiguration.cs @@ -3,8 +3,9 @@ namespace Nancy using System; using System.Diagnostics; using System.Linq; - using Diagnostics; + using Nancy.Bootstrapper; + using Nancy.Diagnostics; public static class StaticConfiguration { diff --git a/src/Nancy/StaticContent.cs b/src/Nancy/StaticContent.cs index d50d302183..050fa79aca 100644 --- a/src/Nancy/StaticContent.cs +++ b/src/Nancy/StaticContent.cs @@ -1,10 +1,10 @@ namespace Nancy { using System; - using System.Collections.Generic; using System.Linq; - using Conventions; + using Nancy.Bootstrapper; + using Nancy.Conventions; /// /// Registers the static contents hook in the application pipeline at startup. diff --git a/src/Nancy/TinyIoc/TinyIoC.cs b/src/Nancy/TinyIoc/TinyIoC.cs index c98ef81e3b..6aef40267d 100755 --- a/src/Nancy/TinyIoc/TinyIoC.cs +++ b/src/Nancy/TinyIoc/TinyIoC.cs @@ -69,10 +69,9 @@ namespace Nancy.TinyIoc { using System; using System.Collections.Generic; - using System.Collections.ObjectModel; + using System.IO; using System.Linq; using System.Reflection; - #if EXPRESSIONS using System.Linq.Expressions; using System.Threading; @@ -293,7 +292,7 @@ public static Type[] SafeGetTypes(this Assembly assembly) { assemblies = assembly.GetTypes(); } - catch (System.IO.FileNotFoundException) + catch (FileNotFoundException) { assemblies = new Type[] { }; } diff --git a/src/Nancy/Validation/DefaultValidatorLocator.cs b/src/Nancy/Validation/DefaultValidatorLocator.cs index faed1396e3..e09c4de20c 100644 --- a/src/Nancy/Validation/DefaultValidatorLocator.cs +++ b/src/Nancy/Validation/DefaultValidatorLocator.cs @@ -1,8 +1,8 @@ namespace Nancy.Validation { using System; - using System.Collections.Generic; using System.Collections.Concurrent; + using System.Collections.Generic; using System.Linq; /// diff --git a/src/Nancy/Validation/ModelValidationError.cs b/src/Nancy/Validation/ModelValidationError.cs index c900d24e40..db24d39b3d 100644 --- a/src/Nancy/Validation/ModelValidationError.cs +++ b/src/Nancy/Validation/ModelValidationError.cs @@ -1,6 +1,5 @@ namespace Nancy.Validation { - using System; using System.Collections.Generic; /// diff --git a/src/Nancy/ViewEngines/DefaultRenderContext.cs b/src/Nancy/ViewEngines/DefaultRenderContext.cs index c8686b1150..e410609b2f 100644 --- a/src/Nancy/ViewEngines/DefaultRenderContext.cs +++ b/src/Nancy/ViewEngines/DefaultRenderContext.cs @@ -2,12 +2,11 @@ { using System; using System.Collections.Generic; - using Cryptography; + using Nancy.Extensions; + using Nancy.Helpers; using Nancy.Localization; - - using Security; - using Session; + using Nancy.Security; /// /// Default render context implementation. @@ -91,7 +90,7 @@ public string ParsePath(string input) /// A HTML encoded . public string HtmlEncode(string input) { - return Helpers.HttpUtility.HtmlEncode(input); + return HttpUtility.HtmlEncode(input); } /// diff --git a/src/Nancy/ViewEngines/DefaultViewFactory.cs b/src/Nancy/ViewEngines/DefaultViewFactory.cs index a99055cc87..660244b019 100644 --- a/src/Nancy/ViewEngines/DefaultViewFactory.cs +++ b/src/Nancy/ViewEngines/DefaultViewFactory.cs @@ -6,8 +6,8 @@ using System.IO; using System.Linq; using System.Text.RegularExpressions; - using Nancy.Conventions; + using Nancy.Conventions; /// /// The default implementation for how views are resolved and rendered by Nancy. diff --git a/src/Nancy/ViewEngines/DefaultViewResolver.cs b/src/Nancy/ViewEngines/DefaultViewResolver.cs index 1c6b72f9f0..debc7b0c31 100644 --- a/src/Nancy/ViewEngines/DefaultViewResolver.cs +++ b/src/Nancy/ViewEngines/DefaultViewResolver.cs @@ -1,6 +1,7 @@ namespace Nancy.ViewEngines { using System; + using Nancy.Conventions; /// diff --git a/src/Nancy/ViewEngines/FileSystemViewLocationProvider.cs b/src/Nancy/ViewEngines/FileSystemViewLocationProvider.cs index 8b909c1cd1..e9889173d7 100644 --- a/src/Nancy/ViewEngines/FileSystemViewLocationProvider.cs +++ b/src/Nancy/ViewEngines/FileSystemViewLocationProvider.cs @@ -1,6 +1,5 @@ namespace Nancy.ViewEngines { - using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/src/Nancy/ViewEngines/IViewEngine.cs b/src/Nancy/ViewEngines/IViewEngine.cs index 8cd000f241..72afff12b5 100644 --- a/src/Nancy/ViewEngines/IViewEngine.cs +++ b/src/Nancy/ViewEngines/IViewEngine.cs @@ -1,8 +1,6 @@ namespace Nancy.ViewEngines { - using System; using System.Collections.Generic; - using System.IO; /// /// Defines the functionality that a view engine must support to be integrated into Nancy. diff --git a/src/Nancy/ViewEngines/IViewFactory.cs b/src/Nancy/ViewEngines/IViewFactory.cs index 99f0b439e8..bbe4e93921 100644 --- a/src/Nancy/ViewEngines/IViewFactory.cs +++ b/src/Nancy/ViewEngines/IViewFactory.cs @@ -1,8 +1,5 @@ namespace Nancy.ViewEngines { - using System; - using System.IO; - /// /// Defines the functionality used by a to render a view to the response. /// diff --git a/src/Nancy/ViewEngines/IViewRenderer.cs b/src/Nancy/ViewEngines/IViewRenderer.cs index d05abf57d8..8dcc2a4eb2 100644 --- a/src/Nancy/ViewEngines/IViewRenderer.cs +++ b/src/Nancy/ViewEngines/IViewRenderer.cs @@ -1,7 +1,5 @@ namespace Nancy.ViewEngines { - using Nancy; - /// /// Interface for manually rendering views to a Response object, rather /// than going through content negotiation. diff --git a/src/Nancy/ViewEngines/SuperSimpleViewEngine/SuperSimpleViewEngineRegistrations.cs b/src/Nancy/ViewEngines/SuperSimpleViewEngine/SuperSimpleViewEngineRegistrations.cs index 05cf1a1737..e1bc7e8280 100644 --- a/src/Nancy/ViewEngines/SuperSimpleViewEngine/SuperSimpleViewEngineRegistrations.cs +++ b/src/Nancy/ViewEngines/SuperSimpleViewEngine/SuperSimpleViewEngineRegistrations.cs @@ -1,7 +1,8 @@ namespace Nancy.ViewEngines.SuperSimpleViewEngine { using System.Collections.Generic; - using Bootstrapper; + + using Nancy.Bootstrapper; /// /// Performs application registations for the SuperSimpleViewEngine. diff --git a/src/Nancy/ViewEngines/SuperSimpleViewEngine/SuperSimpleViewEngineWrapper.cs b/src/Nancy/ViewEngines/SuperSimpleViewEngine/SuperSimpleViewEngineWrapper.cs index b1ff69b2f5..1ce6e7d28c 100644 --- a/src/Nancy/ViewEngines/SuperSimpleViewEngine/SuperSimpleViewEngineWrapper.cs +++ b/src/Nancy/ViewEngines/SuperSimpleViewEngine/SuperSimpleViewEngineWrapper.cs @@ -2,7 +2,8 @@ { using System.Collections.Generic; using System.IO; - using Responses; + + using Nancy.Responses; /// /// Nancy IViewEngine wrapper for the super simple view engine diff --git a/src/Nancy/ViewEngines/ViewEngineApplicationStartup.cs b/src/Nancy/ViewEngines/ViewEngineApplicationStartup.cs index 806e31467e..de73f3d8d4 100644 --- a/src/Nancy/ViewEngines/ViewEngineApplicationStartup.cs +++ b/src/Nancy/ViewEngines/ViewEngineApplicationStartup.cs @@ -1,6 +1,7 @@ namespace Nancy.ViewEngines { using System.Collections.Generic; + using Nancy.Bootstrapper; /// diff --git a/src/Nancy/ViewEngines/ViewEngineStartupContext.cs b/src/Nancy/ViewEngines/ViewEngineStartupContext.cs index 118fa28af4..6dd8398e0d 100644 --- a/src/Nancy/ViewEngines/ViewEngineStartupContext.cs +++ b/src/Nancy/ViewEngines/ViewEngineStartupContext.cs @@ -1,7 +1,5 @@ namespace Nancy.ViewEngines { - using System.Collections.Generic; - /// /// Context passed to each view engine on startup /// diff --git a/src/Nancy/ViewEngines/ViewRenderException.cs b/src/Nancy/ViewEngines/ViewRenderException.cs index 7aa95cd316..2a83e99447 100644 --- a/src/Nancy/ViewEngines/ViewRenderException.cs +++ b/src/Nancy/ViewEngines/ViewRenderException.cs @@ -1,8 +1,8 @@ namespace Nancy.ViewEngines.Razor { - using System; + using System; - /// + /// /// An exception that indicates the view could not be rendered /// public class ViewRenderException : Exception diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs index 967f016ad8..e82a381cbb 100644 --- a/src/SharedAssemblyInfo.cs +++ b/src/SharedAssemblyInfo.cs @@ -1,6 +1,5 @@ -using System.Runtime.InteropServices; -using System.Runtime.CompilerServices; using System.Reflection; +using System.Runtime.CompilerServices; [assembly: AssemblyTitle("Nancy")] [assembly: AssemblyDescription("A Sinatra inspired web framework for the .NET platform")]