Skip to content

Merge main into live #11628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 31, 2025
Merged

Merge main into live #11628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0fa15c
Update String.xml (#11621)
PesBandi Jul 30, 2025
6321b6c
Improve TimeSpan.Divide parameter descriptions (#11619) (#11620)
petterh Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion xml/System/String.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6261,7 +6261,7 @@ The index of a format item is less than zero, or greater than two.</exception>
<param name="arg0">The first object to format.</param>
<param name="arg1">The second object to format.</param>
<param name="arg2">The third object to format.</param>
<summary>Replaces the format items in a string with the string representation of three specified objects. An parameter supplies culture-specific formatting information.</summary>
<summary>Replaces the format items in a string with the string representation of three specified objects. A parameter supplies culture-specific formatting information.</summary>
<returns>A copy of <paramref name="format" /> in which the format items have been replaced by the string representations of <paramref name="arg0" />, <paramref name="arg1" />, and <paramref name="arg2" />.</returns>
<remarks>
<format type="text/markdown"><![CDATA[
Expand Down
10 changes: 5 additions & 5 deletions xml/System/TimeSpan.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ The specified `days`, `hours`, `minutes`, `seconds`, `milliseconds`, and `micros
<Parameter Name="divisor" Type="System.Double" Index="0" FrameworkAlternate="netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netstandard-2.1;netcore-3.1;net-5.0;net-6.0;net-7.0;net-8.0;net-9.0;netframework-4.7.1-pp;netframework-4.7.2-pp;netframework-4.7-pp;netframework-4.8-pp;netframework-4.8.1-pp;net-10.0;netframework-4.6.2-pp" />
</Parameters>
<Docs>
<param name="divisor">The value to be divided by.</param>
<param name="divisor">The divisor or value to be divided by.</param>
<summary>Returns a new <see cref="T:System.TimeSpan" /> object whose value is the result of dividing this instance by the specified <paramref name="divisor" />.</summary>
<returns>A new object that represents the value of this instance divided by the value of <paramref name="divisor" />.</returns>
<remarks>To be added.</remarks>
Expand Down Expand Up @@ -3240,8 +3240,8 @@ The value of this constant is 100.
<Parameter Name="divisor" Type="System.Double" Index="1" FrameworkAlternate="netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netstandard-2.1;netcore-3.1;net-5.0;net-6.0;net-7.0;net-8.0;net-9.0;netframework-4.7.1-pp;netframework-4.7.2-pp;netframework-4.7-pp;netframework-4.8-pp;netframework-4.8.1-pp;net-10.0;netframework-4.6.2-pp" />
</Parameters>
<Docs>
<param name="timeSpan">Dividend or the value to be divided.</param>
<param name="divisor">The value to be divided by.</param>
<param name="timeSpan">The dividend or value to be divided.</param>
<param name="divisor">The divisor or value to be divided by.</param>
<summary>Returns a new <see cref="T:System.TimeSpan" /> object whose value is the result of dividing the specified <paramref name="timeSpan" /> by the specified <paramref name="divisor" />.</summary>
<returns>A new object that represents the value of <paramref name="timeSpan" /> divided by the value of <paramref name="divisor" />.</returns>
<remarks>To be added.</remarks>
Expand Down Expand Up @@ -3282,8 +3282,8 @@ The value of this constant is 100.
<Parameter Name="t2" Type="System.TimeSpan" Index="1" FrameworkAlternate="netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netstandard-2.1;netcore-3.1;net-5.0;net-6.0;net-7.0;net-8.0;net-9.0;netframework-4.7.1-pp;netframework-4.7.2-pp;netframework-4.7-pp;netframework-4.8-pp;netframework-4.8.1-pp;net-10.0;netframework-4.6.2-pp" />
</Parameters>
<Docs>
<param name="t1">The divident or the value to be divided.</param>
<param name="t2">The value to be divided by.</param>
<param name="t1">The dividend or value to be divided.</param>
<param name="t2">The divisor or value to be divided by.</param>
<summary>Returns a new <see cref="T:System.Double" /> value that's the result of dividing <paramref name="t1" /> by <paramref name="t2" />.</summary>
<returns>A new value that represents result of dividing <paramref name="t1" /> by the value of <paramref name="t2" />.</returns>
<remarks>To be added.</remarks>
Expand Down
Loading