Skip to content

Commit 1478513

Browse files
v-aljev-alje
committed
Merge branch 'main' into release-migrate-agent-public-preview
2 parents 18c2a85 + cb03332 commit 1478513

156 files changed

Lines changed: 17720 additions & 8189 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.openpublishing.redirection.json‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/azure-functions/durable/durable-task-scheduler/durable-task-scheduler-dedicated-sku.md",
5+
"redirect_url": "/azure/azure-functions/durable/durable-task-scheduler/durable-task-scheduler-billing",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/azure-functions/durable/durable-functions-cloud-backup.md",
10+
"redirect_url": "/azure/azure-functions/durable/durable-functions-fan-in-fan-out",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/azure-functions/durable/durable-functions-monitor-python.md",
15+
"redirect_url": "/azure/azure-functions/durable/durable-functions-monitor",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/azure-functions/durable/durable-functions-phone-verification.md",
20+
"redirect_url": "/azure/azure-functions/durable/durable-functions-human-interaction",
21+
"redirect_document_id": false
22+
},
323
{
424
"source_path": "articles/expressroute/expressroute-troubleshooting-arp-resource-manager.md",
525
"redirect_url": "/troubleshoot/azure/expressroute/expressroute-troubleshooting-arp-resource-manager",
@@ -6969,16 +6989,16 @@
69696989
"redirect_url": "/azure/oracle/oracle-db/database-overview",
69706990
"redirect_document_id": false
69716991
},
6972-
{
6992+
{
69736993
"source_path": "articles/cyclecloud/how-to/ccws/register-entra-id-app.md",
69746994
"redirect_url": "/azure/cyclecloud/how-to/create-app-registration",
69756995
"redirect_document_id": false
69766996
},
6977-
{
6997+
{
69786998
"source_path": "articles/cyclecloud/how-to/ccws/open-ondemand-add-users.md",
69796999
"redirect_url": "/azure/cyclecloud/how-to/ccws/configure-open-ondemand",
69807000
"redirect_document_id": false
6981-
},
7001+
},
69827002
{
69837003
"source_path": "articles/reliability/reliability-health-insights.md",
69847004
"redirect_url": "/azure/azure-health-insights/reliability-health-insights",

‎articles/api-management/websocket-api.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ During the WebSocket passthrough, the client application establishes a WebSocket
5353
1. When either side disconnects, API Management terminates the corresponding connection.
5454

5555
> [!NOTE]
56-
> The client-side and backend-side connections consist of one-to-one mapping.
56+
> Client-to-backend connections consist of one-to-one mappings. The same WebSocket session cannot be distributed across multiple backends.
5757
5858
## onHandshake operation
5959

@@ -120,6 +120,7 @@ The following are the current restrictions of WebSocket support in API Managemen
120120
* WebSocket APIs support the following valid buffer types for messages: Close, BinaryFragment, BinaryMessage, UTF8Fragment, and UTF8Message.
121121
* Currently, the [set-header](set-header-policy.md) policy doesn't support changing certain well-known headers, including `Host` headers, in onHandshake requests.
122122
* During the TLS handshake with a WebSocket backend, API Management validates that the server certificate is trusted and that its subject name matches the hostname. With HTTP APIs, API Management validates that the certificate is trusted but doesn’t validate that hostname and subject match.
123+
* WebSocket connections cannot be distributed or load-balanced across multiple backends because, once established, each connection is maintained one-to-one between the client and backend.
123124

124125
For WebSocket connection limits, see [API Management limits](../azure-resource-manager/management/azure-subscription-service-limits.md#azure-api-management-limits).
125126

‎articles/app-service/environment/index.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
### YamlMime:Landing
22

33
title: App Service Environment documentation
4-
summary: Azure App Service Environments enables you to host web apps in a fully isolated and dedicated environment for securely running App Service apps at high scale.
4+
summary: Azure App Service Environments enable you to host web apps in a fully isolated and dedicated environment for securely running App Service apps at high scale.
55

66
metadata:
77
title: Azure App Service Environment documentation
88
description: Host fully isolated websites in a secure and scalable environment. Find quickstarts, tutorials, and read about concepts to help you succeed with App Service Environment.
99
ms.topic: landing-page
1010
ms.author: mijacobs
1111
ms.service: azure-app-service
12-
ms.date: 11/15/2021
12+
ms.date: 02/05/2026
1313

1414
landingContent:
1515
- title: About App Service Environment

‎articles/azure-functions/.openpublishing.redirection.azure-functions.json‎

Lines changed: 61 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,55 @@
11
{
22
"redirections": [
33
{
4-
"source_path": "articles/azure=functions/durable/durable-task-scheduler/develop-with-durable-task-scheduler.md",
5-
"redirect_url": "/azure/durable-task-scheduler/develop-with-durable-task-scheduler",
6-
"redirect_document_id": false
4+
"source_path": "articles/azure-functions/durable/durable-functions-create-portal.md",
5+
"redirect_url": "/azure/azure-functions/durable/durable-functions-isolated-create-first-csharp",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/azure-functions/durable/durable-functions-cloud-backup.md",
10+
"redirect_url": "/azure/azure-functions/durable/durable-functions-fan-in-fan-out",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/azure-functions/durable/durable-functions-monitor-python.md",
15+
"redirect_url": "/azure/azure-functions/durable/durable-functions-monitor",
16+
"redirect_document_id": false
717
},
818
{
9-
"source_path": "articles/azure=functions/durable/durable-task-scheduler/troubleshoot-durable-task-scheduler.md",
10-
"redirect_url": "/azure/durable-task-scheduler/troubleshoot-durable-task-scheduler",
11-
"redirect_document_id": false
19+
"source_path": "articles/azure-functions/durable/durable-functions-phone-verification.md",
20+
"redirect_url": "/azure/azure-functions/durable/durable-functions-human-interaction",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/azure-functions/durable/durable-task-scheduler/develop-with-durable-task-scheduler-functions.md",
25+
"redirect_url": "/azure/azure-functions/durable/durable-task-scheduler/develop-with-durable-task-scheduler",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/azure-functions/durable/durable-task-scheduler/troubleshoot-durable-task-scheduler.md",
30+
"redirect_url": "/azure/azure-functions/durable/durable-task-scheduler/troubleshoot-durable-task-scheduler",
31+
"redirect_document_id": false
1232
},
1333
{
14-
"source_path": "articles/azure=functions/durable/durable-task-scheduler/quickstart-durable-task-scheduler.md",
15-
"redirect_url": "/azure/durable-task-scheduler/quickstart-durable-task-scheduler",
16-
"redirect_document_id": false
34+
"source_path": "articles/azure-functions/durable/durable-task-scheduler/quickstart-durable-task-scheduler.md",
35+
"redirect_url": "/azure/azure-functions/durable/durable-task-scheduler/quickstart-durable-task-scheduler",
36+
"redirect_document_id": false
1737
},
1838
{
19-
"source_path": "articles/azure=functions/durable/durable-task-scheduler/durable-task-scheduler.md",
20-
"redirect_url": "/azure/durable-task-scheduler/durable-task-scheduler",
21-
"redirect_document_id": false
39+
"source_path": "articles/azure-functions/durable/durable-task-scheduler/durable-task-scheduler.md",
40+
"redirect_url": "/azure/azure-functions/durable/durable-task-scheduler/durable-task-scheduler",
41+
"redirect_document_id": false
2242
},
2343
{
24-
"source_path": "articles/azure=functions/durable/durable-task-scheduler/durable-task-scheduler-dedicated-sku.md",
25-
"redirect_url": "/azure/durable-task-scheduler/durable-task-scheduler-dedicated-sku",
26-
"redirect_document_id": false
44+
"source_path": "articles/azure-functions/durable/durable-task-scheduler/durable-task-scheduler-dedicated-sku.md",
45+
"redirect_url": "/azure/azure-functions/durable/durable-task-scheduler/durable-task-scheduler-billing",
46+
"redirect_document_id": false
2747
},
2848
{
29-
"source_path": "articles/azure=functions/durable/durable-task-scheduler/durable-task-scheduler-dashboard.md",
30-
"redirect_url": "/azure/durable-task-scheduler/durable-task-scheduler-dashboard",
31-
"redirect_document_id": false
32-
},
49+
"source_path": "articles/azure-functions/durable/durable-task-scheduler/durable-task-scheduler-dashboard.md",
50+
"redirect_url": "/azure/azure-functions/durable/durable-task-scheduler/durable-task-scheduler-dashboard",
51+
"redirect_document_id": false
52+
},
3353
{
3454
"source_path_from_root": "/articles/azure-functions/create-first-function-vs-code-node_uiex.md",
3555
"redirect_url": "/azure/azure-functions/create-first-function-vs-code-node",
@@ -97,12 +117,12 @@
97117
},
98118
{
99119
"source_path_from_root": "/articles/azure-functions/durable-functions-cloud-backup.md",
100-
"redirect_url": "/azure/azure-functions/durable/durable-functions-cloud-backup",
120+
"redirect_url": "/azure/azure-functions/durable/durable-functions-fan-in-fan-out",
101121
"redirect_document_id": false
102122
},
103123
{
104124
"source_path_from_root": "/articles/azure-functions/durable-functions-install.md",
105-
"redirect_url": "/azure/azure-functions/durable/durable-functions-create-portal",
125+
"redirect_url": "/azure/azure-functions/durable/durable-functions-isolated-create-first-csharp",
106126
"redirect_document_id": false
107127
},
108128
{
@@ -182,7 +202,7 @@
182202
},
183203
{
184204
"source_path_from_root": "/articles/azure-functions/durable-functions-phone-verification.md",
185-
"redirect_url": "/azure/azure-functions/durable/durable-functions-phone-verification",
205+
"redirect_url": "/azure/azure-functions/durable/durable-functions-human-interaction",
186206
"redirect_document_id": false
187207
},
188208
{
@@ -212,7 +232,7 @@
212232
},
213233
{
214234
"source_path_from_root": "/articles/azure-functions/durable-functions-types-features-overview.md",
215-
"redirect_url": "/azure/azure-functions/durable/durable-functions-types-features-overview",
235+
"redirect_url": "/azure/azure-functions/durable/programming-model-overview",
216236
"redirect_document_id": false
217237
},
218238
{
@@ -232,7 +252,12 @@
232252
},
233253
{
234254
"source_path_from_root": "/articles/azure-functions/durable-functions-webjobs-sdk.md",
235-
"redirect_url": "/azure/azure-functions/durable/durable-functions-webjobs-sdk",
255+
"redirect_url": "/azure/azure-functions/durable/durable-task-scheduler/durable-task-overview",
256+
"redirect_document_id": false
257+
},
258+
{
259+
"source_path_from_root": "/articles/azure-functions/durable/durable-functions-webjobs-sdk.md",
260+
"redirect_url": "/azure/azure-functions/durable/durable-task-scheduler/durable-task-overview",
236261
"redirect_document_id": false
237262
},
238263
{
@@ -664,7 +689,7 @@
664689
"source_path_from_root": "/articles/azure-functions/python-313-changes.md",
665690
"redirect_url": "/azure/azure-functions/functions-reference-python#python-313-updates",
666691
"redirect_document_id": false
667-
},
692+
},
668693
{
669694
"source_path_from_root": "/articles/azure-functions/functions-bindings-mongodb-vcore-input.md",
670695
"redirect_url": "/azure/azure-functions/functions-bindings-documentdb-input",
@@ -684,6 +709,16 @@
684709
"source_path_from_root": "/articles/azure-functions/functions-bindings-mongodb-vcore.md",
685710
"redirect_url": "/azure/azure-functions/functions-bindings-documentdb",
686711
"redirect_document_id": true
712+
},
713+
{
714+
"source_path_from_root": "/articles/azure-functions/durable/durable-functions-orchestration-versioning.md",
715+
"redirect_url": "/azure/azure-functions/durable/durable-orchestration-versioning",
716+
"redirect_document_id": false
717+
},
718+
{
719+
"source_path_from_root": "/articles/azure-functions/durable/durable-task-scheduler/durable-task-scheduler-versioning.md",
720+
"redirect_url": "/azure/azure-functions/durable/durable-orchestration-versioning",
721+
"redirect_document_id": false
687722
}
688723
]
689-
}
724+
}

