Skip to content

Merge main into live #11364

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 1 commit into from
May 29, 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 xml/Microsoft.Extensions.Caching.Hybrid/HybridCache.xml
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@
<typeparam name="TState">The type of additional state required by <paramref name="factory" />.</typeparam>
<typeparam name="T">The type of the data being considered.</typeparam>
<param name="key">The key of the entry to look for or create.</param>
<param name="factory">Provides the underlying data service if the data is not available in the cache.</param>
<param name="state">The state required for <paramref name="factory" />.</param>
<param name="factory">Provides the underlying data service if the data is not available in the cache.</param>
<param name="options">Additional options for this cache entry.</param>
<param name="tags">The tags to associate with this cache item.</param>
<param name="cancellationToken">The <see cref="T:System.Threading.CancellationToken" /> used to propagate notifications that the operation should be canceled.</param>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -649,8 +649,8 @@
<Docs>
<typeparam name="TService">The type of the service to add.</typeparam>
<param name="services">The <see cref="T:Microsoft.Extensions.DependencyInjection.IServiceCollection" />.</param>
<param name="implementationFactory">The factory that creates the service.</param>
<param name="serviceKey">The service key.</param>
<param name="implementationFactory">The factory that creates the service.</param>
<summary>
Adds the specified <typeparamref name="TService" /> as a <see cref="F:Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped" /> service
using the factory specified in <paramref name="implementationFactory" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
<Parameter Name="listener" Type="Microsoft.Extensions.Diagnostics.Metrics.IMetricsListener" />
</Parameters>
<Docs>
<param name="listener">The implementation type of the listener.</param>
<param name="builder">The <see cref="T:Microsoft.Extensions.Diagnostics.Metrics.IMetricsBuilder" />.</param>
<param name="listener">The implementation type of the listener.</param>
<summary>
Registers a new <see cref="T:Microsoft.Extensions.Diagnostics.Metrics.IMetricsListener" /> instance.
</summary>
Expand Down
4 changes: 3 additions & 1 deletion xml/System.Buffers/ReadOnlySpanAction`2.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<Type Name="ReadOnlySpanAction&lt;T,TArg&gt;" FullName="System.Buffers.ReadOnlySpanAction&lt;T,TArg&gt;">
<TypeSignature Language="C#" Value="public delegate void ReadOnlySpanAction&lt;T,in TArg&gt;(ReadOnlySpan&lt;T&gt; span, TArg arg);" />
<TypeSignature Language="C#" Value="public delegate void ReadOnlySpanAction&lt;T,in TArg&gt;(ReadOnlySpan&lt;T&gt; span, TArg arg) where TArg : allows ref struct;" FrameworkAlternate="net-10.0;net-9.0" />
<TypeSignature Language="ILAsm" Value=".class public auto ansi sealed ReadOnlySpanAction`2&lt;T, - TArg&gt; extends System.MulticastDelegate" />
<TypeSignature Language="DocId" Value="T:System.Buffers.ReadOnlySpanAction`2" />
<TypeSignature Language="VB.NET" Value="Public Delegate Sub ReadOnlySpanAction(Of T, In TArg)(span As ReadOnlySpan(Of T), arg As TArg)" />
<TypeSignature Language="F#" Value="type ReadOnlySpanAction&lt;'T, 'Arg&gt; = delegate of ReadOnlySpan&lt;'T&gt; * 'Arg -&gt; unit" />
<TypeSignature Language="C++ CLI" Value="generic &lt;typename T, typename TArg&gt;&#xA;public delegate void ReadOnlySpanAction(ReadOnlySpan&lt;T&gt; span, TArg arg);" />
<TypeSignature Language="C#" Value="public delegate void ReadOnlySpanAction&lt;T,in TArg&gt;(ReadOnlySpan&lt;T&gt; span, TArg arg);" FrameworkAlternate="net-5.0;net-6.0;net-7.0;net-8.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netstandard-2.1" />
<AssemblyInfo>
<AssemblyName>System.Runtime</AssemblyName>
<AssemblyVersion>4.2.1.0</AssemblyVersion>
Expand Down Expand Up @@ -46,6 +47,7 @@
</Attributes>
<Constraints>
<ParameterAttribute>Contravariant</ParameterAttribute>
<ParameterAttribute>AllowByRefLike</ParameterAttribute>
</Constraints>
</TypeParameter>
</TypeParameters>
Expand Down
4 changes: 3 additions & 1 deletion xml/System.Buffers/SpanAction`2.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<Type Name="SpanAction&lt;T,TArg&gt;" FullName="System.Buffers.SpanAction&lt;T,TArg&gt;">
<TypeSignature Language="C#" Value="public delegate void SpanAction&lt;T,in TArg&gt;(Span&lt;T&gt; span, TArg arg);" />
<TypeSignature Language="C#" Value="public delegate void SpanAction&lt;T,in TArg&gt;(Span&lt;T&gt; span, TArg arg) where TArg : allows ref struct;" FrameworkAlternate="net-10.0;net-9.0" />
<TypeSignature Language="ILAsm" Value=".class public auto ansi sealed SpanAction`2&lt;T, - TArg&gt; extends System.MulticastDelegate" />
<TypeSignature Language="DocId" Value="T:System.Buffers.SpanAction`2" />
<TypeSignature Language="VB.NET" Value="Public Delegate Sub SpanAction(Of T, In TArg)(span As Span(Of T), arg As TArg)" />
<TypeSignature Language="F#" Value="type SpanAction&lt;'T, 'Arg&gt; = delegate of Span&lt;'T&gt; * 'Arg -&gt; unit" />
<TypeSignature Language="C++ CLI" Value="generic &lt;typename T, typename TArg&gt;&#xA;public delegate void SpanAction(Span&lt;T&gt; span, TArg arg);" />
<TypeSignature Language="C#" Value="public delegate void SpanAction&lt;T,in TArg&gt;(Span&lt;T&gt; span, TArg arg);" FrameworkAlternate="net-5.0;net-6.0;net-7.0;net-8.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netstandard-2.1" />
<AssemblyInfo>
<AssemblyName>System.Runtime</AssemblyName>
<AssemblyVersion>4.2.1.0</AssemblyVersion>
Expand Down Expand Up @@ -46,6 +47,7 @@
</Attributes>
<Constraints>
<ParameterAttribute>Contravariant</ParameterAttribute>
<ParameterAttribute>AllowByRefLike</ParameterAttribute>
</Constraints>
</TypeParameter>
</TypeParameters>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Type Name="ConcurrentDictionary&lt;TKey,TValue&gt;+AlternateLookup&lt;TAlternateKey&gt;" FullName="System.Collections.Concurrent.ConcurrentDictionary&lt;TKey,TValue&gt;+AlternateLookup&lt;TAlternateKey&gt;">
<TypeSignature Language="C#" Value="public readonly struct ConcurrentDictionary&lt;TKey,TValue&gt;.AlternateLookup&lt;TAlternateKey&gt;" />
<TypeSignature Language="C#" Value="public readonly struct ConcurrentDictionary&lt;TKey,TValue&gt;.AlternateLookup&lt;TAlternateKey&gt; where TAlternateKey : allows ref struct" />
<TypeSignature Language="ILAsm" Value=".class nested public sequential ansi sealed beforefieldinit ConcurrentDictionary`2/AlternateLookup`1&lt;TKey, TValue, TAlternateKey&gt; extends System.ValueType" />
<TypeSignature Language="DocId" Value="T:System.Collections.Concurrent.ConcurrentDictionary`2.AlternateLookup`1" />
<TypeSignature Language="VB.NET" Value="Public Structure ConcurrentDictionary(Of TKey, TValue).AlternateLookup(Of TAlternateKey)" />
Expand All @@ -24,7 +24,11 @@
</Attribute>
</Attributes>
</TypeParameter>
<TypeParameter Name="TAlternateKey" Index="2" FrameworkAlternate="net-9.0" />
<TypeParameter Name="TAlternateKey" Index="2" FrameworkAlternate="net-9.0">
<Constraints>
<ParameterAttribute>AllowByRefLike</ParameterAttribute>
</Constraints>
</TypeParameter>
</TypeParameters>
<Base>
<BaseTypeName>System.ValueType</BaseTypeName>
Expand Down
28 changes: 22 additions & 6 deletions xml/System.Collections.Concurrent/ConcurrentDictionary`2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -704,12 +704,13 @@
</Docs>
</Member>
<Member MemberName="AddOrUpdate&lt;TArg&gt;">
<MemberSignature Language="C#" Value="public TValue AddOrUpdate&lt;TArg&gt; (TKey key, Func&lt;TKey,TArg,TValue&gt; addValueFactory, Func&lt;TKey,TValue,TArg,TValue&gt; updateValueFactory, TArg factoryArgument);" />
<MemberSignature Language="C#" Value="public TValue AddOrUpdate&lt;TArg&gt; (TKey key, Func&lt;TKey,TArg,TValue&gt; addValueFactory, Func&lt;TKey,TValue,TArg,TValue&gt; updateValueFactory, TArg factoryArgument) where TArg : allows ref struct;" FrameworkAlternate="net-10.0;net-9.0" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance !TValue AddOrUpdate&lt;TArg&gt;(!TKey key, class System.Func`3&lt;!TKey, !!TArg, !TValue&gt; addValueFactory, class System.Func`4&lt;!TKey, !TValue, !!TArg, !TValue&gt; updateValueFactory, !!TArg factoryArgument) cil managed" />
<MemberSignature Language="DocId" Value="M:System.Collections.Concurrent.ConcurrentDictionary`2.AddOrUpdate``1(`0,System.Func{`0,``0,`1},System.Func{`0,`1,``0,`1},``0)" />
<MemberSignature Language="VB.NET" Value="Public Function AddOrUpdate(Of TArg) (key As TKey, addValueFactory As Func(Of TKey, TArg, TValue), updateValueFactory As Func(Of TKey, TValue, TArg, TValue), factoryArgument As TArg) As TValue" />
<MemberSignature Language="F#" Value="member this.AddOrUpdate : 'Key * Func&lt;'Key, 'Arg, 'Value&gt; * Func&lt;'Key, 'Value, 'Arg, 'Value&gt; * 'Arg -&gt; 'Value" Usage="concurrentDictionary.AddOrUpdate (key, addValueFactory, updateValueFactory, factoryArgument)" />
<MemberSignature Language="C++ CLI" Value="public:&#xA;generic &lt;typename TArg&gt;&#xA; TValue AddOrUpdate(TKey key, Func&lt;TKey, TArg, TValue&gt; ^ addValueFactory, Func&lt;TKey, TValue, TArg, TValue&gt; ^ updateValueFactory, TArg factoryArgument);" />
<MemberSignature Language="C#" Value="public TValue AddOrUpdate&lt;TArg&gt; (TKey key, Func&lt;TKey,TArg,TValue&gt; addValueFactory, Func&lt;TKey,TValue,TArg,TValue&gt; updateValueFactory, TArg factoryArgument);" FrameworkAlternate="net-5.0;net-6.0;net-7.0;net-8.0;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1;netstandard-2.1" />
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyName>System.Collections.Concurrent</AssemblyName>
Expand Down Expand Up @@ -741,6 +742,9 @@
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(2)&gt;]</AttributeName>
</Attribute>
</Attributes>
<Constraints>
<ParameterAttribute>AllowByRefLike</ParameterAttribute>
</Constraints>
</TypeParameter>
</TypeParameters>
<Parameters>
Expand Down Expand Up @@ -969,7 +973,7 @@
</Docs>
</Member>
<Member MemberName="GetAlternateLookup&lt;TAlternateKey&gt;">
<MemberSignature Language="C#" Value="public System.Collections.Concurrent.ConcurrentDictionary&lt;TKey,TValue&gt;.AlternateLookup&lt;TAlternateKey&gt; GetAlternateLookup&lt;TAlternateKey&gt; ();" />
<MemberSignature Language="C#" Value="public System.Collections.Concurrent.ConcurrentDictionary&lt;TKey,TValue&gt;.AlternateLookup&lt;TAlternateKey&gt; GetAlternateLookup&lt;TAlternateKey&gt; () where TAlternateKey : allows ref struct;" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance valuetype System.Collections.Concurrent.ConcurrentDictionary`2/AlternateLookup`1&lt;!TKey, !TValue, !!TAlternateKey&gt; GetAlternateLookup&lt;TAlternateKey&gt;() cil managed" />
<MemberSignature Language="DocId" Value="M:System.Collections.Concurrent.ConcurrentDictionary`2.GetAlternateLookup``1" />
<MemberSignature Language="VB.NET" Value="Public Function GetAlternateLookup(Of TAlternateKey) () As ConcurrentDictionary(Of TKey, TValue).AlternateLookup(Of TAlternateKey)" />
Expand Down Expand Up @@ -997,7 +1001,11 @@
</Attributes>
</ReturnValue>
<TypeParameters>
<TypeParameter Name="TAlternateKey" />
<TypeParameter Name="TAlternateKey">
<Constraints>
<ParameterAttribute>AllowByRefLike</ParameterAttribute>
</Constraints>
</TypeParameter>
</TypeParameters>
<Parameters />
<Docs>
Expand Down Expand Up @@ -1227,12 +1235,13 @@
</Docs>
</Member>
<Member MemberName="GetOrAdd&lt;TArg&gt;">
<MemberSignature Language="C#" Value="public TValue GetOrAdd&lt;TArg&gt; (TKey key, Func&lt;TKey,TArg,TValue&gt; valueFactory, TArg factoryArgument);" />
<MemberSignature Language="C#" Value="public TValue GetOrAdd&lt;TArg&gt; (TKey key, Func&lt;TKey,TArg,TValue&gt; valueFactory, TArg factoryArgument) where TArg : allows ref struct;" FrameworkAlternate="net-10.0;net-9.0" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance !TValue GetOrAdd&lt;TArg&gt;(!TKey key, class System.Func`3&lt;!TKey, !!TArg, !TValue&gt; valueFactory, !!TArg factoryArgument) cil managed" />
<MemberSignature Language="DocId" Value="M:System.Collections.Concurrent.ConcurrentDictionary`2.GetOrAdd``1(`0,System.Func{`0,``0,`1},``0)" />
<MemberSignature Language="VB.NET" Value="Public Function GetOrAdd(Of TArg) (key As TKey, valueFactory As Func(Of TKey, TArg, TValue), factoryArgument As TArg) As TValue" />
<MemberSignature Language="F#" Value="member this.GetOrAdd : 'Key * Func&lt;'Key, 'Arg, 'Value&gt; * 'Arg -&gt; 'Value" Usage="concurrentDictionary.GetOrAdd (key, valueFactory, factoryArgument)" />
<MemberSignature Language="C++ CLI" Value="public:&#xA;generic &lt;typename TArg&gt;&#xA; TValue GetOrAdd(TKey key, Func&lt;TKey, TArg, TValue&gt; ^ valueFactory, TArg factoryArgument);" />
<MemberSignature Language="C#" Value="public TValue GetOrAdd&lt;TArg&gt; (TKey key, Func&lt;TKey,TArg,TValue&gt; valueFactory, TArg factoryArgument);" FrameworkAlternate="net-5.0;net-6.0;net-7.0;net-8.0;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1;netstandard-2.1" />
<MemberType>Method</MemberType>
<AssemblyInfo>
<AssemblyName>System.Collections.Concurrent</AssemblyName>
Expand Down Expand Up @@ -1264,6 +1273,9 @@
<AttributeName Language="F#">[&lt;System.Runtime.CompilerServices.Nullable(2)&gt;]</AttributeName>
</Attribute>
</Attributes>
<Constraints>
<ParameterAttribute>AllowByRefLike</ParameterAttribute>
</Constraints>
</TypeParameter>
</TypeParameters>
<Parameters>
Expand Down Expand Up @@ -2714,7 +2726,7 @@ This member is an explicit interface member implementation. It can be used only
</Docs>
</Member>
<Member MemberName="TryGetAlternateLookup&lt;TAlternateKey&gt;">
<MemberSignature Language="C#" Value="public bool TryGetAlternateLookup&lt;TAlternateKey&gt; (out System.Collections.Concurrent.ConcurrentDictionary&lt;TKey,TValue&gt;.AlternateLookup&lt;TAlternateKey&gt; lookup);" />
<MemberSignature Language="C#" Value="public bool TryGetAlternateLookup&lt;TAlternateKey&gt; (out System.Collections.Concurrent.ConcurrentDictionary&lt;TKey,TValue&gt;.AlternateLookup&lt;TAlternateKey&gt; lookup) where TAlternateKey : allows ref struct;" />
<MemberSignature Language="ILAsm" Value=".method public hidebysig instance bool TryGetAlternateLookup&lt;TAlternateKey&gt;([out] valuetype System.Collections.Concurrent.ConcurrentDictionary`2/AlternateLookup`1&lt;!TKey, !TValue, !!TAlternateKey&gt;&amp; lookup) cil managed" />
<MemberSignature Language="DocId" Value="M:System.Collections.Concurrent.ConcurrentDictionary`2.TryGetAlternateLookup``1(System.Collections.Concurrent.ConcurrentDictionary`2.AlternateLookup{`0,`1,``0}@)" />
<MemberSignature Language="VB.NET" Value="Public Function TryGetAlternateLookup(Of TAlternateKey) (ByRef lookup As ConcurrentDictionary(Of TKey, TValue).AlternateLookup(Of TAlternateKey)) As Boolean" />
Expand All @@ -2736,7 +2748,11 @@ This member is an explicit interface member implementation. It can be used only
<ReturnType>System.Boolean</ReturnType>
</ReturnValue>
<TypeParameters>
<TypeParameter Name="TAlternateKey" />
<TypeParameter Name="TAlternateKey">
<Constraints>
<ParameterAttribute>AllowByRefLike</ParameterAttribute>
</Constraints>
</TypeParameter>
</TypeParameters>
<Parameters>
<Parameter Name="lookup" Type="System.Collections.Concurrent.ConcurrentDictionary&lt;TKey,TValue&gt;+AlternateLookup&lt;TAlternateKey&gt;" RefType="out" Index="0" FrameworkAlternate="net-9.0;net-10.0">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Type Name="FrozenDictionary&lt;TKey,TValue&gt;+AlternateLookup&lt;TAlternateKey&gt;" FullName="System.Collections.Frozen.FrozenDictionary&lt;TKey,TValue&gt;+AlternateLookup&lt;TAlternateKey&gt;">
<TypeSignature Language="C#" Value="public readonly struct FrozenDictionary&lt;TKey,TValue&gt;.AlternateLookup&lt;TAlternateKey&gt;" />
<TypeSignature Language="C#" Value="public readonly struct FrozenDictionary&lt;TKey,TValue&gt;.AlternateLookup&lt;TAlternateKey&gt; where TAlternateKey : allows ref struct" />
<TypeSignature Language="ILAsm" Value=".class nested public sequential ansi sealed beforefieldinit FrozenDictionary`2/AlternateLookup`1&lt;TKey, TValue, TAlternateKey&gt; extends System.ValueType" />
<TypeSignature Language="DocId" Value="T:System.Collections.Frozen.FrozenDictionary`2.AlternateLookup`1" />
<TypeSignature Language="VB.NET" Value="Public Structure FrozenDictionary(Of TKey, TValue).AlternateLookup(Of TAlternateKey)" />
Expand All @@ -20,7 +20,11 @@
</Attribute>
</Attributes>
</TypeParameter>
<TypeParameter Name="TAlternateKey" />
<TypeParameter Name="TAlternateKey">
<Constraints>
<ParameterAttribute>AllowByRefLike</ParameterAttribute>
</Constraints>
</TypeParameter>
</TypeParameters>
<Base>
<BaseTypeName>System.ValueType</BaseTypeName>
Expand Down
Loading