Skip to content

Commit b0cc129

Browse files
authored
Merge pull request #299723 from MicrosoftDocs/main
5/12/2025 PM Publish
2 parents 2786c9f + af9043e commit b0cc129

File tree

122 files changed

+1406
-1033
lines changed

Some content is hidden

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

122 files changed

+1406
-1033
lines changed

articles/app-service/configure-basic-auth-disable.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ The following table shows how various deployment methods behave when basic authe
6868

6969
| Deployment method | When basic authentication is disabled |
7070
|-|-|
71-
| Visual Studio deployment | Doesn't work. |
71+
| Visual Studio deployment | Deployment with Microsoft Entra authentication requires Visual Studio 2022 version 17.12 or later. |
7272
| [FTP](deploy-ftp.md) | Doesn't work. |
7373
| [Local Git](deploy-local-git.md) | Doesn't work. |
7474
| Azure CLI | In the Azure CLI 2.48.1 or higher, the following commands fall back to Microsoft Entra authentication:<br/>[`az webapp up`](/cli/azure/webapp#az-webapp-up).<br/>[`az webapp deploy`](/cli/azure/webapp#az-webapp-deploy).<br/>[`az webapp log deployment show`](/cli/azure/webapp/log/deployment#az-webapp-log-deployment-show).<br/>[`az webapp log deployment list`](/cli/azure/webapp/log/deployment#az-webapp-log-deployment-list).<br/>[`az webapp log download`](/cli/azure/webapp/log#az-webapp-log-download).<br/>[`az webapp log tail`](/cli/azure/webapp/log#az-webapp-log-tail).<br/>[`az webapp browse`](/cli/azure/webapp#az-webapp-browse).<br/>[`az webapp create-remote-connection`](/cli/azure/webapp#az-webapp-create-remote-connection).<br/>[`az webapp ssh`](/cli/azure/webapp#az-webapp-ssh).<br/>[`az functionapp deploy`](/cli/azure/functionapp#az-functionapp-deploy).<br/>[`az functionapp log deployment list`](/cli/azure/functionapp/log/deployment#az-functionapp-log-deployment-list).<br/>[`az functionapp log deployment show`](/cli/azure/functionapp/log/deployment#az-functionapp-log-deployment-show).<br/>[`az functionapp deployment source config-zip`](/cli/azure/functionapp/deployment/source#az-functionapp-deployment-source-config-zip). |

articles/app-service/deploy-authentication-types.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ With Azure App Service, you have multiple options for deploying your web applica
2222
| SCM/Kudu/OneDeploy REST endpoint | Basic authentication<br/><br/>Microsoft Entra | [Deploy files to App Service](deploy-zip.md) |
2323
| Kudu UI | Basic authentication<br/><br/>Microsoft Entra | [Deploy files to App Service](deploy-zip.md) |
2424
| FTP/FTPS | Basic authentication | [Deploy your app to Azure App Service by using FTP/S](deploy-ftp.md) |
25-
| Visual Studio | Basic authentication  | [Quickstart: Deploy an ASP.NET web app](quickstart-dotnetcore.md)<br/><br/>[Develop and deploy WebJobs by using Visual Studio](webjobs-dotnet-deploy-vs.md)<br/><br/>[Troubleshoot an app in Azure App Service by using Visual Studio](troubleshoot-dotnet-visual-studio.md)<br/><br/>[GitHub Actions integration in Visual Studio](/visualstudio/azure/overview-github-actions)<br/><br/>[Deploy your application to Azure by using GitHub Actions workflows created by Visual Studio](/visualstudio/deployment/azure-deployment-using-github-actions) |
25+
| Visual Studio | Basic authentication<br/><br/>Microsoft Entra  | [Quickstart: Deploy an ASP.NET web app](quickstart-dotnetcore.md)<br/><br/>[Develop and deploy WebJobs by using Visual Studio](webjobs-dotnet-deploy-vs.md)<br/><br/>[Troubleshoot an app in Azure App Service by using Visual Studio](troubleshoot-dotnet-visual-studio.md)<br/><br/>[GitHub Actions integration in Visual Studio](/visualstudio/azure/overview-github-actions)<br/><br/>[Deploy your application to Azure by using GitHub Actions workflows created by Visual Studio](/visualstudio/deployment/azure-deployment-using-github-actions) |
2626
| Visual Studio Code | Microsoft Entra | [Quickstart: Deploy an ASP.NET web app](quickstart-dotnetcore.md)<br/><br/>[Working with GitHub in VS Code](https://code.visualstudio.com/docs/sourcecontrol/github) |
2727
| GitHub with GitHub Actions | Publish profile (basic authentication)<br/><br/>Service principal (Microsoft Entra)<br/><br/>OpenID Connect (Microsoft Entra) | [Deploy to App Service by using GitHub Actions](deploy-github-actions.md) |
2828
| GitHub with the App Service build service as a build engine | Basic authentication | [Continuous deployment to Azure App Service](deploy-continuous-deployment.md) |

articles/app-service/overview-vnet-integration.md

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ You must have at least the following Role-based access control permissions on th
108108
|-|-|
109109
| Microsoft.Network/virtualNetworks/read | Read the virtual network definition |
110110
| Microsoft.Network/virtualNetworks/subnets/read | Read a virtual network subnet definition |
111+
| Microsoft.Network/virtualNetworks/subnets/write | Delegate the subnet. Only required when the subnet has not been delegated or has not already been used for virtual network integration |
111112
| Microsoft.Network/virtualNetworks/subnets/join/action | Joins a virtual network |
112113

113114
If the virtual network is in a different subscription than the app, you must ensure that the subscription with the virtual network is registered for the `Microsoft.Web` resource provider. You can explicitly register the provider [by following this documentation](../azure-resource-manager/management/resource-providers-and-types.md#register-resource-provider), but it also automatically registers when creating the first web app in a subscription.

articles/application-gateway/for-containers/session-affinity.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application gateway
55
author: greg-lindsay
66
ms.service: azure-appgw-for-containers
77
ms.topic: concept-article
8-
ms.date: 5/9/2024
8+
ms.date: 5/12/2025
99
ms.author: greglin
1010
---
1111

@@ -78,7 +78,7 @@ EOF
7878

7979
Session affinity can be defined in an [IngressExtension](api-specification-kubernetes.md#alb.networking.azure.io/v1.IngressExtensionSpec) resource. You must specify `sessionAffinity` with an `affinityType` of either `application-cookie` or `managed-cookie`. In this example, we use `application-cookie` as the affinityType and explicitly define a cookie name and lifetime.
8080

81-
Example command to create a new IngressExtension with a defined cookie called `nomnom` with a lifetime of 3,600 seconds (1 hour).
81+
Example command to create a new IngressExtension with a defined cookie called `nomnom` with a lifetime of 3,600 seconds (1 hour) targetting a backend service called `echo`.
8282

8383
```bash
8484
kubectl apply -f - <<EOF
@@ -89,7 +89,7 @@ metadata:
8989
namespace: test-infra
9090
spec:
9191
backendSettings:
92-
- service: echo
92+
- service: echo # replace with your service name
9393
sessionAffinity:
9494
affinityType: "application-cookie"
9595
cookieName: "nomnom"

articles/application-gateway/how-to-tcp-tls-proxy.md

+2-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: application-gateway
66
author: greg-lindsay
77
ms.service: azure-application-gateway
88
ms.topic: how-to
9-
ms.date: 03/21/2025
9+
ms.date: 05/12/2025
1010
ms.author: greglin
1111
---
1212

@@ -40,13 +40,7 @@ Use the following steps to enroll into the public preview for Application Gatewa
4040

4141
1. Sign in to the [Azure portal](https://portal.azure.com/).
4242
2. In the search box, enter _subscriptions_ and select **Subscriptions**.
43-
44-
:::image type="content" source="../azure-resource-manager/management/media/preview-features/search.png" alt-text="Screenshot of Azure portal search.":::
45-
4643
3. Select the link for your subscription's name.
47-
48-
:::image type="content" source="../azure-resource-manager/management/media/preview-features/subscriptions.png" alt-text="Screenshot selecting the Azure subscription.":::
49-
5044
4. From the left menu, under **Settings** select **Preview features**.
5145

5246
:::image type="content" source="../azure-resource-manager/management/media/preview-features/preview-features-menu.png" alt-text="Screenshot of the Azure preview features menu.":::
@@ -57,7 +51,7 @@ Use the following steps to enroll into the public preview for Application Gatewa
5751

5852
6. From **Preview features** type into the filter box **AllowApplicationGatewayTlsProxy**, select the feature, and then select **Register**.
5953

60-
:::image type="content" source="../azure-resource-manager/management/media/preview-features/filter.png" alt-text="Screenshot of Azure portal filter preview features.":::
54+
![A screenshot of registering for the preview.](media/how-to-tcp-tls-proxy/preview.png)
6155

6256
## Create a SQL server
6357

Loading
Loading

articles/azure-functions/TOC.yml

+3
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,9 @@
741741
items:
742742
- name: Migrate from AWS Lambda
743743
items:
744+
- name: Migrate from AWS Lambda
745+
href: migration/migrate-aws-lambda-to-azure-functions.md
746+
displayName: AWS Lambda, migration
744747
- name: Overview
745748
href: migration/migrate-lambda-workloads-overview.md
746749
displayName: AWS Lambda, migration

articles/azure-functions/configure-networking-how-to.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,11 @@ Set up a secured storage account for your function app:
6666

6767
1. Secure the new storage account in one of the following ways:
6868

69-
* [Create a private endpoint](../storage/common/storage-private-endpoints.md#creating-a-private-endpoint). As you set up your private endpoint connection, create private endpoints for the `file` and `blob` subresources. For Durable Functions, you must also make `queue` and `table` subresources accessible through private endpoints. If you're using a custom or on-premises Domain Name System (DNS) server, [configure your DNS server](../storage/common/storage-private-endpoints.md#dns-changes-for-private-endpoints) to resolve to the new private endpoints.
69+
* [Create a private endpoint](../storage/common/storage-private-endpoints.md#creating-a-private-endpoint). As you set up your private endpoint connection, create private endpoints for the `file`, `blob` and `table` subresources. For Durable Functions, you must also make `queue` subresources accessible through private endpoints. If you're using a custom or on-premises Domain Name System (DNS) server, [configure your DNS server](../storage/common/storage-private-endpoints.md#dns-changes-for-private-endpoints) to resolve to the new private endpoints.
7070

71-
* [Restrict traffic to specific subnets](../storage/common/storage-network-security.md#grant-access-from-a-virtual-network). Ensure your function app is network integrated with an allowed subnet and that the subnet has a service endpoint to `Microsoft.Storage`.
71+
* [Restrict traffic to specific subnets](../storage/common/storage-network-security.md#grant-access-from-a-virtual-network). Ensure your function app is network integrated with an allowed subnet and that the subnet has only one of these service endpoints defined:
72+
* `Microsoft.Storage`: use when your app is in the same region as your virtual network.
73+
* `Microsoft.Storage.Global`: use when your app is in a different region than your virtual network.
7274

7375
1. Copy the file and blob content from the current storage account used by the function app to the newly secured storage account and file share. [AzCopy](../storage/common/storage-use-azcopy-blobs-copy.md) and [Azure Storage Explorer](https://techcommunity.microsoft.com/t5/azure-developer-community-blog/azure-tips-and-tricks-how-to-move-azure-storage-blobs-between/ba-p/3545304) are common methods. If you use Azure Storage Explorer, you might need to allow your client IP address access to your storage account's firewall.
7476

@@ -88,7 +90,7 @@ You're now ready to route your function app's traffic to go through the virtual
8890

8991
1. In the new page, under **Application routing**, select **Outbound internet traffic**.
9092

91-
1. Enable [content share routing](../app-service/overview-vnet-integration.md#content-share) to enable your function app to communicate with your new storage account through its virtual network. In the same page as the previous step, under **Configuration routing**, select **Content storage**.
93+
1. If your app uses an Azure Files share, enable [content share routing](../app-service/overview-vnet-integration.md#content-share) by selecting **Content storage** under **Configuration routing**. This allows your app to communicate with Azure Files using the virtual network.
9294

9395
[!INCLUDE [functions-content-over-vnet-shared-storage-note](../../includes/functions-content-over-vnet-shared-storage-note.md)]
9496

@@ -102,12 +104,10 @@ Finally, you need to update your application settings to point to the new secure
102104
| Setting name | Value | Comment |
103105
|----|----|----|
104106
| [`AzureWebJobsStorage`](./functions-app-settings.md#azurewebjobsstorage)| Storage connection string | Use the connection string for your new secured storage account, which you saved earlier. |
105-
| [`WEBSITE_CONTENTAZUREFILECONNECTIONSTRING`](./functions-app-settings.md#website_contentazurefileconnectionstring) | Storage connection string | Use the connection string for your new secured storage account, which you saved earlier. |
106-
| [`WEBSITE_CONTENTSHARE`](./functions-app-settings.md#website_contentshare) | File share | Use the name of the file share created in the secured storage account where the project deployment files reside. |
107+
| [`WEBSITE_CONTENTAZUREFILECONNECTIONSTRING`](./functions-app-settings.md#website_contentazurefileconnectionstring) | Storage connection string | Use the connection string for your new secured storage account, which you saved earlier. Only relevant if your app is using Azure Files. |
108+
| [`WEBSITE_CONTENTSHARE`](./functions-app-settings.md#website_contentshare) | File share | Use the name of the file share created in the secured storage account where the project deployment files reside. Only relevant if your app is using Azure Files. |
107109

108-
1. Select **Apply**, and then **Confirm** to save the new application settings in the function app.
109-
110-
The function app restarts.
110+
1. Select **Apply**, and then **Confirm** to save the new application settings in the function app. This causes the function app to restart.
111111

112112
After the function app finishes restarting, it connects to the secured storage account.
113113

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Functions Consumption plan hosting
3-
description: Learn about how Azure Functions Consumption plan hosting lets you run your code in an environment that scales dynamically, but you only pay for resources used during execution.
4-
ms.date: 07/10/2023
3+
description: Learn about how Azure Functions Consumption plan hosting lets you run your code in an environment that scales dynamically.
4+
ms.date: 05/06/2025
55
ms.topic: conceptual
66
ms.custom:
77
- build-2024
@@ -10,7 +10,7 @@ ms.custom:
1010

1111
# Azure Functions Consumption plan hosting
1212

13-
When you're using the Consumption plan, instances of the Azure Functions host are dynamically added and removed based on the number of incoming events. The Consumption plan, along with the [Flex Consumption plan](./flex-consumption-plan.md), is a fully <em>serverless</em> hosting option for Azure Functions.
13+
When you're using the Consumption plan, instances of the Azure Functions host are dynamically added and removed based on the number of incoming events. The Consumption plan, along with the [Flex Consumption plan](./flex-consumption-plan.md), is a fully *serverless* hosting option for Azure Functions.
1414

1515
## Benefits
1616

@@ -23,29 +23,29 @@ For a comparison of the Consumption plan against the other plan and hosting type
2323
2424
## Billing
2525

26-
Billing is based on number of executions, execution time, and memory used. Usage is aggregated across all functions within a function app. For more information, see the [Azure Functions pricing page](https://azure.microsoft.com/pricing/details/functions/).
26+
Billing is based on number of executions, execution time, and memory used. Usage is aggregated across all functions within a function app. For more information, see [Azure Functions pricing](https://azure.microsoft.com/pricing/details/functions/).
2727

2828
To learn more about how to estimate costs when running in a Consumption plan, see [Understanding Consumption plan costs](functions-consumption-costs.md).
2929

3030
## Create a Consumption plan function app
3131

3232
When you create a function app in the Azure portal, the Consumption plan is the default. When using APIs to create your function app, you don't have to first create an App Service plan as you do with Premium and Dedicated plans.
3333

34-
In Consumption plan hosting, each function app typically runs in its own plan. In the Azure portal or in code, you may also see the Consumption plan referred to as `Dynamic` or `Y1`.
34+
In Consumption plan hosting, each function app typically runs in its own plan. In the Azure portal or in code, you might also see the Consumption plan referred to as `Dynamic` or `Y1`.
3535

3636
Use the following links to learn how to create a serverless function app in a Consumption plan, either programmatically or in the Azure portal:
3737

38-
+ [Azure CLI](./scripts/functions-cli-create-serverless.md)
39-
+ [Azure portal](./functions-get-started.md)
40-
+ [Azure Resource Manager template](functions-create-first-function-resource-manager.md)
38+
- [Azure CLI](./scripts/functions-cli-create-serverless.md)
39+
- [Azure portal](./functions-get-started.md)
40+
- [Azure Resource Manager template](functions-create-first-function-resource-manager.md)
4141

4242
You can also create function apps in a Consumption plan when you publish a Functions project from [Visual Studio Code](./create-first-function-vs-code-csharp.md#publish-the-project-to-azure) or [Visual Studio](functions-create-your-first-function-visual-studio.md#publish-the-project-to-azure).
4343

4444
## Multiple apps in the same plan
4545

46-
The general recommendation is for each function app to have its own Consumption plan. However, if needed, function apps in the same region can be assigned to the same Consumption plan. Keep in mind that there is a [limit to the number of function apps that can run in a Consumption plan](functions-scale.md#service-limits). Function apps in the same plan still scale independently of each other.
46+
The general recommendation is for each function app to have its own Consumption plan. However, if needed, function apps in the same region can be assigned to the same Consumption plan. Keep in mind that there's a [limit to the number of function apps that can run in a Consumption plan](functions-scale.md#service-limits). Function apps in the same plan still scale independently of each other.
4747

4848
## Next steps
4949

50-
+ [Azure Functions hosting options](functions-scale.md)
51-
+ [Event-driven scaling in Azure Functions](event-driven-scaling.md)
50+
- [Azure Functions hosting options](functions-scale.md)
51+
- [Event-driven scaling in Azure Functions](event-driven-scaling.md)

0 commit comments

Comments
 (0)