Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merged PR 34030: [frameshift/7.0] merge internal/release/7.0 into int…
…ernal/release/frameshift/7.0 The frameshift branch was based off the 6.0 branding commit. This commit was upmerged into the 7.0 release branch and the branch got it's history instead of the merged history. This PR just merges the 7.0 branch on top of that history
- Loading branch information
Showing
4,343 changed files
with
967,166 additions
and
774,133 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| { | ||
| "version": "1.0", | ||
| "tasks": [ | ||
| { | ||
| "taskType": "trigger", | ||
| "capabilityId": "AutoMerge", | ||
| "subCapability": "AutoMerge", | ||
| "version": "1.0", | ||
| "id": "5F9qlkCNy", | ||
| "config": { | ||
| "taskName": "Auto-merge PRs", | ||
| "label": "auto-merge", | ||
| "minMinutesOpen": "", | ||
| "mergeType": "squash", | ||
| "deleteBranches": true, | ||
| "removeLabelOnPush": true, | ||
| "requireAllStatuses": true, | ||
| "conditionalMergeTypes": [ | ||
| { | ||
| "mergeType": "merge", | ||
| "condition": { | ||
| "placeholder": "labels", | ||
| "operator": "contains", | ||
| "label_name": "type-merge forward :fast_forward:" | ||
| } | ||
| } | ||
| ], | ||
| "requireAllStatuses_exemptList": [ | ||
| "dependabot", | ||
| "codecov", | ||
| "DotNet Maestro - Int", | ||
| "Dotnet maestro", | ||
| "msftbot" | ||
| ], | ||
| "minimumNumberOfStatuses": 0 | ||
| } | ||
| }, | ||
| { | ||
| "taskType": "trigger", | ||
| "capabilityId": "IssueResponder", | ||
| "subCapability": "PullRequestResponder", | ||
| "version": "1.0", | ||
| "config": { | ||
| "conditions": { | ||
| "operator": "and", | ||
| "operands": [ | ||
| { | ||
| "name": "isAction", | ||
| "parameters": { | ||
| "action": "opened" | ||
| } | ||
| }, | ||
| { | ||
| "name": "isActivitySender", | ||
| "parameters": { | ||
| "user": "dotnet-maestro[bot]", | ||
| "association": "CONTRIBUTOR" | ||
| } | ||
| }, | ||
| { | ||
| "name": "titleContains", | ||
| "parameters": { | ||
| "titlePattern": "Update dependencies" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "eventType": "pull_request", | ||
| "eventNames": [ | ||
| "pull_request", | ||
| "issues", | ||
| "project_card" | ||
| ], | ||
| "taskName": "[Infrastructure PRs] Add area-infrastructure label to dependency update Pull Requests", | ||
| "actions": [ | ||
| { | ||
| "name": "addLabel", | ||
| "parameters": { | ||
| "label": "area-infrastructure" | ||
| } | ||
| }, | ||
| { | ||
| "name": "addLabel", | ||
| "parameters": { | ||
| "label": "type-dependency update :arrow_up_small:" | ||
| } | ||
| }, | ||
| { | ||
| "name": "approvePullRequest", | ||
| "parameters": { | ||
| "comment": "Auto-approving dependency update." | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "id": "2khUSIqMEcJ" | ||
| }, | ||
| { | ||
| "taskType": "trigger", | ||
| "capabilityId": "IssueResponder", | ||
| "subCapability": "PullRequestResponder", | ||
| "version": "1.0", | ||
| "config": { | ||
| "conditions": { | ||
| "operator": "and", | ||
| "operands": [ | ||
| { | ||
| "name": "isAction", | ||
| "parameters": { | ||
| "action": "opened" | ||
| } | ||
| }, | ||
| { | ||
| "name": "isActivitySender", | ||
| "parameters": { | ||
| "user": "dotnet-maestro-bot" | ||
| } | ||
| }, | ||
| { | ||
| "name": "titleContains", | ||
| "parameters": { | ||
| "titlePattern": "Merge branch" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "eventType": "pull_request", | ||
| "eventNames": [ | ||
| "pull_request", | ||
| "issues", | ||
| "project_card" | ||
| ], | ||
| "taskName": "[Infrastructure PRs] Add area-infrastructure label to auto-merge Pull Requests", | ||
| "actions": [ | ||
| { | ||
| "name": "addLabel", | ||
| "parameters": { | ||
| "label": "area-infrastructure" | ||
| } | ||
| }, | ||
| { | ||
| "name": "addLabel", | ||
| "parameters": { | ||
| "label": "type-merge forward :fast_forward:" | ||
| } | ||
| }, | ||
| { | ||
| "name": "approvePullRequest", | ||
| "parameters": { | ||
| "comment": "Auto-approving branch merge." | ||
| } | ||
| }, | ||
| { | ||
| "name": "addLabel", | ||
| "parameters": { | ||
| "label": "auto-merge" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "id": "T7d3xzteS9I" | ||
| } | ||
| ], | ||
| "userGroups": [] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.