Merge pull request #6 from wikibus/release/v0.3

Release/v0.3
wikibus · Dec 2, 2016 · e691dcb · e691dcb
2 parents 14d2ec5 + 37ec97e
commit e691dcb
Show file tree

Hide file tree

Showing 53 changed files with 866 additions and 643 deletions.
diff --git a/Nancy.Rdf.sln b/Nancy.Rdf.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Rdf", "src\Nancy.Rdf\Nancy.Rdf.csproj", "{D789D63C-821B-410B-A953-DFEBCBFC9D40}"
 EndProject

diff --git a/Nancy.Rdf.sln.DotSettings b/Nancy.Rdf.sln.DotSettings
@@ -1,3 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeThisQualifier/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters&gt;&lt;Filter ModuleMask="*.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;/ExcludeFilters&gt;&lt;/data&gt;</s:String>
 	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String></wpf:ResourceDictionary>
diff --git a/paket.dependencies b/paket.dependencies
@@ -1,15 +1,13 @@
 source https://nuget.org/api/v2
-source https://ci.appveyor.com/nuget/jsonld-entities-aavhsnxi7xjp
 
 content: none
 redirects: on
-framework: net40, net45
+framework: net452
 
-nuget Nancy
 nuget newtonsoft.json
 nuget dotNetRDF
 nuget json-ld.net
-nuget Nancy
+nuget Nancy >= 2 prerelease
 nuget GitVersionTask
 nuget HtmlAgilityPack
 nuget OpenCover
@@ -20,10 +18,13 @@ nuget StyleCop.Analyzers
 nuget GitLink
 nuget JsonLd.Entities prerelease
 nuget Nullguard.Fody
-nuget Nancy.Testing
+nuget Nancy.Testing >= 2 prerelease
 nuget FluentAssertions
 nuget JetbrainsAnnotations.Fody
-nuget Nancy.Owin
+nuget Nancy.Owin >= 2 prerelease
 nuget Microsoft.Owin.Host.SystemWeb
 nuget Microsoft.Owin.Hosting
-nuget Rdf.Vocabularies
+nuget Rdf.Vocabularies
+
+group code-analysis
+gist tpluscode/a285267d2543466fc35c3a168c846f9f
diff --git a/paket.lock b/paket.lock
@@ -1,24 +1,29 @@
 REDIRECTS: ON
 CONTENT: NONE
-FRAMEWORK: NET40, NET45
+FRAMEWORK: NET452
 NUGET
   remote: https://www.nuget.org/api/v2
-  specs:
-    CsQuery (1.3.4)
-    dotNetRDF (1.0.9.3683)
+    AngleSharp (0.9.9)
+    dotNetRDF (1.0.12)
       HtmlAgilityPack (>= 1.4.9)
-      Newtonsoft.Json (>= 6.0.8)
-      VDS.Common (1.6)
-    FakeItEasy (2.0)
-    FluentAssertions (4.6.3)
+      Newtonsoft.Json (>= 8.0.3)
+      VDS.Common (1.6.4)
+    FakeItEasy (2.3.1)
+    FluentAssertions (4.17)
     Fody (1.29.4)
-    gitlink (2.2)
-    GitVersionTask (3.5.4)
-    HtmlAgilityPack (1.4.9)
-    JetBrainsAnnotations.Fody (1.0.4)
+    gitlink (2.3)
+    GitVersionTask (3.6.4)
+    HtmlAgilityPack (1.4.9.5)
+    JetBrainsAnnotations.Fody (1.0.5)
       Fody (>= 1.29.2)
+    JsonLd.Entities (0.3.3)
+      json-ld.net (>= 1.0.5)
     json-ld.net (1.0.5)
       Newtonsoft.Json (>= 6.0.4)
