Skip to content

Commit 3e4b446

Browse files
authored
Merge branch 'main' into docs-to-learn
2 parents cb4c96a + 691a300 commit 3e4b446

File tree

9 files changed

+60
-65
lines changed

9 files changed

+60
-65
lines changed

.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: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ resource: repository
55
configuration:
66
resourceManagementConfiguration:
77
eventResponderTasks:
8-
- if:
8+
- description: Needs-author-action notification
9+
if:
910
- payloadType: Issues
1011
- labelAdded:
1112
label: needs-author-action
1213
then:
1314
- 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:
15+
reply: This issue has been marked `needs-author-action` and might be missing some important information.
16+
17+
- description: PR reviews with "changes requested" applies the needs-author-action label
18+
if:
1719
- payloadType: Pull_Request_Review
1820
- not:
1921
activitySenderHasPermission:
@@ -25,8 +27,9 @@ configuration:
2527
then:
2628
- addLabel:
2729
label: needs-author-action
28-
description: PR reviews with "changes requested" applies the needs-author-action label
29-
- if:
30+
31+
- description: Replace `needs-author-action` label with `needs-further-triage` label when the author comments on an issue that's not "untriaged"
32+
if:
3033
- payloadType: Issue_Comment
3134
- isAction:
3235
action: Created
@@ -43,8 +46,9 @@ configuration:
4346
label: needs-further-triage
4447
- removeLabel:
4548
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:
49+
50+
- description: Remove `needs-author-action` label when the author comments on an `untriaged` issue
51+
if:
4852
- payloadType: Issue_Comment
4953
- isAction:
5054
action: Created
@@ -58,8 +62,9 @@ configuration:
5862
then:
5963
- removeLabel:
6064
label: needs-author-action
61-
description: Remove `needs-author-action` label when the author comments on an `untriaged` issue
62-
- if:
65+
66+
- description: Pushing changes to PR branch removes the needs-author-action label
67+
if:
6368
- payloadType: Pull_Request
6469
- isAction:
6570
action: Synchronize
@@ -68,8 +73,9 @@ configuration:
6873
then:
6974
- removeLabel:
7075
label: needs-author-action
71-
description: Pushing changes to PR branch removes the needs-author-action label
72-
- if:
76+
77+
- description: Author commenting in PR removes the needs-author-action label
78+
if:
7379
- payloadType: Issue_Comment
7480
- isActivitySender:
7581
issueAuthor: True
@@ -81,8 +87,9 @@ configuration:
8187
then:
8288
- removeLabel:
8389
label: needs-author-action
84-
description: Author commenting in PR removes the needs-author-action label
85-
- if:
90+
91+
- description: Author responding to a PR review comment removes the needs-author-action label
92+
if:
8693
- payloadType: Pull_Request_Review
8794
- isActivitySender:
8895
issueAuthor: True
@@ -94,4 +101,3 @@ configuration:
94101
then:
95102
- removeLabel:
96103
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: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
id:
21
name: GitOps.PullRequestIssueManagement
32
description: GitOps.PullRequestIssueManagement primitive
4-
owner:
53
resource: repository
6-
disabled: false
7-
where:
4+
85
configuration:
96
resourceManagementConfiguration:
107
eventResponderTasks:
11-
- if:
8+
- description: Auto-squash-merge PRs to main labeled with auto-merge
9+
triggerOnOwnActions: true
10+
if:
1211
- payloadType: Pull_Request
1312
- labelAdded:
1413
label: ':octocat: auto-merge'
@@ -17,9 +16,10 @@ configuration:
1716
then:
1817
- enableAutoMerge:
1918
mergeMethod: Squash
19+
20+
- description: Auto-merge PRs to live labeled with auto-merge
2021
triggerOnOwnActions: true
21-
description: Auto-squash-merge PRs to main labeled with auto-merge
22-
- if:
22+
if:
2323
- payloadType: Pull_Request
2424
- labelAdded:
2525
label: ':octocat: auto-merge'
@@ -28,26 +28,11 @@ configuration:
2828
then:
2929
- enableAutoMerge:
3030
mergeMethod: Merge
31-
triggerOnOwnActions: true
32-
description: Auto-merge PRs to live labeled with auto-merge
33-
- if:
34-
- payloadType: Pull_Request
35-
- isAction:
36-
action: Opened
37-
- titleContains:
38-
pattern: Merge main into live
39-
isRegex: False
40-
- targetsBranch:
41-
branch: live
42-
then:
43-
- enableAutoMerge:
44-
mergeMethod: Merge
45-
triggerOnOwnActions: true
46-
description: Auto-merge PRs to live with title "Merge main into live"
47-
- if:
31+
32+
- description: Don't auto-merge PRs with auto-merge label removed
33+
if:
4834
- payloadType: Pull_Request
4935
- labelRemoved:
5036
label: ':octocat: auto-merge'
5137
then:
5238
- disableAutoMerge
53-
description: Don't auto-merge PRs with auto-merge label removed

