Merge pull request #25 from IliyanIlievPH/20

Closes #20
OpenMAVN · Jul 20, 2020 · 7277b2c · 7277b2c
2 parents 3ecd1f7 + 874d7d1
commit 7277b2c
Show file tree

Hide file tree

Showing 32 changed files with 197 additions and 760 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.AdminManagement.Client/MAVN.Service.AdminManagement.Client.csproj b/client/MAVN.Service.AdminManagement.Client/MAVN.Service.AdminManagement.Client.csproj
@@ -11,8 +11,8 @@
     <DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
   </PropertyGroup>
   <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.AdminManagement.Domain/MAVN.Service.AdminManagement.Domain.csproj b/src/MAVN.Service.AdminManagement.Domain/MAVN.Service.AdminManagement.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>

diff --git a/...Service.AdminManagement.DomainServices/MAVN.Service.AdminManagement.DomainServices.csproj b/...Service.AdminManagement.DomainServices/MAVN.Service.AdminManagement.DomainServices.csproj
@@ -1,18 +1,18 @@
 <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.Common.Redis" Version="1.0.2" />
-    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.1" />
+    <PackageReference Include="Lykke.RabbitMqBroker" Version="7.13.3" />
     <PackageReference Include="MAVN.Common" Version="1.0.0" />
-    <PackageReference Include="MAVN.Service.Credentials.Client" Version="1.0.1" />
+    <PackageReference Include="MAVN.Service.Credentials.Client" Version="1.1.0" />
     <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="1.1.0" />
     <PackageReference Include="MAVN.Service.NotificationSystem.SubscriberContract" Version="1.1.0" />
     <PackageReference Include="MAVN.Service.Sessions.Client" Version="1.0.1" />
-    <PackageReference Include="StackExchange.Redis" Version="2.1.30" />
+    <PackageReference Include="StackExchange.Redis" Version="2.1.58" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\contract\MAVN.Service.AdminManagement.Contract\MAVN.Service.AdminManagement.Contract.csproj" />

diff --git a/src/MAVN.Service.AdminManagement.MsSqlRepositories/AdminManagementContext.cs b/src/MAVN.Service.AdminManagement.MsSqlRepositories/AdminManagementContext.cs
@@ -1,14 +1,14 @@
-using System;
+using System;
 using System.Data.Common;
 using JetBrains.Annotations;
-using MAVN.Common.MsSql;
+using MAVN.Persistence.PostgreSQL.Legacy;
 using MAVN.Service.AdminManagement.Domain.Enums;
 using MAVN.Service.AdminManagement.MsSqlRepositories.Entities;
 using Microsoft.EntityFrameworkCore;
 
 namespace MAVN.Service.AdminManagement.MsSqlRepositories
 {
-    public class AdminManagementContext : MsSqlContext
+    public class AdminManagementContext : PostgreSQLContext
     {
         private const string Schema = "admin_users";
 
@@ -31,7 +31,7 @@ public AdminManagementContext(DbConnection dbConnection)
         {
         }
 
-        protected override void OnLykkeModelCreating(ModelBuilder modelBuilder)
+        protected override void OnMAVNModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<AdminUserEntity>()
                 .HasIndex(c => c.EmailHash)

diff --git a/...e.AdminManagement.MsSqlRepositories/MAVN.Service.AdminManagement.MsSqlRepositories.csproj b/...e.AdminManagement.MsSqlRepositories/MAVN.Service.AdminManagement.MsSqlRepositories.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="MAVN.Common" Version="1.0.0" />
-    <PackageReference Include="MAVN.Common.MsSql" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.4">
+    <PackageReference Include="MAVN.Persistence.PostgreSQL.Legacy" Version="1.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/....AdminManagement.MsSqlRepositories/Migrations/20190529105517_InitialMigration.Designer.cs b/....AdminManagement.MsSqlRepositories/Migrations/20190529105517_InitialMigration.Designer.cs
diff --git a/...N.Service.AdminManagement.MsSqlRepositories/Migrations/20190529105517_InitialMigration.cs b/...N.Service.AdminManagement.MsSqlRepositories/Migrations/20190529105517_InitialMigration.cs
diff --git a/...vice.AdminManagement.MsSqlRepositories/Migrations/20190717082827_IndexRemoval.Designer.cs b/...vice.AdminManagement.MsSqlRepositories/Migrations/20190717082827_IndexRemoval.Designer.cs
diff --git a/src/MAVN.Service.AdminManagement.MsSqlRepositories/Migrations/20190717082827_IndexRemoval.cs b/src/MAVN.Service.AdminManagement.MsSqlRepositories/Migrations/20190717082827_IndexRemoval.cs
diff --git a/...ice.AdminManagement.MsSqlRepositories/Migrations/20191006191402_SensitiveData.Designer.cs b/...ice.AdminManagement.MsSqlRepositories/Migrations/20191006191402_SensitiveData.Designer.cs