Skip to content

Commit 2b7cf34

Browse files
Merge pull request #14 from dotnet/main
Merge main to live
2 parents 3b65f32 + acda3c0 commit 2b7cf34

File tree

5 files changed

+69
-14
lines changed

5 files changed

+69
-14
lines changed

.github/policies/auto-merge.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: GitOps.PullRequestIssueManagement
2+
description: GitOps.PullRequestIssueManagement primitive
3+
resource: repository
4+
5+
configuration:
6+
resourceManagementConfiguration:
7+
eventResponderTasks:
8+
- description: Auto-merge PRs to live labeled with auto-merge
9+
triggerOnOwnActions: true
10+
if:
11+
- payloadType: Pull_Request
12+
- labelAdded:
13+
label: ':octocat: auto-merge'
14+
- targetsBranch:
15+
branch: live
16+
then:
17+
- enableAutoMerge:
18+
mergeMethod: Merge
19+
20+
- description: Don't auto-merge PRs with auto-merge label removed
21+
if:
22+
- payloadType: Pull_Request
23+
- labelRemoved:
24+
label: ':octocat: auto-merge'
25+
then:
26+
- disableAutoMerge

.github/policies/label-prs.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: GitOps.PullRequestIssueManagement
2+
description: GitOps.PullRequestIssueManagement primitive
3+
resource: repository
4+
5+
configuration:
6+
resourceManagementConfiguration:
7+
eventResponderTasks:
8+
- description: Label publish PRs with auto-merge
9+
triggerOnOwnActions: true
10+
if:
11+
- payloadType: Pull_Request
12+
- isAction:
13+
action: Opened
14+
- isActivitySender:
15+
user: dotnet-policy-service[bot]
16+
- titleContains:
17+
pattern: Merge main into live
18+
isRegex: False
19+
then:
20+
- addLabel:
21+
label: ':octocat: auto-merge'

.github/policies/scheduled-pr.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: GitOps.PullRequestIssueManagement
2+
description: Schedule a PR from main to live
3+
resource: repository
4+
5+
configuration:
6+
resourceManagementConfiguration:
7+
scheduledSearches:
8+
- description: Push to live branch (publish)
9+
frequencies:
10+
- hourly:
11+
hour: 3
12+
filters: []
13+
actions:
14+
- createPullRequest:
15+
head: main
16+
base: live
17+
title: Merge main into live
18+
body: Please don't squash-merge this PR.

CODE_OF_CONDUCT.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
# Microsoft Open Source Code of Conduct
1+
# Code of Conduct
22

3-
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
3+
This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
44

5-
Resources:
6-
7-
- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
8-
- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
9-
- Contact [[email protected]](mailto:[email protected]) with questions or concerns
5+
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@
22

33
This repository contains the API documentation for .NET for Android. It's published at the [.NET API browser](https://learn.microsoft.com/dotnet/api).
44

5-
## Contributing
6-
7-
This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
8-
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
9-
contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
10-
115
## Legal Notices
126

137
.NET Foundation and any contributors grant you a license to the .NET Foundation documentation and other content
@@ -20,7 +14,7 @@ may be either trademarks or registered trademarks of Microsoft in the United Sta
2014
The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks.
2115
Microsoft's general trademark guidelines can be found at http://go.microsoft.com/fwlink/?LinkID=254653.
2216

23-
Privacy information can be found at https://privacy.microsoft.com/en-us/
17+
Privacy information can be found at https://privacy.microsoft.com/en-us/.
2418

2519
.NET Foundation and any contributors reserve all other rights, whether under their respective copyrights, patents,
2620
or trademarks, whether by implication, estoppel or otherwise.

0 commit comments

Comments
 (0)