.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/label-prs.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@ resource: repository
55
configuration:
66
resourceManagementConfiguration:
77
eventResponderTasks:
8-
- if:
8+
- description: Label publish PRs with auto-merge
9+
triggerOnOwnActions: true
10+
if:
911
- payloadType: Pull_Request
1012
- isAction:
1113
action: Opened
14+
- isActivitySender:
15+
user: dotnet-policy-service[bot]
1216
- titleContains:
1317
pattern: Merge main into live
1418
isRegex: False
1519
then:
1620
- addLabel:
1721
label: ':octocat: auto-merge'
18-
description: Label main to live PRs
19-
triggerOnOwnActions: true
2022

2123

.github/policies/scheduled-pr.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
scheduledSearches:
8-
- frequencies:
8+
- description: Push to live branch (publish)
9+
frequencies:
910
- daily:
1011
time: 08:0
1112
filters: []
@@ -15,5 +16,4 @@ configuration:
1516
base: live
1617
title: Merge main into live
1718
body: Please don't squash-merge this PR.
18-
description: Push to live branch (publish)
1919

.github/policies/untriaged-label.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ resource: repository
66
configuration:
77
resourceManagementConfiguration:
88
eventResponderTasks:
9-
- if:
9+
- description: Add untriaged label to new/reopened issues without a milestone
10+
if:
1011
- payloadType: Issues
1112
- isOpen
1213
- not:
@@ -22,8 +23,9 @@ configuration:
2223
then:
2324
- addLabel:
2425
label: untriaged
25-
description: Add untriaged label to new/reopened issues without a milestone
26-
- if:
26+
27+
- description: Remove untriaged label from issues when closed or added to a milestone
28+
if:
2729
- payloadType: Issues
2830
- or:
2931
- isAction:
@@ -34,4 +36,3 @@ configuration:
3436
then:
3537
- removeLabel:
3638
label: untriaged
37-
description: Remove untriaged label from issues when closed or added to a milestone

