Merge pull request #11696 from dotnet/main

Merge main into live

Author: dotnet-policy-service[bot]

xml/System.IO.Compression/ZipArchiveEntry.xml

@@ -409,7 +409,7 @@ If the comment byte length is larger than <xref:System.UInt16.MaxValue>, it will
 -or-
 
  The archive mode is set to <see cref="F:System.IO.Compression.ZipArchiveMode.Update" /> and the entry has been opened.</exception>
-        <exception cref="T:System.ArgumentOutOfRangeException">An attempt was made to set this property to a value that is either earlier than 1980 January 1 0:00:00 (midnight) or later than 2107 December 31 23:59:58 (one second before midnight).</exception>
+        <exception cref="T:System.ArgumentOutOfRangeException">An attempt was made to set this property to a value that is either earlier than 1980 January 1 0:00:00 (midnight) or later than 2107 December 31 23:59:58 (two seconds before midnight).</exception>
       </Docs>
     </Member>
     <Member MemberName="Length">

xml/System.Reflection.Emit/AssemblyBuilder.xml

@@ -442,7 +442,7 @@ The following code example shows how to define and use a dynamic assembly. The e
         <param name="access">The access rights of the assembly.</param>
         <summary>Defines a dynamic assembly that has the specified name and access rights.</summary>
         <returns>An object that represents the new assembly.</returns>
-        <remarks>To be added.</remarks>
+        <remarks>.NET 6+ only: If the <see cref="P:System.Runtime.Loader.AssemblyLoadContext.CurrentContextualReflectionContext" /> property is null, then the assembly is created in the <see cref="T:System.Runtime.Loader.AssemblyLoadContext" /> of the function that calls DefineDynamicAssembly. Otherwise, it's created with the <see cref="T:System.Runtime.Loader.AssemblyLoadContext" /> specified in <see cref="P:System.Runtime.Loader.AssemblyLoadContext.CurrentContextualReflectionContext" />.</remarks>
       </Docs>
     </Member>
     <Member MemberName="DefineDynamicAssembly">
@@ -505,9 +505,9 @@ The following code example shows how to define and use a dynamic assembly. The e
         <param name="name">The name of the assembly.</param>
         <param name="access">The access rights of the assembly.</param>
         <param name="assemblyAttributes">A collection that contains the attributes of the assembly.</param>
-        <summary>Defines a new assembly that has the specified name, access rights, and attributes.</summary>
+        <summary>Defines a dynamic assembly that has the specified name, access rights, and attributes.</summary>
         <returns>An object that represents the new assembly.</returns>
-        <remarks>To be added.</remarks>
+        <remarks>.NET 6+ only: If the <see cref="P:System.Runtime.Loader.AssemblyLoadContext.CurrentContextualReflectionContext" /> property is null, then the assembly is created in the <see cref="T:System.Runtime.Loader.AssemblyLoadContext" /> of the function that calls DefineDynamicAssembly. Otherwise, it's created with the <see cref="T:System.Runtime.Loader.AssemblyLoadContext" /> specified in <see cref="P:System.Runtime.Loader.AssemblyLoadContext.CurrentContextualReflectionContext" />.</remarks>
       </Docs>
     </Member>
     <MemberGroup MemberName="DefineDynamicModule">

xml/System.Reflection/Assembly.xml

@@ -3241,6 +3241,8 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
 ## Remarks
  This method only searches the current assembly instance. The `name` parameter includes the namespace but not the assembly. To search other assemblies for a type, use the <xref:System.Type.GetType%28System.String%29?displayProperty=nameWithType> method overload, which can optionally include an assembly display name as part of the type name.
 
+ In .NET Core/.NET 5+, if there are assembly-qualified generic type parameters in the type name string, those assembly references will be loaded by the <xref:System.Runtime.Loader.AssemblyLoadContext> of the method that called Assembly.GetType, or by the <xref:System.Runtime.Loader.AssemblyLoadContext.CurrentContextualReflectionContext%2A?displayProperty=nameWithType> context if it's set.
+
 > [!NOTE]
 >  If the type has been forwarded to another assembly, it is still returned by this method. For information on type forwarding, see [Type Forwarding in the Common Language Runtime](/dotnet/standard/assembly/type-forwarding).
 
