Skip to content

Commit 14d2ec5

Browse files
tpluscodetpluscode
committed
Merge branch 'release/0.2'
# Conflicts: # src/Nancy.Rdf/Responses/RdfSerializer.cs
2 parents a26910c + 3597ed9 commit 14d2ec5

File tree

14 files changed

+337
-134
lines changed

14 files changed

+337
-134
lines changed

‎Nancy.Rdf.sln‎

Lines changed: 1 addition & 2 deletions
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.24720.0
4+
VisualStudioVersion = 14.0.23107.0
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
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1111
ProjectSection(SolutionItems) = preProject
1212
after.Nancy.Rdf.sln.targets = after.Nancy.Rdf.sln.targets
1313
appveyor.yml = appveyor.yml
14-
src\Common\Common.props = src\Common\Common.props
1514
GitVersionConfig.yaml = GitVersionConfig.yaml
1615
paket.dependencies = paket.dependencies
1716
paket.lock = paket.lock

‎paket.dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ nuget OpenCover
1616
nuget SpecFlow
1717
nuget FakeItEasy
1818
nuget NUnit < 3
19-
nuget StyleCopPlus.MSBuild
19+
nuget StyleCop.Analyzers
2020
nuget GitLink
2121
nuget JsonLd.Entities prerelease
2222
nuget Nullguard.Fody

‎paket.lock‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,17 @@ NUGET
88
dotNetRDF (1.0.9.3683)
99
HtmlAgilityPack (>= 1.4.9)
1010
Newtonsoft.Json (>= 6.0.8)
11-
VDS.Common (1.6.0)
12-
FakeItEasy (1.25.3)
13-
FluentAssertions (4.2.2)
11+
VDS.Common (1.6)
12+
FakeItEasy (2.0)
13+
FluentAssertions (4.6.3)
1414
Fody (1.29.4)
15-
gitlink (2.2.0)
16-
GitVersionTask (3.4.1)
15+
gitlink (2.2)
16+
GitVersionTask (3.5.4)
1717
HtmlAgilityPack (1.4.9)
1818
JetBrainsAnnotations.Fody (1.0.4)
1919
Fody (>= 1.29.2)
20-
JsonLd.Entities (0.3.1)
21-
json-ld.net
22-
json-ld.net (1.0.4)
23-
Newtonsoft.Json (>= 4.0.1)
20+
json-ld.net (1.0.5)
21+
Newtonsoft.Json (>= 6.0.4)
2422
Microsoft.Owin (3.0.1)
2523
Owin (>= 1.0)
2624
Microsoft.Owin.Host.SystemWeb (3.0.1)
@@ -42,9 +40,11 @@ NUGET
4240
NUnit (2.6.4)
4341
OpenCover (4.6.519)
4442
Owin (1.0)
45-
Rdf.Vocabularies (1.1.0)
46-
SpecFlow (2.0.0)
47-
StyleCop.MSBuild (4.7.50)
48-
StyleCopPlus.MSBuild (4.7.49.5)
49-
StyleCop.MSBuild (>= 4.7.49.0)
50-
VDS.Common (1.6.0)
43+
Rdf.Vocabularies (1.1.1)
44+
SpecFlow (2.1)
45+
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

‎src/Common/Common.props‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup Label="StyleCopAdditionalAddinPaths">
4-
<StyleCopAdditionalAddinPaths Include="$(MSBuildThisFileDirectory)..\..\src\packages\StyleCopPlus.MSBuild\tools">
5-
<Visible>false</Visible>
6-
</StyleCopAdditionalAddinPaths>
7-
</ItemGroup>
83
<PropertyGroup>
94
<StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
105
<GitVersionOnlyMajorAndMinorInAssemblyVersion>true</GitVersionOnlyMajorAndMinorInAssemblyVersion>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
122122
<ItemGroup>
123123
<Reference Include="JsonLD.Entities">
124-
<HintPath>..\..\..\packages\JsonLd.Entities\lib\net40\JsonLD.Entities.dll</HintPath>
124+
<HintPath>..\..\..\packages\JsonLD.Entities\lib\net40\JsonLD.Entities.dll</HintPath>
125125
<Private>True</Private>
126126
<Paket>True</Paket>
127127
</Reference>
@@ -131,8 +131,8 @@
131131
<Choose>
132132
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
133133
<ItemGroup>
134-
<Reference Include="JsonLD">
135-
<HintPath>..\..\..\packages\json-ld.net\lib\net40-Client\JsonLD.dll</HintPath>
134+
<Reference Include="json-ld.net">
135+
<HintPath>..\..\..\packages\json-ld.net\lib\net40-client\json-ld.net.dll</HintPath>
136136
<Private>True</Private>
137137
<Paket>True</Paket>
138138
</Reference>

