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
116be0ae
Commit
116be0ae
authored
Sep 11, 2020
by
Marcel Nellesen
Browse files
Merge branch 'Sprint/2020-16' into 'master'
Sprint/2020 16 See merge request coscine/api/project!103
parents
bc1ca9e1
509fb848
Changes
4
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
src/Project.Tests/Project.Tests.csproj
View file @
116be0ae
...
...
@@ -58,8 +58,8 @@
<Reference
Include=
"Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Consul.0.7.2.6\lib\net45\Consul.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Action, Version=1.1
4
.0.0, Culture=neutral, processorArchitecture=AMD64"
>
<HintPath>
..\packages\Coscine.Action.1.1
4
.0\lib\net461\Coscine.Action.dll
</HintPath>
<Reference
Include=
"Coscine.Action, Version=1.1
5
.0.0, Culture=neutral, processorArchitecture=AMD64"
>
<HintPath>
..\packages\Coscine.Action.1.1
5
.0\lib\net461\Coscine.Action.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.ApiCommons, Version=1.9.0.0, Culture=neutral, PublicKeyToken=af4c1345df96546b, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.ApiCommons.1.9.0\lib\net461\Coscine.ApiCommons.dll
</HintPath>
...
...
@@ -265,6 +265,12 @@
<Reference
Include=
"Microsoft.CodeAnalysis.Razor, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Microsoft.CodeAnalysis.Razor.2.2.0\lib\net46\Microsoft.CodeAnalysis.Razor.dll
</HintPath>
</Reference>
<Reference
Include=
"Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll
</HintPath>
</Reference>
<Reference
Include=
"Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll
</HintPath>
</Reference>
<Reference
Include=
"Microsoft.DotNet.PlatformAbstractions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Microsoft.DotNet.PlatformAbstractions.2.1.0\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll
</HintPath>
</Reference>
...
...
@@ -575,6 +581,9 @@
</Reference>
<Reference
Include=
"System.ServiceModel"
/>
<Reference
Include=
"System.ServiceProcess"
/>
<Reference
Include=
"System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
>
<HintPath>
..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll
</HintPath>
</Reference>
<Reference
Include=
"System.Text.Encoding.CodePages, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
>
<HintPath>
..\packages\System.Text.Encoding.CodePages.4.5.1\lib\net461\System.Text.Encoding.CodePages.dll
</HintPath>
</Reference>
...
...
src/Project.Tests/packages.config
View file @
116be0ae
...
...
@@ -4,7 +4,7 @@
<
package
id
=
"AutoMapper.Extensions.Microsoft.DependencyInjection"
version
=
"6.0.0"
targetFramework
=
"net472"
/>
<
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.1
4
.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Action"
version
=
"1.1
5
.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.ApiCommons"
version
=
"1.9.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Configuration"
version
=
"1.5.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Database"
version
=
"1.22.2"
targetFramework
=
"net472"
/>
...
...
@@ -78,6 +78,8 @@
<
package
id
=
"Microsoft.CodeAnalysis.CSharp"
version
=
"3.0.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Microsoft.CodeAnalysis.Razor"
version
=
"2.2.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Microsoft.CSharp"
version
=
"4.5.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Microsoft.Data.Edm"
version
=
"5.6.4"
targetFramework
=
"net472"
/>
<
package
id
=
"Microsoft.Data.OData"
version
=
"5.6.4"
targetFramework
=
"net472"
/>
<
package
id
=
"Microsoft.DiaSymReader.Native"
version
=
"1.7.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Microsoft.DotNet.PlatformAbstractions"
version
=
"2.1.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Microsoft.Extensions.ApiDescription.Server"
version
=
"3.0.0"
targetFramework
=
"net472"
developmentDependency
=
"true"
/>
...
...
@@ -174,6 +176,7 @@
<
package
id
=
"System.Security.Cryptography.Xml"
version
=
"4.5.0"
targetFramework
=
"net472"
/>
<
package
id
=
"System.Security.Permissions"
version
=
"4.5.0"
targetFramework
=
"net472"
/>
<
package
id
=
"System.Security.Principal.Windows"
version
=
"4.5.1"
targetFramework
=
"net472"
/>
<
package
id
=
"System.Spatial"
version
=
"5.6.4"
targetFramework
=
"net472"
/>
<
package
id
=
"System.Text.Encoding.CodePages"
version
=
"4.5.1"
targetFramework
=
"net472"
/>
<
package
id
=
"System.Text.Encodings.Web"
version
=
"4.5.0"
targetFramework
=
"net472"
/>
<
package
id
=
"System.Threading.Tasks.Extensions"
version
=
"4.5.2"
targetFramework
=
"net472"
/>
...
...
src/Project/Project.csproj
View file @
116be0ae
...
...
@@ -51,8 +51,8 @@
<Reference
Include=
"Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Consul.0.7.2.6\lib\net45\Consul.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.Action, Version=1.1
4
.0.0, Culture=neutral, processorArchitecture=AMD64"
>
<HintPath>
..\packages\Coscine.Action.1.1
4
.0\lib\net461\Coscine.Action.dll
</HintPath>
<Reference
Include=
"Coscine.Action, Version=1.1
5
.0.0, Culture=neutral, processorArchitecture=AMD64"
>
<HintPath>
..\packages\Coscine.Action.1.1
5
.0\lib\net461\Coscine.Action.dll
</HintPath>
</Reference>
<Reference
Include=
"Coscine.ApiCommons, Version=1.9.0.0, Culture=neutral, PublicKeyToken=af4c1345df96546b, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Coscine.ApiCommons.1.9.0\lib\net461\Coscine.ApiCommons.dll
</HintPath>
...
...
@@ -261,6 +261,12 @@
<Reference
Include=
"Microsoft.CodeAnalysis.Razor, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Microsoft.CodeAnalysis.Razor.2.2.0\lib\net46\Microsoft.CodeAnalysis.Razor.dll
</HintPath>
</Reference>
<Reference
Include=
"Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll
</HintPath>
</Reference>
<Reference
Include=
"Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll
</HintPath>
</Reference>
<Reference
Include=
"Microsoft.DotNet.PlatformAbstractions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL"
>
<HintPath>
..\packages\Microsoft.DotNet.PlatformAbstractions.2.1.0\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll
</HintPath>
</Reference>
...
...
@@ -583,6 +589,9 @@
</Reference>
<Reference
Include=
"System.ServiceModel"
/>
<Reference
Include=
"System.ServiceProcess"
/>
<Reference
Include=
"System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
>
<HintPath>
..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll
</HintPath>
</Reference>
<Reference
Include=
"System.Text.Encoding.CodePages, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
>
<HintPath>
..\packages\System.Text.Encoding.CodePages.4.5.1\lib\net461\System.Text.Encoding.CodePages.dll
</HintPath>
<Private>
True
</Private>
...
...
src/Project/packages.config
View file @
116be0ae
...
...
@@ -4,7 +4,7 @@
<
package
id
=
"AutoMapper.Extensions.Microsoft.DependencyInjection"
version
=
"6.0.0"
targetFramework
=
"net472"
/>
<
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.1
4
.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Action"
version
=
"1.1
5
.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.ApiCommons"
version
=
"1.9.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Configuration"
version
=
"1.5.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Coscine.Database"
version
=
"1.22.2"
targetFramework
=
"net472"
/>
...
...
@@ -78,6 +78,8 @@
<
package
id
=
"Microsoft.CodeAnalysis.CSharp"
version
=
"3.0.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Microsoft.CodeAnalysis.Razor"
version
=
"2.2.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Microsoft.CSharp"
version
=
"4.5.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Microsoft.Data.Edm"
version
=
"5.6.4"
targetFramework
=
"net472"
/>
<
package
id
=
"Microsoft.Data.OData"
version
=
"5.6.4"
targetFramework
=
"net472"
/>
<
package
id
=
"Microsoft.DiaSymReader.Native"
version
=
"1.7.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Microsoft.DotNet.PlatformAbstractions"
version
=
"2.1.0"
targetFramework
=
"net472"
/>
<
package
id
=
"Microsoft.Extensions.ApiDescription.Server"
version
=
"3.0.0"
targetFramework
=
"net472"
developmentDependency
=
"true"
/>
...
...
@@ -180,6 +182,7 @@
<
package
id
=
"System.Security.Cryptography.Xml"
version
=
"4.5.0"
targetFramework
=
"net472"
/>
<
package
id
=
"System.Security.Permissions"
version
=
"4.5.0"
targetFramework
=
"net472"
/>
<
package
id
=
"System.Security.Principal.Windows"
version
=
"4.5.1"
targetFramework
=
"net472"
/>
<
package
id
=
"System.Spatial"
version
=
"5.6.4"
targetFramework
=
"net472"
/>
<
package
id
=
"System.Text.Encoding"
version
=
"4.3.0"
targetFramework
=
"net472"
/>
<
package
id
=
"System.Text.Encoding.CodePages"
version
=
"4.5.1"
targetFramework
=
"net472"
/>
<
package
id
=
"System.Text.Encoding.Extensions"
version
=
"4.3.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