Skip to content

Merge main into live #11521

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.

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 4 commits into from
Jun 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 snippets/csharp/System.IO/Path/Combine/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private static void Combine4()
// C:\Pictures\Saved Pictures\2019\Jan\
//
// The example displays the following output if run on a Unix-based system:
// C:\Pictures\Saved Pictures\2019\Jan\
// C:\Pictures\/Saved Pictures\/2019\/Jan\
// </Snippet4>
}
}
2 changes: 1 addition & 1 deletion snippets/visualbasic/api/system.io/path/combine/Program.vb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Module Program
' C:\Pictures\Saved Pictures\2019\Jan\
'
' The example displays the following output if run on a Unix-based system:
' C:\Pictures\Saved Pictures\2019\Jan\
' C:\Pictures\/Saved Pictures\/2019\/Jan\
' </Snippet4>
End Sub
End Module
26 changes: 25 additions & 1 deletion xml/System/DateTime.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9934,6 +9934,17 @@ The following example illustrates the <xref:System.DateTime.TryParse%28System.St
<returns>
<see langword="true" /> if <paramref name="s" /> was converted successfully; otherwise, <see langword="false" />.</returns>
<remarks>To be added.</remarks>
<exception cref="T:System.FormatException">The length of <paramref name="format" /> is 1, and it is not one of the format specifier characters defined for <see cref="T:System.Globalization.DateTimeFormatInfo" />.

-or-

<paramref name="format" /> does not contain a valid custom format pattern.</exception>
<exception cref="T:System.ArgumentException">
<paramref name="style" /> is not a valid <see cref="T:System.Globalization.DateTimeStyles" /> value.

-or-

<paramref name="style" /> contains an invalid combination of <see cref="T:System.Globalization.DateTimeStyles" /> values (for example, both <see cref="F:System.Globalization.DateTimeStyles.AssumeLocal" /> and <see cref="F:System.Globalization.DateTimeStyles.AssumeUniversal" />).</exception>
</Docs>
</Member>
<Member MemberName="TryParseExact">
Expand Down Expand Up @@ -9999,8 +10010,15 @@ The following example illustrates the <xref:System.DateTime.TryParse%28System.St
<param name="result">When this method returns, contains the <see cref="T:System.DateTime" /> value equivalent to the date and time contained in <paramref name="s" />, if the conversion succeeded, or <see cref="F:System.DateTime.MinValue">DateTime.MinValue</see> if the conversion failed. The conversion fails if the <paramref name="s" /> parameter is <see langword="null" />, is <see cref="F:System.String.Empty" />, or does not contain a valid string representation of a date and time. This parameter is passed uninitialized.</param>
<summary>Converts the specified char span of a date and time to its <see cref="T:System.DateTime" /> equivalent and returns a value that indicates whether the conversion succeeded.</summary>
<returns>
<see langword="true" /> if the <paramref name="s" /> parameter was converted successfully; otherwise, <see langword="false" />.</returns>
<see langword="true" /> if <paramref name="s" /> was converted successfully; otherwise, <see langword="false" />.</returns>
<remarks>To be added.</remarks>
<exception cref="T:System.FormatException">The length of an element in <paramref name="formats" /> is 1, and it is not one of the format specifier characters defined for <see cref="T:System.Globalization.DateTimeFormatInfo" />.</exception>
<exception cref="T:System.ArgumentException">
<paramref name="style" /> is not a valid <see cref="T:System.Globalization.DateTimeStyles" /> value.

-or-

<paramref name="style" /> contains an invalid combination of <see cref="T:System.Globalization.DateTimeStyles" /> values (for example, both <see cref="F:System.Globalization.DateTimeStyles.AssumeLocal" /> and <see cref="F:System.Globalization.DateTimeStyles.AssumeUniversal" />).</exception>
</Docs>
</Member>
<Member MemberName="TryParseExact">
Expand Down Expand Up @@ -10129,6 +10147,11 @@ The following example illustrates the <xref:System.DateTime.TryParse%28System.St

]]></format>
</remarks>
<exception cref="T:System.FormatException">The length of <paramref name="format" /> is 1, and it is not one of the format specifier characters defined for <see cref="T:System.Globalization.DateTimeFormatInfo" />.

-or-

<paramref name="format" /> does not contain a valid custom format pattern.</exception>
<exception cref="T:System.ArgumentException">
<paramref name="style" /> is not a valid <see cref="T:System.Globalization.DateTimeStyles" /> value.

Expand Down Expand Up @@ -10269,6 +10292,7 @@ The following example illustrates the <xref:System.DateTime.TryParse%28System.St

]]></format>
</remarks>
<exception cref="T:System.FormatException">The length of an element in <paramref name="formats" /> is 1, and it is not one of the format specifier characters defined for <see cref="T:System.Globalization.DateTimeFormatInfo" />.</exception>
<exception cref="T:System.ArgumentException">
<paramref name="style" /> is not a valid <see cref="T:System.Globalization.DateTimeStyles" /> value.

Expand Down
Loading