+    Microsoft.DotNet.PlatformAbstractions (1.1)
+    Microsoft.Extensions.DependencyModel (1.1)
+      Microsoft.DotNet.PlatformAbstractions (>= 1.1)
+      Newtonsoft.Json (>= 9.0.1)
     Microsoft.Owin (3.0.1)
       Owin (>= 1.0)
     Microsoft.Owin.Host.SystemWeb (3.0.1)
@@ -27,14 +32,18 @@ NUGET
     Microsoft.Owin.Hosting (3.0.1)
       Microsoft.Owin (>= 3.0.1)
       Owin (>= 1.0)
-    Nancy (1.4.3)
-    Nancy.Owin (1.4.1)
-      Nancy (>= 1.4.1)
+    Nancy (2.0.0-barneyrubble)
+      Microsoft.Extensions.DependencyModel (>= 1.0)
+    Nancy.Authentication.Forms (2.0.0-barneyrubble)
+      Nancy (>= 2.0.0-barneyrubble)
+    Nancy.Owin (2.0.0-barneyrubble)
+      Nancy (>= 2.0.0-barneyrubble)
       Owin (>= 1.0)
-    Nancy.Testing (1.4.1)
-      CsQuery (>= 1.3.3)
-      Nancy (>= 1.4.1)
-    Newtonsoft.Json (8.0.3)
+    Nancy.Testing (2.0.0-barneyrubble)
+      AngleSharp (>= 0.9.5)
+      Nancy (>= 2.0.0-barneyrubble)
+      Nancy.Authentication.Forms (>= 2.0.0-barneyrubble)
+    Newtonsoft.Json (9.0.1)
     NullGuard.Fody (1.4.6)
       Fody (>= 1.29.2)
     NUnit (2.6.4)
@@ -43,8 +52,10 @@ NUGET
     Rdf.Vocabularies (1.1.1)
     SpecFlow (2.1)
     StyleCop.Analyzers (1.0)
-    VDS.Common (1.6)
-  remote: https://ci.appveyor.com/nuget/jsonld-entities-aavhsnxi7xjp
-  specs:
-    JsonLD.Entities (0.3.3)
-      json-ld.net
+    VDS.Common (1.6.4)
+
+GROUP code-analysis
+
+GIST
+  remote: tpluscode/a285267d2543466fc35c3a168c846f9f
+    FULLPROJECT (c9b7a831e53e929f2ecce09b14a61e28007b669f)
diff --git a/src/Example/Nancy.Rdf.Sample/Nancy.Rdf.Sample.csproj b/src/Example/Nancy.Rdf.Sample/Nancy.Rdf.Sample.csproj
@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Nancy.Rdf.Sample</RootNamespace>
     <AssemblyName>Nancy.Rdf.Sample</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
@@ -54,9 +54,9 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
@@ -118,29 +118,51 @@
   </Target>
   -->
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
+      <ItemGroup>
+        <Reference Include="json-ld.net">
+          <HintPath>..\..\..\packages\json-ld.net\lib\net40-client\json-ld.net.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
+  <Choose>
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
       <ItemGroup>
         <Reference Include="JsonLD.Entities">
-          <HintPath>..\..\..\packages\JsonLD.Entities\lib\net40\JsonLD.Entities.dll</HintPath>
+          <HintPath>..\..\..\packages\JsonLd.Entities\lib\net40\JsonLD.Entities.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
       </ItemGroup>
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
       <ItemGroup>
-        <Reference Include="json-ld.net">
-          <HintPath>..\..\..\packages\json-ld.net\lib\net40-client\json-ld.net.dll</HintPath>
+        <Reference Include="Microsoft.DotNet.PlatformAbstractions">
+          <HintPath>..\..\..\packages\Microsoft.DotNet.PlatformAbstractions\lib\net451\Microsoft.DotNet.PlatformAbstractions.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
       </ItemGroup>
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
+      <ItemGroup>
+        <Reference Include="Microsoft.Extensions.DependencyModel">
+          <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyModel\lib\net451\Microsoft.Extensions.DependencyModel.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
+  <Choose>
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
       <ItemGroup>
         <Reference Include="Microsoft.Owin">
           <HintPath>..\..\..\packages\Microsoft.Owin\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -151,7 +173,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
       <ItemGroup>
         <Reference Include="Microsoft.Owin.Host.SystemWeb">
           <HintPath>..\..\..\packages\Microsoft.Owin.Host.SystemWeb\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
