Skip to content

Commit 4c04fbd

Browse files
committed
Merge branch 'prerel-9.0' into auto-merge/rel-8-3/3094
2 parents fb0546a + 7780f28 commit 4c04fbd

File tree

1,593 files changed

+12993
-18094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,593 files changed

+12993
-18094
lines changed
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
name: 🤠 ABP Studio
2+
description: Create a report to help us improve the ABP Studio
3+
labels: [studio]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
We welcome bug reports! This template will help us gather the information we need to start the triage process.
9+
10+
Please keep in mind that the GitHub issue tracker is not intended as a general support forum, but for reporting **non-security** bugs and feature requests.
11+
If you believe you have an issue that affects the SECURITY of the platform, please do NOT create an issue and instead email your issue details to [email protected].
12+
For other types of questions, consider using [StackOverflow](https://stackoverflow.com/questions/tagged/abp).
13+
- type: checkboxes
14+
id: searched
15+
attributes:
16+
label: Is there an existing issue for this?
17+
description: Please search to see if an issue already exists for the bug you encountered or feature request ([abp/issues](https://github.com/abpframework/abp/issues?q=is%3Aopen+is%3Aissue+label%3Astudio)).
18+
options:
19+
- label: I have searched the existing issues
20+
required: true
21+
- type: textarea
22+
id: background
23+
attributes:
24+
label: Description
25+
description: Please share a clear and concise description of the problem.
26+
placeholder: Description
27+
validations:
28+
required: true
29+
- type: markdown
30+
attributes:
31+
value: |
32+
## Setup
33+
Please provide more information on your ABP Studio setup.
34+
- type: input
35+
id: version
36+
attributes:
37+
label: Version
38+
description: Which version of ABP Studio are you using?
39+
placeholder: Version
40+
validations:
41+
required: true
42+
- type: dropdown
43+
id: Operation-System
44+
attributes:
45+
label: Operation System
46+
description: What is the operation system of the computer?
47+
options:
48+
- Windows (Default)
49+
- Linux
50+
- macOS
51+
- Others
52+
validations:
53+
required: true
54+
- type: textarea
55+
id: solution-config
56+
attributes:
57+
label: Solution Configuration
58+
description: |
59+
If there is an open solution, what are the configurations of the solution?
60+
🧐 Hint: You can see all the information about your solution from the configuration window, which opens when you right-click on the [solution](https://abp.io/docs/latest/studio/solution-explorer#solution) and click on the `Solution Configuration` button.
61+
placeholder: |
62+
- **Template**: app
63+
- **Created ABP Studio Version**: 0.7.9
64+
- **Tiered**: No
65+
- **UI Framework**: mvc
66+
- **Theme**: leptonx
67+
- **Theme Style**: system
68+
- **Database Provider**: ef
69+
- **Database Management System**: sqlserver
70+
- **Separate Tenant Schema**: No
71+
- **Mobile Framework**: none
72+
- **Public Website**: No
73+
- **Optional Modules**:
74+
* GDPR
75+
* TextTemplateManagement
76+
* LanguageManagement
77+
* AuditLogging
78+
* SaaS
79+
* OpenIddictAdmin
80+
validations:
81+
required: false
82+
- type: markdown
83+
attributes:
84+
value: |
85+
---
86+
- type: textarea
87+
id: other-info
88+
attributes:
89+
label: Other information
90+
description: |
91+
If you have an idea where the problem might lie, let us know that here. Please include any pointers to code, relevant changes, or related issues you know of.
92+
placeholder: Other information
93+
validations:
94+
required: false
File renamed without changes.
File renamed without changes.

.github/workflows/auto-pr.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
name: Merge branch prerel-9.0 with rel-8.3
1+
name: Merge branch dev with prerel-9.0
22
on:
33
push:
44
branches:
5-
- rel-8.3
5+
- prerel-9.0
66
permissions:
77
contents: read
88

99
jobs:
10-
merge-prerel-9-0-with-rel-8-3:
10+
merge-dev-with-prerel-9-0:
1111
permissions:
1212
contents: write # for peter-evans/create-pull-request to create branch
1313
pull-requests: write # for peter-evans/create-pull-request to create a PR
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
1717
with:
18-
ref: prerel-9.0
18+
ref: dev
1919
- name: Reset promotion branch
2020
run: |
21-
git fetch origin rel-8.3:rel-8.3
22-
git reset --hard rel-8.3
21+
git fetch origin prerel-9.0:prerel-9.0
22+
git reset --hard prerel-9.0
2323
- name: Create Pull Request
2424
uses: peter-evans/create-pull-request@v3
2525
with:
26-
branch: auto-merge/rel-8-3/${{github.run_number}}
27-
title: Merge branch prerel-9.0 with rel-8.3
28-
body: This PR generated automatically to merge prerel-9.0 with rel-8.3. Please review the changed files before merging to prevent any errors that may occur.
26+
branch: auto-merge/prerel-9-0/${{github.run_number}}
27+
title: Merge branch dev with prerel-9.0
28+
body: This PR generated automatically to merge dev with prerel-9.0. Please review the changed files before merging to prevent any errors that may occur.
2929
reviewers: maliming
3030
token: ${{ github.token }}
3131
- name: Merge Pull Request
3232
env:
3333
GH_TOKEN: ${{ secrets.BOT_SECRET }}
3434
run: |
35-
gh pr review auto-merge/rel-8-3/${{github.run_number}} --approve
36-
gh pr merge auto-merge/rel-8-3/${{github.run_number}} --merge --auto --delete-branch
35+
gh pr review auto-merge/prerel-9-0/${{github.run_number}} --approve
36+
gh pr merge auto-merge/prerel-9-0/${{github.run_number}} --merge --auto --delete-branch

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- uses: actions/checkout@v2
5252
- uses: actions/setup-dotnet@master
5353
with:
54-
dotnet-version: 8.0.100
54+
dotnet-version: 9.0.100-rc.2.24474.11
5555

5656
- name: chown
5757
run: |

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
## Contribution
22

3-
See the [contribution guide](docs/en/Contribution/Index.md).
3+
The contribution guide is available at [contribution guide](docs/en/contribution/index.md).

0 commit comments

Comments
 (0)