Skip to content

Commit

Permalink
Merge pull request #1838 from dotnet/main
Browse files Browse the repository at this point in the history
Merge main into live
  • Loading branch information
gewarren authored Jun 3, 2024
2 parents a27abc5 + 0cd4e0d commit 2809740
Show file tree
Hide file tree
Showing 7 changed files with 223 additions and 153 deletions.
41 changes: 41 additions & 0 deletions .github/policies/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
id:
name: GitOps.PullRequestIssueManagement
description: GitOps.PullRequestIssueManagement primitive
owner:
resource: repository
disabled: false
where:
configuration:
resourceManagementConfiguration:
eventResponderTasks:
- description: Auto-squash-merge PRs to main labeled with auto-merge
triggerOnOwnActions: true
if:
- payloadType: Pull_Request
- labelAdded:
label: ':octocat: auto-merge'
- targetsBranch:
branch: main
then:
- enableAutoMerge:
mergeMethod: Squash

- description: Auto-merge PRs to live labeled with auto-merge
triggerOnOwnActions: true
if:
- payloadType: Pull_Request
- labelAdded:
label: ':octocat: auto-merge'
- targetsBranch:
branch: live
then:
- enableAutoMerge:
mergeMethod: Merge

- description: Don't auto-merge PRs with auto-merge label removed
if:
- payloadType: Pull_Request
- labelRemoved:
label: ':octocat: auto-merge'
then:
- disableAutoMerge
23 changes: 0 additions & 23 deletions .github/policies/good-first-issue.yml

This file was deleted.

65 changes: 65 additions & 0 deletions .github/policies/label-issues.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
id:
name: GitOps.PullRequestIssueManagement
description: GitOps.PullRequestIssueManagement primitive
owner:
resource: repository
disabled: false
where:
configuration:
resourceManagementConfiguration:
scheduledSearches:
- description: Label doc-bug issues with okr-health (scheduled search)
frequencies:
- hourly:
hour: 3
filters:
- isIssue
- isOpen
- hasLabel:
label: doc-bug
- isNotLabeledWith:
label: okr-health
actions:
- addLabel:
label: okr-health

eventResponderTasks:
- description: Label issues with okr-health (event-based)
if:
- payloadType: Issues
- or:
- hasLabel:
label: doc-bug
- titleContains:
pattern: freshness
isRegex: False
- titleContains:
pattern: out( |-)of( |-)date
isRegex: True
then:
- addLabel:
label: okr-health

- description: Add in-pr label to issues
if:
- payloadType: Pull_Request
then:
- inPrLabel:
label: in-pr

- description: Label typo issues
if:
- payloadType: Issues
- isAction:
action: Opened
- titleContains:
pattern: (T|t)ypo
isRegex: True
then:
- addLabel:
label: doc-bug
- addLabel:
label: help wanted
- addLabel:
label: good first issue

95 changes: 95 additions & 0 deletions .github/policies/label-prs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
id:
name: GitOps.PullRequestIssueManagement
description: GitOps.PullRequestIssueManagement primitive
owner:
resource: repository
disabled: false
where:
configuration:
resourceManagementConfiguration:
eventResponderTasks:
- description: Label community PRs
if:
- payloadType: Pull_Request
- isAction:
action: Opened
- and:
- not:
activitySenderHasPermission:
permission: Admin
- not:
activitySenderHasPermission:
permission: Write
- not:
isActivitySender:
user: github-actions[bot]
issueAuthor: False
- not:
isActivitySender:
user: github-actions
issueAuthor: False
- not:
isActivitySender:
user: azure-sdk
issueAuthor: False
- not:
isActivitySender:
user: dependabot
issueAuthor: False
then:
- addLabel:
label: community-contribution

- description: Label publish PRs from dotnet-policy-service bot
triggerOnOwnActions: true
if:
- payloadType: Pull_Request
- isAction:
action: Opened
- isActivitySender:
user: dotnet-policy-service[bot]
- titleContains:
pattern: Merge main into live
isRegex: False
then:
- addLabel:
label: ':octocat: auto-merge'

- description: Label PRs from the Azure SDK bot
if:
- payloadType: Pull_Request
- isActivitySender:
user: azure-sdk
then:
- approvePullRequest:
comment: "Approved; this PR will merge when all status checks pass."
- addLabel:
label: ':octocat: auto-merge'

- description: Label PRs with okr-health
if:
- payloadType: Pull_Request
- or:
- titleContains:
pattern: build warning
isRegex: False
- bodyContains:
pattern: build warning
isRegex: False
then:
- addLabel:
label: okr-health

- description: Label PRs with okr-freshness
if:
- payloadType: Pull_Request
- or:
- titleContains:
pattern: freshness
isRegex: False
- bodyContains:
pattern: freshness
isRegex: False
then:
- addLabel:
label: okr-freshness
129 changes: 0 additions & 129 deletions .github/policies/resourceManagement.yml

This file was deleted.

21 changes: 21 additions & 0 deletions .github/policies/scheduled-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
id:
name: GitOps.PullRequestIssueManagement
description: GitOps.PullRequestIssueManagement primitive
owner:
resource: repository
disabled: false
where:
configuration:
resourceManagementConfiguration:
scheduledSearches:
- description: Push to live branch (scheduled publish)
frequencies:
- daily:
time: 08:0
filters: []
actions:
- createPullRequest:
head: main
base: live
title: Merge main into live
body: Please don't squash-merge this PR.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The following example shows how to bind to a method using <xref:System.Windows.D

The converter `DoubleToString` takes a double and turns it into a string in the <xref:System.Windows.Data.IValueConverter.Convert%2A> direction (from the binding source to binding target, which is the <xref:System.Windows.Controls.TextBox.Text%2A> property) and converts a `string` to a `double` in the <xref:System.Windows.Data.IValueConverter.ConvertBack%2A> direction.

The `InvalidationCharacterRule` is a <xref:System.Windows.Controls.ValidationRule> that checks for invalid characters. The default error template, which is a red border around the <xref:System.Windows.Controls.TextBox>, appears to notify users when the input value is not a double value.
The `InvalidCharacterRule` is a <xref:System.Windows.Controls.ValidationRule> that checks for invalid characters. The default error template, which is a red border around the <xref:System.Windows.Controls.TextBox>, appears to notify users when the input value is not a double value.

## See also

Expand Down

0 comments on commit 2809740

Please sign in to comment.