From 0d97f195506170e58d3fc70e029e87d5d8652a9a Mon Sep 17 00:00:00 2001
From: malik masis <malik.masis@gmail.com>
Date: Thu, 5 Jan 2023 11:06:46 +0300
Subject: [PATCH] upgrade to 7.0 - Payment

---
 ...opOnAbp.PaymentService.Application.Contracts.csproj |  4 ++--
 .../EShopOnAbp.PaymentService.Application.csproj       |  5 +++--
 .../PaymentMethods/PaypalMethod.cs                     | 10 +++++-----
 .../EShopOnAbp.PaymentService.Domain.Shared.csproj     |  4 ++--
 .../EShopOnAbp.PaymentService.Domain.csproj            |  2 +-
 ...ShopOnAbp.PaymentService.EntityFrameworkCore.csproj |  6 +++---
 .../EShopOnAbp.PaymentService.HttpApi.Client.csproj    |  2 +-
 .../EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile  |  4 ++--
 .../Dockerfile.local                                   |  4 ++--
 .../EShopOnAbp.PaymentService.HttpApi.Host.csproj      |  2 +-
 .../EShopOnAbp.PaymentService.HttpApi.csproj           |  4 ++--
 .../EShopOnAbp.PaymentService.Application.Tests.csproj |  2 +-
 .../EShopOnAbp.PaymentService.Domain.Tests.csproj      |  2 +-
 ...Abp.PaymentService.EntityFrameworkCore.Tests.csproj |  6 +++---
 ...PaymentService.HttpApi.Client.ConsoleTestApp.csproj |  6 +++---
 .../EShopOnAbp.PaymentService.TestBase.csproj          |  8 ++++----
 16 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/services/payment/src/EShopOnAbp.PaymentService.Application.Contracts/EShopOnAbp.PaymentService.Application.Contracts.csproj b/services/payment/src/EShopOnAbp.PaymentService.Application.Contracts/EShopOnAbp.PaymentService.Application.Contracts.csproj
index a28085fc..bafc1625 100644
--- a/services/payment/src/EShopOnAbp.PaymentService.Application.Contracts/EShopOnAbp.PaymentService.Application.Contracts.csproj
+++ b/services/payment/src/EShopOnAbp.PaymentService.Application.Contracts/EShopOnAbp.PaymentService.Application.Contracts.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="7.0.0" />
     <ProjectReference Include="..\EShopOnAbp.PaymentService.Domain.Shared\EShopOnAbp.PaymentService.Domain.Shared.csproj" />
   </ItemGroup>
 
diff --git a/services/payment/src/EShopOnAbp.PaymentService.Application/EShopOnAbp.PaymentService.Application.csproj b/services/payment/src/EShopOnAbp.PaymentService.Application/EShopOnAbp.PaymentService.Application.csproj
index d55ff1d0..fb45f0bf 100644
--- a/services/payment/src/EShopOnAbp.PaymentService.Application/EShopOnAbp.PaymentService.Application.csproj
+++ b/services/payment/src/EShopOnAbp.PaymentService.Application/EShopOnAbp.PaymentService.Application.csproj
@@ -8,9 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="PayPalCheckoutSdk" Version="1.0.4" />
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Ddd.Application" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.AutoMapper" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Application" Version="7.0.0" />
     <ProjectReference Include="..\EShopOnAbp.PaymentService.Application.Contracts\EShopOnAbp.PaymentService.Application.Contracts.csproj" />
     <ProjectReference Include="..\EShopOnAbp.PaymentService.Domain\EShopOnAbp.PaymentService.Domain.csproj" />
   </ItemGroup>
diff --git a/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/PaypalMethod.cs b/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/PaypalMethod.cs
index b6ae0e6d..96c50a1e 100644
--- a/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/PaypalMethod.cs
+++ b/services/payment/src/EShopOnAbp.PaymentService.Application/PaymentMethods/PaypalMethod.cs
@@ -1,12 +1,12 @@
-using System;
+using EShopOnAbp.PaymentService.PaymentRequests;
+using Newtonsoft.Json.Linq;
+using PayPalCheckoutSdk.Core;
+using PayPalCheckoutSdk.Orders;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
-using EShopOnAbp.PaymentService.PaymentRequests;
-using Newtonsoft.Json.Linq;
-using PayPalCheckoutSdk.Core;
-using PayPalCheckoutSdk.Orders;
 using Volo.Abp.DependencyInjection;
 
 namespace EShopOnAbp.PaymentService.PaymentMethods;
diff --git a/services/payment/src/EShopOnAbp.PaymentService.Domain.Shared/EShopOnAbp.PaymentService.Domain.Shared.csproj b/services/payment/src/EShopOnAbp.PaymentService.Domain.Shared/EShopOnAbp.PaymentService.Domain.Shared.csproj
index aaa3a66d..4f790e8f 100644
--- a/services/payment/src/EShopOnAbp.PaymentService.Domain.Shared/EShopOnAbp.PaymentService.Domain.Shared.csproj
+++ b/services/payment/src/EShopOnAbp.PaymentService.Domain.Shared/EShopOnAbp.PaymentService.Domain.Shared.csproj
@@ -9,11 +9,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Validation" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Validation" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" />
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/services/payment/src/EShopOnAbp.PaymentService.Domain/EShopOnAbp.PaymentService.Domain.csproj b/services/payment/src/EShopOnAbp.PaymentService.Domain/EShopOnAbp.PaymentService.Domain.csproj
index 0e883ed5..2997df1d 100644
--- a/services/payment/src/EShopOnAbp.PaymentService.Domain/EShopOnAbp.PaymentService.Domain.csproj
+++ b/services/payment/src/EShopOnAbp.PaymentService.Domain/EShopOnAbp.PaymentService.Domain.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="7.0.0" />
     <ProjectReference Include="..\EShopOnAbp.PaymentService.Domain.Shared\EShopOnAbp.PaymentService.Domain.Shared.csproj" />
   </ItemGroup>
 
diff --git a/services/payment/src/EShopOnAbp.PaymentService.EntityFrameworkCore/EShopOnAbp.PaymentService.EntityFrameworkCore.csproj b/services/payment/src/EShopOnAbp.PaymentService.EntityFrameworkCore/EShopOnAbp.PaymentService.EntityFrameworkCore.csproj
index 8f8bb0f3..fbeb36ba 100644
--- a/services/payment/src/EShopOnAbp.PaymentService.EntityFrameworkCore/EShopOnAbp.PaymentService.EntityFrameworkCore.csproj
+++ b/services/payment/src/EShopOnAbp.PaymentService.EntityFrameworkCore/EShopOnAbp.PaymentService.EntityFrameworkCore.csproj
@@ -3,17 +3,17 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>EShopOnAbp.PaymentService</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\EShopOnAbp.PaymentService.Domain\EShopOnAbp.PaymentService.Domain.csproj" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.PostgreSql" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native</PrivateAssets>
     </PackageReference>
diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/EShopOnAbp.PaymentService.HttpApi.Client.csproj b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/EShopOnAbp.PaymentService.HttpApi.Client.csproj
index 7a5c9fc5..03d265df 100644
--- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/EShopOnAbp.PaymentService.HttpApi.Client.csproj
+++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Client/EShopOnAbp.PaymentService.HttpApi.Client.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Http.Client" Version="7.0.0" />
     <ProjectReference Include="..\EShopOnAbp.PaymentService.Application.Contracts\EShopOnAbp.PaymentService.Application.Contracts.csproj" />
   </ItemGroup>
 
diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile
index baaf72d6..02c6bc73 100644
--- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile
+++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile
@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src
 
 # It's important to keep lines from here down to "COPY . ." identical in all Dockerfiles
diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.local b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.local
index 07db2a8c..c1ecbf53 100644
--- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.local
+++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/Dockerfile.local
@@ -1,4 +1,4 @@
-  FROM mcr.microsoft.com/dotnet/aspnet:6.0
-  COPY bin/Release/net6.0/publish/ app/
+  FROM mcr.microsoft.com/dotnet/aspnet:7.0
+  COPY bin/Release/net7.0/publish/ app/
   WORKDIR /app
   ENTRYPOINT ["dotnet", "EShopOnAbp.PaymentService.HttpApi.Host.dll"]
\ No newline at end of file
diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/EShopOnAbp.PaymentService.HttpApi.Host.csproj b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/EShopOnAbp.PaymentService.HttpApi.Host.csproj
index c1c7f3e1..06859ad5 100644
--- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/EShopOnAbp.PaymentService.HttpApi.Host.csproj
+++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi.Host/EShopOnAbp.PaymentService.HttpApi.Host.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>EShopOnAbp.PaymentService</RootNamespace>
     <PreserveCompilationReferences>true</PreserveCompilationReferences>
     <UserSecretsId>EShopOnAbp.PaymentService-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>
diff --git a/services/payment/src/EShopOnAbp.PaymentService.HttpApi/EShopOnAbp.PaymentService.HttpApi.csproj b/services/payment/src/EShopOnAbp.PaymentService.HttpApi/EShopOnAbp.PaymentService.HttpApi.csproj
index 17464377..71329310 100644
--- a/services/payment/src/EShopOnAbp.PaymentService.HttpApi/EShopOnAbp.PaymentService.HttpApi.csproj
+++ b/services/payment/src/EShopOnAbp.PaymentService.HttpApi/EShopOnAbp.PaymentService.HttpApi.csproj
@@ -3,12 +3,12 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>EShopOnAbp.PaymentService</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="7.0.0" />
     <ProjectReference Include="..\EShopOnAbp.PaymentService.Application.Contracts\EShopOnAbp.PaymentService.Application.Contracts.csproj" />
   </ItemGroup>
 
diff --git a/services/payment/test/EShopOnAbp.PaymentService.Application.Tests/EShopOnAbp.PaymentService.Application.Tests.csproj b/services/payment/test/EShopOnAbp.PaymentService.Application.Tests/EShopOnAbp.PaymentService.Application.Tests.csproj
index 110632e8..b67de138 100644
--- a/services/payment/test/EShopOnAbp.PaymentService.Application.Tests/EShopOnAbp.PaymentService.Application.Tests.csproj
+++ b/services/payment/test/EShopOnAbp.PaymentService.Application.Tests/EShopOnAbp.PaymentService.Application.Tests.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>EShopOnAbp.PaymentService</RootNamespace>
   </PropertyGroup>
 
diff --git a/services/payment/test/EShopOnAbp.PaymentService.Domain.Tests/EShopOnAbp.PaymentService.Domain.Tests.csproj b/services/payment/test/EShopOnAbp.PaymentService.Domain.Tests/EShopOnAbp.PaymentService.Domain.Tests.csproj
index feb9fd14..d2b19812 100644
--- a/services/payment/test/EShopOnAbp.PaymentService.Domain.Tests/EShopOnAbp.PaymentService.Domain.Tests.csproj
+++ b/services/payment/test/EShopOnAbp.PaymentService.Domain.Tests/EShopOnAbp.PaymentService.Domain.Tests.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>EShopOnAbp.PaymentService</RootNamespace>
   </PropertyGroup>
 
diff --git a/services/payment/test/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests.csproj b/services/payment/test/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests.csproj
index 9f759236..3dc785e0 100644
--- a/services/payment/test/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests.csproj
+++ b/services/payment/test/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests/EShopOnAbp.PaymentService.EntityFrameworkCore.Tests.csproj
@@ -3,16 +3,16 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>EShopOnAbp.PaymentService</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.0" />
     <ProjectReference Include="..\..\src\EShopOnAbp.PaymentService.EntityFrameworkCore\EShopOnAbp.PaymentService.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\EShopOnAbp.PaymentService.TestBase\EShopOnAbp.PaymentService.TestBase.csproj" />
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.EntityFrameworkCore.Sqlite" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/services/payment/test/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp.csproj b/services/payment/test/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp.csproj
index cb80c303..af853a07 100644
--- a/services/payment/test/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp.csproj
+++ b/services/payment/test/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp/EShopOnAbp.PaymentService.HttpApi.Client.ConsoleTestApp.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>EShopOnAbp.PaymentService</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Http.Client.IdentityModel" Version="7.0.0" />
     <ProjectReference Include="..\..\src\EShopOnAbp.PaymentService.HttpApi.Client\EShopOnAbp.PaymentService.HttpApi.Client.csproj" />
   </ItemGroup>
 
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/services/payment/test/EShopOnAbp.PaymentService.TestBase/EShopOnAbp.PaymentService.TestBase.csproj b/services/payment/test/EShopOnAbp.PaymentService.TestBase/EShopOnAbp.PaymentService.TestBase.csproj
index edaa3268..5514db15 100644
--- a/services/payment/test/EShopOnAbp.PaymentService.TestBase/EShopOnAbp.PaymentService.TestBase.csproj
+++ b/services/payment/test/EShopOnAbp.PaymentService.TestBase/EShopOnAbp.PaymentService.TestBase.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>EShopOnAbp.PaymentService</RootNamespace>
   </PropertyGroup>
 
@@ -14,9 +14,9 @@
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.Authorization" Version="6.0.0" />
-    <PackageReference Include="Volo.Abp.TestBase" Version="6.0.0" />
+    <PackageReference Include="Volo.Abp.Autofac" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.Authorization" Version="7.0.0" />
+    <PackageReference Include="Volo.Abp.TestBase" Version="7.0.0" />
     <ProjectReference Include="..\..\src\EShopOnAbp.PaymentService.Domain\EShopOnAbp.PaymentService.Domain.csproj" />
   </ItemGroup>