Skip to content

Commit 61b87f7

Browse files
Merge pull request #11162 from dotnet/main
Merge main into live
2 parents 3b1d8eb + 67ccaec commit 61b87f7

Some content is hidden

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

44 files changed

+4484
-4519
lines changed

.github/workflows/quest-bulk.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: "bulk quest import"
22
on:
33
schedule:
4-
- cron: '0 10 * * *' # UTC time, that's 5:00 am EST, 2:00 am PST.
5-
- cron: '0 9 6 * *' # This is the morning of the 6th.
4+
- cron: '30 10 1-5,7-31 * *' # UTC time, that's 5:30 am EST, 2:30 am PST.
5+
- cron: '30 10 6 * *' # This is the morning of the 6th.
66
workflow_dispatch:
77
inputs:
88
reason:
@@ -50,4 +50,4 @@ jobs:
5050
org: ${{ github.repository_owner }}
5151
repo: ${{ github.repository }}
5252
issue: '-1'
53-
duration: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.duration || github.event.schedule == '0 9 6 * *' && -1 || 5 }}
53+
duration: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.duration || github.event.schedule == '30 10 6 * *' && -1 || 5 }}

xml/System.Text.RegularExpressions/GroupCollection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1614,7 +1614,7 @@ This member is an explicit interface member implementation. It can be used only
16141614
<Docs>
16151615
<param name="value">The group to locate in the group collection.</param>
16161616
<summary>Determines the index of a specific group in the group collection.</summary>
1617-
<returns>The index of the <paramref name="item" /> if found; otherwise, -1.</returns>
1617+
<returns>The index of the <paramref name="value" /> if found; otherwise, -1.</returns>
16181618
<remarks>
16191619
<format type="text/markdown"><![CDATA[
16201620

xml/System.Text/ASCIIEncoding.xml

Lines changed: 364 additions & 372 deletions
Large diffs are not rendered by default.

xml/System.Text/Decoder.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,7 @@ The following example uses the <xref:System.Text.Encoder.Convert%2A> method to c
11781178

11791179
-or-
11801180

1181-
<paramref name="byteindex" /> and <paramref name="byteCount" /> do not denote a valid range in <paramref name="bytes" />.
1181+
<paramref name="byteIndex" /> and <paramref name="byteCount" /> do not denote a valid range in <paramref name="bytes" />.
11821182

11831183
-or-
11841184

@@ -1276,7 +1276,7 @@ The following example uses the <xref:System.Text.Encoder.Convert%2A> method to c
12761276

12771277
-or-
12781278

1279-
<paramref name="byteindex" /> and <paramref name="byteCount" /> do not denote a valid range in <paramref name="bytes" />.
1279+
<paramref name="byteIndex" /> and <paramref name="byteCount" /> do not denote a valid range in <paramref name="bytes" />.
12801280

12811281
-or-
12821282

xml/System.Text/Encoding.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2466,7 +2466,7 @@ The returned <xref:System.IO.Stream>'s <xref:System.IO.Stream.CanRead> and <xref
24662466

24672467
-or-
24682468

2469-
<paramref name="charIndex" /> and <paramref name="charCount" /> do not denote a valid range in <paramref name="chars" />.
2469+
<paramref name="charIndex" /> and <paramref name="charCount" /> do not denote a valid range in <paramref name="s" />.
24702470

24712471
-or-
24722472

@@ -3339,7 +3339,7 @@ The returned <xref:System.IO.Stream>'s <xref:System.IO.Stream.CanRead> and <xref
33393339

33403340
-or-
33413341

3342-
<paramref name="byteindex" /> and <paramref name="byteCount" /> do not denote a valid range in <paramref name="bytes" />.
3342+
<paramref name="byteIndex" /> and <paramref name="byteCount" /> do not denote a valid range in <paramref name="bytes" />.
33433343

33443344
-or-
33453345

xml/System.Text/EncodingProvider.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ This method is called by the [Encoding.GetEncoding(String)](<xref:System.Text.En
406406
<format type="text/markdown"><![CDATA[
407407
408408
## Remarks
409-
The `encoderFallback` and `decoderFallback` parameters are objects that define the fallback strategy used in the event that an encoder cannot convert a character to a sequence of bytes or a decoder cannot convert a sequence of bytes to a character. The .NET Framework provides the following fallback mechanisms:
409+
The `encoderFallback` and `decoderFallback` parameters are objects that define the fallback strategy used in the event that an encoder cannot convert a character to a sequence of bytes or a decoder cannot convert a sequence of bytes to a character. .NET provides the following fallback mechanisms:
410410
411411
- Exception fallback. If the `encoderFallback` argument is an instance of <xref:System.Text.EncoderExceptionFallback>, or the `decoderExceptionFallback` argument is an instance of <xref:System.Text.DecoderExceptionFallback>, the encoding method throws an exception if characters cannot be encoded, and the decoding method throws an exception if a byte sequence cannot be decoded.
412412
@@ -416,9 +416,6 @@ This method is called by the [Encoding.GetEncoding(String)](<xref:System.Text.En
416416
417417
]]></format>
418418
</remarks>
419-
<block subset="none" type="overrides">
420-
<para>Because calls to this method use your implementation of the <see cref="M:System.Text.EncodingProvider.GetEncoding(System.String)" /> method, you do not have to override it. When user code attempts to retrieve an encoding by calling the <see cref="M:System.Text.EncodingProvider.GetEncoding(System.String,System.Text.EncoderFallback,System.Text.DecoderFallback)" /> method, the method passes the <paramref name="codepage" /> identifier to every registered encoding provider until one returns a valid encoding. If none returns a valid encoding, the <see cref="M:System.Text.Encoding.GetEncoding(System.Int32)" /> method attempts to retrieve a cached encoding whose code page identifier is <paramref name="codepage" />. Because of this, if you do choose to override the <see cref="M:System.Text.EncodingProvider.GetEncoding(System.Int32,System.Text.EncoderFallback,System.Text.DecoderFallback)" /> method, your override should return <see langword="null" /> if <paramref name="codepage" /> is not the code page identifier of an encoding that you support; it should never throw an exception.</para>
421-
</block>
422419
<block subset="none" type="usage">
423420
<para>This method is called by the <see cref="M:System.Text.Encoding.GetEncoding(System.String,System.Text.EncoderFallback,System.Text.DecoderFallback)" /> method. You should not call it directly from user code.</para>
424421
</block>

0 commit comments

Comments
 (0)