@@ -3345,6 +3347,8 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
 ## Remarks
  This method only searches the current assembly instance. The `name` parameter includes the namespace but not the assembly. To search other assemblies for a type, use the <xref:System.Type.GetType%28System.String%29?displayProperty=nameWithType> method overload, which can optionally include an assembly display name as part of the type name.
 
+ In .NET Core/.NET 5+, if there are assembly-qualified generic type parameters in the type name string, those assembly references will be loaded by the <xref:System.Runtime.Loader.AssemblyLoadContext> of the method that called Assembly.GetType, or by the <xref:System.Runtime.Loader.AssemblyLoadContext.CurrentContextualReflectionContext%2A?displayProperty=nameWithType> context if it's set.
+
 > [!NOTE]
 >  If the type has been forwarded to another assembly, it is still returned by this method. For information on type forwarding, see [Type Forwarding in the Common Language Runtime](/dotnet/standard/assembly/type-forwarding).
 
@@ -3450,6 +3454,8 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
 ## Remarks
  This method only searches the current assembly instance. The `name` parameter includes the namespace but not the assembly. To search other assemblies for a type, use the <xref:System.Type.GetType%28System.String%29?displayProperty=nameWithType> method overload, which can optionally include an assembly display name as part of the type name.
 
+ In .NET Core/.NET 5+, if there are assembly-qualified generic type parameters in the type name string, those assembly references will be loaded by the <xref:System.Runtime.Loader.AssemblyLoadContext> of the method that called Assembly.GetType, or by the <xref:System.Runtime.Loader.AssemblyLoadContext.CurrentContextualReflectionContext%2A?displayProperty=nameWithType> context if it's set.
+
 > [!NOTE]
 >  If the type has been forwarded to another assembly, it is still returned by this method. For information on type forwarding, see [Type Forwarding in the Common Language Runtime](/dotnet/standard/assembly/type-forwarding).
 
@@ -4097,7 +4103,7 @@ This property is marked obsolete starting in .NET 5, and generates a compile-tim
 
 ## Remarks
 
-In .NET Core/.NET 5+, the target assembly will be loaded into the current <xref:System.Runtime.Loader.AssemblyLoadContext>. For more information on assembly loading, see [Managed assembly loading algorithm](/dotnet/core/dependency-loading/loading-managed#algorithm").
+ In .NET Core/.NET 5+, the target assembly will be loaded into the current <xref:System.Runtime.Loader.AssemblyLoadContext> or into the <xref:System.Runtime.Loader.AssemblyLoadContext.CurrentContextualReflectionContext%2A?displayProperty=nameWithType> context if it's set. For more information on assembly loading, see [Managed assembly loading algorithm](/dotnet/core/dependency-loading/loading-managed#algorithm).
 
 > [!NOTE]
 > **.NET Framework only:** For information about loading assemblies from remote locations, see [`<loadFromRemoteSources>`](/dotnet/framework/configure-apps/file-schema/runtime/loadfromremotesources-element).
@@ -4191,7 +4197,7 @@ Note: In <see href="https://go.microsoft.com/fwlink/?LinkID=247912">.NET for Win
 
 ## Remarks
 
-In .NET Core/5+, the target assembly is loaded into the current <xref:System.Runtime.Loader.AssemblyLoadContext>. For more information on assembly loading, see [Managed assembly loading algorithm](/dotnet/core/dependency-loading/loading-managed#algorithm").
+ In .NET Core/.NET 5+, the target assembly will be loaded into the current <xref:System.Runtime.Loader.AssemblyLoadContext> or into the <xref:System.Runtime.Loader.AssemblyLoadContext.CurrentContextualReflectionContext%2A?displayProperty=nameWithType> context if it's set. For more information on assembly loading, see [Managed assembly loading algorithm](/dotnet/core/dependency-loading/loading-managed#algorithm).
 
 To load the correct assembly, it's recommended to call the `Load` method by passing the long form of the assembly name. The long form of an assembly name consists of its simple name (such as "System" for the System.dll assembly) along with its version, culture, public key token, and optionally its processor architecture. It corresponds to the assembly's <xref:System.Reflection.Assembly.FullName%2A> property. The following example illustrates the use of a long name to load the System.dll assembly for .NET Framework 4:
 
@@ -5571,6 +5577,8 @@ The assembly is loaded into the default AssemblyLoadContext. For more informatio
 
  Applications that load assemblies with this method will be affected by upgrades of those assemblies. Therefore, do not use this method; redesign the application to use the <xref:System.Reflection.Assembly.Load%28System.String%29> method overload or the <xref:System.Reflection.Assembly.LoadFrom%28System.String%29> method overload.
 
+ In .NET Core/5+, the target assembly is loaded into the current <xref:System.Runtime.Loader.AssemblyLoadContext> or the <xref:System.Runtime.Loader.AssemblyLoadContext.CurrentContextualReflectionContext%2A?displayProperty=nameWithType> if it's set.
+
  This method first calls <xref:System.Reflection.Assembly.Load%2A>. If the assembly is not found, this method returns the assembly from the global assembly cache that has the same simple name, and the highest version number.
 
  ]]></format>

