Skip to content

Commit e691dcb

Browse files
tpluscodetpluscode
authored
Merge pull request #6 from wikibus/release/v0.3
Release/v0.3
2 parents 14d2ec5 + 37ec97e commit e691dcb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+866
-643
lines changed

‎Nancy.Rdf.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.23107.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nancy.Rdf", "src\Nancy.Rdf\Nancy.Rdf.csproj", "{D789D63C-821B-410B-A953-DFEBCBFC9D40}"
77
EndProject

‎Nancy.Rdf.sln.DotSettings‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
<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">
2+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeThisQualifier/@EntryIndexedValue">DO_NOT_SHOW</s:String>
3+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
24
<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>
35
<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String></wpf:ResourceDictionary>

‎paket.dependencies‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
source https://nuget.org/api/v2
2-
source https://ci.appveyor.com/nuget/jsonld-entities-aavhsnxi7xjp
32

43
content: none
54
redirects: on
6-
framework: net40, net45
5+
framework: net452
76

8-
nuget Nancy
97
nuget newtonsoft.json
108
nuget dotNetRDF
119
nuget json-ld.net
12-
nuget Nancy
10+
nuget Nancy >= 2 prerelease
1311
nuget GitVersionTask
1412
nuget HtmlAgilityPack
1513
nuget OpenCover
@@ -20,10 +18,13 @@ nuget StyleCop.Analyzers
2018
nuget GitLink
2119
nuget JsonLd.Entities prerelease
2220
nuget Nullguard.Fody
23-
nuget Nancy.Testing
21+
nuget Nancy.Testing >= 2 prerelease
2422
nuget FluentAssertions
2523
nuget JetbrainsAnnotations.Fody
26-
nuget Nancy.Owin
24+
nuget Nancy.Owin >= 2 prerelease
2725
nuget Microsoft.Owin.Host.SystemWeb
2826
nuget Microsoft.Owin.Hosting
29-
nuget Rdf.Vocabularies
27+
nuget Rdf.Vocabularies
28+
29+
group code-analysis
30+
gist tpluscode/a285267d2543466fc35c3a168c846f9f

‎paket.lock‎

Lines changed: 35 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
11
REDIRECTS: ON
22
CONTENT: NONE
3-
FRAMEWORK: NET40, NET45
3+
FRAMEWORK: NET452
44
NUGET
55
remote: https://www.nuget.org/api/v2
6-
specs:
7-
CsQuery (1.3.4)
8-
dotNetRDF (1.0.9.3683)
6+
AngleSharp (0.9.9)
7+
dotNetRDF (1.0.12)
98
HtmlAgilityPack (>= 1.4.9)
10-
Newtonsoft.Json (>= 6.0.8)
11-
VDS.Common (1.6)
12-
FakeItEasy (2.0)
13-
FluentAssertions (4.6.3)
9+
Newtonsoft.Json (>= 8.0.3)
10+
VDS.Common (1.6.4)
11+
FakeItEasy (2.3.1)
12+
FluentAssertions (4.17)
1413
Fody (1.29.4)
15-
gitlink (2.2)
16-
GitVersionTask (3.5.4)
17-
HtmlAgilityPack (1.4.9)
18-
JetBrainsAnnotations.Fody (1.0.4)
14+
gitlink (2.3)
15+
GitVersionTask (3.6.4)
16+
HtmlAgilityPack (1.4.9.5)
17+
JetBrainsAnnotations.Fody (1.0.5)
1918
Fody (>= 1.29.2)
19+
JsonLd.Entities (0.3.3)
20+
json-ld.net (>= 1.0.5)
2021
json-ld.net (1.0.5)
2122
Newtonsoft.Json (>= 6.0.4)
23+
Microsoft.DotNet.PlatformAbstractions (1.1)
24+
Microsoft.Extensions.DependencyModel (1.1)
25+
Microsoft.DotNet.PlatformAbstractions (>= 1.1)
26+
Newtonsoft.Json (>= 9.0.1)
2227
Microsoft.Owin (3.0.1)
2328
Owin (>= 1.0)
2429
Microsoft.Owin.Host.SystemWeb (3.0.1)
@@ -27,14 +32,18 @@ NUGET
2732
Microsoft.Owin.Hosting (3.0.1)
2833
Microsoft.Owin (>= 3.0.1)
2934
Owin (>= 1.0)
30-
Nancy (1.4.3)
31-
Nancy.Owin (1.4.1)
32-
Nancy (>= 1.4.1)
35+
Nancy (2.0.0-barneyrubble)
36+
Microsoft.Extensions.DependencyModel (>= 1.0)
37+
Nancy.Authentication.Forms (2.0.0-barneyrubble)
38+
Nancy (>= 2.0.0-barneyrubble)
39+
Nancy.Owin (2.0.0-barneyrubble)
40+
Nancy (>= 2.0.0-barneyrubble)
3341
Owin (>= 1.0)
34-
Nancy.Testing (1.4.1)
35-
CsQuery (>= 1.3.3)
36-
Nancy (>= 1.4.1)
37-
Newtonsoft.Json (8.0.3)
42+
Nancy.Testing (2.0.0-barneyrubble)
43+
AngleSharp (>= 0.9.5)
44+
Nancy (>= 2.0.0-barneyrubble)
45+
Nancy.Authentication.Forms (>= 2.0.0-barneyrubble)
46+
Newtonsoft.Json (9.0.1)
3847
NullGuard.Fody (1.4.6)
3948
Fody (>= 1.29.2)
4049
NUnit (2.6.4)
@@ -43,8 +52,10 @@ NUGET
4352
Rdf.Vocabularies (1.1.1)
4453
SpecFlow (2.1)
4554
StyleCop.Analyzers (1.0)
46-
VDS.Common (1.6)
47-
remote: https://ci.appveyor.com/nuget/jsonld-entities-aavhsnxi7xjp
48-
specs:
49-
JsonLD.Entities (0.3.3)
50-
json-ld.net
55+
VDS.Common (1.6.4)
56+
57+
GROUP code-analysis
58+
59+
GIST
60+
remote: tpluscode/a285267d2543466fc35c3a168c846f9f
61+
FULLPROJECT (c9b7a831e53e929f2ecce09b14a61e28007b669f)

