Skip to content

Commit 8d04fa9

Browse files
authored
Merge pull request #295353 from MicrosoftDocs/main
2/26/2025 AM Publish
2 parents 30e4da7 + 379c0e0 commit 8d04fa9

File tree

43 files changed

+246
-86
lines changed

Some content is hidden

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

43 files changed

+246
-86
lines changed

articles/active-directory-b2c/json-transformations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ The GetClaimFromJson claims transformation gets a single element from a JSON dat
337337

338338
## GetClaimsFromJsonArray
339339

340-
Get a list of specified elements from Json data. Check out the [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims-transformation/json#getclaimsfromjsonarray) of this claims transformation.
340+
Get a list of specified elements from JSON data. Check out the [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims-transformation/json#getclaimsfromjsonarray) of this claims transformation.
341341

342342
| Element | TransformationClaimType | Data Type | Notes |
343343
| ---- | ----------------------- | --------- | ----- |

articles/app-service/configure-language-python.md

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ This article describes how [Azure App Service](overview.md) runs Python apps, ho
2020
The App Service deployment engine automatically activates a virtual environment and runs `pip install -r requirements.txt` for you when you deploy a [Git repository](deploy-local-git.md), or when you deploy a [zip package](deploy-zip.md) [with build automation enabled](deploy-zip.md#enable-build-automation-for-zip-deploy).
2121

2222
> [!NOTE]
23-
> Currently App Service requires `requirements.txt` in your project's root directory, even if you're using modern Python packaging tools such as `pyproject.toml`.
23+
> Currently App Service requires `requirements.txt` in your project's root directory even if you have a `pyproject.toml`. See [Generate requirements.txt from pyproject.toml](#generate-requirementstxt-from-pyprojecttoml) for recommended approaches.
2424
2525
This guide provides key concepts and instructions for Python developers who use a built-in Linux container in App Service. If you've never used Azure App Service, first follow the [Python quickstart](quickstart-python.md) and [Flask](tutorial-python-postgresql-app-flask.md), [Django](tutorial-python-postgresql-app-django.md), or [FastAPI](tutorial-python-postgresql-app-fastapi.md) with PostgreSQL tutorial.
2626

@@ -101,6 +101,30 @@ For more information on how App Service runs and builds Python apps in Linux, se
101101
> [!NOTE]
102102
> Always use relative paths in all pre- and post-build scripts because the build container in which Oryx runs is different from the runtime container in which the app runs. Never rely on the exact placement of your app project folder within the container (for example, that it's placed under *site/wwwroot*).
103103
104+
## Generate requirements.txt from pyproject.toml
105+
106+
App Service does not directly support `pyproject.toml` at the moment. If you're using tools like Poetry or uv, the recommended approach is to generate a compatible `requirements.txt` before deployment in your project's root:
107+
108+
### Using Poetry
109+
110+
Using [Poetry](https://python-poetry.org/) with the [export plugin](https://github.com/python-poetry/poetry-plugin-export):
111+
112+
```sh
113+
114+
poetry export -f requirements.txt --output requirements.txt --without-hashes
115+
116+
```
117+
118+
### Using uv
119+
120+
Using [uv](https://docs.astral.sh/uv/concepts/projects/sync/#exporting-the-lockfile):
121+
122+
```sh
123+
124+
uv export --format requirements-txt --no-hashes --output-file requirements.txt
125+
126+
```
127+
104128
## Migrate existing applications to Azure
105129

106130
Existing web applications can be redeployed to Azure as follows:

articles/app-service/configure-ssl-certificate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ By default, the App Service resource provider doesn't have access to your key va
141141
|--|--|--|
142142
| **Microsoft Azure App Service** or **Microsoft.Azure.WebSites** | - `abfa0a7c-a6b6-4736-8310-5855508787cd` for public Azure cloud environment <br><br>- `6a02c803-dafd-4136-b4c3-5a6f318b4714` for Azure Government cloud environment | Certificate User |
143143

144-
The service principal app ID or assignee value is the ID for the App Service resource provider. To learn how to authorize key vault permissions for the App Service resource provider using an access policy, see the [provide access to Key Vault keys, certificates, and secrets with an Azure role-based access control documentation](/azure/key-vault/general/rbac-guide?tabs=azure-portal#key-vault-scope-role-assignment).
144+
The service principal app ID or assignee value is the ID for the App Service resource provider. Note that when granting access using RBAC, the corresponding Object ID of the service principal app ID is tenant-specific. To learn how to authorize key vault permissions for the App Service resource provider using an access policy, see the [provide access to Key Vault keys, certificates, and secrets with an Azure role-based access control documentation](/azure/key-vault/general/rbac-guide?tabs=azure-portal#key-vault-scope-role-assignment).
145145

146146
### [Access policy permissions](#tab/accesspolicy)
147147

articles/app-service/manage-backup.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -359,18 +359,22 @@ You can back up to a firewall-protected storage account if it's part of the same
359359
360360
### How do I restore to an app in a different subscription?
361361
362-
1. Make a custom backup to an Azure Storage container.
363-
1. [Download the backup ZIP file](../storage/blobs/storage-quickstart-blobs-portal.md) to your local machine.
364-
1. On the **Backups** page for your target app, select **Restore** in the top menu.
365-
1. In **Backup details**, select **Storage** in **Source**.
366-
1. Select the preferred storage account.
367-
1. In **Zip file**, select **Upload file**.
368-
1. In **Name**, select **Browse** and select the downloaded ZIP file.
369-
1. Configure the rest of the sections as described in [Restore a backup](#restore-a-backup).
362+
1. Make a custom backup of the source App to an **Azure Storage container**.
363+
2. [Download the backup ZIP file](../storage/blobs/storage-quickstart-blobs-portal.md) and the **XML metadata file** to your local machine.
364+
3. Upload **both the ZIP and XML files** to the target storage account.
365+
4. In the **Backups** page of your target app, click **Restore** in the top menu.
366+
5. In the **Backup details** section, choose **Storage** as the **Source**. Select the **storage account** where you uploaded the backup files.
367+
6. Click **Use file in storage account** and select the **ZIP file** to restore.
368+
7. Configure the remaining settings as outlined in the [Restore a backup](#restore-a-backup). Confirm and start the restore process.
370369
371370
### How do I restore to an app in the same subscription but in a different region?
372371
373-
The steps are the same as in [How do I restore to an app in a different subscription?](#how-do-i-restore-to-an-app-in-a-different-subscription).
372+
You can restore an app to a different region within the same subscription. The process follows the same steps outlined in [Restore a backup](#restore-a-backup).
373+
374+
#### Key considerations
375+
Ensure that the backup storage for the source app is accessible by the target app.
376+
The restoration process in the Azure portal allows selecting an app in a different region as long as it remains within the same subscription.
377+
374378
375379
### Where are the automatic backups stored?
376380

articles/azure-cache-for-redis/cache-aspnet-output-cache-provider.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ If you don’t think you need retry or if you want to handle the retry logic you
147147

148148
### About _redisSerializerType_
149149

150-
The serialization to store the values on Redis is done in a binary format by default, which is provided by the **BinaryFormatter** class. Use _redisSerializerType_ to specify the assembly qualified type name of a class that implements **Microsoft.Web.Redis.ISerializer** and has the custom logic to serialize and deserialize the values. For example, here's a Json serializer class using JSON.NET:
150+
The serialization to store the values on Redis is done in a binary format by default, which is provided by the **BinaryFormatter** class. Use _redisSerializerType_ to specify the assembly qualified type name of a class that implements **Microsoft.Web.Redis.ISerializer** and has the custom logic to serialize and deserialize the values. For example, here's a JSON serializer class using JSON.NET:
151151

152152
```cs
153153
namespace MyCompany.Redis

articles/azure-functions/functions-bindings-rabbitmq-trigger.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ namespace Company.Function
6969
}
7070
```
7171

72-
Like with Json objects, an error will occur if the message isn't properly formatted as a C# object. If it is, it's then bound to the variable pocObj, which can be used for what whatever it's needed for.
72+
Like with JSON objects, an error will occur if the message isn't properly formatted as a C# object. If it is, it's then bound to the variable pocObj, which can be used for what whatever it's needed for.
7373

7474
---
7575

articles/azure-netapp-files/large-volumes-requirements-considerations.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: b-ahibbard
66
ms.service: azure-netapp-files
77
ms.custom: references_regions
88
ms.topic: conceptual
9-
ms.date: 02/18/2025
9+
ms.date: 02/25/2025
1010
ms.author: anfdocs
1111
---
1212
# Requirements and considerations for large volumes
@@ -79,23 +79,38 @@ Whereas regular volumes use 32-bit file IDs, large volumes employ 64-bit file ID
7979

8080
Support for Azure NetApp Files large volumes is available in the following regions:
8181

82+
* Australia Central
83+
* Australia Central 2
8284
* Australia East
8385
* Australia Southeast
8486
* Brazil South
87+
* Brazil Southeast
8588
* Canada Central
89+
* Canada East
8690
* Central India
8791
* Central US
92+
* East Asia
8893
* East US
8994
* East US 2
9095
* France Central
96+
* Germany North
9197
* Germany West Central
98+
* Italy North
9299
* Japan East
100+
* Japan West
101+
* Korea Central
102+
* Korea South
103+
* North Central US
93104
* North Europe
105+
* Norway East
106+
* Norway West
94107
* Qatar Central
95108
* South Africa North
96109
* South Central US
97110
* Southeast Asia
111+
* Sweden Central
98112
* Switzerland North
113+
* Switzerland West
99114
* UAE North
100115
* UK West
101116
* UK South

articles/azure-vmware/enable-hcx-access-over-internet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Enable HCX access over the internet
33
description: This article describes how to access HCX over a public IP address using Azure VMware solution.
44
ms.topic: how-to
5-
ms.date: 01/08/2025
5+
ms.date: 02/26/2025
66
ms.custom: engagement-fy23
77
---
88
# Enable HCX access over the internet
@@ -135,4 +135,4 @@ After the network is extended to destination site, VMs can be migrated over Laye
135135
## Next steps
136136
[Enable Public IP to the NSX Edge for Azure VMware Solution](./enable-public-ip-nsx-edge.md)
137137

138-
For detailed information on HCX network underlay minimum requirements, see [Network Underlay Minimum Requirements](https://techdocs.broadcom.com/us/en/vmware-cis/hcx/vmware-hcx/4-9/vmware-hcx-user-guide-4-9/preparing-for-hcx-installations/network-underlay-minimum-requirements.html).
138+
For detailed information on HCX network underlay minimum requirements, see [Network Underlay Minimum Requirements](https://techdocs.broadcom.com/us/en/vmware-cis/hcx/vmware-hcx/4-10/vmware-hcx-user-guide-4-10/preparing-for-hcx-installations/network-underlay-minimum-requirements.html).

articles/azure-vmware/move-azure-vmware-solution-across-regions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ In this article, walk through the steps to:
4242
4343
## Prerequisites
4444

45-
- [VMware HCX appliance is upgraded to the latest patch](https://techdocs.broadcom.com/us/en/vmware-cis/hcx/vmware-hcx/4-9/vmware-hcx-user-guide-4-9/updating-vmware-hcx.html) to avoid migration issues if any.
45+
- [VMware HCX appliance is upgraded to the latest patch](https://techdocs.broadcom.com/us/en/vmware-cis/hcx/vmware-hcx/4-10/vmware-hcx-user-guide-4-10/updating-vmware-hcx.html) to avoid migration issues if any.
4646

4747
- Source's local content library is a [published content library](https://techdocs.broadcom.com/us/en/vmware-cis/vsphere/vsphere/8-0/vsphere-virtual-machine-administration-guide-8-0/using-content-librariesvsphere-vm-admin/publish-the-contents-of-a-library-and-a-single-template-to-a-subscribervsphere-vm-admin.html).
4848

articles/azure-web-pubsub/howto-develop-reliable-clients.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The following tutorial walks you through the important part of implementing the
2828

2929
To use reliable subprotocols, you must set the subprotocol when constructing WebSocket connections. In JavaScript, you can use the following code:
3030

31-
- Use Json reliable subprotocol:
31+
- Use JSON reliable subprotocol:
3232

3333
```js
3434
var pubsub = new WebSocket(

0 commit comments

Comments
 (0)