Merge pull request #15631 from abpframework/auto-merge/rel-7-1/1705

Merge branch dev with rel-7.1

.github/workflows/auto-pr.yml

@@ -1,13 +1,13 @@
-name: Merge branch dev with rel-7.0
+name: Merge branch dev with rel-7.1
 on:
   push:
     branches:
-      - rel-7.0
+      - rel-7.1
 permissions:
   contents: read
 
 jobs:
-  merge-dev-with-rel-6-0:
+  merge-dev-with-rel-7-1:
     permissions:
       contents: write  # for peter-evans/create-pull-request to create branch
       pull-requests: write  # for peter-evans/create-pull-request to create a PR
@@ -18,13 +18,13 @@ jobs:
           ref: dev
       - name: Reset promotion branch
         run: |
-          git fetch origin rel-7.0:rel-7.0
-          git reset --hard rel-7.0
+          git fetch origin rel-7.1:rel-7.1
+          git reset --hard rel-7.1
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
-          branch: auto-merge/rel-7-0/${{github.run_number}}
-          title: Merge branch dev with rel-7.0
-          body: This PR generated automatically to merge dev with rel-7.0. Please review the changed files before merging to prevent any errors that may occur.
+          branch: auto-merge/rel-7-1/${{github.run_number}}
+          title: Merge branch dev with rel-7.1
+          body: This PR generated automatically to merge dev with rel-7.1. Please review the changed files before merging to prevent any errors that may occur.
           reviewers: ${{github.actor}}
           token: ${{ github.token }}

common.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>7.1.0</Version>
+    <Version>7.1.0-rc.1</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
     <PackageProjectUrl>https://abp.io/</PackageProjectUrl>