Skip to content

Commit 192a442

Browse files
gewarrengewarren
committed
resolve merge conflicts
2 parents bc147ff + e669d4a commit 192a442

File tree

10,746 files changed

+2354131
-845216
lines changed

Some content is hidden

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

10,746 files changed

+2354131
-845216
lines changed

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
/xml/System.Activities*/ @dotnet/docs
2626
/xml/System.AddIn*/ @dotnet/docs
2727
/xml/System.ComponentModel.DataAnnotations*/ @ajcvickers
28-
/xml/System.Data*/ @ajcvickers @david-engel @JRahnama
28+
/xml/System.Data*/ @ajcvickers
2929
/xml/System.Data.Odbc/ @ajcvickers
3030
/xml/System.Data.OleDb/ @ajcvickers
31-
/xml/System.Data.SqlClient/ @david-engel @JRahnama
31+
/xml/System.Data.SqlClient/ @david-engel @cheenamalhotra
3232
/xml/System.Deployment*/ @dotnet/docs
3333
/xml/System.Device*/ @dotnet/docs
3434
/xml/System.Dynamic*/ @dotnet/docs

‎.github/ISSUE_TEMPLATE/01-general-issue.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: "General feedback"
2+
description: Provide general feedback about the .NET API reference docs or a specific article.
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: Thanks for helping us improve the docs!
7+
- type: textarea
8+
id: description
9+
attributes:
10+
label: Describe the issue or suggestion
11+
description: "Note: If your issue is about a specific article, it's best to submit your feedback by clicking the 'Open a documentation issue' link in the '.NET feedback' box at the end of the article."
12+
validations:
13+
required: true

‎.github/ISSUE_TEMPLATE/z-customer-feedback.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Learn feedback control.
2+
description: |
3+
⛔ This template is hooked into the feedback control on the bottom of every page on the live site. It automatically fills in several fields for you. Don't use for other purposes. ⛔
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: "## Issue information"
8+
- type: markdown
9+
attributes:
10+
value: Select the issue type, and describe the issue in the text box below. Add as much detail as needed to help us resolve the issue.
11+
- type: dropdown
12+
id: issue-type
13+
attributes:
14+
label: Type of issue
15+
options:
16+
- Typo
17+
- Code doesn't work
18+
- Missing information
19+
- Outdated article
20+
- Thank you
21+
- Other (describe below)
22+
validations:
23+
required: true
24+
- type: textarea
25+
id: feedback
26+
validations:
27+
required: true
28+
attributes:
29+
label: Description
30+
- type: markdown
31+
attributes:
32+
value: "## 🚧 Article information 🚧"
33+
- type: markdown
34+
attributes:
35+
value: "*Don't modify the following fields*. They are automatically filled in for you. Doing so will disconnect your issue from the affected article. *Don't edit them*."
36+
- type: input
37+
id: pageUrl
38+
validations:
39+
required: true
40+
attributes:
41+
label: Page URL
42+
- type: input
43+
id: contentSourceUrl
44+
validations:
45+
required: true
46+
attributes:
47+
label: Content source URL
48+
- type: input
49+
id: documentVersionIndependentId
50+
validations:
51+
required: true
52+
attributes:
53+
label: Document Version Independent Id
54+
- type: input
55+
id: author
56+
validations:
57+
required: true
58+
attributes:
59+
label: Article author

‎.github/policies/assign-prs.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ resource: repository
55
configuration:
66
resourceManagementConfiguration:
77
eventResponderTasks:
8-
- if:
8+
- description: Assign team PRs to author
9+
if:
910
- payloadType: Pull_Request
1011
- isAction:
1112
action: Opened
@@ -15,4 +16,4 @@ configuration:
1516
then:
1617
- assignTo:
1718
author: True
18-
description: Assign team PRs to author
19+

‎.github/policies/author-action.yml‎

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,38 @@
11
name: GitOps.PullRequestIssueManagement
2-
description: Add and remove needs-author-action label to issues and PRs
2+
description: Add and remove needs-author-action label from issues and PRs, and close stale issues.
33
resource: repository
44

