Skip to content

Commit 7577e04

Browse files
authored
Merge branch 'main' into Top50_patricka_Row47
2 parents 7a7baf6 + 145a045 commit 7577e04

File tree

352 files changed

+4755
-3336
lines changed

Some content is hidden

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

352 files changed

+4755
-3336
lines changed

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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-diagnostics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This article explains how to troubleshoot issues with your app in Azure App Serv
1515

1616
Azure App Service diagnostics is an interactive experience to help you troubleshoot your app with no configuration required. App Service diagnostics points out what's wrong and guides you to the right information to more easily and quickly troubleshoot and resolve the problem.
1717

18-
Although this experience is most helpful for problems that occured within the last 24 hours, all the diagnostic graphs are always available for you to analyze.
18+
Although this experience is most helpful for problems that occurred within the last 24 hours, all the diagnostic graphs are always available for you to analyze.
1919

2020
App Service diagnostics works for not only apps on Windows, but also for apps on built-in or custom containers, [App Service Environments](./environment/intro.md), and [Azure Functions](../azure-functions/functions-overview.md).
2121

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

Lines changed: 1 addition & 0 deletions
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/app-service/tutorial-java-jboss-mysql-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ If you see the error: `The subscription '701ea799-fb46-4407-bb67-9cbcf289f1c7' i
665665
666666
Depending on your subscription and the region you select, you might see the deployment status for Azure Database for MySQL Flexible Server to be `Conflict`, with the following message in Operation details:
667667
668-
`InternalServerError: An unexpected error occured while processing the request.`
668+
`InternalServerError: An unexpected error occurred while processing the request.`
669669
670670
This error is most likely caused by a limit on your subscription for the region you select. Try choosing a different region for your deployment.
671671

articles/app-service/tutorial-java-tomcat-mysql-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ You can ignore the warnings. The Maven Jetty plugin shows the warnings because t
697697

698698
Depending on your subscription and the region you select, you might see the deployment status for Azure Database for MySQL Flexible Server to be `Conflict`, with the following message in Operation details:
699699

700-
`InternalServerError: An unexpected error occured while processing the request.`
700+
`InternalServerError: An unexpected error occurred while processing the request.`
701701
702702
This error is most likely caused by a limit on your subscription for the region you select. Try choosing a different region for your deployment.
703703

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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 2 additions & 8 deletions
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

83 KB
Loading
3.79 KB
Loading

0 commit comments

Comments
 (0)