diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f657148..312055e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -51,7 +51,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
- dotnet-version: 2.2.207
+ dotnet-version: 3.1.302
- name: Install dependencies
run: dotnet restore
- name: Build solution
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4601449..fa70168 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
- dotnet-version: 2.2.207
+ dotnet-version: 3.1.302
- name: Install dependencies
run: dotnet restore
- name: Build
diff --git a/client/MAVN.Service.Tiers.Client/MAVN.Service.Tiers.Client.csproj b/client/MAVN.Service.Tiers.Client/MAVN.Service.Tiers.Client.csproj
index 59cfa6a..d6a12e1 100644
--- a/client/MAVN.Service.Tiers.Client/MAVN.Service.Tiers.Client.csproj
+++ b/client/MAVN.Service.Tiers.Client/MAVN.Service.Tiers.Client.csproj
@@ -13,8 +13,8 @@
-
-
+
+
diff --git a/src/MAVN.Service.Tiers.Domain/MAVN.Service.Tiers.Domain.csproj b/src/MAVN.Service.Tiers.Domain/MAVN.Service.Tiers.Domain.csproj
index 2bf2601..90a0bf5 100644
--- a/src/MAVN.Service.Tiers.Domain/MAVN.Service.Tiers.Domain.csproj
+++ b/src/MAVN.Service.Tiers.Domain/MAVN.Service.Tiers.Domain.csproj
@@ -1,6 +1,6 @@
- netcoreapp2.2
+ netcoreapp3.1
1.0.0
diff --git a/src/MAVN.Service.Tiers.DomainServices/MAVN.Service.Tiers.DomainServices.csproj b/src/MAVN.Service.Tiers.DomainServices/MAVN.Service.Tiers.DomainServices.csproj
index e6cda0f..b0f6555 100644
--- a/src/MAVN.Service.Tiers.DomainServices/MAVN.Service.Tiers.DomainServices.csproj
+++ b/src/MAVN.Service.Tiers.DomainServices/MAVN.Service.Tiers.DomainServices.csproj
@@ -1,6 +1,6 @@
- netcoreapp2.2
+ netcoreapp3.1
1.0.0
@@ -8,7 +8,7 @@
-
-
+
+
diff --git a/src/MAVN.Service.Tiers.MsSqlRepositories/AutofacModule.cs b/src/MAVN.Service.Tiers.MsSqlRepositories/AutofacModule.cs
index 586474f..0885bf1 100644
--- a/src/MAVN.Service.Tiers.MsSqlRepositories/AutofacModule.cs
+++ b/src/MAVN.Service.Tiers.MsSqlRepositories/AutofacModule.cs
@@ -1,5 +1,5 @@
-using Autofac;
-using MAVN.Common.MsSql;
+using Autofac;
+using MAVN.Persistence.PostgreSQL.Legacy;
using MAVN.Service.Tiers.Domain.Repositories;
using MAVN.Service.Tiers.MsSqlRepositories.Repositories;
@@ -16,7 +16,7 @@ public AutofacModule(string connectionString)
protected override void Load(ContainerBuilder builder)
{
- builder.RegisterMsSql(
+ builder.RegisterPostgreSQL(
_connectionString,
connString => new DataContext(connString, false),
dbConn => new DataContext(dbConn));
diff --git a/src/MAVN.Service.Tiers.MsSqlRepositories/DataContext.cs b/src/MAVN.Service.Tiers.MsSqlRepositories/DataContext.cs
index 8a70d3f..bd6d7c6 100644
--- a/src/MAVN.Service.Tiers.MsSqlRepositories/DataContext.cs
+++ b/src/MAVN.Service.Tiers.MsSqlRepositories/DataContext.cs
@@ -4,13 +4,13 @@
using System.Numerics;
using MAVN.Numerics;
using JetBrains.Annotations;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
using MAVN.Service.Tiers.MsSqlRepositories.Entities;
using Microsoft.EntityFrameworkCore;
namespace MAVN.Service.Tiers.MsSqlRepositories
{
- public class DataContext : MsSqlContext
+ public class DataContext : PostgreSQLContext
{
internal const string Schema = "tiers";
@@ -35,7 +35,7 @@ public DataContext(DbConnection dbConnection)
{
}
- protected override void OnLykkeModelCreating(ModelBuilder modelBuilder)
+ protected override void OnMAVNModelCreating(ModelBuilder modelBuilder)
{
modelBuilder.Entity()
.HasMany()
diff --git a/src/MAVN.Service.Tiers.MsSqlRepositories/Entities/TierEntity.cs b/src/MAVN.Service.Tiers.MsSqlRepositories/Entities/TierEntity.cs
index 1f67121..0af66b3 100644
--- a/src/MAVN.Service.Tiers.MsSqlRepositories/Entities/TierEntity.cs
+++ b/src/MAVN.Service.Tiers.MsSqlRepositories/Entities/TierEntity.cs
@@ -24,7 +24,7 @@ public TierEntity(Guid id, string name, Money18 threshold)
public Guid Id { get; set; }
[Required]
- [Column("name", TypeName = "nvarchar(50)")]
+ [Column("name")]
public string Name { get; set; }
[Column("threshold")]
diff --git a/src/MAVN.Service.Tiers.MsSqlRepositories/MAVN.Service.Tiers.MsSqlRepositories.csproj b/src/MAVN.Service.Tiers.MsSqlRepositories/MAVN.Service.Tiers.MsSqlRepositories.csproj
index 0d84121..1910151 100644
--- a/src/MAVN.Service.Tiers.MsSqlRepositories/MAVN.Service.Tiers.MsSqlRepositories.csproj
+++ b/src/MAVN.Service.Tiers.MsSqlRepositories/MAVN.Service.Tiers.MsSqlRepositories.csproj
@@ -1,11 +1,12 @@
- netcoreapp2.2
+ netcoreapp3.1
1.0.0
-
+
+
true
diff --git a/src/MAVN.Service.Tiers.MsSqlRepositories/Migrations/20190815200544_Initial.cs b/src/MAVN.Service.Tiers.MsSqlRepositories/Migrations/20190815200544_Initial.cs
index 63fa80e..1df4958 100644
--- a/src/MAVN.Service.Tiers.MsSqlRepositories/Migrations/20190815200544_Initial.cs
+++ b/src/MAVN.Service.Tiers.MsSqlRepositories/Migrations/20190815200544_Initial.cs
@@ -16,7 +16,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
columns: table => new
{
id = table.Column(nullable: false),
- name = table.Column(type: "nvarchar(50)", nullable: false),
+ name = table.Column(nullable: false),
threshold = table.Column(nullable: false)
},
constraints: table =>
diff --git a/src/MAVN.Service.Tiers.MsSqlRepositories/Repositories/CustomerBonusesRepository.cs b/src/MAVN.Service.Tiers.MsSqlRepositories/Repositories/CustomerBonusesRepository.cs
index cf2e8d2..0d34b02 100644
--- a/src/MAVN.Service.Tiers.MsSqlRepositories/Repositories/CustomerBonusesRepository.cs
+++ b/src/MAVN.Service.Tiers.MsSqlRepositories/Repositories/CustomerBonusesRepository.cs
@@ -1,7 +1,7 @@
-using System;
+using System;
using System.Threading.Tasks;
using AutoMapper;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
using MAVN.Service.Tiers.Domain.Entities;
using MAVN.Service.Tiers.Domain.Repositories;
using MAVN.Service.Tiers.MsSqlRepositories.Entities;
@@ -12,10 +12,10 @@ namespace MAVN.Service.Tiers.MsSqlRepositories.Repositories
public class CustomerBonusesRepository : ICustomerBonusesRepository
{
private readonly IMapper _mapper;
- private readonly MsSqlContextFactory _contextFactory;
+ private readonly PostgreSQLContextFactory _contextFactory;
public CustomerBonusesRepository(
- MsSqlContextFactory contextFactory,
+ PostgreSQLContextFactory contextFactory,
IMapper mapper)
{
_contextFactory = contextFactory;
diff --git a/src/MAVN.Service.Tiers.MsSqlRepositories/Repositories/CustomerTiersRepository.cs b/src/MAVN.Service.Tiers.MsSqlRepositories/Repositories/CustomerTiersRepository.cs
index 63ce564..55a9deb 100644
--- a/src/MAVN.Service.Tiers.MsSqlRepositories/Repositories/CustomerTiersRepository.cs
+++ b/src/MAVN.Service.Tiers.MsSqlRepositories/Repositories/CustomerTiersRepository.cs
@@ -1,7 +1,7 @@
-using System;
+using System;
using System.Linq;
using System.Threading.Tasks;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
using MAVN.Service.Tiers.Domain.Repositories;
using MAVN.Service.Tiers.MsSqlRepositories.Entities;
using Microsoft.EntityFrameworkCore;
@@ -10,9 +10,9 @@ namespace MAVN.Service.Tiers.MsSqlRepositories.Repositories
{
public class CustomerTiersRepository : ICustomerTiersRepository
{
- private readonly MsSqlContextFactory _contextFactory;
+ private readonly PostgreSQLContextFactory _contextFactory;
- public CustomerTiersRepository(MsSqlContextFactory contextFactory)
+ public CustomerTiersRepository(PostgreSQLContextFactory contextFactory)
{
_contextFactory = contextFactory;
}
diff --git a/src/MAVN.Service.Tiers.MsSqlRepositories/Repositories/TiersRepository.cs b/src/MAVN.Service.Tiers.MsSqlRepositories/Repositories/TiersRepository.cs
index a779ce4..8a56877 100644
--- a/src/MAVN.Service.Tiers.MsSqlRepositories/Repositories/TiersRepository.cs
+++ b/src/MAVN.Service.Tiers.MsSqlRepositories/Repositories/TiersRepository.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using AutoMapper;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
using MAVN.Service.Tiers.Domain.Entities;
using MAVN.Service.Tiers.Domain.Repositories;
using Microsoft.EntityFrameworkCore;
@@ -11,10 +11,10 @@ namespace MAVN.Service.Tiers.MsSqlRepositories.Repositories
{
public class TiersRepository : ITiersRepository
{
- private readonly MsSqlContextFactory _contextFactory;
+ private readonly PostgreSQLContextFactory _contextFactory;
private readonly IMapper _mapper;
- public TiersRepository(MsSqlContextFactory contextFactory, IMapper mapper)
+ public TiersRepository(PostgreSQLContextFactory contextFactory, IMapper mapper)
{
_contextFactory = contextFactory;
_mapper = mapper;
diff --git a/src/MAVN.Service.Tiers/Dockerfile b/src/MAVN.Service.Tiers/Dockerfile
index 3423bf6..d445880 100644
--- a/src/MAVN.Service.Tiers/Dockerfile
+++ b/src/MAVN.Service.Tiers/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/dotnet:2.2-aspnetcore-runtime
+FROM microsoft/dotnet:3.1-aspnetcore-runtime
WORKDIR /app
COPY . .
ENTRYPOINT ["dotnet", "MAVN.Service.Tiers.dll"]
\ No newline at end of file
diff --git a/src/MAVN.Service.Tiers/MAVN.Service.Tiers.csproj b/src/MAVN.Service.Tiers/MAVN.Service.Tiers.csproj
index 4621a79..8bdf13f 100644
--- a/src/MAVN.Service.Tiers/MAVN.Service.Tiers.csproj
+++ b/src/MAVN.Service.Tiers/MAVN.Service.Tiers.csproj
@@ -1,6 +1,6 @@
- netcoreapp2.2
+ netcoreapp3.1
Exe
1.0.0
@@ -13,12 +13,16 @@
latest
+
+ Always
+
PreserveNewest
-
+
+
diff --git a/tests/MAVN.Service.Tiers.DomainServices.Tests/MAVN.Service.Tiers.DomainServices.Tests.csproj b/tests/MAVN.Service.Tiers.DomainServices.Tests/MAVN.Service.Tiers.DomainServices.Tests.csproj
index 8e54ab6..7fb38d5 100644
--- a/tests/MAVN.Service.Tiers.DomainServices.Tests/MAVN.Service.Tiers.DomainServices.Tests.csproj
+++ b/tests/MAVN.Service.Tiers.DomainServices.Tests/MAVN.Service.Tiers.DomainServices.Tests.csproj
@@ -1,16 +1,19 @@
- netcoreapp2.2
+ netcoreapp3.1
false
1.0.0
-
+
-
-
+
+
-
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
diff --git a/tests/MAVN.Service.Tiers.MsSqlRepositories.Tests/MAVN.Service.Tiers.MsSqlRepositories.Tests.csproj b/tests/MAVN.Service.Tiers.MsSqlRepositories.Tests/MAVN.Service.Tiers.MsSqlRepositories.Tests.csproj
index 46e3958..bdb24ec 100644
--- a/tests/MAVN.Service.Tiers.MsSqlRepositories.Tests/MAVN.Service.Tiers.MsSqlRepositories.Tests.csproj
+++ b/tests/MAVN.Service.Tiers.MsSqlRepositories.Tests/MAVN.Service.Tiers.MsSqlRepositories.Tests.csproj
@@ -1,14 +1,17 @@
- netcoreapp2.2
+ netcoreapp3.1
false
1.0.0
-
-
+
+
-
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
diff --git a/tests/MAVN.Service.Tiers.Tests/MAVN.Service.Tiers.Tests.csproj b/tests/MAVN.Service.Tiers.Tests/MAVN.Service.Tiers.Tests.csproj
index e71cc2c..00c2d2d 100644
--- a/tests/MAVN.Service.Tiers.Tests/MAVN.Service.Tiers.Tests.csproj
+++ b/tests/MAVN.Service.Tiers.Tests/MAVN.Service.Tiers.Tests.csproj
@@ -1,18 +1,21 @@
- netcoreapp2.2
+ netcoreapp3.1
false
1.0.0
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
-
+
+
-
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+