Merge pull request #14 from IliyanIlievPH/13

Closes #13
OpenMAVN · Jul 20, 2020 · 1450532 · 1450532
2 parents 7e5bdf1 + 86952b2
commit 1450532
Show file tree

Hide file tree

Showing 75 changed files with 211 additions and 7,932 deletions.
diff --git 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
@@ -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.Referral.Client/MAVN.Service.Referral.Client.csproj b/client/MAVN.Service.Referral.Client/MAVN.Service.Referral.Client.csproj
@@ -14,8 +14,8 @@
     <None Remove="MAVN.Service.Referral.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="Refit" Version="4.6.107" />
   </ItemGroup>
 </Project>
diff --git a/src/MAVN.Service.Referral.Domain/MAVN.Service.Referral.Domain.csproj b/src/MAVN.Service.Referral.Domain/MAVN.Service.Referral.Domain.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <Version>1.0.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Lykke.Common" Version="7.5.0" />
     <PackageReference Include="MAVN.Numerics" Version="1.0.0" />
     <PackageReference Include="MAVN.Service.Campaign.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.Staking.Client" Version="1.1.1" />
     <PackageReference Include="MAVN.Service.UrlShortener.Client" Version="1.0.1" />
   </ItemGroup>

diff --git a/src/MAVN.Service.Referral.DomainServices/MAVN.Service.Referral.DomainServices.csproj b/src/MAVN.Service.Referral.DomainServices/MAVN.Service.Referral.DomainServices.csproj
@@ -1,14 +1,14 @@
 <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="Lykke.RabbitMqBroker" Version="7.13.1" />
-    <PackageReference Include="MAVN.Service.CurrencyConverter.Client" Version="1.2.0" />
+    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.3" />
+    <PackageReference Include="MAVN.Service.CurrencyConverter.Client" Version="1.3.0" />
     <PackageReference Include="MAVN.Service.CustomerManagement.Contract" Version="1.1.0" />
-    <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="1.3.0" />
+    <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="2.2.0" />
     <PackageReference Include="MAVN.Service.Dictionaries.Client" Version="1.1.0" />
     <PackageReference Include="MAVN.Service.NotificationSystem.SubscriberContract" Version="1.1.0" />
   </ItemGroup>

diff --git a/src/MAVN.Service.Referral.MsSqlRepositories/AutofacModule.cs b/src/MAVN.Service.Referral.MsSqlRepositories/AutofacModule.cs
@@ -1,5 +1,5 @@
 using Autofac;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.Referral.Domain.Repositories;
 using MAVN.Service.Referral.MsSqlRepositories.Repositories;
 
@@ -16,7 +16,7 @@ public AutofacModule(string connectionString)
 
         protected override void Load(ContainerBuilder builder)
         {
-            builder.RegisterMsSql(
+            builder.RegisterPostgreSQL(
                 _connectionString,
                 connString => new ReferralContext(connString, false),
                 dbConn => new ReferralContext(dbConn));

diff --git a/src/MAVN.Service.Referral.MsSqlRepositories/MAVN.Service.Referral.MsSqlRepositories.csproj b/src/MAVN.Service.Referral.MsSqlRepositories/MAVN.Service.Referral.MsSqlRepositories.csproj
@@ -1,23 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<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="LinqKit.Core" Version="1.1.17" />
-    <PackageReference Include="MAVN.Common.MsSql" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.4" />
+    <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.Referral.Domain\MAVN.Service.Referral.Domain.csproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Migrations\" />
-  </ItemGroup>
 
 </Project>
diff --git a/...Service.Referral.MsSqlRepositories/Migrations/20190605122149_InitialMigration.Designer.cs b/...Service.Referral.MsSqlRepositories/Migrations/20190605122149_InitialMigration.Designer.cs
diff --git a/....Service.Referral.MsSqlRepositories/Migrations/20190607115039_AddReferralLead.Designer.cs b/....Service.Referral.MsSqlRepositories/Migrations/20190607115039_AddReferralLead.Designer.cs