Merge branch 'release' into master

# Conflicts: # common.props
EasyAbp · Jul 23, 2023 · 18c348b · 18c348b
2 parents 73cc30f + 93db1b4
commit 18c348b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - master
       - main
+      - release
 jobs:
   publish:
     runs-on: ubuntu-20.04

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
 
-        <AbpVersion>7.2.1</AbpVersion>
+        <AbpVersion>7.3.0</AbpVersion>
         <MicrosoftNetTestSdkVersion>17.2.0</MicrosoftNetTestSdkVersion>
 
     </PropertyGroup>

diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <LangVersion>latest</LangVersion>
-        <Version>3.0.0-preview.1</Version>
+        <Version>3.0.0-preview.2</Version>
         <NoWarn>$(NoWarn);CS1591</NoWarn>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Authors>EasyAbp Team</Authors>