tsai
/
EShop
mirror of https://github.com/EasyAbp/EShop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into dev 

# Conflicts:
#	Directory.Build.props
pull/251/head
gdlcf88 3 years ago
parent
46ab9be41b bf91d41131
commit
3f4c0a33de
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Directory.Build.props
  2. 2
      common.props

2
Directory.Build.props
View File

@ -3,7 +3,7 @@
<AbpVersion>7.1.0</AbpVersion> <AbpVersion>7.1.0</AbpVersion>
<EasyAbpAbpTreesModuleVersion>2.10.0</EasyAbpAbpTreesModuleVersion> <EasyAbpAbpTreesModuleVersion>2.10.0</EasyAbpAbpTreesModuleVersion>
<EasyAbpPaymentServiceModuleVersion>2.5.0</EasyAbpPaymentServiceModuleVersion> <EasyAbpPaymentServiceModuleVersion>2.5.1</EasyAbpPaymentServiceModuleVersion>
<EasyAbpAbpTagHelperPlusModuleVersion>1.4.0</EasyAbpAbpTagHelperPlusModuleVersion> <EasyAbpAbpTagHelperPlusModuleVersion>1.4.0</EasyAbpAbpTagHelperPlusModuleVersion>
<EasyAbpBookingServiceModuleVersion>0.5.0</EasyAbpBookingServiceModuleVersion> <EasyAbpBookingServiceModuleVersion>0.5.0</EasyAbpBookingServiceModuleVersion>
<DaprSdkVersion>1.9.0</DaprSdkVersion> <DaprSdkVersion>1.9.0</DaprSdkVersion>

2
common.props
View File

@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Version>3.5.0</Version> <Version>3.6.0</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn> <NoWarn>$(NoWarn);CS1591</NoWarn>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>EasyAbp Team</Authors> <Authors>EasyAbp Team</Authors>

Write Preview
Loading…
Cancel
Save