Skip to content

Commit

Permalink
Merge branch 'rel-7.0' into auto-merge/rel-6-0/1809
Browse files Browse the repository at this point in the history
  • Loading branch information
maliming authored Mar 20, 2023
2 parents 8defc1b + 6f82b6b commit 050a11d
Show file tree
Hide file tree
Showing 4,692 changed files with 317,250 additions and 85,491 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
25 changes: 0 additions & 25 deletions .github/ISSUE_TEMPLATE

This file was deleted.

148 changes: 148 additions & 0 deletions .github/ISSUE_TEMPLATE/01_bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
name: 🐞 Bug Report
description: Create a report to help us improve
labels: [bug]
body:
- type: markdown
attributes:
value: |
We welcome bug reports! This template will help us gather the information we need to start the triage process.
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.
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].
For other types of questions, consider using [StackOverflow](https://stackoverflow.com/questions/tagged/abp).
- type: checkboxes
id: searched
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered ([abp/issues](https://github.com/abpframework/abp/issues)).
options:
- label: I have searched the existing issues
required: true
- type: textarea
id: background
attributes:
label: Description
description: Please share a clear and concise description of the problem.
placeholder: Description
validations:
required: true
- type: textarea
id: repro-steps
attributes:
label: Reproduction Steps
description: |
Please include minimal steps to reproduce the problem if possible. E.g.: the smallest possible code snippet; or a small project, with steps to run it. If possible include text as text rather than screenshots (so it shows up in searches).
placeholder: Minimal Reproduction
validations:
required: false
- type: textarea
id: expected-behavior
attributes:
label: Expected behavior
description: |
Provide a description of the expected behavior.
placeholder: Expected behavior
validations:
required: false
- type: textarea
id: actual-behavior
attributes:
label: Actual behavior
description: |
Provide a description of the actual behavior observed. If applicable please include any error messages, exception stacktraces or memory dumps.
placeholder: Actual behavior
validations:
required: false
- type: textarea
id: regression
attributes:
label: Regression?
description: |
Did this work in a previous build or release of ABP framework? If you can try a previous release or build to find out, that can help us narrow down the problem. If you don't know, that's OK.
placeholder: Regression?
validations:
required: false
- type: textarea
id: known-workarounds
attributes:
label: Known Workarounds
description: |
Please provide a description of any known workarounds.
placeholder: Known Workarounds
validations:
required: false
- type: markdown
attributes:
value: |
## Configuration
Please provide more information on your ABP configuration.
- type: input
id: version
attributes:
label: Version
description: Which version of ABP is the code running on?
placeholder: Version
validations:
required: true
- type: dropdown
id: user-interface
attributes:
label: User Interface
description: Which user interface of ABP is related to the problem?
options:
- Common (Default)
- MVC
- Angular
- Blazor
- Blazor Server
- React Native
- MAUI
validations:
required: true
- type: dropdown
id: database-provider
attributes:
label: Database Provider
description: Which database provider of ABP is used?
options:
- EF Core (Default)
- MongoDB
- None/Others
validations:
required: true
- type: dropdown
id: structure
attributes:
label: Tiered or separate authentication server
description: Which structure of ABP is specified?
options:
- None (Default)
- Tiered
- Separate Auth Server
validations:
required: true
- type: dropdown
id: Operation-System
attributes:
label: Operation System
description: What is the operation system of the server?
options:
- Windows (Default)
- Linux
- macOS
- Others
validations:
required: true
- type: markdown
attributes:
value: |
---
- type: textarea
id: other-info
attributes:
label: Other information
description: |
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.
placeholder: Other information
validations:
required: false
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/02_feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: 💡 Feature request
description: Suggest an idea for this project
labels: [feature]
body:
- type: checkboxes
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the feature you are requesting. (https://github.com/abpframework/abp/issues).
options:
- label: I have searched the existing issues
required: true
- type: textarea
attributes:
label: Is your feature request related to a problem? Please describe the problem.
description: A clear and concise description of what the problem is.
placeholder: I am trying to do [...] but [...]
validations:
required: false
- type: textarea
attributes:
label: Describe the solution you'd like
description: |
A clear and concise description of what you want to happen. Include any alternative solutions you've considered.
placeholder: I would like to see [...]
validations:
required: true
- type: textarea
attributes:
label: Additional context
description: |
Add any other context or screenshots about the feature request here.
placeholder: Add any other context or screenshots about the feature request here.
validations:
required: false
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/03_article_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: 💎 Article request
description: Article suggestion you want to be published on community.abp.io
labels: [community-article-request]
body:
- type: checkboxes
id: searched
attributes:
label: Is there an existing article or article request for this?
description: Please search to see if there is an article or article request related to your article request ([community.abp.io](https://community.abp.io/posts), [abp/issues](https://github.com/abpframework/abp/issues?q=is%3Aopen+is%3Aissue+label%3Acommunity-article-request))
options:
- label: I have searched the existing resources
required: true
- type: textarea
attributes:
label: Describe the article you'd like
description: |
Please describe the article you'd like to be published on community.abp.io.
If you have any reference article, please share it here.
validations:
required: true
49 changes: 49 additions & 0 deletions .github/ISSUE_TEMPLATE/04_performance_issue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
---
name: Performance issue
about: Report a performance problem or regression
title: ''
labels: 'problem'
assignees: ''

---

<!--This is just a template - feel free to delete any and all of it and replace as appropriate.-->

### Description

<!--
* Please share a clear and concise description of the performance problem.
* Include minimal steps to reproduce the problem if possible. E.g.: the smallest possible code snippet; or a small repo to clone, with steps to run it.
-->

### Configuration

<!--
(If you are posting Benchmark.NET results, this info will be included.)
* Which version of .NET is the code running on?
* What OS version, and what distro if applicable?
* What is the architecture (x64, x86, ARM, ARM64)?
* If relevant, what are the specs of the machine?
-->

### Regression?

<!--
* Did this work in a previous build or release of ABP framework? If you can try a previous release or build to find out, that can help us narrow down the problem. If you don't know, that's OK.
-->

### Data

<!--
* Please include any benchmark results, images of graphs, timings or measurements, or callstacks that are relevant.
* If possible please include text as text rather than images (so it shows up in searches).
* If applicable please include before and after measurements.
-->

### Analysis

<!--
* 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.
* If you don't know, you can delete this section.
-->
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/05_blank_issue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Blank issue
about: Something that doesn't fit the other categories
title: ''
labels: ''
assignees: ''

---

### Documentation

Please check the official documentation before asking questions: https://docs.abp.io

### GitHub Issues

GitHub issues are for bug reports, feature requests, and other discussions about the framework.

If you're creating a bug/problem report, please include the followings:

* Your **ABP Framework version**.
* Your **User Interface** type (Angular/MVC/React... etc.) if the issue is related to a specific UI
* Your database provider(EF Core/MongoDB)
* Exception message and **stack trace** if available (check the logs).
* Steps needed to **reproduce** the problem.

Please **write in English**.

### Stack Overflow

Please use Stack Overflow for your questions about using the framework, templates, and samples:

https://stackoverflow.com/questions/tagged/abp

Use **abp** tag in your questions.
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: true
contact_links:
- name: Issue with ABP Commercial
url: https://support.abp.io/QA/Questions
about: Please open issues relating to ABP Commercial in support.abp.io.
- name: Ask a question (community support)
url: https://stackoverflow.com/questions/tagged/abp
about: Ask a question that will be answered by the ABP community
3 changes: 0 additions & 3 deletions .github/ISSUE_TEMPLATES/community-post-request.md

This file was deleted.

1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATES/feature.md

This file was deleted.

18 changes: 9 additions & 9 deletions .github/workflows/auto-pr.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
name: Merge branch rel-7.0 with rel-6.0
name: Merge branch rel-7.1 with rel-7.0
on:
push:
branches:
- rel-6.0
- rel-7.0
permissions:
contents: read

jobs:
merge-dev-with-rel-6-0:
merge-rel-7-1-with-rel-7-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
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: rel-7.0
ref: rel-7.1
- name: Reset promotion branch
run: |
git fetch origin rel-6.0:rel-6.0
git reset --hard rel-6.0
git fetch origin rel-7.0:rel-7.0
git reset --hard rel-7.0
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
branch: auto-merge/rel-6-0/${{github.run_number}}
title: Merge branch rel-7.0 with rel-6.0
body: This PR generated automatically to merge rel-7.0 with rel-6.0. Please review the changed files before merging to prevent any errors that may occur.
branch: auto-merge/rel-7-0/${{github.run_number}}
title: Merge branch rel-7.1 with rel-7.0
body: This PR generated automatically to merge rel-7.1 with rel-7.0. Please review the changed files before merging to prevent any errors that may occur.
reviewers: ${{github.actor}}
token: ${{ github.token }}
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-dotnet@master
with:
dotnet-version: 6.0.100
dotnet-version: 7.0.100

- name: Build All
run: .\build-all.ps1 -f
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ name: Pull request labeler
on:
schedule:
- cron: '0 12 */1 * *'
permissions:
contents: read
jobs:
labeler:
permissions:
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: paulfantom/periodic-labeler@master
Expand Down
Loading

0 comments on commit 050a11d

Please sign in to comment.