Skip to content

Commit

Permalink
Merge branch 'main' into vm-empty-struct-passing
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkotas
jkotas authored Aug 9, 2024
2 parents 3985f11 + aa3825e commit 88815d2
Show file tree
Hide file tree
Showing 669 changed files with 29,317 additions and 17,905 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "9.0.0-prerelease.24317.3",
"version": "9.0.0-prerelease.24405.1",
"commands": [
"xharness"
]
Expand Down
280 changes: 126 additions & 154 deletions .github/policies/resourceManagement.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1636,42 +1636,68 @@ configuration:
Tagging @dotnet/compat for awareness of the breaking change.
description: Add breaking change doc label to PR
- if:
- payloadType: Pull_Request
- or:
- filesMatchPattern:
pattern: .*ILLink.*
- filesMatchPattern:
pattern: .*illink.*
- not:
hasLabel:
label: linkable-framework
- isPullRequest
- isOpen
then:
- addLabel:
label: linkable-framework
description: '[Linkable-framework workgroup] Add linkable-framework label to new Prs that touch files with *ILLink* that not have it already'
- if:
- payloadType: Pull_Request
- or:
- filesMatchPattern:
pattern: .*ILLink.*
- filesMatchPattern:
pattern: .*illink.*
- not:
hasLabel:
label: linkable-framework
- isPullRequest
- isOpen
- isAction:
action: Synchronize
then:
- addLabel:
label: linkable-framework
description: '[Linkable-framework workgroup] Add linkable-framework label to Prs that get changes pushed where they touch *ILLInk* files'
- if:
- or:
- payloadType: Issues
- payloadType: Pull_Request
- isAction:
action: Opened
- labelAdded:
label: linkable-framework
then:
- if:
- hasLabel:
label: linkable-framework
then:
- mentionUsers:
mentionees:
- eerhardt
- vitek-karas
- LakshanF
- sbomer
- joperezr
- marek-safar
replyTemplate: >-
Tagging subscribers to 'linkable-framework': ${mentionees}
See info in area-owners.md if you want to be subscribed.
assignMentionees: False
- mentionUsers:
mentionees:
- eerhardt
- vitek-karas
- LakshanF
- sbomer
- joperezr
- marek-safar
replyTemplate: >-
Tagging subscribers to 'linkable-framework': ${mentionees}
See info in [area-owners.md](https://github.com/dotnet/runtime/blob/main/docs/area-owners.md) if you want to be subscribed.
assignMentionees: False
description: '@Mention for linkable-framework'
- if:
- or:
- payloadType: Issues
- payloadType: Pull_Request
- isAction:
action: Opened
- labelAdded:
label: size-reduction
then:
- if:
- hasLabel:
label: size-reduction
then:
- mentionUsers:
mentionees:
- eerhardt
Expand All @@ -1680,110 +1706,104 @@ configuration:
replyTemplate: >-
Tagging subscribers to 'size-reduction': ${mentionees}
See info in area-owners.md if you want to be subscribed.
See info in [area-owners.md](https://github.com/dotnet/runtime/blob/main/docs/area-owners.md) if you want to be subscribed.
assignMentionees: False
description: '@Mention for size-reduction'
- if:
- or:
- payloadType: Issues
- payloadType: Pull_Request
- isAction:
action: Opened
- labelAdded:
label: arch-wasm
then:
- if:
- hasLabel:
label: arch-wasm
then:
- mentionUsers:
mentionees:
- lewing
replyTemplate: >-
Tagging subscribers to 'arch-wasm': ${mentionees}
See info in area-owners.md if you want to be subscribed.
assignMentionees: False
description: '@Mention for wasm'
- mentionUsers:
mentionees:
- lewing
replyTemplate: >-
Tagging subscribers to 'arch-wasm': ${mentionees}
See info in [area-owners.md](https://github.com/dotnet/runtime/blob/main/docs/area-owners.md) if you want to be subscribed.
assignMentionees: False
description: '@Mention for arch-wasm'
- if:
- or:
- payloadType: Issues
- payloadType: Pull_Request
- isAction:
action: Opened
- labelAdded:
label: os-ios
then:
- if:
- hasLabel:
label: os-ios
then:
- mentionUsers:
mentionees:
- vitek-karas
- kotlarmilos
- ivanpovazan
- steveisok
- akoeplinger
replyTemplate: >-
Tagging subscribers to 'os-ios': ${mentionees}
See info in area-owners.md if you want to be subscribed.
assignMentionees: False
description: '@Mention for ios'
- mentionUsers:
mentionees:
- vitek-karas
- kotlarmilos
- ivanpovazan
- steveisok
- akoeplinger
replyTemplate: >-
Tagging subscribers to 'os-ios': ${mentionees}
See info in [area-owners.md](https://github.com/dotnet/runtime/blob/main/docs/area-owners.md) if you want to be subscribed.
assignMentionees: False
description: '@Mention for os-ios'
- if:
- or:
- payloadType: Issues
- payloadType: Pull_Request
- isAction:
action: Opened
- labelAdded:
label: os-android
then:
- if:
- hasLabel:
label: os-android
then:
- mentionUsers:
mentionees:
- vitek-karas
- simonrozsival
- steveisok
- akoeplinger
replyTemplate: >-
Tagging subscribers to 'arch-android': ${mentionees}
See info in area-owners.md if you want to be subscribed.
assignMentionees: False
description: '@Mention for android'
- mentionUsers:
mentionees:
- vitek-karas
- simonrozsival
- steveisok
- akoeplinger
replyTemplate: >-
Tagging subscribers to 'arch-android': ${mentionees}
See info in [area-owners.md](https://github.com/dotnet/runtime/blob/main/docs/area-owners.md) if you want to be subscribed.
assignMentionees: False
description: '@Mention for os-android'
- if:
- payloadType: Pull_Request
- or:
- filesMatchPattern:
pattern: .*ILLink.*
- filesMatchPattern:
pattern: .*illink.*
- not:
hasLabel:
label: linkable-framework
- isPullRequest
- isOpen
- payloadType: Issues
- payloadType: Pull_Request
- labelAdded:
label: os-tvos
then:
- addLabel:
label: linkable-framework
description: '[Linkable-framework workgroup] Add linkable-framework label to new Prs that touch files with *ILLink* that not have it already'
- mentionUsers:
mentionees:
- vitek-karas
- kotlarmilos
- ivanpovazan
- steveisok
- akoeplinger
replyTemplate: >-
Tagging subscribers to 'os-tvos': ${mentionees}
See info in [area-owners.md](https://github.com/dotnet/runtime/blob/main/docs/area-owners.md) if you want to be subscribed.
assignMentionees: False
description: '@Mention for os-tvos'
- if:
- payloadType: Pull_Request
- or:
- filesMatchPattern:
pattern: .*ILLink.*
- filesMatchPattern:
pattern: .*illink.*
- not:
hasLabel:
label: linkable-framework
- isPullRequest
- isOpen
- isAction:
action: Synchronize
- payloadType: Issues
- payloadType: Pull_Request
- labelAdded:
label: os-maccatalyst
then:
- addLabel:
label: linkable-framework
description: '[Linkable-framework workgroup] Add linkable-framework label to Prs that get changes pushed where they touch *ILLInk* files'
- mentionUsers:
mentionees:
- vitek-karas
- kotlarmilos
- ivanpovazan
- steveisok
- akoeplinger
replyTemplate: >-
Tagging subscribers to 'os-maccatalyst': ${mentionees}
See info in [area-owners.md](https://github.com/dotnet/runtime/blob/main/docs/area-owners.md) if you want to be subscribed.
assignMentionees: False
description: '@Mention for os-maccatalyst'
- if:
- payloadType: Issues
- labelAdded:
Expand All @@ -1798,54 +1818,6 @@ configuration:
- addLabel:
label: no-recent-activity
description: Manual Issue Cleanup
- if:
- or:
- payloadType: Issues
- payloadType: Pull_Request
- isAction:
action: Opened
then:
- if:
- hasLabel:
label: os-tvos
then:
- mentionUsers:
mentionees:
- vitek-karas
- kotlarmilos
- ivanpovazan
- steveisok
- akoeplinger
replyTemplate: >-
Tagging subscribers to 'os-tvos': ${mentionees}
See info in area-owners.md if you want to be subscribed.
assignMentionees: False
description: '@Mention for tvos'
- if:
- or:
- payloadType: Issues
- payloadType: Pull_Request
- isAction:
action: Opened
then:
- if:
- hasLabel:
label: os-maccatalyst
then:
- mentionUsers:
mentionees:
- vitek-karas
- kotlarmilos
- ivanpovazan
- steveisok
- akoeplinger
replyTemplate: >-
Tagging subscribers to 'os-maccatalyst': ${mentionees}
See info in area-owners.md if you want to be subscribed.
assignMentionees: False
description: '@Mention for maccatalyst'
- if:
- payloadType: Issues
- or:
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ Ports have a weaker contribution bar, at least initially. A functionally correct

#### Copying Files from Other Projects

The .NET runtime uses some files from other projects, typically where a binary distribution does not exist or would be inconvenient.
The .NET runtime uses some files from other projects, per [copyright](./docs/project/copyright.md) rules.

The following rules must be followed for PRs that include files from another project:

Expand Down
2 changes: 1 addition & 1 deletion docs/area-owners.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Note: Editing this file doesn't update the mapping used by `@msftbot` for area-s
| area-System.Formats.Asn1 | @jeffhandley | @dotnet/area-system-formats-asn1 | Consultants: @bartonjs @vcsjones |
| area-System.Formats.Cbor | @jeffhandley | @dotnet/area-system-formats-cbor | Consultants: @bartonjs @vcsjones |
| area-System.Formats.Nrbf | @jeffhandley | @dotnet/area-system-formats-nrbf | Consultants: @bartonjs @grabyourpitchforks |
| area-System.Formats.Tar | @jeffhandley | @dotnet/area-system-formats-tar | |
| area-System.Formats.Tar | @ericstj | @dotnet/area-system-formats-tar | |
| area-System.Globalization | @ericstj | @dotnet/area-system-globalization | |
| area-System.IO | @jeffhandley | @dotnet/area-system-io | |
| area-System.IO.Compression | @ericstj | @dotnet/area-system-io-compression | Included:<ul><li>System.Formats.Tar</li><li>System.IO.Packaging</li></ul> |
Expand Down
Loading

0 comments on commit 88815d2

Please sign in to comment.