Skip to content

Commit dcef47f

Browse files
Merge pull request #44507 from dotnet/main
Merge main into live
2 parents d2dcf0d + c00df70 commit dcef47f

File tree

9 files changed

+47
-17
lines changed

9 files changed

+47
-17
lines changed

docs/azure/includes/dotnet-all.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Name | Package | Docs | Source |
22
| ---- | ------- | ---- | ------ |
3-
| AI Foundry | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.AI.Projects/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/AI.Projects-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Projects_1.0.0-beta.2/sdk/ai/Azure.AI.Projects/) |
3+
| AI Foundry | NuGet [1.0.0-beta.3](https://www.nuget.org/packages/Azure.AI.Projects/1.0.0-beta.3) | [docs](/dotnet/api/overview/azure/AI.Projects-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Projects_1.0.0-beta.3/sdk/ai/Azure.AI.Projects/) |
44
| AI Model Inference | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.AI.Inference/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/AI.Inference-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Inference_1.0.0-beta.2/sdk/ai/Azure.AI.Inference/) |
55
| Anomaly Detector | NuGet [3.0.0-preview.7](https://www.nuget.org/packages/Azure.AI.AnomalyDetector/3.0.0-preview.7) | [docs](/dotnet/api/overview/azure/AI.AnomalyDetector-readme?view=azure-dotnet-preview&preserve-view=true) | GitHub [3.0.0-preview.7](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.AnomalyDetector_3.0.0-preview.7/sdk/anomalydetector/Azure.AI.AnomalyDetector/) |
66
| App Configuration | NuGet [1.5.0](https://www.nuget.org/packages/Azure.Data.AppConfiguration/1.5.0) | [docs](/dotnet/api/overview/azure/Data.AppConfiguration-readme) | GitHub [1.5.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Data.AppConfiguration_1.5.0/sdk/appconfiguration/Azure.Data.AppConfiguration/) |
@@ -556,12 +556,12 @@
556556
| Microsoft.Azure.WebJobs.Extensions.Rpc | NuGet [3.0.41](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Extensions.Rpc/3.0.41) | | |
557557
| Microsoft.Azure.WebJobs.Rpc.Core | NuGet [3.0.41](https://www.nuget.org/packages/Microsoft.Azure.WebJobs.Rpc.Core/3.0.41) | | |
558558
| Service Bus - Message ID plugin | NuGet [2.0.0](https://www.nuget.org/packages/Microsoft.Azure.ServiceBus.MessageIdPlugin/2.0.0) | | |
559-
| SignalR | NuGet [1.29.0](https://www.nuget.org/packages/Microsoft.Azure.SignalR/1.29.0)<br>NuGet [1.25.0-preview1-11147](https://www.nuget.org/packages/Microsoft.Azure.SignalR/1.25.0-preview1-11147) | | GitHub [1.29.0](https://github.com/Azure/azure-signalr/tree/v1.5.0/src/Microsoft.Azure.SignalR) |
560-
| SignalR - ASP.NET | NuGet [1.29.0](https://www.nuget.org/packages/Microsoft.Azure.SignalR.AspNet/1.29.0) | | GitHub [1.29.0](https://github.com/Azure/azure-signalr/tree/v1.5.0/src/Microsoft.Azure.SignalR.AspNet) |
559+
| SignalR | NuGet [1.30.0](https://www.nuget.org/packages/Microsoft.Azure.SignalR/1.30.0)<br>NuGet [1.25.0-preview1-11147](https://www.nuget.org/packages/Microsoft.Azure.SignalR/1.25.0-preview1-11147) | | GitHub [1.30.0](https://github.com/Azure/azure-signalr/tree/v1.5.0/src/Microsoft.Azure.SignalR) |
560+
| SignalR - ASP.NET | NuGet [1.30.0](https://www.nuget.org/packages/Microsoft.Azure.SignalR.AspNet/1.30.0) | | GitHub [1.30.0](https://github.com/Azure/azure-signalr/tree/v1.5.0/src/Microsoft.Azure.SignalR.AspNet) |
561561
| SignalR - Benchmark | NuGet [1.0.0-preview1-10415](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Benchmark/1.0.0-preview1-10415) | | GitHub [1.0.0-preview1-10415](https://github.com/azure/azure-signalr-bench) |
562-
| SignalR - Protocols | NuGet [1.29.0](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Protocols/1.29.0) | | GitHub [1.29.0](https://github.com/Azure/azure-signalr/tree/v1.5.0/src/Microsoft.Azure.SignalR.Protocols) |
563-
| SignalR - Serverless Protocols | NuGet [1.10.0](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Serverless.Protocols/1.10.0) | | GitHub [1.10.0](https://github.com/Azure/azure-functions-signalrservice-extension/tree/v1.2.0/src/Microsoft.Azure.SignalR.Serverless.Protocols) |
564-
| SignalR Management | NuGet [1.29.0](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Management/1.29.0) | | GitHub [1.29.0](https://github.com/Azure/azure-signalr/tree/v1.5.0/src/Microsoft.Azure.SignalR.Management) |
562+
| SignalR - Protocols | NuGet [1.30.0](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Protocols/1.30.0) | | GitHub [1.30.0](https://github.com/Azure/azure-signalr/tree/v1.5.0/src/Microsoft.Azure.SignalR.Protocols) |
563+
| SignalR - Serverless Protocols | NuGet [1.11.0](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Serverless.Protocols/1.11.0) | | GitHub [1.11.0](https://github.com/Azure/azure-functions-signalrservice-extension/tree/v1.2.0/src/Microsoft.Azure.SignalR.Serverless.Protocols) |
564+
| SignalR Management | NuGet [1.30.0](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Management/1.30.0) | | GitHub [1.30.0](https://github.com/Azure/azure-signalr/tree/v1.5.0/src/Microsoft.Azure.SignalR.Management) |
565565
| SQL Database Elastic Scale Client | NuGet [2.4.2](https://www.nuget.org/packages/Microsoft.Azure.SqlDatabase.ElasticScale.Client/2.4.2) | | GitHub [2.4.2](https://github.com/Azure/elastic-db-tools/tree/v2.3.0/Src/ElasticScale.Client) |
566566
| SQL Database Elastic Scale Service SplitMerge | NuGet [1.2.0](https://www.nuget.org/packages/Microsoft.Azure.SqlDatabase.ElasticScale.Service.SplitMerge/1.2.0) | | |
567567
| SQL Database Jobs | NuGet [0.8.3362.1](https://www.nuget.org/packages/Microsoft.Azure.SqlDatabase.Jobs/0.8.3362.1) | | |
@@ -574,7 +574,7 @@
574574
| Hyak Common | NuGet [1.2.2](https://www.nuget.org/packages/Hyak.Common/1.2.2) | | |
575575
| Hyak Common - Tracing Etw | NuGet [1.0.2](https://www.nuget.org/packages/Hyak.Common.Tracing.Etw/1.0.2) | | |
576576
| Hyak Common - Tracing Log4Net | NuGet [1.0.2](https://www.nuget.org/packages/Hyak.Common.Tracing.Log4Net/1.0.2) | | |
577-
| Microsoft.Azure.SignalR.Emulator | NuGet [1.6.0](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Emulator/1.6.0)<br>NuGet [1.0.0-preview1-10809](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Emulator/1.0.0-preview1-10809) | | |
577+
| Microsoft.Azure.SignalR.Emulator | NuGet [1.6.1](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Emulator/1.6.1)<br>NuGet [1.0.0-preview1-10809](https://www.nuget.org/packages/Microsoft.Azure.SignalR.Emulator/1.0.0-preview1-10809) | | |
578578
| MSBuild | NuGet [0.32.0](https://www.nuget.org/packages/Microsoft.TypeSpec.MSBuild/0.32.0) | | |
579579
| ProviderHub Controller | NuGet [0.18.0](https://www.nuget.org/packages/Microsoft.TypeSpec.ProviderHub.Controller/0.18.0) | | |
580580
| ProviderHub Templates | NuGet [1.10.0](https://www.nuget.org/packages/Microsoft.TypeSpec.ProviderHub.Templates/1.10.0) | | |

docs/azure/includes/dotnet-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Name | Package | Docs | Source |
22
| ---- | ------- | ---- | ------ |
3-
| AI Foundry | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.AI.Projects/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/AI.Projects-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Projects_1.0.0-beta.2/sdk/ai/Azure.AI.Projects/) |
3+
| AI Foundry | NuGet [1.0.0-beta.3](https://www.nuget.org/packages/Azure.AI.Projects/1.0.0-beta.3) | [docs](/dotnet/api/overview/azure/AI.Projects-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.3](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Projects_1.0.0-beta.3/sdk/ai/Azure.AI.Projects/) |
44
| AI Model Inference | NuGet [1.0.0-beta.2](https://www.nuget.org/packages/Azure.AI.Inference/1.0.0-beta.2) | [docs](/dotnet/api/overview/azure/AI.Inference-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [1.0.0-beta.2](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.Inference_1.0.0-beta.2/sdk/ai/Azure.AI.Inference/) |
55
| Anomaly Detector | NuGet [3.0.0-preview.7](https://www.nuget.org/packages/Azure.AI.AnomalyDetector/3.0.0-preview.7) | [docs](/dotnet/api/overview/azure/AI.AnomalyDetector-readme?view=azure-dotnet-preview&amp;preserve-view=true) | GitHub [3.0.0-preview.7](https://github.com/Azure/azure-sdk-for-net/tree/Azure.AI.AnomalyDetector_3.0.0-preview.7/sdk/anomalydetector/Azure.AI.AnomalyDetector/) |
66
| App Configuration | NuGet [1.5.0](https://www.nuget.org/packages/Azure.Data.AppConfiguration/1.5.0) | [docs](/dotnet/api/overview/azure/Data.AppConfiguration-readme) | GitHub [1.5.0](https://github.com/Azure/azure-sdk-for-net/tree/Azure.Data.AppConfiguration_1.5.0/sdk/appconfiguration/Azure.Data.AppConfiguration/) |

docs/core/extensions/dependency-injection-basics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Dependency injection basics
33
description: Learn how to use dependency injection (DI) in your .NET apps with this simple example. Follow along with this pragmatic guide to understand DI basics in C#.
44
author: IEvangelist
55
ms.author: dapine
6-
ms.date: 07/30/2024
6+
ms.date: 01/22/2025
77
no-loc: [Transient, Scoped, Singleton, Example]
88
---
99

@@ -87,7 +87,7 @@ The preceding updated code demonstrates the how-to:
8787

8888
- Create a new `ServiceCollection` instance.
8989
- Register and configure services in the `ServiceCollection`:
90-
- The `IConsole` using the implementation factory overload, return a `DefaultConsole` type with the `IsEnabled` set to `true.
90+
- The `IConsole` using the implementation factory overload, return a `DefaultConsole` type with the `IsEnabled` set to `true`.
9191
- The `IGreetingService` is added with a corresponding implementation type of `DefaultGreetingService` type.
9292
- The `FarewellService` is added as a concrete type.
9393
- Build the `ServiceProvider` from the `ServiceCollection`.

docs/core/install/includes/verify-download-macos-linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The .NET release notes contain a link to a checksum file you can use to validate
4343
Replace the link in the following command with the link you copied.
4444

4545
```bash
46-
curl -O https://dotnetcli.blob.core.windows.net/dotnet/checksums/8.0.0-sha.txt
46+
curl -O https://builds.dotnet.microsoft.com/dotnet/checksums/8.0.0-sha.txt
4747
```
4848

4949
01. With both the checksum file and the .NET release file downloaded to the same directory, use the `sha512sum -c {file} --ignore-missing` command to validate the downloaded file.

docs/core/install/includes/verify-download-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The .NET release notes contain a link to a checksum file you can use to validate
4343
01. Use the following script, but replace the link to download the appropriate checksum file:
4444

4545
```powershell
46-
Invoke-WebRequest https://dotnetcli.blob.core.windows.net/dotnet/checksums/8.0.0-sha.txt -OutFile 8.0.0-sha.txt
46+
Invoke-WebRequest https://builds.dotnet.microsoft.com/dotnet/checksums/8.0.0-sha.txt -OutFile 8.0.0-sha.txt
4747
```
4848
4949
01. With both the checksum file and the .NET release file downloaded to the same directory, search the checksum file for the checksum of the .NET download:

docs/core/resilience/http-resilience.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,16 @@ Additionally, these strategies handle the following exceptions:
102102
- `HttpRequestException`
103103
- `TimeoutRejectedException`
104104

105+
#### Disable retries for a given list of HTTP methods
106+
107+
By default, the standard resilience handler is configured to make retries for all HTTP methods. For some applications, such behavior could be undesirable or even harmful. For example, if a POST request inserts a new record to a database, then making retries for such a request could lead to data duplication. If you need to disable retries for a given list of HTTP methods you can use the <xref:Microsoft.Extensions.Http.Resilience.HttpRetryStrategyOptionsExtensions.DisableFor(Microsoft.Extensions.Http.Resilience.HttpRetryStrategyOptions,System.Net.Http.HttpMethod[])> method:
108+
109+
:::code language="csharp" source="snippets/http-resilience/Program.RetryOptions.cs" id="disable_for":::
110+
111+
Alternatively, you can use the <xref:Microsoft.Extensions.Http.Resilience.HttpRetryStrategyOptionsExtensions.DisableForUnsafeHttpMethods(Microsoft.Extensions.Http.Resilience.HttpRetryStrategyOptions)> method, which disables retries for `POST`, `PATCH`, `PUT`, `DELETE`, and `CONNECT` requests. According to [RFC](https://www.rfc-editor.org/rfc/rfc7231#section-4.2.1), these methods are considered unsafe; meaning their semantics are not read-only:
112+
113+
:::code language="csharp" source="snippets/http-resilience/Program.RetryOptions.cs" id="disable_for_unsafe_http_methods":::
114+
105115
## Add standard hedging handler
106116

107117
The standard hedging handler wraps the execution of the request with a standard hedging mechanism. Hedging retries slow requests in parallel.

docs/core/resilience/snippets/http-resilience/Program.RetryOptions.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,24 @@ private static void ConfigureRetryOptions(HostApplicationBuilder builder)
1313
builder.Services.Configure<HttpStandardResilienceOptions>(section);
1414
// </options>
1515
}
16+
17+
private static void DisableRetriesFor(IHttpClientBuilder httpClientBuilder)
18+
{
19+
// <disable_for>
20+
httpClientBuilder.AddStandardResilienceHandler(options =>
21+
{
22+
options.Retry.DisableFor(HttpMethod.Post, HttpMethod.Delete);
23+
});
24+
// </disable_for>
25+
}
26+
27+
private static void DisableRetriesForUnsafeHttpMethods(IHttpClientBuilder httpClientBuilder)
28+
{
29+
// <disable_for_unsafe_http_methods>
30+
httpClientBuilder.AddStandardResilienceHandler(options =>
31+
{
32+
options.Retry.DisableForUnsafeHttpMethods();
33+
});
34+
// </disable_for_unsafe_http_methods>
35+
}
1636
}

docs/fundamentals/code-analysis/style-rules/ide0033.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Options specify the behavior that you want the rule to enforce. For information
4848
var name = customer.name;
4949

5050
// dotnet_style_explicit_tuple_names = false
51-
(string name, int age) customer = GetCustomer();
51+
(string, int) customer = GetCustomer();
5252
var name = customer.Item1;
5353
```
5454

@@ -58,7 +58,7 @@ Dim customer As (name As String, age As Integer) = GetCustomer()
5858
Dim name = customer.name
5959

6060
' dotnet_style_explicit_tuple_names = false
61-
Dim customer As (name As String, age As Integer) = GetCustomer()
61+
Dim customer As (String, Integer) = GetCustomer()
6262
Dim name = customer.Item1
6363
```
6464

docs/index.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,9 +372,9 @@ additionalContent:
372372
summary: API reference documentation for ML.NET
373373
url: ../api/index.md?view=ml-dotnet&preserve-view=true
374374
# Card
375-
- title: ".NET Package-provided API reference"
376-
summary: Reference documentation for package-provided .NET APIs
377-
url: ../api/index.md?view=dotnet-9.0-pp&preserve-view=true
375+
- title: ".NET Aspire API reference"
376+
summary: Reference documentation for .NET Aspire
377+
url: ../api/index.md?view=dotnet-aspire-9.0&preserve-view=true
378378
# Card
379379
- title: "C# language reference"
380380
summary: C# language reference and specification

0 commit comments

Comments
 (0)