55
configuration:
66
resourceManagementConfiguration:
7+
scheduledSearches:
8+
- frequencies:
9+
- daily:
10+
time: 12:00
11+
filters:
12+
- isIssue
13+
- isOpen
14+
- hasLabel:
15+
label: needs-author-action
16+
- noActivitySince:
17+
days: 14
18+
actions:
19+
- addReply:
20+
reply: This issue has been automatically closed due to no response from the original author. Feel free to reopen it if you have more information that can help us investigate the issue further.
21+
- closeIssue
22+
723
eventResponderTasks:
8-
- if:
24+
- description: Needs-author-action notification
25+
if:
926
- payloadType: Issues
1027
- labelAdded:
1128
label: needs-author-action
1229
then:
1330
- addReply:
14-
reply: This issue has been marked `needs-author-action` and may be missing some important information.
15-
description: Needs-author-action notification
16-
- if:
31+
reply: >-
32+
@${issueAuthor} - This issue has been marked `needs-author-action` and might be missing some important information.
33+
34+
- description: PR reviews with "changes requested" applies the needs-author-action label
35+
if:
1736
- payloadType: Pull_Request_Review
1837
- not:
1938
activitySenderHasPermission:
@@ -25,8 +44,9 @@ configuration:
2544
then:
2645
- addLabel:
2746
label: needs-author-action
28-
description: PR reviews with "changes requested" applies the needs-author-action label
29-
- if:
47+
48+
- description: Replace `needs-author-action` label with `needs-further-triage` label when the author comments on an issue that's not "untriaged"
49+
if:
3050
- payloadType: Issue_Comment
3151
- isAction:
3252
action: Created
@@ -43,8 +63,9 @@ configuration:
4363
label: needs-further-triage
4464
- removeLabel:
4565
label: needs-author-action
46-
description: Replace `needs-author-action` label with `needs-further-triage` label when the author comments on an issue that is not still untriaged
47-
- if:
66+
67+
- description: Remove `needs-author-action` label when the author comments on an `untriaged` issue
68+
if:
4869
- payloadType: Issue_Comment
4970
- isAction:
5071
action: Created
@@ -58,8 +79,9 @@ configuration:
5879
then:
5980
- removeLabel:
6081
label: needs-author-action
61-
description: Remove `needs-author-action` label when the author comments on an `untriaged` issue
62-
- if:
82+
83+
- description: Pushing changes to PR branch removes the needs-author-action label
84+
if:
6385
- payloadType: Pull_Request
6486
- isAction:
6587
action: Synchronize
@@ -68,8 +90,9 @@ configuration:
6890
then:
6991
- removeLabel:
7092
label: needs-author-action
71-
description: Pushing changes to PR branch removes the needs-author-action label
72-
- if:
93+
94+
- description: Author commenting in PR removes the needs-author-action label
95+
if:
7396
- payloadType: Issue_Comment
7497
- isActivitySender:
7598
issueAuthor: True
@@ -81,8 +104,9 @@ configuration:
81104
then:
82105
- removeLabel:
83106
label: needs-author-action
84-
description: Author commenting in PR removes the needs-author-action label
85-
- if:
107+
108+
- description: Author responding to a PR review comment removes the needs-author-action label
109+
if:
86110
- payloadType: Pull_Request_Review
87111
- isActivitySender:
88112
issueAuthor: True
@@ -94,4 +118,3 @@ configuration:
94118
then:
95119
- removeLabel:
96120
label: needs-author-action
97-
description: Author responding to a pull request review comment removes the needs-author-action label

‎.github/policies/auto-merge.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
id:
2+
name: GitOps.PullRequestIssueManagement
3+
description: GitOps.PullRequestIssueManagement primitive
4+
owner:
5+
resource: repository
6+
disabled: false
7+
where:
8+
configuration:
9+
resourceManagementConfiguration:
10+
eventResponderTasks:
11+
- description: Approve and auto-squash-merge dependabot PRs to main labeled 'auto-merge'
12+
triggerOnOwnActions: true
13+
if:
14+
- payloadType: Pull_Request
15+
- labelAdded:
16+
label: ':octocat: auto-merge'
17+
- targetsBranch:
18+
branch: main
19+
- or:
20+
- isActivitySender:
21+
user: dotnet-policy-service[bot]
22+
then:
23+
- enableAutoMerge:
24+
mergeMethod: Squash
25+
- approvePullRequest:
26+
comment: "Approved; this PR will merge when all status checks pass."
27+
28+
- description: Auto-merge policy service bot PRs to live labeled 'auto-merge'
29+
triggerOnOwnActions: true
30+
if:
31+
- payloadType: Pull_Request
32+
- labelAdded:
33+
label: ':octocat: auto-merge'
34+
- targetsBranch:
35+
branch: live
36+
- isActivitySender:
37+
user: dotnet-policy-service[bot]
38+
then:
39+
- enableAutoMerge:
40+
mergeMethod: Merge
41+
42+
- description: Don't auto-merge PRs with 'auto-merge' label removed
43+
if:
44+
- payloadType: Pull_Request
45+
- labelRemoved:
46+
label: ':octocat: auto-merge'
47+
then:
48+
- disableAutoMerge

