Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Coscine
backend
apis
Project
Commits
94de2aff
Commit
94de2aff
authored
Nov 09, 2020
by
Marcel Nellesen
Browse files
Merge branch 'Sprint/2020-20' into 'master'
Sprint/2020 20 See merge request coscine/api/project!111
parents
982136ee
72cd30bb
Changes
6
Pipelines
7
Hide whitespace changes
Inline
Side-by-side
src/Project.Tests/Project.Tests.csproj
View file @
94de2aff
...
...
@@ -62,17 +62,17 @@
<Reference
Include=
"Coscine.Action, Version=1.16.0.0, Culture=neutral, processorArchitecture=AMD64"
>
<HintPath>
..\packages\Coscine.Action.1.16.0\lib\net461\Coscine.Action.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.ApiCommons, Version=1.
9.1
.0, Culture=neutral, PublicKeyToken=af4c1345df96546b, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.ApiCommons.1.
9.1
\lib\net461\Coscine.ApiCommons.dll
</HintPath>
<Reference
Include=
"Coscine.ApiCommons, Version=1.
10.0
.0, Culture=neutral, PublicKeyToken=af4c1345df96546b, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.ApiCommons.1.
10.0
\lib\net461\Coscine.ApiCommons.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Configuration, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Database, Version=1.2
5
.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Database.1.2
5
.0\lib\net461\Coscine.Database.dll
</HintPath>
<Reference
Include=
"Coscine.Database, Version=1.2
6
.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Database.1.2
6
.0\lib\net461\Coscine.Database.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Database.T4, Version=1.2
5
.0.0, Culture=neutral, PublicKeyToken=84b4c404a0696261, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Database.1.2
5
.0\lib\net461\Coscine.Database.T4.dll
</HintPath>
<Reference
Include=
"Coscine.Database.T4, Version=1.2
6
.0.0, Culture=neutral, PublicKeyToken=84b4c404a0696261, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Database.1.2
6
.0\lib\net461\Coscine.Database.T4.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Logging.1.2.0\lib\net461\Coscine.Logging.dll
</HintPath>
...
...
src/Project.Tests/app.config
View file @
94de2aff
...
...
@@ -88,7 +88,7 @@
</
dependentAssembly
>
<
dependentAssembly
>
<
assemblyIdentity
name
=
"Coscine.Database"
publicKeyToken
=
"767d77427707b70a"
culture
=
"neutral"
/>
<
bindingRedirect
oldVersion
=
"0.0.0.0-1.2
5
.0.0"
newVersion
=
"1.2
5
.0.0"
/>
<
bindingRedirect
oldVersion
=
"0.0.0.0-1.2
6
.0.0"
newVersion
=
"1.2
6
.0.0"
/>
</
dependentAssembly
>
<
dependentAssembly
>
<
assemblyIdentity
name
=
"System.IdentityModel.Tokens.Jwt"
publicKeyToken
=
"31bf3856ad364e35"
culture
=
"neutral"
/>
...
...
@@ -192,7 +192,7 @@
</
dependentAssembly
>
<
dependentAssembly
>
<
assemblyIdentity
name
=
"Coscine.Database.T4"
publicKeyToken
=
"84b4c404a0696261"
culture
=
"neutral"
/>
<
bindingRedirect
oldVersion
=
"0.0.0.0-1.2
5
.0.0"
newVersion
=
"1.2
5
.0.0"
/>
<
bindingRedirect
oldVersion
=
"0.0.0.0-1.2
6
.0.0"
newVersion
=
"1.2
6
.0.0"
/>
</
dependentAssembly
>
</
assemblyBinding
>
</
runtime
>
...
...
src/Project.Tests/packages.config
View file @
94de2aff
...
...
@@ -5,9 +5,9 @@
<
package
id
=
"Castle.Core"
version
=
"4.4.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Consul"
version
=
"0.7.2.6"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Action"
version
=
"1.16.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.ApiCommons"
version
=
"1.
9.1
"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.ApiCommons"
version
=
"1.
10.0
"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Configuration"
version
=
"1.5.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Database"
version
=
"1.2
5
.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Database"
version
=
"1.2
6
.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Logging"
version
=
"1.2.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.ProxyApi"
version
=
"1.3.0"
targetFramework
=
"net472"
/>
<
package
id
=
"EntityFramework"
version
=
"6.4.4"
targetFramework
=
"net472"
/>
...
...
src/Project/App.config
View file @
94de2aff
...
...
@@ -91,7 +91,7 @@
</
dependentAssembly
>
<
dependentAssembly
>
<
assemblyIdentity
name
=
"Coscine.Database"
publicKeyToken
=
"767d77427707b70a"
culture
=
"neutral"
/>
<
bindingRedirect
oldVersion
=
"0.0.0.0-1.2
5
.0.0"
newVersion
=
"1.2
5
.0.0"
/>
<
bindingRedirect
oldVersion
=
"0.0.0.0-1.2
6
.0.0"
newVersion
=
"1.2
6
.0.0"
/>
</
dependentAssembly
>
<
dependentAssembly
>
<
assemblyIdentity
name
=
"System.IdentityModel.Tokens.Jwt"
publicKeyToken
=
"31bf3856ad364e35"
culture
=
"neutral"
/>
...
...
@@ -191,7 +191,7 @@
</
dependentAssembly
>
<
dependentAssembly
>
<
assemblyIdentity
name
=
"Coscine.Database.T4"
publicKeyToken
=
"84b4c404a0696261"
culture
=
"neutral"
/>
<
bindingRedirect
oldVersion
=
"0.0.0.0-1.2
5
.0.0"
newVersion
=
"1.2
5
.0.0"
/>
<
bindingRedirect
oldVersion
=
"0.0.0.0-1.2
6
.0.0"
newVersion
=
"1.2
6
.0.0"
/>
</
dependentAssembly
>
</
assemblyBinding
>
</
runtime
>
...
...
src/Project/Project.csproj
View file @
94de2aff
...
...
@@ -55,23 +55,23 @@
<Reference
Include=
"Coscine.Action, Version=1.16.0.0, Culture=neutral, processorArchitecture=AMD64"
>
<HintPath>
..\packages\Coscine.Action.1.16.0\lib\net461\Coscine.Action.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.ApiCommons, Version=1.
9.1
.0, Culture=neutral, PublicKeyToken=af4c1345df96546b, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.ApiCommons.1.
9.1
\lib\net461\Coscine.ApiCommons.dll
</HintPath>
<Reference
Include=
"Coscine.ApiCommons, Version=1.
10.0
.0, Culture=neutral, PublicKeyToken=af4c1345df96546b, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.ApiCommons.1.
10.0
\lib\net461\Coscine.ApiCommons.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Configuration, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Database, Version=1.2
5
.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Database.1.2
5
.0\lib\net461\Coscine.Database.dll
</HintPath>
<Reference
Include=
"Coscine.Database, Version=1.2
6
.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Database.1.2
6
.0\lib\net461\Coscine.Database.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Database.T4, Version=1.2
5
.0.0, Culture=neutral, PublicKeyToken=84b4c404a0696261, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Database.1.2
5
.0\lib\net461\Coscine.Database.T4.dll
</HintPath>
<Reference
Include=
"Coscine.Database.T4, Version=1.2
6
.0.0, Culture=neutral, PublicKeyToken=84b4c404a0696261, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Database.1.2
6
.0\lib\net461\Coscine.Database.T4.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Logging.1.2.0\lib\net461\Coscine.Logging.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Metadata, Version=1.
3.2
.0, Culture=neutral, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Metadata.1.
3.2
\lib\net461\Coscine.Metadata.dll
</HintPath>
<Reference
Include=
"Coscine.Metadata, Version=1.
4.0
.0, Culture=neutral, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.Metadata.1.
4.0
\lib\net461\Coscine.Metadata.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.ProxyApi, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.ProxyApi.1.3.0\lib\net461\Coscine.ProxyApi.dll
</HintPath>
...
...
src/Project/packages.config
View file @
94de2aff
...
...
@@ -5,11 +5,11 @@
<
package
id
=
"Castle.Core"
version
=
"4.4.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Consul"
version
=
"0.7.2.6"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Action"
version
=
"1.16.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.ApiCommons"
version
=
"1.
9.1
"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.ApiCommons"
version
=
"1.
10.0
"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Configuration"
version
=
"1.5.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Database"
version
=
"1.2
5
.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Database"
version
=
"1.2
6
.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Logging"
version
=
"1.2.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Metadata"
version
=
"1.
3.2
"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Metadata"
version
=
"1.
4.0
"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.ProxyApi"
version
=
"1.3.0"
targetFramework
=
"net472"
/>
<
package
id
=
"dotNetRDF"
version
=
"2.5.0"
targetFramework
=
"net472"
/>
<
package
id
=
"dotNetRDF.Data.Virtuoso"
version
=
"2.5.0"
targetFramework
=
"net472"
/>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment