From f5c71705c526af8704cdea0addbfa422f0bf549a Mon Sep 17 00:00:00 2001
From: gdlcf88 <gdlcf88@outlook.com>
Date: Mon, 18 Jan 2021 22:42:32 +0800
Subject: [PATCH] Upgrade PaymentService module to version 1.10.0

---
 common.props                                                | 2 +-
 .../EasyAbp.EShop.Payments.Application.Contracts.csproj     | 2 +-
 .../EasyAbp.EShop.Payments.Domain.Shared.csproj             | 2 +-
 .../EShopSample.Application.Contracts.csproj                | 6 +++---
 .../EShopSample.Application/EShopSample.Application.csproj  | 6 +++---
 .../EShopSample.Domain.Shared.csproj                        | 6 +++---
 .../src/EShopSample.Domain/EShopSample.Domain.csproj        | 6 +++---
 .../EShopSample.EntityFrameworkCore.csproj                  | 6 +++---
 .../EShopSample.HttpApi.Client.csproj                       | 6 +++---
 .../src/EShopSample.HttpApi/EShopSample.HttpApi.csproj      | 6 +++---
 .../aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj  | 6 +++---
 11 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/common.props b/common.props
index 3cf8d324..5b4754ef 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.1.0</Version>
+    <Version>2.1.1</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>
diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj
index fc53792a..a4ab86ea 100644
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Application.Contracts/EasyAbp.EShop.Payments.Application.Contracts.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="1.8.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="1.10.0" />
     <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Authorization" Version="$(AbpVersion)" />    
     <ProjectReference Include="..\EasyAbp.EShop.Payments.Domain.Shared\EasyAbp.EShop.Payments.Domain.Shared.csproj" />
diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj
index a94f02a3..3aa52383 100644
--- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj
+++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Domain.Shared/EasyAbp.EShop.Payments.Domain.Shared.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Volo.Abp.Validation" Version="$(AbpVersion)" />
-    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="1.8.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="1.10.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj
index 5df57748..7389eef3 100644
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Application.Contracts/EShopSample.Application.Contracts.csproj
@@ -15,9 +15,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Application.Contracts" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application.Contracts" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Application.Contracts" Version="1.8.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Application.Contracts" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application.Contracts" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Application.Contracts" Version="1.10.0" />
     <PackageReference Include="Volo.Abp.ObjectExtending" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="$(AbpVersion)" />
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj
index a6c351d5..eb9a0dc3 100644
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Application/EShopSample.Application.csproj
@@ -17,9 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Application" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Application" Version="1.8.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Application" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Application" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Application" Version="1.10.0" />
     <PackageReference Include="Volo.Abp.Account.Application" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Identity.Application" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="$(AbpVersion)" />
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj
index e77ab454..ae898602 100644
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/EShopSample.Domain.Shared.csproj
@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain.Shared" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Domain.Shared" Version="1.8.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Domain.Shared" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain.Shared" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Domain.Shared" Version="1.10.0" />
     <PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.IdentityServer.Domain.Shared" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="$(AbpVersion)" />
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj
index dcfbec87..e31bd731 100644
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSample.Domain.csproj
@@ -15,9 +15,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.Domain" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Domain" Version="1.8.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Domain" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Domain" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Domain" Version="1.10.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" />
     <PackageReference Include="Volo.Abp.Identity.Domain" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="$(AbpVersion)" />
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj
index 9a7c24e7..ffb6f2ac 100644
--- a/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.EntityFrameworkCore/EShopSample.EntityFrameworkCore.csproj
@@ -12,9 +12,9 @@
     <ProjectReference Include="..\..\..\..\..\plugins\Baskets\src\EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore\EasyAbp.EShop.Plugins.Baskets.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\..\..\..\plugins\Coupons\src\EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore\EasyAbp.EShop.Plugins.Coupons.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\EShopSample.Domain\EShopSample.Domain.csproj" />
-    <PackageReference Include="EasyAbp.PaymentService.EntityFrameworkCore" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.EntityFrameworkCore" Version="1.8.0" />
+    <PackageReference Include="EasyAbp.PaymentService.EntityFrameworkCore" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.EntityFrameworkCore" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.EntityFrameworkCore" Version="1.10.0" />
     <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj
index 8eefd390..263faee1 100644
--- a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi.Client/EShopSample.HttpApi.Client.csproj
@@ -15,9 +15,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.HttpApi.Client" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi.Client" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.HttpApi.Client" Version="1.8.0" />
+    <PackageReference Include="EasyAbp.PaymentService.HttpApi.Client" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi.Client" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.HttpApi.Client" Version="1.10.0" />
     <PackageReference Include="Volo.Abp.Account.HttpApi.Client" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Identity.HttpApi.Client" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi.Client" Version="$(AbpVersion)" />
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj
index 7d8cc0c1..cdb0328e 100644
--- a/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.HttpApi/EShopSample.HttpApi.csproj
@@ -15,9 +15,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyAbp.PaymentService.HttpApi" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.HttpApi" Version="1.8.0" />
+    <PackageReference Include="EasyAbp.PaymentService.HttpApi" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.HttpApi" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.HttpApi" Version="1.10.0" />
     <PackageReference Include="Volo.Abp.Account.HttpApi" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Identity.HttpApi" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="$(AbpVersion)" />
diff --git a/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj b/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj
index 9d74651e..ec812cf2 100644
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Web/EShopSample.Web.csproj
@@ -50,9 +50,9 @@
     <ProjectReference Include="..\EShopSample.Application\EShopSample.Application.csproj" />
     <ProjectReference Include="..\EShopSample.HttpApi\EShopSample.HttpApi.csproj" />
     <ProjectReference Include="..\EShopSample.EntityFrameworkCore.DbMigrations\EShopSample.EntityFrameworkCore.DbMigrations.csproj" />
-    <PackageReference Include="EasyAbp.PaymentService.Web" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Web" Version="1.8.0" />
-    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Web" Version="1.8.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Web" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.WeChatPay.Web" Version="1.10.0" />
+    <PackageReference Include="EasyAbp.PaymentService.Prepayment.Web" Version="1.10.0" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="$(AbpVersion)" />