Merge branch 'master' into dev

# Conflicts: # Directory.Build.props
3 years ago · 3f4c0a33de
2 changed files with 2 additions and 2 deletions
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -3,7 +3,7 @@

    <AbpVersion>7.1.0</AbpVersion>
    <EasyAbpAbpTreesModuleVersion>2.10.0</EasyAbpAbpTreesModuleVersion>
-    <EasyAbpPaymentServiceModuleVersion>2.5.0</EasyAbpPaymentServiceModuleVersion>
+    <EasyAbpPaymentServiceModuleVersion>2.5.1</EasyAbpPaymentServiceModuleVersion>
    <EasyAbpAbpTagHelperPlusModuleVersion>1.4.0</EasyAbpAbpTagHelperPlusModuleVersion>
    <EasyAbpBookingServiceModuleVersion>0.5.0</EasyAbpBookingServiceModuleVersion>
    <DaprSdkVersion>1.9.0</DaprSdkVersion>
--- a/common.props
+++ b/common.props
@ -1,7 +1,7 @@
 <Project>
  <PropertyGroup>
    <LangVersion>latest</LangVersion>
-    <Version>3.5.0</Version>
+    <Version>3.6.0</Version>
    <NoWarn>$(NoWarn);CS1591</NoWarn>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    <Authors>EasyAbp Team</Authors>