Skip to content

Commit 39db2ad

Browse files
Merge pull request #12472 from dotnet/main
Merge main into live
2 parents a40b6c1 + d00cdce commit 39db2ad

37 files changed

Lines changed: 331 additions & 351 deletions

File tree

xml/System.Buffers.Text/Base64.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -281,16 +281,16 @@
281281
<summary>Decodes the span of UTF-8 encoded text represented as base 64 into binary data. If the input is not a multiple of 4, it will decode as much as it can, to the closest multiple of 4.</summary>
282282
<returns>One of the enumeration values that indicates the status of the decoding operation.</returns>
283283
<remarks>
284-
<format type="text/markdown"><![CDATA[
285-
286-
## Remarks
284+
<format type="text/markdown"><![CDATA[
285+
286+
## Remarks
287287
288288
The return value can be as follows:
289289
290290
- <xref:System.Buffers.OperationStatus.Done?displayProperty=nameWithType>: Processing of the entire input span succeeded.
291291
- <xref:System.Buffers.OperationStatus.DestinationTooSmall?displayProperty=nameWithType>: There is not enough space in the output span to write the decoded input.
292292
- <xref:System.Buffers.OperationStatus.NeedMoreData?displayProperty=nameWithType>: `isFinalBlock` is `false` and the input is not a multiple of 4. Otherwise, the partial input is considered <xref:System.Buffers.OperationStatus.InvalidData>.
293-
- <xref:System.Buffers.OperationStatus.InvalidData?displayProperty=nameWithType>: The input contains bytes outside of the expected base 64 range, or is incomplete (that is, not a multiple of 4) and `isFinalBlock` is `true`. In .NET 7 and earlier versions, this value can also indicate that the input has invalid or more than two padding characters.
293+
- <xref:System.Buffers.OperationStatus.InvalidData?displayProperty=nameWithType>: The input contains bytes outside of the expected base 64 range, or is incomplete (that is, not a multiple of 4) and `isFinalBlock` is `true`.
294294
295295
]]></format>
296296
</remarks>
@@ -340,14 +340,14 @@ The return value can be as follows:
340340
<summary>Decodes the span of UTF-8 encoded text in base 64 (in-place) into binary data. The decoded binary output is smaller than the text data contained in the input (the operation deflates the data). If the input is not a multiple of 4, the method will not decode any data.</summary>
341341
<returns>One of the enumeration values that indicates the status of the decoding operation.</returns>
342342
<remarks>
343-
<format type="text/markdown"><![CDATA[
344-
345-
## Remarks
343+
<format type="text/markdown"><![CDATA[
344+
345+
## Remarks
346346
347347
The return value can be as follows:
348348
349349
- <xref:System.Buffers.OperationStatus.Done?displayProperty=nameWithType>: Processing of the entire input span succeeded.
350-
- <xref:System.Buffers.OperationStatus.InvalidData?displayProperty=nameWithType>: The input contains bytes outside of the expected base 64 range or is incomplete (that is, not a multiple of 4). In .NET 7 and earlier versions, this value can also indicate that the input has invalid or more than two padding characters.
350+
- <xref:System.Buffers.OperationStatus.InvalidData?displayProperty=nameWithType>: The input contains bytes outside of the expected base 64 range or is incomplete (that is, not a multiple of 4).
351351
352352
This method cannot return the <xref:System.Buffers.OperationStatus.DestinationTooSmall?displayProperty=nameWithType> and <xref:System.Buffers.OperationStatus.NeedMoreData?displayProperty=nameWithType> values.
353353
@@ -620,9 +620,9 @@ This method cannot return the <xref:System.Buffers.OperationStatus.DestinationTo
620620
<summary>Encodes the span of binary data into UTF-8 encoded text represented as base 64.</summary>
621621
<returns>One of the enumeration values that indicates the status of the encoding operation.</returns>
622622
<remarks>
623-
<format type="text/markdown"><![CDATA[
624-
625-
## Remarks
623+
<format type="text/markdown"><![CDATA[
624+
625+
## Remarks
626626
627627
The return value can be as follows:
628628
@@ -682,9 +682,9 @@ This method cannot return <xref:System.Buffers.OperationStatus.InvalidData?displ
682682
<summary>Encodes the span of binary data (in-place) into UTF-8 encoded text represented as base 64. The encoded text output is larger than the binary data contained in the input (the operation inflates the data).</summary>
683683
<returns>One of the enumeration values that indicates the status of the encoding operation.</returns>
684684
<remarks>
685-
<format type="text/markdown"><![CDATA[
686-
687-
## Remarks
685+
<format type="text/markdown"><![CDATA[
686+
687+
## Remarks
688688
689689
The return value can be as follows:
690690

xml/System.Collections.Generic/Dictionary`2.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@
10041004
10051005
This method is an O(`n`) operation, where `n` is the capacity of the dictionary.
10061006
1007-
.NET Core 3.0+ only: this mutating method may be safely called without invalidating active enumerators on the <xref:System.Collections.Generic.Dictionary%602> instance. This does not imply thread safety.
1007+
.NET Core 3.0+ only: This mutating method can be safely called without invalidating active enumerators on the <xref:System.Collections.Generic.Dictionary%602> instance. This does not imply thread safety.
10081008
10091009
]]></format>
10101010
</remarks>
@@ -1782,7 +1782,7 @@
17821782
17831783
This method approaches an O(1) operation.
17841784
1785-
.NET Core 3.0+ only: this mutating method may be safely called without invalidating active enumerators on the <xref:System.Collections.Generic.Dictionary%602> instance. This does not imply thread safety.
1785+
.NET Core 3.0+ only: This mutating method can be safely called without invalidating active enumerators on the <xref:System.Collections.Generic.Dictionary%602> instance. This does not imply thread safety.
17861786
17871787
## Examples
17881788
The following code example shows how to remove a key/value pair from a dictionary using the <xref:System.Collections.Generic.Dictionary%602.Remove%2A> method.

xml/System.Diagnostics/Activity.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ This key/value pair is included in the collection returned by the <xref:System.D
590590
591591
The `Activity` instance tries to use the same format for IDs as its parent. If the activity has no parent, this property determines the default format to use.
592592
593-
In .NET 5 and later versions, the default format is <xref:System.Diagnostics.ActivityIdFormat.W3C?displayProperty=nameWithType>. In previous versions, the default format is <xref:System.Diagnostics.ActivityIdFormat.Hierarchical?displayProperty=nameWithType>.
593+
The default format is <xref:System.Diagnostics.ActivityIdFormat.W3C?displayProperty=nameWithType>.
594594
595595
]]></format>
596596
</remarks>
@@ -2170,7 +2170,7 @@ Call <xref:System.Diagnostics.DiagnosticSource.StopActivity%2A?displayProperty=n
21702170
<Docs>
21712171
<summary>Gets a collection of key/value pairs that represent information that will be logged along with the <see cref="T:System.Diagnostics.Activity" /> to the logging system.</summary>
21722172
<value>Information that will be logged along with the <see cref="T:System.Diagnostics.Activity" /> to the logging system.</value>
2173-
<remarks>In .NET 5 and later versions, the order of the tags in the list matches the order in which they're added to the list. In previous versions, the order is reversed, that is, the first item added is last in the list.</remarks>
2173+
<remarks>The order of the tags in the list matches the order in which they're added to the list.</remarks>
21742174
<seealso cref="P:System.Diagnostics.Activity.Baggage" />
21752175
</Docs>
21762176
</Member>

xml/System.Diagnostics/Process.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2493,7 +2493,7 @@ You cannot cause processes on remote computers to exit. You can only view inform
24932493

24942494
The process is terminating.</exception>
24952495
<exception cref="T:System.NotSupportedException">You are attempting to call <see cref="M:System.Diagnostics.Process.Kill" /> for a process that is running on a remote computer. The method is available only for processes running on the local computer.</exception>
2496-
<exception cref="T:System.InvalidOperationException">.NET Framework and .NET Core 3.0 and earlier versions only: The process has already exited.
2496+
<exception cref="T:System.InvalidOperationException">.NET Framework only: The process has already exited.
24972497

24982498
-or-
24992499

xml/System.Diagnostics/ProcessStartInfo.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ The length of the string assigned to the `Arguments` property must be less than
448448
Arguments are parsed and interpreted by the target application, so must align with the expectations of that application. For .NET applications as demonstrated in the Examples below, spaces are interpreted as a separator between multiple arguments. A single argument that includes spaces must be surrounded by quotation marks, but those quotation marks are not carried through to the target application. To include quotation marks in the final parsed argument, triple-escape each mark.
449449
If you use this property to set command-line arguments, <xref:System.Diagnostics.ProcessStartInfo.ArgumentList> must not contain any elements.
450450
451-
`Arguments` and <xref:System.Diagnostics.ProcessStartInfo.ArgumentList>, which is supported starting with .NET Core 2.1 and .NET Standard 2.1, are independent of one another. That is, the string assigned to the `Arguments` property does not populate the <xref:System.Diagnostics.ProcessStartInfo.ArgumentList> collection, and the members of the <xref:System.Diagnostics.ProcessStartInfo.ArgumentList> collection are not assigned to the `Arguments` property.
451+
`Arguments` and <xref:System.Diagnostics.ProcessStartInfo.ArgumentList> are independent of one another. That is, the string assigned to the `Arguments` property does not populate the <xref:System.Diagnostics.ProcessStartInfo.ArgumentList> collection, and the members of the <xref:System.Diagnostics.ProcessStartInfo.ArgumentList> collection are not assigned to the `Arguments` property.
452452
453453
[!INCLUDE [untrusted-data-instance-note](~/includes/untrusted-data-instance-note.md)]
454454

xml/System.Globalization/NumberFormatInfo.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ On Windows, the initial value of this property is derived from the settings in t
612612
613613
]]></format>
614614
</remarks>
615-
<exception cref="T:System.ArgumentOutOfRangeException">The property is set to a value that's less than 0 or greater than 16. On .NET Core 3.1 and earlier versions, this exception is thrown if the value is greater than 15.</exception>
615+
<exception cref="T:System.ArgumentOutOfRangeException">The property is set to a value that's less than 0 or greater than 16. On .NET Framework, this exception is thrown if the value is greater than 15.</exception>
616616
<exception cref="T:System.InvalidOperationException">The property is being set and the <see cref="T:System.Globalization.NumberFormatInfo" /> object is read-only.</exception>
617617
<altmember cref="P:System.Globalization.NumberFormatInfo.CurrencyDecimalDigits" />
618618
<altmember cref="P:System.Globalization.NumberFormatInfo.CurrencyDecimalSeparator" />

xml/System.IO/Directory.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4314,7 +4314,7 @@ Trailing spaces are removed from the end of the path parameters before moving th
43144314
For a list of common I/O tasks, see [Common I/O Tasks](/dotnet/standard/io/common-i-o-tasks).
43154315
43164316
> [!NOTE]
4317-
> Starting with .NET Core 3.0, the `Move` method throws an <xref:System.IO.IOException> in all platforms when the `destDirName` already exists. In .NET Core 2.2 and previous versions, the exception was only thrown on Windows, and other platforms could either fail or overwrite the `destDirName`. See [C++ rename](https://linux.die.net/man/2/rename).
4317+
> Starting with .NET Core 3.0, the `Move` method throws an <xref:System.IO.IOException> in all platforms when the `destDirName` already exists. See [C++ rename](https://linux.die.net/man/2/rename).
43184318
43194319
## Examples
43204320

xml/System.IO/File.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3735,7 +3735,7 @@ This method works across disk volumes, and it does not throw an exception if the
37353735

37363736
Note that if you attempt to replace a file by moving a file of the same name into that directory, an <xref:System.IO.IOException> is thrown. To avoid this problem:
37373737

3738-
- In .NET Core 3.0 and later versions, you can call <xref:System.IO.File.Move(System.String,System.String,System.Boolean)> setting the parameter `overwrite` to `true`, which will replace the file if it exists.
3738+
- In .NET Core 3.0 and later versions, you can call <xref:System.IO.File.Move(System.String,System.String,System.Boolean)> setting the parameter `overwrite` to `true`, which replaces the file if it exists.
37393739

37403740
- In all .NET versions, you can call <xref:System.IO.File.Copy(System.String,System.String,System.Boolean)> to copy with overwrite, then call `Delete` to remove the excess source file. This strategy isn't atomic, because a system or program crash during the `Copy` may leave a partially-written destination file, but it will ensure a (possibly incomplete) file always exists at the destination.
37413741

xml/System.IO/FileStream.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1710,7 +1710,7 @@ The file was too large (when <see cref="P:System.IO.FileStreamOptions.Preallocat
17101710
For a list of common file and directory operations, see [Common I/O Tasks](/dotnet/standard/io/common-i-o-tasks).
17111711
17121712
> [!IMPORTANT]
1713-
> This constructor does not exist in .NET Core. Instead, starting in .NET Core 3.1, you can use the following extension method of the `FileSystemAclExtensions` class inside the `System.Security.AccessControl` assembly: <xref:System.IO.FileSystemAclExtensions.Create(System.IO.FileInfo,System.IO.FileMode,System.Security.AccessControl.FileSystemRights,System.IO.FileShare,System.Int32,System.IO.FileOptions,System.Security.AccessControl.FileSecurity)>.
1713+
> This constructor only exists in .NET Framework. In .NET, you can use the <xref:System.IO.FileSystemAclExtensions.Create(System.IO.FileInfo,System.IO.FileMode,System.Security.AccessControl.FileSystemRights,System.IO.FileShare,System.Int32,System.IO.FileOptions,System.Security.AccessControl.FileSecurity)> extension method instead.
17141714
17151715
## Examples
17161716
The following example writes data to a file and then reads the data using the <xref:System.IO.FileStream> object.

xml/System.IO/Path.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,17 @@
8282
8383
A path can contain absolute or relative location information. Absolute paths fully specify a location: the file or directory can be uniquely identified regardless of the current location. Relative paths specify a partial location: the current location is used as the starting point when locating a file specified with a relative path. To determine the current directory, call <xref:System.IO.Directory.GetCurrentDirectory%2A?displayProperty=nameWithType>.
8484
85-
.NET Core 1.1 and later versions and .NET Framework 4.6.2 and later versions also support access to file system objects that are device names, such as "\\\\?\\C:\\".
85+
This type also supports access to file system objects that are device names, such as "\\\\?\\C:\\". Device name support was added in .NET Framework 4.6.2.
8686
8787
For more information on file path formats on Windows, see [File path formats on Windows systems](/dotnet/standard/io/file-path-formats).
8888
8989
Most members of the `Path` class do not interact with the file system and do not verify the existence of the file specified by a path string. `Path` class members that modify a path string, such as <xref:System.IO.Path.ChangeExtension%2A>, have no effect on names of files in the file system.
9090
9191
Some `Path` members do validate the contents of a specified path string, and throw an <xref:System.ArgumentException> if the string contains characters that are not valid in path strings, as defined in the characters returned from the <xref:System.IO.Path.GetInvalidPathChars%2A> method. For example, on Windows-based desktop platforms, invalid path characters might include quote ("), less than (\<), greater than (>), pipe (&#124;), backspace (\\b), null (\\0), and Unicode characters 16 through 18 and 20 through 25. This validation behavior varies between .NET versions:
9292
93-
- On .NET Framework and .NET Core versions older than 2.1: All `Path` members that take a path as an argument throw an <xref:System.ArgumentException> if they detect invalid path characters.
93+
- On .NET Framework: All `Path` members that take a path as an argument throw an <xref:System.ArgumentException> if they detect invalid path characters.
9494
95-
- On .NET Core 2.1 and later versions: <xref:System.IO.Path.GetFullPath%2A> is the only member that throws an <xref:System.ArgumentException> if the string contains invalid path characters.
95+
- On .NET: <xref:System.IO.Path.GetFullPath%2A> is the only member that throws an <xref:System.ArgumentException> if the string contains invalid path characters.
9696
9797
The members of the `Path` class enable you to quickly and easily perform common operations such as determining whether a file name extension is part of a path, and combining two strings into one path name.
9898
@@ -1815,7 +1815,7 @@ Possible patterns for the read-only character span returned by this method are a
18151815
18161816
- "\\\\ComputerName\\SharedFolder" (Windows: a UNC path).
18171817
1818-
- "\\\\?\\C:" (Windows: a DOS device path, supported in .NET Core 1.1 and later versions, and in .NET Framework 4.6.2 and later versions).
1818+
- "\\\\?\\C:" (Windows: a DOS device path, supported in .NET versions and in .NET Framework 4.6.2 and later versions).
18191819
18201820
For more information on file paths on Windows, see [File path formats on Windows systems](/dotnet/standard/io/file-path-formats). For a list of common I/O tasks, see [Common I/O Tasks](/dotnet/standard/io/common-i-o-tasks).
18211821
@@ -1917,7 +1917,7 @@ Possible patterns for the string returned by this method are as follows:
19171917
19181918
- "\\\\ComputerName\\SharedFolder" (Windows: a UNC path).
19191919
1920-
- "\\\\?\\C:" (Windows: a DOS device path, supported in .NET Core 1.1 and later versions, and in .NET Framework 4.6.2 and later versions).
1920+
- "\\\\?\\C:" (Windows: a DOS device path, supported in .NET versions and in .NET Framework 4.6.2 and later versions).
19211921
19221922
For more information on file paths on Windows, see [File path formats on Windows systems](/dotnet/standard/io/file-path-formats). For a list of common I/O tasks, see [Common I/O Tasks](/dotnet/standard/io/common-i-o-tasks).
19231923
@@ -2124,7 +2124,7 @@ Paths are resolved by calling the <xref:System.IO.Path.GetFullPath%2A> method be
21242124
21252125
This method creates a temporary file with a *.tmp* file extension and returns the path to it. The temporary file is created within the user's temporary folder, which is the path returned by the <xref:System.IO.Path.GetTempPath%2A> method.
21262126
2127-
On .NET 7 and earlier versions, when using this method on Windows, the <xref:System.IO.Path.GetTempFileName%2A> method raises an <xref:System.IO.IOException> if it's used to create more than 65535 files without deleting previous temporary files. This limitation does not exist on operating systems other than Windows. Starting in .NET 8, the limitation does not exist on *any* operating system.
2127+
On .NET Framework, the <xref:System.IO.Path.GetTempFileName*> method raises an <xref:System.IO.IOException> if it's used to create more than 65535 files without deleting previous temporary files. This limitation does not exist on operating systems other than Windows. Starting in .NET 8, the limitation does not exist on *any* operating system.
21282128
21292129
The <xref:System.IO.Path.GetTempFileName%2A> method will raise an <xref:System.IO.IOException> if no unique temporary file name is available. To resolve this error, delete all unneeded temporary files.
21302130
@@ -2218,7 +2218,7 @@ If the `TMPDIR` environment variable has been set, this method returns the value
22182218
22192219
Otherwise, this method returns `/tmp/`.
22202220
The `/tmp/` directory on Linux is commonly shared among all users (`1777` permissions); ensure this meets your application's security needs.
2221-
2221+
22222222
---
22232223
22242224
## Examples

0 commit comments

Comments
 (0)