‎src/Example/Nancy.Rdf.Sample/Nancy.Rdf.Sample.csproj‎

Lines changed: 39 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>Nancy.Rdf.Sample</RootNamespace>
1515
<AssemblyName>Nancy.Rdf.Sample</AssemblyName>
16-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1717
<UseIISExpress>true</UseIISExpress>
1818
<IISExpressSSLPort />
1919
<IISExpressAnonymousAuthentication />
@@ -54,9 +54,9 @@
5454
<Reference Include="System.ComponentModel.DataAnnotations" />
5555
<Reference Include="System" />
5656
<Reference Include="System.Data" />
57-
<Reference Include="System.Web.Extensions" />
5857
<Reference Include="System.Drawing" />
5958
<Reference Include="System.Web" />
59+
<Reference Include="System.Web.Extensions" />
6060
<Reference Include="System.Xml" />
6161
<Reference Include="System.Configuration" />
6262
<Reference Include="System.Web.Services" />
@@ -118,29 +118,51 @@
118118
</Target>
119119
-->
120120
<Choose>
121-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
121+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
122+
<ItemGroup>
123+
<Reference Include="json-ld.net">
124+
<HintPath>..\..\..\packages\json-ld.net\lib\net40-client\json-ld.net.dll</HintPath>
125+
<Private>True</Private>
126+
<Paket>True</Paket>
127+
</Reference>
128+
</ItemGroup>
129+
</When>
130+
</Choose>
131+
<Choose>
132+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
122133
<ItemGroup>
123134
<Reference Include="JsonLD.Entities">
124-
<HintPath>..\..\..\packages\JsonLD.Entities\lib\net40\JsonLD.Entities.dll</HintPath>
135+
<HintPath>..\..\..\packages\JsonLd.Entities\lib\net40\JsonLD.Entities.dll</HintPath>
125136
<Private>True</Private>
126137
<Paket>True</Paket>
127138
</Reference>
128139
</ItemGroup>
129140
</When>
130141
</Choose>
131142
<Choose>
132-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
143+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
133144
<ItemGroup>
134-
<Reference Include="json-ld.net">
135-
<HintPath>..\..\..\packages\json-ld.net\lib\net40-client\json-ld.net.dll</HintPath>
145+
<Reference Include="Microsoft.DotNet.PlatformAbstractions">
146+
<HintPath>..\..\..\packages\Microsoft.DotNet.PlatformAbstractions\lib\net451\Microsoft.DotNet.PlatformAbstractions.dll</HintPath>
136147
<Private>True</Private>
137148
<Paket>True</Paket>
138149
</Reference>
139150
</ItemGroup>
140151
</When>
141152
</Choose>
142153
<Choose>
143-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
154+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
155+
<ItemGroup>
156+
<Reference Include="Microsoft.Extensions.DependencyModel">
157+
<HintPath>..\..\..\packages\Microsoft.Extensions.DependencyModel\lib\net451\Microsoft.Extensions.DependencyModel.dll</HintPath>
158+
<Private>True</Private>
159+
<Paket>True</Paket>
160+
</Reference>
161+
</ItemGroup>
162+
</When>
163+
</Choose>
164+
<Choose>
165+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
144166
<ItemGroup>
145167
<Reference Include="Microsoft.Owin">
146168
<HintPath>..\..\..\packages\Microsoft.Owin\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -151,7 +173,7 @@
151173
</When>
152174
</Choose>
153175
<Choose>
154-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
176+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
155177
<ItemGroup>
156178
<Reference Include="Microsoft.Owin.Host.SystemWeb">
157179
<HintPath>..\..\..\packages\Microsoft.Owin.Host.SystemWeb\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
@@ -162,7 +184,7 @@
162184
</When>
163185
</Choose>
164186
<Choose>
165-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
187+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
166188
<ItemGroup>
167189
<Reference Include="Microsoft.Owin.Hosting">
168190
<HintPath>..\..\..\packages\Microsoft.Owin.Hosting\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
@@ -173,38 +195,29 @@
173195
</When>
174196
</Choose>
175197
<Choose>
176-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
198+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
177199
<ItemGroup>
178200
<Reference Include="Nancy">
179-
<HintPath>..\..\..\packages\Nancy\lib\net40\Nancy.dll</HintPath>
201+
<HintPath>..\..\..\packages\Nancy\lib\net452\Nancy.dll</HintPath>
180202
<Private>True</Private>
181203
<Paket>True</Paket>
182204
</Reference>
183205
</ItemGroup>
184206
</When>
185207
</Choose>
186208
<Choose>
187-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
209+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
188210
<ItemGroup>
189211
<Reference Include="Nancy.Owin">
190-
<HintPath>..\..\..\packages\Nancy.Owin\lib\net40\Nancy.Owin.dll</HintPath>
212+
<HintPath>..\..\..\packages\Nancy.Owin\lib\net452\Nancy.Owin.dll</HintPath>
191213
<Private>True</Private>
192214
<Paket>True</Paket>
193215
</Reference>
194216
</ItemGroup>
195217
</When>
196218
</Choose>
197219
<Choose>
198-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
199-
<ItemGroup>
200-
<Reference Include="Newtonsoft.Json">
201-
<HintPath>..\..\..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll</HintPath>
202-
<Private>True</Private>
203-
<Paket>True</Paket>
204-
</Reference>
205-
</ItemGroup>
206-
</When>
207-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5'">
220+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
208221
<ItemGroup>
209222
<Reference Include="Newtonsoft.Json">
210223
<HintPath>..\..\..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -215,7 +228,7 @@
215228
</When>
216229
</Choose>
217230
<Choose>
218-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
231+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
219232
<ItemGroup>
220233
<Reference Include="Owin">
221234
<HintPath>..\..\..\packages\Owin\lib\net40\Owin.dll</HintPath>
@@ -226,7 +239,7 @@
226239
</When>
227240
</Choose>
228241
<Choose>
229-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
242+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.5.2'">
230243
<ItemGroup>
231244
<Reference Include="Rdf.Vocabularies">
232245
<HintPath>..\..\..\packages\Rdf.Vocabularies\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Rdf.Vocabularies.dll</HintPath>

