From 39cf835350fb67c55ede7758a7b8236ea6c4c604 Mon Sep 17 00:00:00 2001
From: Heinrichs <Heinrichs@itc.rwth-aachen.de>
Date: Fri, 12 Jul 2019 11:23:21 +0200
Subject: [PATCH] Add 1.4.0 Database version
---
src/Project.Tests/DefaultControllerTests.cs | 6 +++++-
src/Project.Tests/Project.Tests.csproj | 4 ++--
src/Project.Tests/app.config | 4 ++++
src/Project.Tests/packages.config | 2 +-
src/Project/App.config | 4 ++++
src/Project/Project.csproj | 4 ++--
src/Project/packages.config | 2 +-
7 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/Project.Tests/DefaultControllerTests.cs b/src/Project.Tests/DefaultControllerTests.cs
index cb50cd2..95bb30b 100644
--- a/src/Project.Tests/DefaultControllerTests.cs
+++ b/src/Project.Tests/DefaultControllerTests.cs
@@ -39,7 +39,11 @@ namespace Coscine.Api.Project.Tests
UserModel userModel = new UserModel();
- var user = new User();
+ var user = new User()
+ {
+ DisplayName = "TestUser",
+ EmailAddress = "testUser@test.com",
+ };
userModel.Insert(user);
users.Add(user);
diff --git a/src/Project.Tests/Project.Tests.csproj b/src/Project.Tests/Project.Tests.csproj
index 5a7f2b4..61f5900 100644
--- a/src/Project.Tests/Project.Tests.csproj
+++ b/src/Project.Tests/Project.Tests.csproj
@@ -60,8 +60,8 @@
<Reference Include="Coscine.Configuration, Version=1.4.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Configuration.1.4.0\lib\net461\Coscine.Configuration.dll</HintPath>
</Reference>
- <Reference Include="Coscine.Database, Version=1.3.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
- <HintPath>..\packages\Coscine.Database.1.3.0\lib\net461\Coscine.Database.dll</HintPath>
+ <Reference Include="Coscine.Database, Version=1.4.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
+ <HintPath>..\packages\Coscine.Database.1.4.0\lib\net461\Coscine.Database.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
diff --git a/src/Project.Tests/app.config b/src/Project.Tests/app.config
index 75f38ee..989be91 100644
--- a/src/Project.Tests/app.config
+++ b/src/Project.Tests/app.config
@@ -86,6 +86,10 @@
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="Coscine.Database" publicKeyToken="767d77427707b70a" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.4.0.0" newVersion="1.4.0.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
<entityFramework>
diff --git a/src/Project.Tests/packages.config b/src/Project.Tests/packages.config
index 969d907..01b9101 100644
--- a/src/Project.Tests/packages.config
+++ b/src/Project.Tests/packages.config
@@ -6,7 +6,7 @@
<package id="Consul" version="0.7.2.6" targetFramework="net472" />
<package id="Coscine.ApiCommons" version="1.0.0" targetFramework="net472" />
<package id="Coscine.Configuration" version="1.4.0" targetFramework="net472" />
- <package id="Coscine.Database" version="1.3.0" targetFramework="net472" />
+ <package id="Coscine.Database" version="1.4.0" targetFramework="net472" />
<package id="EntityFramework" version="6.2.0" targetFramework="net472" />
<package id="linq2db" version="2.6.4" targetFramework="net472" />
<package id="linq2db.SqlServer" version="2.6.4" targetFramework="net472" />
diff --git a/src/Project/App.config b/src/Project/App.config
index 4a82b79..9d0f41c 100644
--- a/src/Project/App.config
+++ b/src/Project/App.config
@@ -89,6 +89,10 @@
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="Coscine.Database" publicKeyToken="767d77427707b70a" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.4.0.0" newVersion="1.4.0.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
<entityFramework>
diff --git a/src/Project/Project.csproj b/src/Project/Project.csproj
index dfd45b0..a759b00 100644
--- a/src/Project/Project.csproj
+++ b/src/Project/Project.csproj
@@ -51,8 +51,8 @@
<Reference Include="Coscine.Configuration, Version=1.4.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Configuration.1.4.0\lib\net461\Coscine.Configuration.dll</HintPath>
</Reference>
- <Reference Include="Coscine.Database, Version=1.3.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
- <HintPath>..\packages\Coscine.Database.1.3.0\lib\net461\Coscine.Database.dll</HintPath>
+ <Reference Include="Coscine.Database, Version=1.4.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
+ <HintPath>..\packages\Coscine.Database.1.4.0\lib\net461\Coscine.Database.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
diff --git a/src/Project/packages.config b/src/Project/packages.config
index a1ad35e..29a6518 100644
--- a/src/Project/packages.config
+++ b/src/Project/packages.config
@@ -5,7 +5,7 @@
<package id="Consul" version="0.7.2.6" targetFramework="net472" />
<package id="Coscine.ApiCommons" version="1.0.0" targetFramework="net472" />
<package id="Coscine.Configuration" version="1.4.0" targetFramework="net472" />
- <package id="Coscine.Database" version="1.3.0" targetFramework="net472" />
+ <package id="Coscine.Database" version="1.4.0" targetFramework="net472" />
<package id="EntityFramework" version="6.2.0" targetFramework="net472" />
<package id="linq2db" version="2.6.4" targetFramework="net472" />
<package id="linq2db.SqlServer" version="2.6.4" targetFramework="net472" />
--
GitLab