Skip to content
Snippets Groups Projects
Commit 3e99fe9e authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Merge branch 'Topic/776-s3ResourceUrl' into 'Product/772-s3ResourceUrl' 

Update: updated the database version coscine/issues#776

See merge request coscine/api/project!86
parents 55a64ef2 63efae38
No related branches found
No related tags found
2 merge requests!88Product/772-s3ResourceUrl,!86Update: updated the database version coscine/issues#776
Show whitespace changes
Inline Side-by-side
src/Project.Tests/Project.Tests.csproj
+ 2
− 2
View file @ 3e99fe9e
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
<Reference Include="Coscine.Configuration, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL"> <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> <HintPath>..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Coscine.Database, Version=1.18.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL"> <Reference Include="Coscine.Database, Version=1.19.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Database.1.18.0\lib\net461\Coscine.Database.dll</HintPath> <HintPath>..\packages\Coscine.Database.1.19.0-topic-776-s3reso0001\lib\net461\Coscine.Database.dll</HintPath>
</Reference> </Reference>
<Reference Include="Coscine.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL"> <Reference Include="Coscine.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Logging.1.1.0\lib\net461\Coscine.Logging.dll</HintPath> <HintPath>..\packages\Coscine.Logging.1.1.0\lib\net461\Coscine.Logging.dll</HintPath>
......
src/Project.Tests/app.config
+ 1
− 1
View file @ 3e99fe9e
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Coscine.Database" publicKeyToken="767d77427707b70a" culture="neutral" /> <assemblyIdentity name="Coscine.Database" publicKeyToken="767d77427707b70a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" /> <bindingRedirect oldVersion="0.0.0.0-1.19.0.0" newVersion="1.19.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
......
src/Project.Tests/packages.config
+ 1
− 1
View file @ 3e99fe9e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<package id="Coscine.Action" version="1.11.0" targetFramework="net472" /> <package id="Coscine.Action" version="1.11.0" targetFramework="net472" />
<package id="Coscine.ApiCommons" version="1.7.0" targetFramework="net472" /> <package id="Coscine.ApiCommons" version="1.7.0" targetFramework="net472" />
<package id="Coscine.Configuration" version="1.5.0" targetFramework="net472" /> <package id="Coscine.Configuration" version="1.5.0" targetFramework="net472" />
<package id="Coscine.Database" version="1.18.0" targetFramework="net472" /> <package id="Coscine.Database" version="1.19.0-topic-776-s3reso0001" targetFramework="net472" />
<package id="Coscine.Logging" version="1.1.0" targetFramework="net472" /> <package id="Coscine.Logging" version="1.1.0" targetFramework="net472" />
<package id="Coscine.ProxyApi" version="1.2.1" targetFramework="net472" /> <package id="Coscine.ProxyApi" version="1.2.1" targetFramework="net472" />
<package id="EntityFramework" version="6.2.0" targetFramework="net472" /> <package id="EntityFramework" version="6.2.0" targetFramework="net472" />
......
src/Project/App.config
+ 1
− 1
View file @ 3e99fe9e
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Coscine.Database" publicKeyToken="767d77427707b70a" culture="neutral" /> <assemblyIdentity name="Coscine.Database" publicKeyToken="767d77427707b70a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.18.0.0" newVersion="1.18.0.0" /> <bindingRedirect oldVersion="0.0.0.0-1.19.0.0" newVersion="1.19.0.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" /> <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
......
src/Project/Project.csproj
+ 2
− 2
View file @ 3e99fe9e
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
<Reference Include="Coscine.Configuration, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL"> <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> <HintPath>..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll</HintPath>
</Reference> </Reference>
<Reference Include="Coscine.Database, Version=1.18.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL"> <Reference Include="Coscine.Database, Version=1.19.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Database.1.18.0\lib\net461\Coscine.Database.dll</HintPath> <HintPath>..\packages\Coscine.Database.1.19.0-topic-776-s3reso0001\lib\net461\Coscine.Database.dll</HintPath>
</Reference> </Reference>
<Reference Include="Coscine.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL"> <Reference Include="Coscine.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Logging.1.1.0\lib\net461\Coscine.Logging.dll</HintPath> <HintPath>..\packages\Coscine.Logging.1.1.0\lib\net461\Coscine.Logging.dll</HintPath>
......
src/Project/packages.config
+ 1
− 1
View file @ 3e99fe9e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<package id="Coscine.Action" version="1.11.0" targetFramework="net472" /> <package id="Coscine.Action" version="1.11.0" targetFramework="net472" />
<package id="Coscine.ApiCommons" version="1.7.0" targetFramework="net472" /> <package id="Coscine.ApiCommons" version="1.7.0" targetFramework="net472" />
<package id="Coscine.Configuration" version="1.5.0" targetFramework="net472" /> <package id="Coscine.Configuration" version="1.5.0" targetFramework="net472" />
<package id="Coscine.Database" version="1.18.0" targetFramework="net472" /> <package id="Coscine.Database" version="1.19.0-topic-776-s3reso0001" targetFramework="net472" />
<package id="Coscine.Logging" version="1.1.0" targetFramework="net472" /> <package id="Coscine.Logging" version="1.1.0" targetFramework="net472" />
<package id="Coscine.ProxyApi" version="1.2.1" targetFramework="net472" /> <package id="Coscine.ProxyApi" version="1.2.1" targetFramework="net472" />
<package id="EntityFramework" version="6.2.0" targetFramework="net472" /> <package id="EntityFramework" version="6.2.0" targetFramework="net472" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment