Skip to content

Commit

Permalink
Template tools spike (#3)
Browse files Browse the repository at this point in the history
* proof of concept for wikibus/Argolis#4

* move getting template from module and some comments

* make template api injectable

* replace all handling of templates with attributes

* add interfaces and make stuff actually injectable

* make action `Func<object, object>`

* add async variant to argolis module

* make repositories and actions async

* more work on templates

* update with new Argolis packages

* remove spike code

* fix tests to reflect change to template usage

* automatically deploy only on master

* fix appveyor tabs

* less changef for PR

* paket simplify

* paket update

* change routing templates

* code review and removed obsolete stuff
  • Loading branch information
tpluscode committed Mar 10, 2018
1 parent d41ca2b commit ebe9f8f
Show file tree
Hide file tree
Showing 49 changed files with 411 additions and 611 deletions.
17 changes: 14 additions & 3 deletions .paket/Paket.Restore.targets
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>

<!-- .net core fdd -->
<_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
<PaketCommand Condition=" '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>

<!-- no extension is a shell script -->
<PaketCommand Condition=" '$(_PaketExeExtension)' == '' ">"$(PaketExePath)"</PaketCommand>

<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
Expand Down Expand Up @@ -45,10 +53,10 @@
</PropertyGroup>

<!-- If shasum and awk exist get the hashes -->
<Exec Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
<Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreCachedHasher)' != '' " Command="$(PaketRestoreCachedHasher)" ConsoleToMSBuild='true'>
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreCachedHash" />
</Exec>
<Exec Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
<Exec StandardOutputImportance="Low" Condition=" '$(PaketRestoreLockFileHasher)' != '' " Command="$(PaketRestoreLockFileHasher)" ConsoleToMSBuild='true'>
<Output TaskParameter="ConsoleOutput" PropertyName="PaketRestoreLockFileHash" />
</Exec>

Expand Down Expand Up @@ -114,9 +122,11 @@
<PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
</PaketReferencesFileLinesInfo>
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
<PrivateAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'true'">All</PrivateAssets>
</PackageReference>
</ItemGroup>

Expand All @@ -138,9 +148,10 @@
</DotNetCliToolReference>
</ItemGroup>

<!-- Disabled for now until we know what to do with runtime deps - https://github.com/fsprojects/Paket/issues/2964
<PropertyGroup>
<RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
</PropertyGroup>
</PropertyGroup> -->

</Target>

Expand Down
2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ deploy:
name: '[TEST] data.wikibus.org'
on:
Configuration: Debug
branch: master
- provider: Environment
name: '[TEST] wikibus.org'
on:
Configuration: Debug
branch: master
9 changes: 2 additions & 7 deletions paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,21 @@ copy_local: true