‎articles/azure-functions/dotnet-isolated-in-process-differences.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Use the following table to compare feature and functional differences between th
3030
| [Supported .NET versions](#supported-versions) | Long Term Support (LTS) versions,<br/>Standard Term Support (STS) versions,<br/>.NET Framework | Long Term Support (LTS) versions, ending with .NET 8 |
3131
| Core packages | [Microsoft.Azure.Functions.Worker](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker/)<br/>[Microsoft.Azure.Functions.Worker.Sdk](https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.Sdk) | [Microsoft.NET.Sdk.Functions](https://www.nuget.org/packages/Microsoft.NET.Sdk.Functions/) |
3232
| Binding extension packages | [Microsoft.Azure.Functions.Worker.Extensions.*](https://www.nuget.org/packages?q=Microsoft.Azure.Functions.Worker.Extensions) | [Microsoft.Azure.WebJobs.Extensions.*](https://www.nuget.org/packages?q=Microsoft.Azure.WebJobs.Extensions) |
33-
| Durable Functions | [Supported](durable/durable-functions-dotnet-isolated-overview.md)| [Supported](durable/durable-functions-overview.md) |
33+
| Durable Functions | [Supported](durable/durable-functions-dotnet-isolated-overview.md)| [Supported](durable/what-is-durable-task.md) |
3434
| Model types exposed by bindings | Simple types<br/>JSON serializable types<br/>Arrays/enumerations<br/>[Service SDK types](dotnet-isolated-process-guide.md#sdk-types)<sup>4</sup> | Simple types<br/>[JSON serializable](/dotnet/api/system.text.json.jsonserializeroptions) types<br/>Arrays/enumerations<br/>Service SDK types<sup>4</sup> |
3535
| HTTP trigger model types| [HttpRequestData] / [HttpResponseData]<br/>[HttpRequest] / [IActionResult] (using [ASP.NET Core integration][aspnetcore-integration])<sup>5</sup>| [HttpRequest] / [IActionResult]<sup>5</sup><br/>[HttpRequestMessage] / [HttpResponseMessage] |
3636
| Output binding interactions | Return values in an expanded model with:<br/> - single or [multiple outputs](dotnet-isolated-process-guide.md#multiple-output-bindings)<br/> - arrays of outputs| Return values (single output only),<br/>`out` parameters,<br/>`IAsyncCollector` |

0 commit comments

Comments
 (0)