NancyFx · thecodejunkie · Feb 18, 2015 · Feb 19, 2015 · Feb 19, 2015 · Feb 19, 2015
diff --git 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
@@ -25,3 +25,4 @@ _[Rr]e[Ss]harper.*/
 src/_NCrunch_Nancy/
 Thumbs.db
 .idea
+.vs
diff --git a/.travis.yml b/.travis.yml
@@ -1,25 +1,14 @@
-language: ruby
-rvm:
-  - 1.9.3
+language: csharp
+solution: src/Nancy.sln
+sudo: false
 install:
-  - sudo bash -c "echo deb http://badgerports.org lucid main >> /etc/apt/sources.list"
-  - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E1FAD0C
-  - sudo apt-get update
-  - sudo apt-get install mono-devel mono-gmcs mono-vbnc
-  - sudo apt-get install gettext
-  - sudo wget -q -P "/opt"  "http://samples.nancyfx.org/content/mono-3.0.12-x64-bin.tar.bz2"
   - gem install rake
   - gem install albacore --version "1.0.0.rc2"
   - echo \#\!/bin/bash >> ./travis.sh
   - echo set -e >> ./travis.sh
   - echo set -x >> ./travis.sh
   - echo set -o pipefail >> ./travis.sh
-  - echo echo Running on Mono 2.x >> ./travis.sh
-  - echo rake mono >> ./travis.sh
   - echo echo Running on Mono 3.x >> ./travis.sh
-  - echo sudo tar xkv -C "/opt" -f /opt/mono-3.0.12-x64-bin.tar.bz2 >> ./travis.sh
-  - echo export PATH="/opt/mono/bin:$PATH" >> ./travis.sh
-  - echo export LD_LIBRARY_PATH="/opt/mono/bin" >> ./travis.sh
   - echo rake mono >> ./travis.sh
   - chmod +x ./travis.sh
   - cat travis.sh

diff --git a/rakefile.rb b/rakefile.rb
@@ -55,7 +55,7 @@
 desc "Compile solution file for Mono"
 xbuild :compilemono => [:assembly_info] do |xb|
     xb.solution = SOLUTION_FILE
-    xb.properties = { :configuration => CONFIGURATIONMONO, "TargetFrameworkProfile" => "", "TargetFrameworkVersion" => "v4.0" }
+    xb.properties = { :configuration => CONFIGURATIONMONO, "TargetFrameworkProfile" => "", "TargetFrameworkVersion" => "v4.5" }
 end
 
 desc "Gathers output files and copies them to the output folder"

diff --git 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
@@ -2,15 +2,18 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Security.Claims;
     using System.Text;
     using System.Threading;
+
     using FakeItEasy;
-    using Nancy.Security;
-    using Nancy.Tests;
-    using Xunit;
+
     using Nancy.Bootstrapper;
+    using Nancy.Tests;
     using Nancy.Tests.Fakes;
 