‎.github/policies/close-issues.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Close issues
2+
description: Close issues based on label.
3+
resource: repository
4+
where:
5+
configuration:
6+
resourceManagementConfiguration:
7+
eventResponderTasks:
8+
- description: Close issues labeled 'code-of-conduct'
9+
if:
10+
- payloadType: Issues
11+
- hasLabel:
12+
label: code-of-conduct
13+
then:
14+
- closeIssue

‎.github/policies/community-contrib.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ resource: repository
55
configuration:
66
resourceManagementConfiguration:
77
eventResponderTasks:
8-
- if:
8+
- description: Label community PRs
9+
if:
910
- payloadType: Pull_Request
1011
- isAction:
1112
action: Opened
@@ -46,4 +47,3 @@ configuration:
4647
then:
4748
- addLabel:
4849
label: community-contribution
49-
description: Label community PRs

‎.github/policies/disallow-edits.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: GitOps.PullRequestIssueManagement
2+
description: GitOps.PullRequestIssueManagement primitive
3+
resource: repository
4+
5+
configuration:
6+
resourceManagementConfiguration:
7+
eventResponderTasks:
8+
- description: Close PRs that modify files whose "source of truth" is not in this repo.
9+
if:
10+
- payloadType: Pull_Request
11+
- isAction:
12+
action: Opened
13+
- or:
14+
- filesMatchPattern:
15+
pattern: xml/Microsoft.Extensions*/*
16+
matchAny: true
17+
excludedFiles:
18+
- xml/Microsoft.Extensions.FileSystemGlobbing/*
19+
- xml/Microsoft.Extensions.FileSystemGlobbing.Abstractions/*
20+
- xml/Microsoft.Extensions.FileSystemGlobbing.Internal*/*
21+
- filesMatchPattern:
22+
matchAny: true
23+
pattern: xml/System.Composition/*
24+
- filesMatchPattern:
25+
matchAny: true
26+
pattern: xml/System.Diagnostics.EventLog.Messages/*
27+
- filesMatchPattern:
28+
matchAny: true
29+
pattern: xml/System.Formats.Asn1/*
30+
- filesMatchPattern:
31+
matchAny: true
32+
pattern: xml/System.Formats.Cbor/*
33+
- filesMatchPattern:
34+
matchAny: true
35+
pattern: xml/System.Formats.Nrbf/*
36+
- filesMatchPattern:
37+
matchAny: true
38+
pattern: xml/System.Net.ServerSentEvents/*
39+
- filesMatchPattern:
40+
matchAny: true
41+
pattern: xml/System.Numerics.Tensors/*
42+
- filesMatchPattern:
43+
matchAny: true
44+
pattern: xml/System.Runtime.Serialization.Schema/*
45+
- filesMatchPattern:
46+
matchAny: true
47+
pattern: xml/System.Runtime.Serialization/ISerializationCodeDomSurrogateProvider.xml
48+
- filesMatchPattern:
49+
matchAny: true
50+
pattern: xml/System.Runtime.Serialization/ImportOptions.xml
51+
- filesMatchPattern:
52+
matchAny: true
53+
pattern: xml/System.Runtime.Serialization/XsdDataContractExporter.xml
54+
- filesMatchPattern:
55+
matchAny: true
56+
pattern: xml/System.Speech/*
57+
then:
58+
- addReply:
59+
reply: >-
60+
@${issueAuthor} - This PR edits one or more files whose 'source of truth' for documentation is not in this repo. Please make documentation updates in the /// comments in the dotnet/runtime repo (or dotnet/extensions repo) instead.
61+
- if:
62+
- or:
63+
- activitySenderHasPermission:
64+
permission: None
65+
- activitySenderHasPermission:
66+
permission: Read
67+
then:
68+
- closePullRequest

‎.github/policies/label-prs.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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'
22+
23+

0 commit comments

Comments
 (0)