xml/System.Threading/Interlocked.xml

@@ -858,10 +858,10 @@
         <Parameter Name="comparand" Type="System.IntPtr" Index="2" FrameworkAlternate="dotnet-uwp-10.0;net-10.0;net-5.0;net-6.0;net-7.0;net-8.0;net-9.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-2.0;netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1;netstandard-1.0;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.6;netstandard-2.0;netstandard-2.1" />
       </Parameters>
       <Docs>
-        <param name="location1">The destination <see cref="T:System.IntPtr" />, whose value is compared with the value of <paramref name="comparand" /> and possibly replaced by <paramref name="value" />.</param>
-        <param name="value">The <see cref="T:System.IntPtr" /> that replaces the destination value if the comparison results in equality.</param>
-        <param name="comparand">The <see cref="T:System.IntPtr" /> that is compared to the value at <paramref name="location1" />.</param>
-        <summary>Compares two platform-specific handles or pointers for equality and, if they are equal, replaces the first one, as an atomic operation.</summary>
+        <param name="location1">The destination, whose value is compared with the value of <paramref name="comparand" /> and possibly replaced by <paramref name="value" />.</param>
+        <param name="value">The value that replaces the destination value if the comparison results in equality.</param>
+        <param name="comparand">The value that is compared to the value at <paramref name="location1" />.</param>
+        <summary>Compares two native-sized signed integers for equality and, if they are equal, replaces the first one, as an atomic operation.</summary>
         <returns>The original value in <paramref name="location1" />.</returns>
         <remarks>
           <format type="text/markdown"><![CDATA[
@@ -1251,10 +1251,10 @@ If `comparand` and the object in `location1` are equal by reference, then `value
         <Parameter Name="comparand" Type="System.UIntPtr" Index="2" FrameworkAlternate="net-7.0;net-8.0;net-9.0;net-10.0" />
       </Parameters>
       <Docs>
-        <param name="location1">The destination <see cref="T:System.UIntPtr" />, whose value is compared with the value of <paramref name="comparand" /> and possibly replaced by <paramref name="value" />.</param>
-        <param name="value">The <see cref="T:System.UIntPtr" /> that replaces the destination value if the comparison results in equality.</param>
-        <param name="comparand">The <see cref="T:System.UIntPtr" /> that is compared to the value at <paramref name="location1" />.</param>
-        <summary>Compares two platform-specific handles or pointers for equality and, if they are equal, replaces the first one, as an atomic operation.</summary>
+        <param name="location1">The destination, whose value is compared with the value of <paramref name="comparand" /> and possibly replaced by <paramref name="value" />.</param>
+        <param name="value">The value that replaces the destination value if the comparison results in equality.</param>
+        <param name="comparand">The value that is compared to the value at <paramref name="location1" />.</param>
+        <summary>Compares two native-sized unsigned integers for equality and, if they are equal, replaces the first one, as an atomic operation.</summary>
         <returns>The original value in <paramref name="location1" />.</returns>
         <remarks>To be added.</remarks>
         <exception cref="T:System.NullReferenceException">The address of <paramref name="location1" /> is a <see langword="null" /> pointer.</exception>
@@ -1919,7 +1919,7 @@ If `comparand` and the value in `location1` are equal by reference, then `value`
       <Docs>
         <param name="location1">The variable to set to the specified value.</param>
         <param name="value">The value to which the <paramref name="location1" /> parameter is set.</param>
-        <summary>Sets a platform-specific handle or pointer to a specified value and returns the original value, as an atomic operation.</summary>
+        <summary>Sets a native-sized signed integer to a specified value and returns the original value, as an atomic operation.</summary>
         <returns>The original value of <paramref name="location1" />.</returns>
         <remarks>To be added.</remarks>
         <exception cref="T:System.NullReferenceException">The address of <paramref name="location1" /> is a <see langword="null" /> pointer.</exception>
@@ -2274,7 +2274,7 @@ If `comparand` and the value in `location1` are equal by reference, then `value`
       <Docs>
         <param name="location1">The variable to set to the specified value.</param>
         <param name="value">The value to which the <paramref name="location1" /> parameter is set.</param>
-        <summary>Sets a platform-specific handle or pointer to a specified value and returns the original value, as an atomic operation.</summary>
+        <summary>Sets a native-sized unsigned integer to a specified value and returns the original value, as an atomic operation.</summary>
         <returns>The original value of <paramref name="location1" />.</returns>
         <remarks>To be added.</remarks>
         <exception cref="T:System.NullReferenceException">The address of <paramref name="location1" /> is a <see langword="null" /> pointer.</exception>

xml/System.Threading/SemaphoreSlim.xml

@@ -826,7 +826,7 @@ If a thread or task is blocked when calling <xref:System.Threading.SemaphoreSlim
 
 -or-
 
-<paramref name="timeout" /> is greater than <see cref="F:System.Int32.MaxValue">Int32.MaxValue</see>.</exception>
+In .NET 9 and earlier versions, <paramref name="timeout" /> is greater than <see cref="F:System.Int32.MaxValue">Int32.MaxValue</see>.</exception>
         <exception cref="T:System.ObjectDisposedException">The semaphoreSlim instance has been disposed.</exception>
         <related type="Article" href="/dotnet/standard/threading/semaphore-and-semaphoreslim">Semaphore and SemaphoreSlim</related>
       </Docs>
@@ -988,9 +988,9 @@ If `cancellationToken` is cancelled, the method throws an <xref:System.Operation
         <exception cref="T:System.ArgumentOutOfRangeException">
           <paramref name="timeout" /> is a negative number other than -1, which represents an infinite timeout.
 
--or-.
+-or-
 
-<paramref name="timeout" /> is greater than <see cref="F:System.Int32.MaxValue">Int32.MaxValue</see>.</exception>
+In .NET 9 and earlier versions, <paramref name="timeout" /> is greater than <see cref="F:System.Int32.MaxValue">Int32.MaxValue</see>.</exception>
         <exception cref="T:System.ObjectDisposedException">The semaphoreSlim instance has been disposed.
 
 -or-
@@ -1225,7 +1225,7 @@ The <see cref="T:System.Threading.CancellationTokenSource" /> that created <para
 
 -or-
 
-<paramref name="timeout" /> is greater than <see cref="F:System.Int32.MaxValue">Int32.MaxValue</see>.</exception>
+In .NET 9 and earlier versions, <paramref name="timeout" /> is greater than <see cref="F:System.Int32.MaxValue">Int32.MaxValue</see>.</exception>
       </Docs>
     </Member>
     <Member MemberName="WaitAsync">
@@ -1356,7 +1356,7 @@ The <see cref="T:System.Threading.CancellationTokenSource" /> that created <para
 
 -or-
 
-<paramref name="timeout" /> is greater than <see cref="F:System.Int32.MaxValue">Int32.MaxValue</see>.</exception>
+In .NET 9 and earlier versions, <paramref name="timeout" /> is greater than <see cref="F:System.Int32.MaxValue">Int32.MaxValue</see>.</exception>
         <exception cref="T:System.OperationCanceledException">
           <paramref name="cancellationToken" /> was canceled.</exception>
         <exception cref="T:System.ObjectDisposedException">The <see cref="T:System.Threading.SemaphoreSlim" /> has been disposed.</exception>