Skip to content

Merge main into live #11898

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
Oct 4, 2025
Merged

Merge main into live #11898

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
60e1661
Fix typos in FromKeyedServicesAttribute.Key documentation remarks (#1…
Copilot Oct 3, 2025
a3f9108
Fix typo in Type.GetMethod remarks section (#11891)
oii-nasif Oct 3, 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
4 changes: 2 additions & 2 deletions xml/Microsoft.Extensions.DependencyInjection/FromKeyedServicesAttribute.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
The key of the keyed service to bind to.
</summary>
<value>To be added.</value>
<remarks>A <see langword="null" /> value with indicates there is not a key and just the parameter type is used to resolve the service.
This is useful for DI implementations that require an explict way to declare that the parameter should be resolved for unkeyed services.
<remarks>A <see langword="null" /> value indicates there is not a key and just the parameter type is used to resolve the service.
This is useful for DI implementations that require an explicit way to declare that the parameter should be resolved for unkeyed services.
A <see langword="null" /> value is also used along with <see cref="P:Microsoft.Extensions.DependencyInjection.FromKeyedServicesAttribute.LookupMode" /> set to <see cref="F:Microsoft.Extensions.DependencyInjection.ServiceKeyLookupMode.InheritKey" /> to indicate that the key should be inherited from the parent scope.
</remarks>
</Docs>
Expand Down
2 changes: 1 addition & 1 deletion xml/System/Type.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5626,7 +5626,7 @@ This method can be used to find a constructed generic member given a member from

You can do one of the following to retrieve a specific method:

- Call the <xref:System.Type.GetMethod%28System.String%2CSystem.Reflection.BindingFlags%29> method and specify a `bindingAttr` argument that uniquely identifies the method. For example, if the exception is thrown because a type has a static and an instance overload, you can specify a `bindingAttr` argument of <xref:System.Reflection.BindingFlags.Instance?displayProperty=nameWithType>` Or `<xref:System.Reflection.BindingFlags.Instance?displayProperty=nameWithType>.
- Call the <xref:System.Type.GetMethod%28System.String%2CSystem.Reflection.BindingFlags%29> method and specify a `bindingAttr` argument that uniquely identifies the method. For example, if the exception is thrown because a type has a static and an instance overload, you can specify a `bindingAttr` argument of <xref:System.Reflection.BindingFlags.Static?displayProperty=nameWithType> or <xref:System.Reflection.BindingFlags.Instance?displayProperty=nameWithType>.

- Call an overload of the <xref:System.Type.GetMethod%2A> method that includes a `types` parameter which defines the types of the method's parameters.

Expand Down