-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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
More doc updates for source-of-truth assemblies #107810
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed half of the files, until Microsoft.Extensions.FileProviders.
Next review starts at Microsoft.Extensions.Hosting.
src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/src/Metrics/InstrumentRule.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/src/Metrics/MeasurementHandlers.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/src/Metrics/MeasurementHandlers.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/src/Metrics/MeasurementHandlers.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.Diagnostics.Abstractions/src/Metrics/MeasurementHandlers.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/IFileInfo.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/IFileInfo.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFileProvider.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PollingFileChangeToken.cs
Outdated
Show resolved
Hide resolved
Tagging subscribers to this area: @dotnet/area-meta |
1 similar comment
Tagging subscribers to this area: @dotnet/area-meta |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Left some comments for you to consider, otherwise it LGTM.
I'll backport this to release/9.0 as well when you merge it.
src/libraries/Microsoft.Extensions.Hosting/src/ConsoleLifetimeOptions.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LogEntry.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LoggerExtensions.cs
Show resolved
Hide resolved
/// </summary> | ||
public string? SourceName { get; set; } | ||
|
||
/// <summary> | ||
/// Name of the machine having the event log. If <c>null</c> or not specified, local machine is the default. | ||
/// Gets or sets the name of the machine with the event log. If <see langword="null" /> or not specified, local machine is the default. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For consistency with the others:
/// Gets or sets the name of the machine with the event log. If <see langword="null" /> or not specified, local machine is the default. | |
/// Gets or sets the name of the machine with the event log. If <see langword="null" /> or not specified, "local machine" is the default. |
@dotnet/area-extensions-logging does this default value begin in lowercase?
src/libraries/Microsoft.Extensions.Primitives/src/StringSegment.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.Primitives/src/StringTokenizer.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.Primitives/src/StringTokenizer.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.Primitives/src/StringValues.cs
Outdated
Show resolved
Hide resolved
src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Emitter.cs
Outdated
Show resolved
Hide resolved
It would be nice to backport this to 9.0. Today's the snap for the RC2 branch but we still have time tomorrow before we start the builds. Would you mind looking at the feedback when you get a chance @gewarren? |
Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com>
src/libraries/Microsoft.Extensions.Primitives/src/StringTokenizer.cs
Outdated
Show resolved
Hide resolved
@carlossanlop There seem to be a lot of errors. Is this okay to merge? |
src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Emitter.cs
Outdated
Show resolved
Hide resolved
@carlossanlop Can you backport this one please? |
/backport to release/9.0 |
Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/11041750136 |
@carlossanlop backporting to release/9.0 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: doc updates
Using index info to reconstruct a base tree...
M src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/IFileProvider.cs
M src/libraries/Microsoft.Extensions.FileProviders.Composite/src/CompositeFileProvider.cs
M src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFileProvider.cs
M src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs
M src/libraries/Microsoft.Extensions.Hosting/src/HostingHostBuilderExtensions.cs
M src/libraries/Microsoft.Extensions.Primitives/src/StringValues.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/Microsoft.Extensions.Primitives/src/StringValues.cs
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.Primitives/src/StringValues.cs
Auto-merging src/libraries/Microsoft.Extensions.Hosting/src/HostingHostBuilderExtensions.cs
Auto-merging src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFilesWatcher.cs
Auto-merging src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFileProvider.cs
Auto-merging src/libraries/Microsoft.Extensions.FileProviders.Composite/src/CompositeFileProvider.cs
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.FileProviders.Composite/src/CompositeFileProvider.cs
Auto-merging src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/IFileProvider.cs
CONFLICT (content): Merge conflict in src/libraries/Microsoft.Extensions.FileProviders.Abstractions/src/IFileProvider.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 doc updates
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@carlossanlop an error occurred while backporting to release/9.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Contributes to dotnet/dotnet-api-docs#9989.