Skip to content

Merge main into live #10290

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 1 commit into from
Aug 21, 2024
Merged

Merge main into live #10290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.Diagnostics/Activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,7 +1299,7 @@ If the <xref:System.Diagnostics.Activity.ParentId?displayProperty=nameWithType>
</ReturnValue>
<Docs>
<summary>Gets the root ID of this <see cref="T:System.Diagnostics.Activity" />.</summary>
<value>The root ID, or <see langword="null" /> if the current instance has either a <see cref="P:System.Diagnostics.Activity.ParentId" /> or an <see cref="P:System.Diagnostics.Activity.Id" />.</value>
<value>The root ID, or <see langword="null" /> if the current instance has neither <see cref="P:System.Diagnostics.Activity.ParentId" /> nor <see cref="P:System.Diagnostics.Activity.Id" />.</value>
<remarks>
<format type="text/markdown"><![CDATA[

Expand Down