Skip to content

Merge main into live #10394

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
Sep 12, 2024
Merged

Merge main into live #10394

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
2e9b69c
Update NotSupportedException for BinaryFormatter (de)serialize (#8992)
gewarren Sep 11, 2024
d37511f
Mention gss-ntlmssp package for NTLM on Linux (#10359)
rzikm Sep 12, 2024
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
5 changes: 5 additions & 0 deletions xml/System.Net/NetworkCredential.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@
## Remarks
The <xref:System.Net.NetworkCredential> class is a base class that supplies credentials in password-based authentication schemes such as basic, digest, NTLM, and Kerberos. Classes that implement the <xref:System.Net.ICredentials> interface, such as the <xref:System.Net.CredentialCache> class, return <xref:System.Net.NetworkCredential> objects.

> [!NOTE]
> On Unix platforms, use of NTLM authentication may require installing the NTLM plugin for the GSSAPI layer used by the implemention. On Ubuntu distributions, the package is called `gss-ntlmssp`. Alternatively, applications may opt in for a managed implementation of NTLM by setting the `_UseManagedNtlm` .csproj property (.NET 9+ only), or setting the `System.Net.Security.UseManagedNtlm` AppContext switch.
>
> On Windows, NTLM and Negotiate (Kerberos) authentication always depend on GSSAPI of the operating system.

This class does not support public key-based authentication methods such as Secure Sockets Layer (SSL) client authentication.


Expand Down
10 changes: 5 additions & 5 deletions xml/System.Runtime.Serialization.Formatters.Binary/BinaryFormatter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</Attributes>
<Docs>
<summary>Serializes and deserializes an object, or an entire graph of connected objects, in binary format.</summary>
<remarks>Warning: BinaryFormatter is insecure and can't be made secure. For more information, see the <see href="/dotnet/standard/serialization/binaryformatter-security-guide">BinaryFormatter security guide</see> and <see href="/previous-versions/dotnet/fundamentals/serialization/binary/system-runtime-serialization-formatters-binary-binaryformatter">System.Runtime.Serialization.Formatters.Binary.BinaryFormatter class</see>.</remarks>
<remarks>Warning: BinaryFormatter is insecure and can't be made secure. For more information, see the <see href="/dotnet/standard/serialization/binaryformatter-security-guide">BinaryFormatter security guide</see>. The in-box implementation of BinaryFormatter was removed in .NET 9. For more information, see <see href="/dotnet/standard/serialization/binaryformatter-migration-guide/">BinaryFormatter migration guide</see>.</remarks>
</Docs>
<Members>
<MemberGroup MemberName=".ctor">
Expand Down Expand Up @@ -132,7 +132,6 @@ This constructor sets the properties of the <xref:System.Runtime.Serialization.F
|-------------------|---------------|
|<xref:System.Runtime.Serialization.Formatters.Binary.BinaryFormatter.SurrogateSelector%2A>|`null`|
|<xref:System.Runtime.Serialization.Formatters.Binary.BinaryFormatter.Context%2A>|A <xref:System.Runtime.Serialization.StreamingContext> with a value that indicates that serialized data can be transmitted to or received from any of the other contexts. (<xref:System.Runtime.Serialization.StreamingContextStates.All?displayProperty=nameWithType>)|

]]></format>
</remarks>
</Docs>
Expand Down Expand Up @@ -460,7 +459,8 @@ An error occurred while deserializing an object from the input stream.

The <see langword="InnerException" /> property may contain more information about the root cause.</exception>
<exception cref="T:System.Security.SecurityException">The caller does not have the required permission.</exception>
<exception cref="T:System.NotSupportedException">ASP.NET Core 5 and later: Always thrown unless <see cref="T:System.Runtime.Serialization.Formatters.Binary.BinaryFormatter" /> functionality is re-enabled in the project file. For more information, see <see href="https://aka.ms/binaryformatter">Resolving BinaryFormatter obsoletion and disablement errors</see>.</exception>
<exception cref="T:System.NotSupportedException">ASP.NET Core 5-8: Always thrown unless <see cref="T:System.Runtime.Serialization.Formatters.Binary.BinaryFormatter" /> functionality is re-enabled in the project file. For more information, see <see href="https://aka.ms/binaryformatter">Resolving BinaryFormatter obsoletion and disablement errors</see>.</exception>
<exception cref="T:System.PlatformNotSupportedException">.NET 9 and later versions: In all cases. For more information, see <see href="https://learn.microsoft.com/dotnet/standard/serialization/binaryformatter-migration-guide/">BinaryFormatter migration guide</see>.</exception>
</Docs>
</Member>
<Member MemberName="Deserialize">
Expand Down Expand Up @@ -635,7 +635,6 @@ For deserialization to succeed, the current position in the stream must be at th

]]></format>
</remarks>
<related type="Article" href="https://learn.microsoft.com/previous-versions/dotnet/netframework-4.0/5dxse167(v=vs.100)">Automatic Deserialization in .NET Framework Remoting</related>
</Docs>
</Member>
<MemberGroup MemberName="Serialize">
Expand Down Expand Up @@ -730,7 +729,8 @@ For deserialization to succeed, the current position in the stream must be at th
The <paramref name="graph" /> is null.</exception>
<exception cref="T:System.Runtime.Serialization.SerializationException">An error has occurred during serialization, such as if an object in the <paramref name="graph" /> parameter is not marked as serializable.</exception>
<exception cref="T:System.Security.SecurityException">The caller does not have the required permission.</exception>
<exception cref="T:System.NotSupportedException">ASP.NET Core 5 and later: Always thrown unless <see cref="T:System.Runtime.Serialization.Formatters.Binary.BinaryFormatter" /> functionality is re-enabled in the project file. For more information, see <see href="https://aka.ms/binaryformatter">Resolving BinaryFormatter obsoletion and disablement errors</see>.</exception>
<exception cref="T:System.NotSupportedException">ASP.NET Core 5-8: Always thrown unless <see cref="T:System.Runtime.Serialization.Formatters.Binary.BinaryFormatter" /> functionality is re-enabled in the project file. For more information, see <see href="https://aka.ms/binaryformatter">Resolving BinaryFormatter obsoletion and disablement errors</see>.</exception>
<exception cref="T:System.PlatformNotSupportedException">.NET 9 and later versions: In all cases. For more information, see <see href="https://learn.microsoft.com/dotnet/standard/serialization/binaryformatter-migration-guide/">BinaryFormatter migration guide</see>.</exception>
</Docs>
</Member>
<Member MemberName="Serialize">
Expand Down