Merge pull request #12 from IliyanIlievPH/11

Closes #11

.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

.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

client/MAVN.Service.PartnersPayments.Client/MAVN.Service.PartnersPayments.Client.csproj

@@ -14,8 +14,8 @@
     <None Remove="MAVN.Service.PartnersPayments.Client.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Lykke.HttpClientGenerator" Version="2.5.0" />
-    <PackageReference Include="Lykke.SettingsReader" Version="5.2.0" />
+    <PackageReference Include="Lykke.HttpClientGenerator" Version="3.1.0" />
+    <PackageReference Include="Lykke.SettingsReader" Version="5.3.0" />
     <PackageReference Include="MAVN.Numerics" Version="1.0.0" />
     <PackageReference Include="Refit" Version="4.6.107" />
   </ItemGroup>

contract/MAVN.Service.PartnersPayments.Contract/MAVN.Service.PartnersPayments.Contract.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="JetBrains.Annotations" Version="2019.1.1" />
+      <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
       <PackageReference Include="MAVN.Numerics" Version="1.0.0" />
     </ItemGroup>
 

src/MAVN.Job.PartnersPayments/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.Job.PartnersPayments.dll"]

src/MAVN.Job.PartnersPayments/MAVN.Job.PartnersPayments.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -24,8 +24,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Lykke.Sdk" Version="5.17.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.13.1" />
+    <PackageReference Include="Lykke.Logs" Version="7.4.0" />
+    <PackageReference Include="Lykke.Sdk" Version="5.18.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.14.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MAVN.Service.PartnersPayments.MsSqlRepositories\MAVN.Service.PartnersPayments.MsSqlRepositories.csproj" />

src/MAVN.Job.PartnersPayments/Modules/DataLayerModule.cs

@@ -1,9 +1,9 @@
 using Autofac;
 using JetBrains.Annotations;
 using Lykke.SettingsReader;
-using MAVN.Common.MsSql;
 using MAVN.Job.PartnersPayments.Settings;
 using MAVN.Job.PartnersPayments.Settings.JobSettings;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.PartnersPayments.Domain.Repositories;
 using MAVN.Service.PartnersPayments.MsSqlRepositories;
 using MAVN.Service.PartnersPayments.MsSqlRepositories.Repositories;
@@ -22,7 +22,7 @@ public DataLayerModule(IReloadingManager<AppSettings> appSettings)
 
         protected override void Load(ContainerBuilder builder)
         {
-            builder.RegisterMsSql(
+            builder.RegisterPostgreSQL(
                 _settings.DataConnString,
                 connString => new PartnersPaymentsContext(connString, false),
                 dbConn => new PartnersPaymentsContext(dbConn));

src/MAVN.Service.PartnersPayments.Domain/MAVN.Service.PartnersPayments.Domain.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>

src/MAVN.Service.PartnersPayments.DomainServices/MAVN.Service.PartnersPayments.DomainServices.csproj

@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
+    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.3" />
     <PackageReference Include="MAVN.Job.QuorumTransactionWatcher.Contract" Version="1.1.0" />
     <PackageReference Include="MAVN.PrivateBlockchain.HospitalityRedeemGateway" Version="1.0.0-beta.1" />
-    <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="1.3.0" />
+    <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="2.2.0" />
     <PackageReference Include="MAVN.Service.EligibilityEngine.Client" Version="1.1.1" />
-    <PackageReference Include="MAVN.Service.PartnerManagement.Client" Version="1.4.0" />
+    <PackageReference Include="MAVN.Service.PartnerManagement.Client" Version="2.14.0" />
     <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Client" Version="1.1.0" />
     <PackageReference Include="MAVN.Service.PrivateBlockchainFacade.Contract" Version="1.1.0" />
-    <PackageReference Include="MAVN.Service.WalletManagement.Client" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.WalletManagement.Client" Version="1.1.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\contract\MAVN.Service.PartnersPayments.Contract\MAVN.Service.PartnersPayments.Contract.csproj" />

src/MAVN.Service.PartnersPayments.MsSqlRepositories/MAVN.Service.PartnersPayments.MsSqlRepositories.csproj

@@ -1,12 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Lykke.AzureStorage" Version="8.13.4" />
-    <PackageReference Include="MAVN.Common.MsSql" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
+    <PackageReference Include="MAVN.Persistence.PostgreSQL.Legacy" Version="1.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MAVN.Service.PartnersPayments.Domain\MAVN.Service.PartnersPayments.Domain.csproj" />