xml/System.CodeDom.Compiler/CompilerParameters.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@
5959
To specify a custom command-line arguments string to use when invoking the compilation process, set the string in the <xref:System.CodeDom.Compiler.CompilerParameters.CompilerOptions%2A> property. If a Win32 security token is required to invoke the compiler process, specify the token in the <xref:System.CodeDom.Compiler.CompilerParameters.UserToken%2A> property. To include .NET Framework resource files in the compiled assembly, add the names of the resource files to the <xref:System.CodeDom.Compiler.CompilerParameters.EmbeddedResources%2A> property. To reference .NET Framework resources in another assembly, add the names of the resource files to the <xref:System.CodeDom.Compiler.CompilerParameters.LinkedResources%2A> property. To include a Win32 resource file in the compiled assembly, specify the name of the Win32 resource file in the <xref:System.CodeDom.Compiler.CompilerParameters.Win32Resource%2A> property.
6060
6161
> [!NOTE]
62-
> This class contains a link demand and an inheritance demand at the class level that applies to all members. A <xref:System.Security.SecurityException> is thrown when either the immediate caller or the derived class does not have full-trust permission. For details about security demands, see [Link Demands](/dotnet/framework/misc/link-demands) and [Inheritance Demands](https://learn.microsoft.com/previous-versions/dotnet/netframework-4.0/x4yx82e6(v=vs.100)).
63-
64-
62+
> This class contains a link demand and an inheritance demand at the class level that applies to all members. A <xref:System.Security.SecurityException> is thrown when either the immediate caller or the derived class does not have full-trust permission. For details about security demands, see [Link Demands](/dotnet/framework/misc/link-demands) and [Inheritance Demands](https://learn.microsoft.com/previous-versions/dotnet/netframework-4.0/x4yx82e6(v=vs.100)).
6563
6664
## Examples
6765
The following example builds a CodeDOM source graph for a simple Hello World program. The source is then saved to a file, compiled into an executable, and run. The `CompileCode` method illustrates how to use the <xref:System.CodeDom.Compiler.CompilerParameters> class to specify various compiler settings and options.
@@ -290,11 +288,10 @@
290288
<remarks>
291289
<format type="text/markdown"><![CDATA[
292290
293-
## Remarks
294-
An <xref:System.CodeDom.Compiler.ICodeCompiler> typically includes this string on the command line when invoking a command-line compiler. By default, this property contains an empty string.
295-
296-
297-
291+
## Remarks
292+
293+
An <xref:System.CodeDom.Compiler.ICodeCompiler> typically includes this string on the command line when invoking a command-line compiler. By default, this property contains an empty string.
294+
298295
## Examples
299296
The following example illustrates using <xref:System.CodeDom.Compiler.CompilerParameters> to specify various compiler settings and options. This code example is part of a larger example provided for the <xref:System.CodeDom.Compiler.CompilerParameters> class.
300297
@@ -304,6 +301,9 @@
304301
305302
]]></format>
306303
</remarks>
304+
<related type="Article" href="/dotnet/csharp/language-reference/compiler-options/">C# compiler options</related>
305+
<related type="Article" href="/dotnet/fsharp/language-reference/compiler-options">F# compiler options</related>
306+
<related type="Article" href="/dotnet/visual-basic/reference/command-line-compiler/compiler-options-listed-by-category">Visual Basic compiler options</related>
307307
</Docs>
308308
</Member>
309309
<Member MemberName="CoreAssemblyFileName">

xml/System.IO/Directory.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,7 +1718,7 @@ The returned collection is not cached. Each call to the <xref:System.Collections
17181718
</Parameters>
17191719
<Docs>
17201720
<param name="path">The relative or absolute path to the directory to search. This string is not case-sensitive.</param>
1721-
<param name="searchPattern">The search string to match against the names of subdirectories in <paramref name="path" />. This parameter can contain a combination of valid literal and wildcard characters, but it doesn't support regular expressions.</param>
1721+
<param name="searchPattern">The search string to match against the names of files and directories in <paramref name="path" />. This parameter can contain a combination of valid literal and wildcard characters, but it doesn't support regular expressions.</param>
17221722
<param name="enumerationOptions">An object that describes the search and enumeration configuration to use.</param>
17231723
<summary>Returns an enumerable collection of file names and directory names that match a search pattern and enumeration options in a specified path.</summary>
17241724
<returns>An enumerable collection of file-system entries in the directory specified by <paramref name="path" />, that match the specified search pattern and the specified enumeration options.</returns>
@@ -3100,7 +3100,7 @@ The returned collection is not cached. Each call to the <xref:System.Collections
31003100
</Parameters>
31013101
<Docs>
31023102
<param name="path">The relative or absolute path to the directory to search. This string is not case-sensitive.</param>
3103-
<param name="searchPattern">The search string to match against the names of subdirectories in <paramref name="path" />. This parameter can contain a combination of valid literal and wildcard characters, but it doesn't support regular expressions.</param>
3103+
<param name="searchPattern">The search string to match against the names of files in <paramref name="path" />. This parameter can contain a combination of valid literal and wildcard characters, but it doesn't support regular expressions.</param>
31043104
<param name="enumerationOptions">An object that describes the search and enumeration configuration to use.</param>
31053105
<summary>Returns the names of files (including their paths) that match the specified search pattern and enumeration options in the specified directory.</summary>
31063106
<returns>An array of the full names (including paths) for the files in the specified directory that match the specified search pattern and enumeration options, or an empty array if no files are found.</returns>
@@ -3404,7 +3404,7 @@ The returned collection is not cached. Each call to the <xref:System.Collections
34043404
</Parameters>
34053405
<Docs>
34063406
<param name="path">The relative or absolute path to the directory to search. This string is not case-sensitive.</param>
3407-
<param name="searchPattern">The search string to match against the names of file and directories in <paramref name="path" />. This parameter can contain a combination of valid literal path and wildcard (* and ?) characters, but it doesn't support regular expressions.</param>
3407+
<param name="searchPattern">The search string to match against the names of files and directories in <paramref name="path" />. This parameter can contain a combination of valid literal path and wildcard (* and ?) characters, but it doesn't support regular expressions.</param>
34083408
<summary>Returns an array of file names and directory names that match a search pattern in a specified path.</summary>
34093409
<returns>An array of file names and directory names that match the specified search criteria, or an empty array if no files or directories are found.</returns>
34103410
<remarks>
@@ -3507,7 +3507,7 @@ The returned collection is not cached. Each call to the <xref:System.Collections
35073507
</Parameters>
35083508
<Docs>
35093509
<param name="path">The relative or absolute path to the directory to search. This string is not case-sensitive.</param>
3510-
<param name="searchPattern">The search string to match against the names of subdirectories in <paramref name="path" />. This parameter can contain a combination of valid literal and wildcard characters, but it doesn't support regular expressions.</param>
3510+
<param name="searchPattern">The search string to match against the names of files and directories in <paramref name="path" />. This parameter can contain a combination of valid literal and wildcard characters, but it doesn't support regular expressions.</param>
35113511
<param name="enumerationOptions">An object that describes the search and enumeration configuration to use.</param>
35123512
<summary>Returns an array of file names and directory names that match a search pattern and enumeration options in a specified path.</summary>
35133513
<returns>An array of file names and directory names that match the specified search pattern and enumeration options, or an empty array if no files or directories are found.</returns>

0 commit comments

Comments
 (0)