+    using Xunit;
+
     public class BasicAuthenticationFixture
     {
         private readonly BasicAuthenticationConfiguration config;
@@ -249,7 +252,7 @@ public void Should_set_user_in_context_with_valid_username_in_auth_header()
             var fakePipelines = new Pipelines();
 
             var validator = A.Fake<IUserValidator>();
-            var fakeUser = A.Fake<IUserIdentity>();
+            var fakeUser = A.Fake<ClaimsPrincipal>();
             A.CallTo(() => validator.Validate("foo", "bar")).Returns(fakeUser);
 
             var cfg = new BasicAuthenticationConfiguration(validator, "realm");

diff --git a/src/Nancy.Authentication.Basic.Tests/Nancy.Authentication.Basic.Tests.csproj b/src/Nancy.Authentication.Basic.Tests/Nancy.Authentication.Basic.Tests.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Nancy.Authentication.Basic.Tests</RootNamespace>
     <AssemblyName>Nancy.Authentication.Basic.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -27,6 +27,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -37,6 +38,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -46,6 +48,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -64,6 +67,7 @@
     <CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
     <WarningLevel>4</WarningLevel>
     <Optimize>false</Optimize>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
     <OutputPath>bin\MonoRelease\</OutputPath>
@@ -79,9 +83,11 @@
     <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FakeItEasy">
+    <Reference Include="FakeItEasy, Version=1.19.0.0, Culture=neutral, PublicKeyToken=eff28e2146d5fd2c, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\FakeItEasy.1.19.0\lib\net40\FakeItEasy.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -123,11 +129,6 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">
       <Visible>False</Visible>
@@ -150,6 +151,9 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/src/Nancy.Authentication.Basic.Tests/packages.config b/src/Nancy.Authentication.Basic.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FakeItEasy" version="1.19.0" targetFramework="net40" />
-  <package id="xunit" version="1.9.1" targetFramework="net40" />
-  <package id="xunit.extensions" version="1.9.1" targetFramework="net40" />
+  <package id="FakeItEasy" version="1.19.0" targetFramework="net45" />
+  <package id="xunit" version="1.9.1" targetFramework="net45" />
+  <package id="xunit.extensions" version="1.9.1" targetFramework="net45" />
 </packages>
diff --git 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
@@ -1,7 +1,7 @@
 namespace Nancy.Authentication.Basic
 {
     using System;
-    
+
     /// <summary>
 	/// Configuration options for forms authentication
 	/// </summary>
@@ -13,7 +13,7 @@ public class BasicAuthenticationConfiguration
 		/// <param name="userValidator">A valid instance of <see cref="IUserValidator"/> class</param>
 		/// <param name="realm">Basic authentication realm</param>
         /// <param name="userPromptBehaviour">Control when the browser should be instructed to prompt for credentials</param>
-        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
@@ -1,7 +1,7 @@
 namespace Nancy.Authentication.Basic
 {
     using Nancy.Bootstrapper;
-    
+
     /// <summary>
 	/// Some simple helpers give some nice authentication syntax in the modules.
 	/// </summary>

diff --git a/src/Nancy.Authentication.Basic/IUserValidator.cs b/src/Nancy.Authentication.Basic/IUserValidator.cs
@@ -1,21 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-namespace Nancy.Authentication.Basic
+namespace Nancy.Authentication.Basic
 {
-    using Nancy.Security;
+    using System.Security.Claims;
 
-	/// <summary>
-	/// Provides a way to validate the username and password
-	/// </summary>
-	public interface IUserValidator
-	{
-		/// <summary>
-		/// Validates the username and password
-		/// </summary>
-		/// <param name="username">Username</param>
-		/// <param name="password">Password</param>
-		/// <returns>A value representing the authenticated user, null if the user was not authenticated.</returns>
-		IUserIdentity Validate(string username, string password);
-	}
-}
+    /// <summary>
+    ///     Provides a way to validate the username and password
+    /// </summary>
+    public interface IUserValidator
+    {
+        /// <summary>
+        ///     Validates the username and password
+        /// </summary>
+        /// <param name="username">Username</param>
+        /// <param name="password">Password</param>
+        /// <returns>A value representing the authenticated user, null if the user was not authenticated.</returns>
+        ClaimsPrincipal Validate(string username, string password);
+    }
+}
diff --git a/src/Nancy.Authentication.Basic/Nancy.Authentication.Basic.csproj b/src/Nancy.Authentication.Basic/Nancy.Authentication.Basic.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Nancy.Authentication.Basic</RootNamespace>
     <AssemblyName>Nancy.Authentication.Basic</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -27,6 +27,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,6 +39,7 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Debug\Nancy.Authentication.Basic.XML</DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -48,6 +50,7 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <DocumentationFile>bin\Release\Nancy.Authentication.Basic.XML</DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoDebug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -67,6 +70,7 @@
     <WarningLevel>4</WarningLevel>
     <Optimize>false</Optimize>
     <DocumentationFile>bin\MonoDebug\Nancy.Authentication.Basic.XML</DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'MonoRelease|AnyCPU'">
     <OutputPath>bin\MonoRelease\</OutputPath>
@@ -85,6 +89,7 @@
     <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\MonoRelease\Nancy.Authentication.Basic.XML</DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/src/Nancy.Authentication.Basic/nancy.authentication.basic.nuspec b/src/Nancy.Authentication.Basic/nancy.authentication.basic.nuspec
@@ -18,9 +18,9 @@
     <tags>Nancy Authentication</tags>
   </metadata>
   <files>
-    <file src="build\binaries\Nancy.Authentication.Basic.dll" target="lib\net40" />
-    <file src="build\binaries\Nancy.Authentication.Basic.pdb" target="lib\net40" />
-    <file src="build\binaries\Nancy.Authentication.Basic.XML" target="lib\net40" />
+    <file src="build\binaries\Nancy.Authentication.Basic.dll" target="lib\net45" />
+    <file src="build\binaries\Nancy.Authentication.Basic.pdb" target="lib\net45" />
+    <file src="build\binaries\Nancy.Authentication.Basic.XML" target="lib\net45" />
     <file src="src\Nancy.Authentication.Basic\**\*.cs" target="src" />
   </files>
 </package>
diff --git a/src/Nancy.Authentication.Forms.Tests/Fakes/FakeUserIdentity.cs b/src/Nancy.Authentication.Forms.Tests/Fakes/FakeUserIdentity.cs
diff --git 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