nuget Anotar.Custom.Fody
nuget FakeItEasy
nuget json-ld.net
nuget Nancy.Owin prerelease
nuget nancy.routing.uritemplates
nuget Nancy.Testing prerelease
nuget Nancy.Owin 2.0.0-clinteastwood
nuget Nancy.Testing 2.0.0-clinteastwood
nuget r2rml4net 0.4.0.0-pre01
nuget Resourcer.Fody
nuget SpecFlow.NUnit
nuget StyleCop.Analyzers
nuget GitVersionTask
nuget HtmlAgilityPack
nuget FluentAssertions
nuget dotNetRDF
nuget infoof.fody
nuget JsonLd.Entities
nuget Nancy.RDF
nuget NullGuard.Fody
nuget ImpromptuInterface
nuget NDbUnit.SqlClient
nuget ImageResizer
nuget jsonld.entities
nuget JetBrainsAnnotations.Fody
nuget ModuleInit.Fody
nuget Microsoft.Owin.Host.SystemWeb
Expand Down
103 changes: 57 additions & 46 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,44 +4,45 @@ CONTENT: NONE
RESTRICTION: >= net45
NUGET
remote: https://www.nuget.org/api/v2
AngleSharp (0.9.9) - restriction: || (&& (>= net45) (>= netstandard1.6)) (>= net452)
Anotar.Custom.Fody (3.3.1)
Fody (>= 2.0 < 3.0)
Argolis.Models.TunnelVisionLabs (0.3.0-alpha0002)
Argolis.Models (>= 0.3.0-alpha0002)
TunnelVisionLabs.Net.UriTemplate (>= 1.0.0-beta004)
AsyncUsageAnalyzers (1.0.0-alpha003) - restriction: || (&& (>= net45) (>= netstandard1.6)) (>= net452)
AngleSharp (0.9.9.1) - restriction: || (&& (>= net45) (>= netstandard1.6)) (>= net452)
Anotar.Custom.Fody (4.1)
Fody (>= 2.3.18)
NETStandard.Library (>= 1.6.1) - restriction: && (>= net45) (< net452)
AsyncUsageAnalyzers (1.0.0-alpha003) - restriction: >= net452
Autofac (4.6.2) - restriction: || (&& (>= net45) (>= netstandard1.6)) (>= net452)
DatabaseSchemaReader (2.3.3)
dotNetRDF (1.0.12)
HtmlAgilityPack (>= 1.4.9)
Newtonsoft.Json (>= 8.0.3)
VDS.Common (1.6.4)
EntityFramework (6.1.3)
FakeItEasy (4.1.1)
FluentAssertions (4.19.4)
Fody (2.2)
DatabaseSchemaReader (2.5)
dotNetRDF (2.0.1)
HtmlAgilityPack (>= 1.6)
Newtonsoft.Json (>= 10.0.3)
VDS.Common (>= 1.9)
EntityFramework (6.2)
FakeItEasy (4.5.1)
FluentAssertions (5.1.2)
System.ValueTuple (>= 4.3) - restriction: && (>= net45) (< net47) (< netstandard1.6)
Fody (2.4.4) - restriction: || (&& (>= net45) (>= netstandard1.4)) (>= net452)
GitVersionTask (3.6.5)
HtmlAgilityPack (1.6.6)
ImageResizer (4.1.10)
HtmlAgilityPack (1.7.1)
ImageResizer (4.2)
ImpromptuInterface (6.2.2)
InfoOf.Fody (1.1)
Fody (>= 2.0)
InfoOf.Fody (1.3.2)
Fody (>= 2.3.19) - restriction: || (&& (>= net45) (>= netstandard1.4)) (>= net452)
JetBrains.Annotations (11.1)
JetBrainsAnnotations.Fody (2.0)
Fody (>= 2.1.2)
json-ld.net (1.0.5)
Newtonsoft.Json (>= 6.0.4)
Microsoft.Owin (3.1)
Microsoft.NETCore.Platforms (2.0.1) - restriction: || (&& (>= monoandroid) (>= net45)) (&& (>= monotouch) (>= net45)) (&& (>= net45) (>= netcoreapp2.0)) (&& (>= net45) (< netstandard1.0) (>= portable-net451+win81+wpa81)) (&& (>= net45) (< netstandard1.3) (>= wpa81)) (&& (>= net45) (< netstandard1.5) (>= uap10.0)) (&& (>= net45) (< portable-net45+win8+wpa81)) (&& (>= net45) (< portable-net451+win81+wpa81)) (&& (>= net45) (>= uap10.1)) (&& (>= net45) (>= xamarinios)) (&& (>= net45) (>= xamarinmac)) (&& (>= net45) (>= xamarintvos)) (&& (>= net45) (>= xamarinwatchos)) (&& (>= net451) (< net452) (< netstandard1.3)) (&& (< net452) (>= net46) (< netstandard1.4)) (&& (< net452) (>= net461))
Microsoft.Owin (4.0)
Owin (>= 1.0)
Microsoft.Owin.Host.SystemWeb (3.1)
Microsoft.Owin (>= 3.1)
Microsoft.Owin.Host.SystemWeb (4.0)
Microsoft.Owin (>= 4.0)
Owin (>= 1.0)
Microsoft.Owin.Hosting (3.1)
Microsoft.Owin (>= 3.1)
Microsoft.Owin.Hosting (4.0)
Microsoft.Owin (>= 4.0)
Owin (>= 1.0)
ModuleInit.Fody (1.6)
Fody (>= 2.0)
ModuleInit.Fody (1.7.1)
Fody (>= 2.3.18)
NETStandard.Library (>= 1.6.1) - restriction: && (>= net45) (< net452)
Nancy (2.0.0-clinteastwood)
Nancy.Authentication.Forms (2.0.0-clinteastwood) - restriction: || (&& (>= net45) (>= netstandard1.6)) (>= net452)
AsyncUsageAnalyzers (>= 1.0.0-alpha003) - restriction: || (&& (>= net45) (>= netstandard1.6)) (>= net452)
Expand Down Expand Up @@ -70,43 +71,53 @@ NUGET
NDbUnit.Core (1.6.8)
NDbUnit.SqlClient (1.6.8)
NDbUnit.Core (>= 1.6.8)
Newtonsoft.Json (10.0.3)
NullGuard.Fody (1.6.2)
Fody (>= 2.1.2)
NETStandard.Library (2.0.1) - restriction: && (>= net45) (< net452)
Microsoft.NETCore.Platforms (>= 1.1)
System.Runtime.InteropServices.RuntimeInformation (>= 4.3) - restriction: || (&& (>= net45) (< netstandard1.0) (>= portable-net451+win81+wpa81)) (&& (>= net45) (< netstandard1.3) (>= wpa81)) (&& (>= net45) (< netstandard1.5) (>= uap10.0)) (&& (>= net45) (< portable-net451+win81+wpa81)) (&& (>= net451) (< netstandard1.3)) (&& (>= net46) (< netstandard1.4))
Newtonsoft.Json (11.0.1)
NullGuard.Fody (1.7.1)
Fody (>= 2.4.1) - restriction: || (&& (>= net45) (>= netstandard1.4)) (>= net452)
NUnit (3.9)
Owin (1.0)
r2rml4net (0.4.0-pre01)
DatabaseSchemaReader (>= 1.2.8)
dotNetRDF (>= 1.0)
Rdf.Vocabularies (1.2)
Resourcer.Fody (1.5.1)
Fody (>= 2.0)
SpecFlow (2.2.1)
Resourcer.Fody (1.6.4)
Fody (>= 2.3.24) - restriction: || (&& (>= net45) (>= netstandard1.4)) (>= net452)
SpecFlow (2.3.1)
Newtonsoft.Json (>= 9.0.1)
SpecFlow.NUnit (2.2.1)
System.ValueTuple (>= 4.0.1)
SpecFlow.NUnit (2.3.1)
NUnit (>= 3.0)
SpecFlow (2.2.1)
SpecFlow (2.3.1)
StyleCop.Analyzers (1.0.2)
System.Data.SqlLocalDb (1.15)
System.Runtime.InteropServices.RuntimeInformation (4.3) - restriction: || (&& (>= net45) (< netstandard1.0) (>= portable-net451+win81+wpa81)) (&& (>= net45) (< netstandard1.3) (>= wpa81)) (&& (>= net45) (< netstandard1.5) (>= uap10.0)) (&& (>= net45) (< portable-net451+win81+wpa81)) (&& (>= net451) (< net452) (< netstandard1.3)) (&& (< net452) (>= net46) (< netstandard1.4))
System.ValueTuple (4.4) - restriction: && (>= net45) (< net47) (< netstandard1.6)
NETStandard.Library (>= 1.6.1) - restriction: && (>= net45) (< net461) (< netstandard2.0)
TunnelVisionLabs.Net.UriTemplate (1.0.0-beta004)
UriTemplateString (0.1.1)
VDS.Common (1.6.4)
UriTemplateString (0.2)
VDS.Common (1.9)
remote: https://ci.appveyor.com/nuget/argolis-hydra
Argolis.Hydra (0.3.0-alpha0002)
Argolis.Models (>= 0.3.0-alpha0002)
Argolis.Hydra (0.3.0-alpha0003)
Argolis.Models (>= 0.3.0-alpha0003)
JsonLD.Entities (>= 0.3.4)
Rdf.Vocabularies (>= 1.2)
TunnelVisionLabs.Net.UriTemplate (>= 1.0.0-beta004)
UriTemplateString
Argolis.Hydra.Nancy (0.3.0-alpha0002)
Argolis.Hydra (>= 0.3.0-alpha0002)
Argolis.Hydra.Nancy (0.3.0-alpha0003)
Argolis.Hydra (>= 0.3.0-alpha0003)
Nancy.Rdf (>= 0.3)
Rdf.Vocabularies
Argolis.Models (0.3.0-alpha0002)
Argolis.Nancy (0.3.0-alpha0002)
Argolis.Hydra (>= 0.3.0-alpha0002)
Argolis.Hydra.Nancy (>= 0.3.0-alpha0002)
Argolis.Models (>= 0.3.0-alpha0002)
Argolis.Models (0.3.0-alpha0003)
Argolis.Models.TunnelVisionLabs (0.3.0-alpha0003)
Argolis.Models (>= 0.3.0-alpha0003)
TunnelVisionLabs.Net.UriTemplate (>= 1.0.0-beta004)
Argolis.Nancy (0.3.0-alpha0003)
Argolis.Hydra (>= 0.3.0-alpha0003)
Argolis.Hydra.Nancy (>= 0.3.0-alpha0003)
Argolis.Models (>= 0.3.0-alpha0003)
Nancy (>= 2.0.0-clinteastwood)
Nancy.Routing.UriTemplates
remote: https://ci.appveyor.com/nuget/jsonld-entities-aavhsnxi7xjp
Expand Down
12 changes: 6 additions & 6 deletions src/data.wikibus.org/Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection" />
</configSections>
<connectionStrings>
<add name="wikibus.sources#sql" connectionString="Server=t-code.com.pl;Database=wikibus;User Id=wikibus_KB;Password=EBDj!A4VVe#P6jueh^j_;" providerName="System.Data.SqlClient" />
<add name="wikibus.sources#sql" connectionString="Server=(local);Database=wikibus;Integrated Security=True;" providerName="System.Data.SqlClient" />
</connectionStrings>
<appSettings>
<add key="queryPorcessor" value="dydraQueryProcessor" />
<add key="wikibus#baseUrl" value="http://localhost:3324/" />
<add key="wikibus#apiUrl" value="http://localhost:17899/" />
<add key="wikibus#baseUrl" value="http://localhost:3324" />
<add key="wikibus#apiUrl" value="http://localhost:17899" />
<add key="wikibus.sources.dotNetRDF#sparqlEndpoint" value="http://dydra.com/tpluscode/wikibus-brochures-test/sparql" />
</appSettings>
<entityFramework>
Expand Down Expand Up @@ -50,17 +50,17 @@
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.6.6.0" />
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.7.1.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="10.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<Paket>True</Paket>
<assemblyIdentity name="dotNetRDF" publicKeyToken="6055ffe4c97cc780" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.12.0" />
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="2.0.1.0" />
</dependentAssembly>
</assemblyBinding></runtime>
</configuration>
26 changes: 19 additions & 7 deletions src/data.wikibus.org/data.wikibus.org.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,9 @@
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
<ItemGroup>
<Reference Include="System.Security">
<Paket>True</Paket>
</Reference>
<Reference Include="dotNetRDF">
<HintPath>..\..\packages\dotNetRDF\lib\net40\dotNetRDF.dll</HintPath>
<Private>True</Private>
Expand Down Expand Up @@ -293,32 +296,32 @@
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
<ItemGroup>
<Reference Include="Microsoft.Owin">
<HintPath>..\..\packages\Microsoft.Owin\lib\net45\Microsoft.Owin.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Owin\lib\net451\Microsoft.Owin.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
<ItemGroup>
<Reference Include="Microsoft.Owin.Host.SystemWeb">
<HintPath>..\..\packages\Microsoft.Owin.Host.SystemWeb\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Owin.Host.SystemWeb\lib\net451\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
<ItemGroup>
<Reference Include="Microsoft.Owin.Hosting">
<HintPath>..\..\packages\Microsoft.Owin.Hosting\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Owin.Hosting\lib\net451\Microsoft.Owin.Hosting.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
Expand Down Expand Up @@ -456,7 +459,7 @@
</When>
</Choose>
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1')">
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7')">
<ItemGroup>
<Reference Include="VDS.Common">
<HintPath>..\..\packages\VDS.Common\lib\net40-client\VDS.Common.dll</HintPath>
Expand All @@ -465,5 +468,14 @@
</Reference>
</ItemGroup>
</When>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.7.1'">
<ItemGroup>
<Reference Include="VDS.Common">
<HintPath>..\..\packages\VDS.Common\lib\netstandard2.0\VDS.Common.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
</ItemGroup>
</When>
</Choose>
</Project>
3 changes: 0 additions & 3 deletions src/data.wikibus.org/paket.references
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
Nancy.Owin
Microsoft.Owin.Host.SystemWeb
Microsoft.Owin.Hosting
dotNetRDF
r2rml4net
Nancy.RDF
GitVersionTask
Rdf.Vocabularies
argolis.nancy
Nancy.Bootstrappers.Autofac
EntityFramework
Expand Down

0 comments on commit ebe9f8f

Please sign in to comment.