Skip to content

Commit

Permalink
Merge pull request #41542 from dotnet/main
Browse files Browse the repository at this point in the history
Merge main into live
  • Loading branch information
dotnet-policy-service[bot] committed Jun 25, 2024
2 parents 32af537 + 60451f5 commit 03d6184
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
4 changes: 4 additions & 0 deletions docfx.json
Original file line number Diff line number Diff line change
Expand Up @@ -840,6 +840,10 @@
"docs/framework/**/*.md": "UpdateFrequency5",
"docs/visual-basic/**/*.md": "UpdateFrequency5"
},
"ms.collection": {
"docs/ai/**/**.md": "ce-skilling-ai-copilot",
"docs/ai/**/**.yml": "ce-skilling-ai-copilot"
},
"no-loc": {
"**/**.md": [
"Orleans"
Expand Down
2 changes: 1 addition & 1 deletion docs/azure/includes/dotnet-all.md
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
| Resource Management - Monitor | NuGet [1.3.1](https://www.nuget.org/packages/Azure.ResourceManager.Monitor/1.3.1) | [docs](/dotnet/api/overview/azure/ResourceManager.Monitor-readme) | GitHub [1.3.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Monitor_1.3.1/sdk/monitor/Azure.ResourceManager.Monitor/) |
| Resource Management - MySQL | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.MySql/1.0.1)<br>NuGet [1.1.0-beta.5](https://www.nuget.org/packages/Azure.ResourceManager.MySql/1.1.0-beta.5) | [docs](/dotnet/api/overview/azure/ResourceManager.MySql-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MySql_1.0.1/sdk/mysql/Azure.ResourceManager.MySql/)<br>GitHub [1.1.0-beta.5](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MySql_1.1.0-beta.5/sdk/mysql/Azure.ResourceManager.MySql/) |
| Resource Management - NetApp Files | NuGet [1.5.0](https://www.nuget.org/packages/Azure.ResourceManager.NetApp/1.5.0) | [docs](/dotnet/api/overview/azure/ResourceManager.NetApp-readme) | GitHub [1.5.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetApp_1.5.0/sdk/netapp/Azure.ResourceManager.NetApp/) |
| Resource Management - Network | NuGet [1.7.0](https://www.nuget.org/packages/Azure.ResourceManager.Network/1.7.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Network-readme) | GitHub [1.7.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Network_1.7.0/sdk/network/Azure.ResourceManager.Network/) |
| Resource Management - Network | NuGet [1.8.0](https://www.nuget.org/packages/Azure.ResourceManager.Network/1.8.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Network-readme) | GitHub [1.8.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Network_1.8.0/sdk/network/Azure.ResourceManager.Network/) |
| Resource Management - Network Analytics | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.NetworkAnalytics/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.NetworkAnalytics-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkAnalytics_1.0.0/sdk/networkanalytics/Azure.ResourceManager.NetworkAnalytics/) |
| Resource Management - Network Cloud | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.NetworkCloud/1.0.1) | [docs](/dotnet/api/overview/azure/ResourceManager.NetworkCloud-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkCloud_1.0.1/sdk/networkcloud/Azure.ResourceManager.NetworkCloud/) |
| Resource Management - Network Function | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.NetworkFunction/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.NetworkFunction-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkFunction_1.0.0-beta.4/sdk/networkfunction/Azure.ResourceManager.NetworkFunction/) |
Expand Down
2 changes: 1 addition & 1 deletion docs/azure/includes/dotnet-new.md
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
| Resource Management - Monitor | NuGet [1.3.1](https://www.nuget.org/packages/Azure.ResourceManager.Monitor/1.3.1) | [docs](/dotnet/api/overview/azure/ResourceManager.Monitor-readme) | GitHub [1.3.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Monitor_1.3.1/sdk/monitor/Azure.ResourceManager.Monitor/) |
| Resource Management - MySQL | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.MySql/1.0.1)<br>NuGet [1.1.0-beta.5](https://www.nuget.org/packages/Azure.ResourceManager.MySql/1.1.0-beta.5) | [docs](/dotnet/api/overview/azure/ResourceManager.MySql-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MySql_1.0.1/sdk/mysql/Azure.ResourceManager.MySql/)<br>GitHub [1.1.0-beta.5](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.MySql_1.1.0-beta.5/sdk/mysql/Azure.ResourceManager.MySql/) |
| Resource Management - NetApp Files | NuGet [1.5.0](https://www.nuget.org/packages/Azure.ResourceManager.NetApp/1.5.0) | [docs](/dotnet/api/overview/azure/ResourceManager.NetApp-readme) | GitHub [1.5.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetApp_1.5.0/sdk/netapp/Azure.ResourceManager.NetApp/) |
| Resource Management - Network | NuGet [1.7.0](https://www.nuget.org/packages/Azure.ResourceManager.Network/1.7.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Network-readme) | GitHub [1.7.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Network_1.7.0/sdk/network/Azure.ResourceManager.Network/) |
| Resource Management - Network | NuGet [1.8.0](https://www.nuget.org/packages/Azure.ResourceManager.Network/1.8.0) | [docs](/dotnet/api/overview/azure/ResourceManager.Network-readme) | GitHub [1.8.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.Network_1.8.0/sdk/network/Azure.ResourceManager.Network/) |
| Resource Management - Network Analytics | NuGet [1.0.0](https://www.nuget.org/packages/Azure.ResourceManager.NetworkAnalytics/1.0.0) | [docs](/dotnet/api/overview/azure/ResourceManager.NetworkAnalytics-readme) | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkAnalytics_1.0.0/sdk/networkanalytics/Azure.ResourceManager.NetworkAnalytics/) |
| Resource Management - Network Cloud | NuGet [1.0.1](https://www.nuget.org/packages/Azure.ResourceManager.NetworkCloud/1.0.1) | [docs](/dotnet/api/overview/azure/ResourceManager.NetworkCloud-readme) | GitHub [1.0.1](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkCloud_1.0.1/sdk/networkcloud/Azure.ResourceManager.NetworkCloud/) |
| Resource Management - Network Function | NuGet [1.0.0-beta.4](https://www.nuget.org/packages/Azure.ResourceManager.NetworkFunction/1.0.0-beta.4) | [docs](/dotnet/api/overview/azure/ResourceManager.NetworkFunction-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.4](https://github.com/Azure/azure-sdk-for-net/tree/Azure.ResourceManager.NetworkFunction_1.0.0-beta.4/sdk/networkfunction/Azure.ResourceManager.NetworkFunction/) |
Expand Down
2 changes: 1 addition & 1 deletion docs/core/tools/dotnet-install-script.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ The install scripts do not update the registry on Windows. They just download th

- **`-Architecture|--architecture <ARCHITECTURE>`**

Architecture of the .NET binaries to install. Possible values are `<auto>`, `amd64`, `x64`, `x86`, `arm64`, `arm`, `s390x`, and `ppc64le`. The default value is `<auto>`, which represents the currently running OS architecture.
Architecture of the .NET binaries to install. Possible values are `<auto>`, `amd64`, `x64`, `x86`, `arm64`, `arm`, `s390x`, `ppc64le`, and `riscv64`. The default value is `<auto>`, which represents the currently running OS architecture.

- **`-AzureFeed|--azure-feed`**

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,6 @@ That informs the compiler that any code where the return value is `false` doesn'

:::code language="csharp" source="snippets/NullableAttributes.cs" ID="NullCheckExample" :::

> [!NOTE]
> The preceding example is only valid in C# 11 and later. Starting with C# 11, the [`nameof` expression](../operators/nameof.md) can reference parameter and type parameter names when used in an attribute applied to a method. In C# 10 and earlier, you need to use a string literal instead of the `nameof` expression.
The <xref:System.String.IsNullOrEmpty(System.String)?DisplayProperty=nameWithType> method will be annotated as shown above for .NET Core 3.0. You may have similar methods in your codebase that check the state of objects for null values. The compiler won't recognize custom null check methods, and you'll need to add the annotations yourself. When you add the attribute, the compiler's static analysis knows when the tested variable has been null checked.

Another use for these attributes is the `Try*` pattern. The postconditions for `ref` and `out` arguments are communicated through the return value. Consider this method shown earlier (in a nullable disabled context):
Expand Down
11 changes: 8 additions & 3 deletions docs/framework/network-programming/tls.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,15 @@ For more information see [TLS protocol version support in Schannel](/windows/win

## Recommendations

- For TLS 1.3, target .NET Framework 4.8 or later.
- Do not specify the TLS version explicitly. Configure your code to let the OS decide on the TLS version.
- For TLS 1.3, target .NET Framework 4.8 or later. ([here](#audit-your-code-and-make-code-changes) is how to check what is your `target framework`.)
- Do not specify the TLS version explicitly. (i.e. don't use the method overloads of SslStream that take an explicit SslProtocols parameter.)
- That way your code will let the OS decide on the TLS version.
- If you must set <xref:System.Net.ServicePointManager.SecurityProtocol?displayProperty=nameWithType>, then set it to <xref:System.Net.SecurityProtocolType.SystemDefault?displayProperty=nameWithType>. That will also use OS default.
- If you must use the method overloads of SslStream that take an explicit SslProtocols parameter, then pass `SslProtocols.SystemDefault` as argument. That will also use OS default.
- Perform a thorough code audit to verify you're not specifying a TLS or SSL version explicitly.
- Do not use `SslProtocols.Default`. (`SslProtocols.Default` specifies SSL3 and TLS1.0 version which is obsoleted.)

> [!WARNING]
> Do not use `SslProtocols.Default`. (because it sets TLS version to SSL3 and TLS1.0 which is obsoleted.)
When your app lets the OS choose the TLS version:

Expand Down

0 comments on commit 03d6184

Please sign in to comment.