Skip to content

Commit bced484

Browse files
committed
Merge branch 'main' into release-ga-lbcd
2 parents 5ba007f + 180c290 commit bced484

File tree

123 files changed

+1538
-842
lines changed

Some content is hidden

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

123 files changed

+1538
-842
lines changed

articles/app-service/app-service-configure-premium-v4-tier.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configure Premium V4 tier
33
description: Learn how to better performance for your web, mobile, and API app in Azure App Service by scaling to the new Premium V4 pricing tier.
44
keywords: app service, azure app service, scale, scalable, app service plan, app service cost
55
ms.topic: article
6-
ms.date: 06/09/2025
6+
ms.date: 06/13/2025
77
ms.author: msangapu
88
author: msangapu-msft
99
ms.custom:
@@ -98,7 +98,6 @@ Premium V4 is available in the following regions:
9898

9999
- Australia East
100100
- Canada Central
101-
- North Europe
102101
- East US
103102
- East US 2
104103
- France Central

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

Lines changed: 65 additions & 69 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ The following table lists the options for you to add certificates in App Service
3838

3939
The [free App Service managed certificate](#create-a-free-managed-certificate) and the [App Service certificate](configure-ssl-app-service-certificate.md) already satisfy the requirements of App Service. If you choose to upload or import a private certificate to App Service, your certificate must meet the following requirements:
4040

41-
* Be exported as a [password-protected .pfx file](https://en.wikipedia.org/w/index.php?title=X.509&section=4#Certificate_filename_extensions), encrypted by using triple DES.
42-
* Contain a private key at least 2,048 bits long.
41+
* Be exported as a [password-protected PFX file](https://en.wikipedia.org/w/index.php?title=X.509&section=4#Certificate_filename_extensions).
4342
* Contain all intermediate certificates and the root certificate in the certificate chain.
4443

4544
If you want to help secure a custom domain in a TLS binding, the certificate must meet these extra requirements:
@@ -48,7 +47,7 @@ If you want to help secure a custom domain in a TLS binding, the certificate mus
4847
* Be signed by a trusted certificate authority.
4948

5049
> [!NOTE]
51-
> *Elliptic curve cryptography (ECC) certificates* work with App Service but aren't covered by this article. For the exact steps to create ECC certificates, work with your certificate authority.
50+
> **Elliptic Curve Cryptography (ECC) certificates** work with App Service when uploaded as a PFX, but currently cannot be imported from Key Vault. They aren't covered by this article. For the exact steps to create ECC certificates, work with your certificate authority.
5251
5352
After you add a private certificate to an app, the certificate is stored in a deployment unit that's bound to the App Service plan's resource group, region, and operating system (OS) combination. Internally, it's called a *webspace*. That way, the certificate is accessible to other apps in the same resource group, region, and OS combination. Private certificates uploaded or imported to App Service are shared with app services in the same deployment unit.
5453

articles/app-service/deploy-continuous-deployment.md

Lines changed: 86 additions & 81 deletions
Large diffs are not rendered by default.

articles/app-service/invoke-openapi-web-app-from-azure-ai-agent-service.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: 'Invoke an App Service web app from Azure AI Foundry Agent Service'
33
description: Learn how to integrate App Service with AI Foundry Agent Service and get started with agentic AI
44
author: seligj95
55
ms.author: jordanselig
6-
ms.date: 05/28/2025
6+
ms.date: 06/13/2025
77
ms.topic: article
88
ms.custom:
99
- devx-track-dotnet
@@ -84,7 +84,7 @@ For detailed guidance with screenshots and additional information, see [Add Open
8484
</pre>
8585

8686
1. Leave the authentication method as anonymous. There's no authentication on the web app. If the app required an API key or managed identity to access it, this location is where you would specify this information.
87-
1. Copy and paste the OpenAPI specification in the text box. The OpenAPI specification is provided in the Codespace in the `src/webapp` directory and is called `swagger.json`.
87+
1. Copy and paste the OpenAPI specification in the text box. The OpenAPI specification is provided in the Codespace in the `src/webapp` directory and is called [swagger.json](https://github.com/Azure-Samples/ai-agent-openai-web-app/blob/main/src/webapp/swagger.json).
8888
1. Before you complete creating the tool, you need to copy and paste your app's URL into the OpenAPI specification. Replace the placeholder `<APP-SERVICE-URL>` in line 10 of the OpenAPI specification with your app's URL. It's in the format `https://<app-name>.azurewebsites.net`.
8989
- To find your app's URL, go back to your resource group and navigate to your **App Service**. The URL is on the **Overview** page of your App Service.
9090
1. Select **Next**, review the details you provided, and then select **Create Tool**.

articles/app-service/manage-backup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ There are two types of backups in App Service. If your app is in a supported pri
3131
| Backup size | 30 GB. | 10 GB, 4 GB of which can be the linked database. |
3232
| Linked database | Not backed up. | **[Starting 3/31/2028, Azure App Service custom backups will no longer support backing up linked databases.](#deprecation-of-linked-database-backups)** <br><br>The following linked databases can be backed up: [SQL Database](/azure/azure-sql/database/), [Azure Database for MySQL](/azure/mysql/), [Azure Database for PostgreSQL](/azure/postgresql/), [MySQL in-app](https://azure.github.io/AppService/2016/08/18/Announcing-MySQL-in-app-for-Web-Apps-(Windows).html). Note that Azure DB for MySQL - **Flexible Server** and Azure DB for PostgreSQL - **Flexible Server** aren't supported in custom backups. |
3333
| [Storage account](../storage/index.yml) required | No. | Yes. |
34-
| Backup frequency | Hourly, not configurable. | Configurable. |
34+
| Backup frequency | Hourly, not configurable. | Configurable (every 2 hours minimum, up to 12 backups per day (manual + scheduled)). |
3535
| Retention | 30 days, not configurable. <br><br> Days 1-3: hourly backups retained.<br><br> Days 4-14: every third hourly backup retained.<br><br> Days 15-30: every sixth hourly backup retained. | 0-30 days or indefinite. |
3636
| Downloadable | No. | Yes, as Azure Storage blobs. |
3737
| Partial backups | Not supported. | Supported. |
34.3 KB
Loading
-39.4 KB
Loading
60.3 KB
Loading
63.2 KB
Loading

0 commit comments

Comments
 (0)