‎src/Nancy.Rdf.Tests/Nancy.Rdf.Tests.csproj‎

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,20 @@
9898
</ProjectReference>
9999
</ItemGroup>
100100
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
101+
<Choose>
102+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
103+
<PropertyGroup>
104+
<__paket__GitVersionTask_targets>portable-net+sl+win+wpa+wp\GitVersionTask</__paket__GitVersionTask_targets>
105+
</PropertyGroup>
106+
</When>
107+
</Choose>
108+
<Choose>
109+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
110+
<PropertyGroup>
111+
<__paket__Fody_targets>portable-net+sl+win+wpa+wp\Fody</__paket__Fody_targets>
112+
</PropertyGroup>
113+
</When>
114+
</Choose>
101115
<ItemGroup>
102116
<Content Include="FodyWeavers.xml" />
103117
</ItemGroup>
@@ -164,20 +178,6 @@
164178
</ItemGroup>
165179
</When>
166180
</Choose>
167-
<Choose>
168-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
169-
<PropertyGroup>
170-
<__paket__Fody_targets>portable-net+sl+win+wpa+wp\Fody</__paket__Fody_targets>
171-
</PropertyGroup>
172-
</When>
173-
</Choose>
174-
<Choose>
175-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
176-
<PropertyGroup>
177-
<__paket__GitVersionTask_targets>\packages\GitVersionTask\Build\portable-net+sl+win+wpa+wp\GitVersionTask</__paket__GitVersionTask_targets>
178-
</PropertyGroup>
179-
</When>
180-
</Choose>
181181
<Choose>
182182
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.0'">
183183
<ItemGroup>
@@ -213,7 +213,7 @@
213213
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
214214
<ItemGroup>
215215
<Reference Include="JsonLD.Entities">
216-
<HintPath>..\..\packages\JsonLd.Entities\lib\net40\JsonLD.Entities.dll</HintPath>
216+
<HintPath>..\..\packages\JsonLD.Entities\lib\net40\JsonLD.Entities.dll</HintPath>
217217
<Private>True</Private>
218218
<Paket>True</Paket>
219219
</Reference>
@@ -223,8 +223,8 @@
223223
<Choose>
224224
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
225225
<ItemGroup>
226-
<Reference Include="JsonLD">
227-
<HintPath>..\..\packages\json-ld.net\lib\net40-Client\JsonLD.dll</HintPath>
226+
<Reference Include="json-ld.net">
227+
<HintPath>..\..\packages\json-ld.net\lib\net40-client\json-ld.net.dll</HintPath>
228228
<Private>True</Private>
229229
<Paket>True</Paket>
230230
</Reference>
@@ -306,20 +306,19 @@
306306
</ItemGroup>
307307
</When>
308308
</Choose>
309-
<Choose>
310-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
311-
<PropertyGroup>
312-
<__paket__StyleCop_MSBuild_Targets>StyleCop.MSBuild</__paket__StyleCop_MSBuild_Targets>
313-
</PropertyGroup>
314-
</When>
315-
</Choose>
316-
<Choose>
317-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
318-
<PropertyGroup>
319-
<__paket__StyleCopPlus_MSBuild_props>StyleCopPlus.MSBuild</__paket__StyleCopPlus_MSBuild_props>
320-
</PropertyGroup>
321-
</When>
322-
</Choose>
309+
<Import Project="..\..\packages\Fody\build\$(__paket__Fody_targets).targets" Condition="Exists('..\..\packages\Fody\build\$(__paket__Fody_targets).targets')" Label="Paket" />
310+
<Import Project="..\..\packages\GitVersionTask\build\$(__paket__GitVersionTask_targets).targets" Condition="Exists('..\..\packages\GitVersionTask\build\$(__paket__GitVersionTask_targets).targets')" Label="Paket" />
311+
<ItemGroup>
312+
<Analyzer Include="..\..\packages\StyleCop.Analyzers\analyzers\dotnet\cs\Newtonsoft.Json.dll">
313+
<Paket>True</Paket>
314+
</Analyzer>
315+
<Analyzer Include="..\..\packages\StyleCop.Analyzers\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll">
316+
<Paket>True</Paket>
317+
</Analyzer>
318+
<Analyzer Include="..\..\packages\StyleCop.Analyzers\analyzers\dotnet\cs\StyleCop.Analyzers.dll">
319+
<Paket>True</Paket>
320+
</Analyzer>
321+
</ItemGroup>
323322
<Choose>
324323
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
325324
<ItemGroup>
@@ -331,8 +330,4 @@
331330
</ItemGroup>
332331
</When>
333332
</Choose>
334-
<Import Project="..\..\packages\StyleCopPlus.MSBuild\build\$(__paket__StyleCopPlus_MSBuild_props).props" Condition="Exists('..\..\packages\StyleCopPlus.MSBuild\build\$(__paket__StyleCopPlus_MSBuild_props).props')" Label="Paket" />
335-
<Import Project="..\..\packages\Fody\build\$(__paket__Fody_targets).targets" Condition="Exists('..\..\packages\Fody\build\$(__paket__Fody_targets).targets')" Label="Paket" />
336-
<Import Project="..\..$(__paket__GitVersionTask_targets).targets" Condition="Exists('..\..$(__paket__GitVersionTask_targets).targets')" Label="Paket" />
337-
<Import Project="..\..\packages\StyleCop.MSBuild\build\$(__paket__StyleCop_MSBuild_Targets).targets" Condition="Exists('..\..\packages\StyleCop.MSBuild\build\$(__paket__StyleCop_MSBuild_Targets).targets')" Label="Paket" />
338333
</Project>

