Skip to content

Commit 9167de6

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-limits-deny-assignments
2 parents 1235fc0 + e50582f commit 9167de6

18 files changed

+173
-143
lines changed

articles/app-service/includes/quickstart-python/create-app-cli.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ az login
1717
Create the webapp and other resources, then deploy your code to Azure using [az webapp up](/cli/azure/webapp#az-webapp-up).
1818

1919
```azurecli
20-
az webapp up --runtime PYTHON:3.9 --sku B1 --logs
20+
az webapp up --runtime PYTHON:3.13 --sku B1 --logs
2121
```
2222

23-
* The `--runtime` parameter specifies what version of Python your app is running. This example uses Python 3.9. To list all available runtimes, use the command `az webapp list-runtimes --os linux --output table`.
23+
* The `--runtime` parameter specifies what version of Python your app is running. This example uses Python 3.13. To list all available runtimes, use the command `az webapp list-runtimes --os linux --output table`.
2424
* The `--sku` parameter defines the size (CPU, memory) and cost of the app service plan. This example uses the B1 (Basic) service plan, which will incur a small cost in your Azure subscription. For a full list of App Service plans, view the [App Service pricing](https://azure.microsoft.com/pricing/details/app-service/linux/) page.
2525
* The `--logs` flag configures default logging required to enable viewing the log stream immediately after launching the webapp.
2626
* You can optionally specify a name with the argument `--name <app-name>`. If you don't provide one, then a name will be automatically generated.
@@ -47,7 +47,7 @@ You can launch the app at http://&lt;app-name>.azurewebsites.net
4747
"name": "&lt;app-name>",
4848
"os": "&lt;os-type>",
4949
"resourcegroup": "&lt;group-name>",
50-
"runtime_version": "python|3.9",
50+
"runtime_version": "python|3.13",
5151
"runtime_version_detected": "0.0",
5252
"sku": "FREE",
5353
"src_path": "&lt;your-folder-location>"

articles/app-service/includes/quickstart-python/create-app-service-azure-portal-3.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ On the **Create Web App** page, fill out the form as follows.
88

99
1. **Resource Group** &rarr; Select **Create new** and use a name of *msdocs-python-webapp-quickstart*.
1010
1. **Name** &rarr; *msdocs-python-webapp-quickstart-XYZ* where XYZ is any three random characters. This name must be unique across Azure.
11-
1. **Runtime stack** &rarr; **Python 3.9**.
11+
1. **Runtime stack** &rarr; **Python 3.13**.
1212
1. **Region** &rarr; Any Azure region near you.
1313
1. **App Service Plan** &rarr; Under **Pricing plan**, select **Explore pricing plans** to select a different App Service plan.

articles/app-service/includes/quickstart-python/create-app-service-visual-studio-code-5.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ ms.author: daberry
44
ms.topic: include
55
ms.date: 04/30/2022
66
---
7-
Select the runtime stack for the application. In this example, select **Python 3.9**.
7+
Select the runtime stack for the application. In this example, select **Python 3.13**.

articles/app-service/quickstart-dotnetcore.md

Lines changed: 17 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,13 @@ target cross-platform with .NET 8.0.
3636

3737
# Quickstart: Deploy an ASP.NET web app
3838

39-
[!INCLUDE [regionalization-note](./includes/regionalization-note.md)]
40-
4139
In this quickstart, you learn how to create and deploy your first ASP.NET web app to [Azure App Service](overview.md). App Service supports various versions of .NET apps. It provides a highly scalable, self-patching web hosting service. ASP.NET web apps are cross-platform and can be hosted on Linux or Windows. When you're finished, you have an Azure resource group that includes an App Service hosting plan and an App Service with a deployed web application.
4240

4341
Alternatively, you can deploy an ASP.NET web app as part of a [Windows or Linux container in App Service](quickstart-custom-container.md).
4442

4543
> [!TIP]
4644
> Find GitHub Copilot tips in the Visual Studio, Visual Studio Code, and Azure portal steps.
4745
48-
> [!NOTE]
49-
> Building .NET 9 (STS) apps with Windows App Service using MSBuild or SCM_DO_BUILD isn't yet supported. Support for these build scenarios is planned after the initial general availability date and by December 4, 2024. Deployments that build outside of App Service through Visual Studio, Visual Studio Code, GitHub Actions, and Azure DevOps are fully supported.
50-
5146
## Prerequisites
5247

5348
:::zone target="docs" pivot="development-environment-vs"
@@ -111,23 +106,26 @@ If you already installed Visual Studio 2022:
111106

112107
:::zone-end
113108

114-
:::zone target="docs" pivot="development-environment-azd"
115-
116-
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/dotnet).
117-
- The [Azure Developer CLI](/azure/developer/azure-developer-cli/install-azd).
118-
- [The latest .NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet/8.0).
109+
:::zone target="docs" pivot="development-environment-vs, development-environment-azure-portal, development-environment-ps, development-environment-vscode, development-environment-cli"
119110

120-
:::zone-end
111+
## Skip to the end
121112

122-
:::zone target="docs" pivot="development-environment-vs, development-environment-azure-portal, development-environment-ps, development-environment-vscode, development-environment-cli"
113+
You can quickly deploy the ASP.NET Core sample app in this tutorial using Azure Developer CLI and see it running in Azure. Just run the following commands in the [Azure Cloud Shell](https://shell.azure.com), and follow the prompt:
123114

124-
## Create an ASP.NET web app
115+
```bash
116+
mkdir dotnetcore-quickstart
117+
cd dotnetcore-quickstart
118+
azd init --template https://github.com/Azure-Samples/quickstart-deploy-aspnet-core-app-service.git
119+
azd up
120+
```
125121

126-
:::zone-end
122+
And, to delete the resources:
127123

128-
:::zone target="docs" pivot="development-environment-azd"
124+
```bash
125+
azd down
126+
```
129127

130-
## Initialize the ASP.NET web app template
128+
## Create an ASP.NET web app
131129

132130
:::zone-end
133131

@@ -223,32 +221,6 @@ In this step, you fork a demo project to deploy.
223221

224222
:::zone-end
225223

226-
:::zone target="docs" pivot="development-environment-azd"
227-
228-
This quickstart uses the [Azure Developer CLI](/azure/developer/azure-developer-cli/overview) (`azd`) both to create Azure resources and deploy code to it. For more information, see [Install the Azure Developer CLI](/azure/developer/azure-developer-cli/install-azd?tabs=winget-windows%2Cbrew-mac%2Cscript-linux&pivots=os-windows) and [Build and deploy applications with the Azure Developer CLI](/training/paths/azure-developer-cli/).
229-
230-
To get and initialize [the ASP.NET Core web app template](https://github.com/Azure-Samples/quickstart-deploy-aspnet-core-app-service), use the following steps:
231-
232-
1. Open a terminal window on your computer to an empty working directory. Run the following command:
233-
234-
```bash
235-
azd init --template https://github.com/Azure-Samples/quickstart-deploy-aspnet-core-app-service.git
236-
```
237-
238-
When prompted for an environment name, enter `dev`.
239-
240-
1. From the same terminal session, run the application locally using the `dotnet run` command. Use the `--project` parameter to specify the `src` directory of the `azd` template, which is where the application code lives.
241-
242-
```bash
243-
dotnet run --project src --urls=https://localhost:5001/
244-
```
245-
246-
1. Open a web browser and navigate to the app at `https://localhost:5001`. The ASP.NET Core 8.0 web app template is displayed on the page.
247-
248-
:::image type="content" source="media/quickstart-dotnetcore/local-web-app-net.png" alt-text="Screenshot of Visual Studio Code - ASP.NET Core 8.0 in local browser." lightbox="media/quickstart-dotnetcore/local-web-app-net.png" border="true":::
249-
250-
:::zone-end
251-
252224
## Publish your web app
253225

254226
Follow these steps to create your App Service resources and publish your project:
@@ -284,7 +256,7 @@ Follow these steps to create your App Service resources and publish your project
284256
| **Location** | *West Europe* | The datacenter where the web app is hosted. |
285257
| **Size** | Choose the lowest tier. | [Pricing tiers][app-service-pricing-tier] define hosting features. |
286258

287-
1. In **Name**, enter a unique app name. Include only characters `a-z`, `A-Z`, `0-9`, and `-`. You can accept the automatically generated unique name. The URL of the web app is `http://<app-name>.azurewebsites.net`, where `<app-name>` is your app name.
259+
1. In **Name**, enter a unique app name. Include only characters `a-z`, `A-Z`, `0-9`, and `-`. You can accept the automatically generated unique name.
288260
1. Select **Create** to create the Azure resources.
289261

290262
:::image type="content" source="media/quickstart-dotnetcore/web-app-name.png" border="true" alt-text="Screenshot of Visual Studio - Create app resources dialog." lightbox="media/quickstart-dotnetcore/web-app-name.png" :::
@@ -531,7 +503,7 @@ Follow these steps to create your App Service resources and publish your project
531503

532504
:::image type="content" source="./media/quickstart-dotnet/next-steps.png" alt-text="Screenshot of the next step of going to the resource.":::
533505

534-
1. Browse to the deployed application in your web browser at the URL `http://<app-name>.azurewebsites.net`. If you see the message *Your web app is running and waiting for your content*, GitHub deployment is still running. Wait a couple of minutes and refresh the page.
506+
1. To browse to the created app, select the **default domain** in the **Overview** page. If you see the message *Your web app is running and waiting for your content*, GitHub deployment is still running. Wait a couple of minutes and refresh the page.
535507

536508
### [.NET 8.0](#tab/net80)
537509

@@ -544,34 +516,6 @@ Follow these steps to create your App Service resources and publish your project
544516

545517
:::zone-end
546518

547-
:::zone target="docs" pivot="development-environment-azd"
548-
549-
The AZD template contains files that generate the following required resources for your application to run in App service:
550-
551-
- A new [resource group](../azure-resource-manager/management/overview.md#terminology) to contain all of the Azure resources for the service.
552-
- A new [App Service plan](overview-hosting-plans.md) that specifies the location, size, and features of the web server farm that hosts your app.
553-
- A new [App Service app](overview-hosting-plans.md) instance to run the deployed application.
554-
555-
1. Sign into your Azure account by using the `azd auth login` command and following the prompt:
556-
557-
```bash
558-
azd auth login
559-
```
560-
561-
1. Create the Azure resources and deploy your app using the `azd up` command:
562-
563-
```bash
564-
azd up
565-
```
566-
567-
The `azd up` command might take a few minutes to complete. `azd up` uses the Bicep files in your projects to create the resource group, App Service Plan, and hosting app. It also performs certain configurations such as enabling logging and deploys your compiled app code. While it runs, the command provides messages about the provisioning and deployment process, including a link to the deployment in Azure. When it finishes, the command also displays a link to the deploy application.
568-
569-
1. Open a web browser and navigate to the URL. You see the ASP.NET Core 8.0 web app displayed in the page.
570-
571-
:::image type="content" source="media/quickstart-dotnetcore/browse-dotnet-70.png" lightbox="media/quickstart-dotnetcore/browse-dotnet-70.png" border="true" alt-text="Screenshot of the deployed .NET Framework 4.8 sample app.":::
572-
573-
:::zone-end
574-
575519
## Update the app and redeploy
576520

577521
Make a change to *Index.cshtml* and redeploy to see the changes. In the .NET 8.0 template, it's in the *Pages* folder. In the .NET Framework 4.8 template, it's in the *Views/Home* folder. Follow these steps to update and redeploy your web app:
@@ -649,7 +593,7 @@ Make a change to *Index.cshtml* and redeploy to see the changes. In the .NET 8.0
649593
:::zone-end
650594

651595
<!-- markdownlint-disable MD044 -->
652-
:::zone target="docs" pivot="development-environment-cli,development-environment-ps,development-environment-azd"
596+
:::zone target="docs" pivot="development-environment-cli,development-environment-ps"
653597
> [!TIP]
654598
> To see how Visual Studio Code with GitHub Copilot helps improve your web development experience, see the Visual Studio Code steps.
655599
<!-- markdownlint-enable MD044 -->
@@ -813,33 +757,6 @@ You see the updated ASP.NET Core 8.0 web app displayed in the page.
813757

814758
:::zone-end
815759

816-
<!-- markdownlint-disable MD044 -->
817-
:::zone target="docs" pivot="development-environment-azd"
818-
<!-- markdownlint-enable MD044 -->
819-
820-
In the local directory, open the *src/Pages/Index.cshtml* file. Replace the first `<div>` element:
821-
822-
```html
823-
<div class="jumbotron">
824-
<h1>.NET 💜 Azure</h1>
825-
<p class="lead">Example .NET app to Azure App Service.</p>
826-
</div>
827-
```
828-
829-
Save your changes, then redeploy the app using the `azd up` command again:
830-
831-
```azurecli
832-
azd up
833-
```
834-
835-
`azd up` skips the provisioning resources step this time and only redeploys your code, since there are no changes to the Bicep files.
836-
837-
After deployment completes, the browser opens to the updated ASP.NET Core 8.0 web app.
838-
839-
:::image type="content" source="media/quickstart-dotnetcore/updated-azure-web-app-net.png" lightbox="media/quickstart-dotnetcore/updated-azure-web-app-net.png" border="true" alt-text="Screenshot of the CLI - Updated ASP.NET Core 8.0 web app in Azure.":::
840-
841-
:::zone-end
842-
843760
## Manage the Azure app
844761

845762
To manage your web app, go to the [Azure portal](https://portal.azure.com), and search for and select **App Services**.
@@ -890,12 +807,6 @@ For your convenience, the [az webapp up](/cli/azure/webapp#az-webapp-up) command
890807
:::zone-end
891808
<!-- markdownlint-enable MD044 -->
892809

893-
:::zone target="docs" pivot="development-environment-azd"
894-
<!-- markdownlint-enable MD044 -->
895-
[!INCLUDE [Clean-up Azure Developer CLI web app resources](../../includes/clean-up-section-azure-developer-cli.md)]
896-
:::zone-end
897-
<!-- markdownlint-enable MD044 -->
898-
899810
## Next steps
900811

901812
### [.NET 8.0](#tab/net80)
@@ -911,11 +822,6 @@ Advance to the next article to learn how to create a .NET Core app and connect i
911822
> [!div class="nextstepaction"]
912823
> [Configure ASP.NET Core app](configure-language-dotnetcore.md)
913824
914-
:::zone target="docs" pivot="development-environment-azd"
915-
> [!div class="nextstepaction"]
916-
> [Learn more about the Azure Developer CLI](/azure/developer/azure-developer-cli/overview)
917-
:::zone-end
918-
919825
### [.NET Framework 4.8](#tab/netframework48)
920826

921827
Advance to the next article to learn how to create a .NET Framework app and connect it to a SQL Database:

articles/app-service/quickstart-python.md

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: 'Quickstart: Deploy a Python (Django, Flask, or FastAPI) web app to Azure'
33
description: Get started with Azure App Service by deploying your first Python app to Azure App Service.
44
ms.topic: quickstart
5-
ms.date: 09/13/2024
5+
ms.date: 04/24/2025
66
ms.author: msangapu
77
author: msangapu-msft
88
ms.devlang: python
@@ -23,6 +23,45 @@ To complete this quickstart, you need:
2323
> [!NOTE]
2424
> This article contains current instructions on deploying a Python web app using Azure App Service. Python on Windows is no longer supported.
2525
26+
## Skip to the end
27+
28+
You can quickly deploy the sample app in this tutorial using Azure Developer CLI and see it running in Azure. Just run the following commands in the [Azure Cloud Shell](https://shell.azure.com)want, and follow the prompt:
29+
30+
### [Flask](#tab/flask)
31+
32+
```bash
33+
mkdir flask-quickstart
34+
cd flask-quickstart
35+
azd init --template https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart
36+
azd up
37+
```
38+
39+
### [Django](#tab/django)
40+
41+
```bash
42+
mkdir django-quickstart
43+
cd django-quickstart
44+
azd init --template https://github.com/Azure-Samples/msdocs-python-django-webapp-quickstart
45+
azd up
46+
```
47+
48+
### [FastAPI](#tab/fastapi)
49+
50+
```bash
51+
mkdir fastapi-quickstart
52+
cd fastapi-quickstart
53+
azd init --template https://github.com/Azure-Samples/msdocs-python-fastapi-webapp-quickstart
54+
azd up
55+
```
56+
57+
---
58+
59+
And, to delete the resources:
60+
61+
```bash
62+
azd down
63+
```
64+
2665
## Sample application
2766

2867
This quickstart can be completed using either Flask, Django, or FastAPI. A sample application in each framework is provided to help you follow along with this quickstart. Download or clone the sample application to your local workstation.

articles/azure-resource-manager/management/tag-support.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Tag support for resources
33
description: Shows which Azure resource types support tags. Provides details for all Azure services.
44
ms.topic: conceptual
5-
ms.date: 09/26/2024
5+
ms.date: 04/24/2025
66
---
77

88
# Tag support for Azure resources
@@ -1700,6 +1700,7 @@ To get the same data as a file of comma-separated values, download [tag-support.
17001700
> | machines / assessPatches | No | No |
17011701
> | machines / extensions | Yes | Yes |
17021702
> | machines / installPatches | No | No |
1703+
> | machines / licenseProfiles | Yes | |
17031704
> | machines / privateLinkScopes | No | No |
17041705
> | privateLinkScopes | Yes | Yes |
17051706
> | privateLinkScopes / privateEndpointConnectionProxies | No | No |

articles/azure-vmware/architecture-private-clouds.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ AV64 host types are available per availability zone. The following table lists t
120120

121121
[!INCLUDE [hosts-minimum-initial-deployment-statement](includes/hosts-minimum-initial-deployment-statement.md)]
122122

123+
> [!CAUTION]
124+
> Deleting a cluster terminates all running workloads and components and is an irreversible operation. Once you delete a cluster, you cannot recover the data.
125+
123126
[!INCLUDE [azure-vmware-solutions-limits](includes/azure-vmware-solutions-limits.md)]
124127

125128
## VMware software versions

articles/azure-vmware/disaster-recovery-using-vmware-site-recovery-manager.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.date: 01/13/2025
77
ms.custom: engagement-fy23
88
---
99

10-
# Deploy disaster recovery with VMware Site Recovery Manager (SRM)
10+
# Deploy disaster recovery with VMware Live Site Recovery
1111

1212
This article explains how to implement disaster recovery for on-premises VMware vSphere virtual machines (VMs) or Azure VMware Solution-based VMs. The solution in this article uses [VMware Site Recovery Manager (SRM)](https://techdocs.broadcom.com/us/en/vmware-cis/live-recovery/site-recovery-manager/8-8.html) and vSphere Replication with Azure VMware Solution. Instances of VMware SRM and replication servers are deployed at both the protected and the recovery sites.
1313

@@ -17,7 +17,7 @@ VMware vSphere Replication is VMware's hypervisor-based replication technology f
1717

1818

1919
> [!NOTE]
20-
> The current version of VMware Site Recovery Manager (SRM) in Azure VMware Solution is 8.7.0.3.
20+
> The current version of VMware Site Recovery Manager (SRM) in Azure VMware Solution is 8.8.0.3.
2121
2222
## Supported scenarios
2323

@@ -281,11 +281,9 @@ If you no longer require VMware SRM, you must uninstall it in a clean manner. Be
281281

282282
## Support
283283

284-
VMware Site Recovery Manager (SRM) is a Disaster Recovery solution from VMware.
285-
286-
Microsoft only supports install/uninstall of VMware SRM and vSphere Replication Manager and scale up/down of vSphere Replication appliances within Azure VMware Solution.
284+
VMware Live Site Recovery is a Disaster Recovery solution from VMware by Broadcom. Microsoft supports the installation and uninstallation of VMware Live Site Recovery and vSphere Replication Manager, as well as the scaling up or down of vSphere Replication appliances within Azure VMware Solution.
287285

288-
For all other issues, such as configuration and replication, contact VMware for support.
286+
For any other issues, customers are requested to contact Broadcom for support regarding site configurations, licensing issues, replication, pairing failures, and DNS-related problems.
289287

290288
VMware and Microsoft support teams engage each other as needed to troubleshoot VMware SRM issues on Azure VMware Solution.
291289

0 commit comments

Comments
 (0)