From dc259081cbd81453a4efbea837fcd0e563b869c8 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:46:23 +0300 Subject: [PATCH 1/4] Update version to release 8.0.0-rc.1 --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index b39a45b734..1ae93147e6 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 8.0.0 + 8.0.0-rc.1 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ From 1ec580ef121742cbfd967951418f0b1f1aa9ea4d Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 21 Nov 2023 10:50:04 +0800 Subject: [PATCH 2/4] Update `auto-pr` for `rel-8.0`. --- .github/workflows/auto-pr.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 98a0c7f62e..02747e1651 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,13 +1,13 @@ -name: Merge branch dev with rel-7.4 +name: Merge branch dev with rel-8.0 on: push: branches: - - rel-7.4 + - rel-8.0 permissions: contents: read jobs: - merge-dev-with-rel-7-4: + merge-dev-with-rel-8-0: 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,19 +18,19 @@ jobs: ref: dev - name: Reset promotion branch run: | - git fetch origin rel-7.4:rel-7.4 - git reset --hard rel-7.4 + git fetch origin rel-8.0:rel-8.0 + git reset --hard rel-8.0 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-7-4/${{github.run_number}} - title: Merge branch dev with rel-7.4 - body: This PR generated automatically to merge dev with rel-7.4. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/rel-8-0/${{github.run_number}} + title: Merge branch dev with rel-8.0 + body: This PR generated automatically to merge dev with rel-8.0. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }} - name: Merge Pull Request env: GH_TOKEN: ${{ secrets.BOT_SECRET }} run: | - gh pr review auto-merge/rel-7-4/${{github.run_number}} --approve - gh pr merge auto-merge/rel-7-4/${{github.run_number}} --merge --delete-branch \ No newline at end of file + gh pr review auto-merge/rel-8-0/${{github.run_number}} --approve + gh pr merge auto-merge/rel-8-0/${{github.run_number}} --merge --delete-branch From 7800f11eeaacdd1f6e03183db4fed2c3ca132e17 Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 21 Nov 2023 13:30:18 +0800 Subject: [PATCH 3/4] Update `Npgsql.EntityFrameworkCore.PostgreSQL` to `8.0`. --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index abdbbb6666..540c7f109d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -107,7 +107,7 @@ - + From 0a248f75df20b0e6b407485318682e4e4261777b Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 21 Nov 2023 13:31:12 +0800 Subject: [PATCH 4/4] Update Abp-8_0.md --- docs/en/Migration-Guides/Abp-8_0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Migration-Guides/Abp-8_0.md b/docs/en/Migration-Guides/Abp-8_0.md index 796a400a2e..9285858501 100644 --- a/docs/en/Migration-Guides/Abp-8_0.md +++ b/docs/en/Migration-Guides/Abp-8_0.md @@ -244,7 +244,7 @@ You can see the following list of NuGet libraries that have been upgraded with . | NSubstitute | 4.3.0 | 5.1.0 | | NuGet.Versioning | 5.11.0 | 6.7.0 | | NUglify | 1.20.0 | 1.21.0 | -| Npgsql.EntityFrameworkCore.PostgreSQL | 7.0.0 | 8.0.0-rc.2 | +| Npgsql.EntityFrameworkCore.PostgreSQL | 7.0.0 | 8.0.0 | | NSubstitute.Analyzers.CSharp | 1.0.15 | 1.0.16 | | Octokit | 0.50.0 | 9.0.0 | | OpenIddict.Abstractions | 4.8.0 | 4.10.0 |