‎src/Example/Nancy.Rdf.Sample/Startup.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using JsonLD.Entities;
23
using JsonLD.Entities.Context;
34
using Microsoft.Owin;
45
using Nancy.Rdf.Sample;
@@ -30,6 +31,8 @@ public class Person
3031

3132
public DateTime DateOfBirth { get; set; }
3233

34+
public string Friend { get; set; }
35+
3336
[JsonProperty]
3437
private string Type
3538
{
@@ -55,16 +58,17 @@ public class PersonModule : NancyModule
5558
{
5659
public PersonModule()
5760
{
58-
Get["person/{id}"] = _ =>
61+
Get("person/{id}", _ =>
5962
{
6063
return new Person
6164
{
6265
Id = "http://api.guru/person/" + _.id,
6366
Name = "John",
6467
LastName = "Doe",
65-
DateOfBirth = new DateTime(1967, 8, 2)
68+
DateOfBirth = new DateTime(1967, 8, 2),
69+
Friend = ("http://api.guru/person/" + _.id + 10)
6670
};
67-
};
71+
});
6872
}
6973
}
7074

‎src/Example/Nancy.Rdf.Sample/Web.config‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</system.Web>
1414
-->
1515
<system.web>
16-
<compilation debug="true" targetFramework="4.5" />
16+
<compilation debug="true" targetFramework="4.5.2" />
1717
<httpRuntime targetFramework="4.5" />
1818
</system.web>
1919
<system.codedom>
@@ -22,10 +22,16 @@
2222
<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+" />
2323
</compilers>
2424
</system.codedom>
25+
2526
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
27+
<dependentAssembly>
28+
<Paket>True</Paket>
29+
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
30+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.4.9.5" />
31+
</dependentAssembly>
2632
<dependentAssembly>
2733
<Paket>True</Paket>
2834
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
29-
<bindingRedirect oldVersion="0.0.0.0-999.999.999.999" newVersion="8.0.0.0" />
35+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="9.0.0.0" />
3036
</dependentAssembly>
3137
</assemblyBinding></runtime></configuration>

‎src/Nancy.Rdf.Tests/AcceptHeaderCoercion.feature.cs‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)