@@ -162,7 +184,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
       <ItemGroup>
         <Reference Include="Microsoft.Owin.Hosting">
           <HintPath>..\..\..\packages\Microsoft.Owin.Hosting\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
@@ -173,38 +195,29 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
       <ItemGroup>
         <Reference Include="Nancy">
-          <HintPath>..\..\..\packages\Nancy\lib\net40\Nancy.dll</HintPath>
+          <HintPath>..\..\..\packages\Nancy\lib\net452\Nancy.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
       </ItemGroup>
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
       <ItemGroup>
         <Reference Include="Nancy.Owin">
-          <HintPath>..\..\..\packages\Nancy.Owin\lib\net40\Nancy.Owin.dll</HintPath>
+          <HintPath>..\..\..\packages\Nancy.Owin\lib\net452\Nancy.Owin.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>
       </ItemGroup>
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
-      <ItemGroup>
-        <Reference Include="Newtonsoft.Json">
-          <HintPath>..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll</HintPath>
-          <Private>True</Private>
-          <Paket>True</Paket>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
       <ItemGroup>
         <Reference Include="Newtonsoft.Json">
           <HintPath>..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -215,7 +228,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
       <ItemGroup>
         <Reference Include="Owin">
           <HintPath>..\..\..\packages\Owin\lib\net40\Owin.dll</HintPath>
@@ -226,7 +239,7 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
       <ItemGroup>
         <Reference Include="Rdf.Vocabularies">
           <HintPath>..\..\..\packages\Rdf.Vocabularies\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Rdf.Vocabularies.dll</HintPath>

diff --git a/src/Example/Nancy.Rdf.Sample/Startup.cs b/src/Example/Nancy.Rdf.Sample/Startup.cs
@@ -1,4 +1,5 @@
 using System;
+using JsonLD.Entities;
 using JsonLD.Entities.Context;
 using Microsoft.Owin;
 using Nancy.Rdf.Sample;
@@ -30,6 +31,8 @@ public class Person
 
         public DateTime DateOfBirth { get; set; }
 
+        public string Friend { get; set; }
+
         [JsonProperty]
         private string Type
         {
@@ -55,16 +58,17 @@ public class PersonModule : NancyModule
     {
         public PersonModule()
         {
-            Get["person/{id}"] = _ =>
+            Get("person/{id}", _ =>
             {
                 return new Person
                 {
                     Id = "http://api.guru/person/" + _.id,
                     Name = "John",
                     LastName = "Doe",
-                    DateOfBirth = new DateTime(1967, 8, 2)
+                    DateOfBirth = new DateTime(1967, 8, 2),
+                    Friend = ("http://api.guru/person/" + _.id + 10)
                 };
-            };
+            });
         }
     }
 

diff --git a/src/Example/Nancy.Rdf.Sample/Web.config b/src/Example/Nancy.Rdf.Sample/Web.config
@@ -13,7 +13,7 @@
       </system.Web>
   -->
   <system.web>
-    <compilation debug="true" targetFramework="4.5" />
+    <compilation debug="true" targetFramework="4.5.2" />
     <httpRuntime targetFramework="4.5" />
   </system.web>
   <system.codedom>
@@ -22,10 +22,16 @@
       <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
     </compilers>
   </system.codedom>
+
 <runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.4.9.5" />
+  </dependentAssembly>
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="8.0.0.0" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="9.0.0.0" />
   </dependentAssembly>
 </assemblyBinding></runtime></configuration>
diff --git a/src/Nancy.Rdf.Tests/AcceptHeaderCoercion.feature.cs b/src/Nancy.Rdf.Tests/AcceptHeaderCoercion.feature.cs