‎src/Nancy.Rdf.Tests/paket.references‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ JsonLd.Entities
99
Nancy.Testing
1010
FluentAssertions
1111
JetbrainsAnnotations.Fody
12-
StyleCopPlus.MSBuild
12+
StyleCop.Analyzers
1313
Rdf.Vocabularies

‎src/Nancy.Rdf/DefaultNamespaceManager.cs‎ renamed to ‎src/Nancy.Rdf/DictionaryNamespaceManager.cs‎

File renamed without changes.

‎src/Nancy.Rdf/Nancy.Rdf.csproj‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
2626
<DocumentationFile>bin\Debug\Nancy.Rdf.xml</DocumentationFile>
27+
<CodeAnalysisRuleSet>Nancy.Rdf.ruleset</CodeAnalysisRuleSet>
2728
</PropertyGroup>
2829
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2930
<DebugType>pdbonly</DebugType>
@@ -33,6 +34,8 @@
3334
<ErrorReport>prompt</ErrorReport>
3435
<WarningLevel>4</WarningLevel>
3536
<DocumentationFile>bin\Release\Nancy.Rdf.xml</DocumentationFile>
37+
<RunCodeAnalysis>true</RunCodeAnalysis>
38+
<CodeAnalysisRuleSet>Nancy.Rdf.ruleset</CodeAnalysisRuleSet>
3639
</PropertyGroup>
3740
<ItemGroup>
3841
<Reference Include="System" />
@@ -50,7 +53,7 @@
5053
<Compile Include="Contexts\IContextPathMapper.cs" />
5154
<Compile Include="Contexts\JsonLdContextModule.cs" />
5255
<Compile Include="Conventions\AcceptHeaderConventions.cs" />
53-
<Compile Include="DefaultNamespaceManager.cs" />
56+
<Compile Include="DictionaryNamespaceManager.cs" />
5457
<Compile Include="INamespaceManager.cs" />
5558
<Compile Include="Installer.cs" />
5659
<Compile Include="JsonLdProfiles.cs" />
@@ -82,19 +85,16 @@
8285
</Content>
8386
</ItemGroup>
8487
<ItemGroup>
88+
<None Include="Nancy.Rdf.ruleset" />
8589
<None Include="paket.references" />
8690
<None Include="paket.template" />
8791
</ItemGroup>
8892
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8993
<Choose>
9094
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
91-
<ItemGroup>
92-
<Reference Include="dotNetRDF">
93-
<HintPath>..\..\packages\dotNetRDF\lib\net40\dotNetRDF.dll</HintPath>
94-
<Private>True</Private>
95-
<Paket>True</Paket>
96-
</Reference>
97-
</ItemGroup>
95+
<PropertyGroup>
96+
<__paket__GitVersionTask_targets>portable-net+sl+win+wpa+wp\GitVersionTask</__paket__GitVersionTask_targets>
97+
</PropertyGroup>
9898
</When>
9999
</Choose>
100100
<Choose>
@@ -106,9 +106,13 @@
106106
</Choose>
107107
<Choose>
108108
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
109-
<PropertyGroup>
110-
<__paket__GitVersionTask_targets>\packages\GitVersionTask\Build\portable-net+sl+win+wpa+wp\GitVersionTask</__paket__GitVersionTask_targets>
111-
</PropertyGroup>
109+
<ItemGroup>
110+
<Reference Include="dotNetRDF">
111+
<HintPath>..\..\packages\dotNetRDF\lib\net40\dotNetRDF.dll</HintPath>
112+
<Private>True</Private>
113+
<Paket>True</Paket>
114+
</Reference>
115+
</ItemGroup>
112116
</When>
113117
</Choose>
114118
<Choose>
@@ -135,7 +139,7 @@
135139
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
136140
<ItemGroup>
137141
<Reference Include="JsonLD.Entities">
138-
<HintPath>..\..\packages\JsonLd.Entities\lib\net40\JsonLD.Entities.dll</HintPath>
142+
<HintPath>..\..\packages\JsonLD.Entities\lib\net40\JsonLD.Entities.dll</HintPath>
139143
<Private>True</Private>
140144
<Paket>True</Paket>
141145
</Reference>
@@ -145,8 +149,8 @@
145149
<Choose>
146150
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
147151
<ItemGroup>
148-
<Reference Include="JsonLD">
149-
<HintPath>..\..\packages\json-ld.net\lib\net40-Client\JsonLD.dll</HintPath>
152+
<Reference Include="json-ld.net">
153+
<HintPath>..\..\packages\json-ld.net\lib\net40-client\json-ld.net.dll</HintPath>
150154
<Private>True</Private>
151155
<Paket>True</Paket>
152156
</Reference>
@@ -206,20 +210,19 @@
206210
</ItemGroup>
207211
</When>
208212
</Choose>
209-
<Choose>
210-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
211-
<PropertyGroup>
212-
<__paket__StyleCop_MSBuild_Targets>StyleCop.MSBuild</__paket__StyleCop_MSBuild_Targets>
213-
</PropertyGroup>
214-
</When>
215-
</Choose>
216-
<Choose>
217-
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
218-
<PropertyGroup>
219-
<__paket__StyleCopPlus_MSBuild_props>StyleCopPlus.MSBuild</__paket__StyleCopPlus_MSBuild_props>
220-
</PropertyGroup>
221-
</When>
222-
</Choose>
213+
<Import Project="..\..\packages\Fody\build\$(__paket__Fody_targets).targets" Condition="Exists('..\..\packages\Fody\build\$(__paket__Fody_targets).targets')" Label="Paket" />
214+
<Import Project="..\..\packages\GitVersionTask\build\$(__paket__GitVersionTask_targets).targets" Condition="Exists('..\..\packages\GitVersionTask\build\$(__paket__GitVersionTask_targets).targets')" Label="Paket" />
215+
<ItemGroup>
216+
<Analyzer Include="..\..\packages\StyleCop.Analyzers\analyzers\dotnet\cs\Newtonsoft.Json.dll">
217+
<Paket>True</Paket>
218+
</Analyzer>
219+
<Analyzer Include="..\..\packages\StyleCop.Analyzers\analyzers\dotnet\cs\StyleCop.Analyzers.CodeFixes.dll">
220+
<Paket>True</Paket>
221+
</Analyzer>
222+
<Analyzer Include="..\..\packages\StyleCop.Analyzers\analyzers\dotnet\cs\StyleCop.Analyzers.dll">
223+
<Paket>True</Paket>
224+
</Analyzer>
225+
</ItemGroup>
223226
<Choose>
224227
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.5')">
225228
<ItemGroup>
@@ -231,8 +234,4 @@
231234
</ItemGroup>
232235
</When>
233236
</Choose>
234-
<Import Project="..\..\packages\StyleCopPlus.MSBuild\build\$(__paket__StyleCopPlus_MSBuild_props).props" Condition="Exists('..\..\packages\StyleCopPlus.MSBuild\build\$(__paket__StyleCopPlus_MSBuild_props).props')" Label="Paket" />
235-
<Import Project="..\..\packages\Fody\build\$(__paket__Fody_targets).targets" Condition="Exists('..\..\packages\Fody\build\$(__paket__Fody_targets).targets')" Label="Paket" />
236-
<Import Project="..\..$(__paket__GitVersionTask_targets).targets" Condition="Exists('..\..$(__paket__GitVersionTask_targets).targets')" Label="Paket" />
237-
<Import Project="..\..\packages\StyleCop.MSBuild\build\$(__paket__StyleCop_MSBuild_Targets).targets" Condition="Exists('..\..\packages\StyleCop.MSBuild\build\$(__paket__StyleCop_MSBuild_Targets).targets')" Label="Paket" />
238237
</Project>

0 commit comments

Comments
 (0)