Skip to content

Commit 2191620

Browse files
Merge pull request #312185 from MicrosoftDocs/main
Auto Publish – main to live - 2026-02-24 12:00 UTC
2 parents 04ed0c4 + c053276 commit 2191620

31 files changed

Lines changed: 613 additions & 115 deletions

articles/api-management/breaking-changes/trusted-service-connectivity-retirement-march-2026.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ms.service: azure-api-management
1010
ai-usage: ai-assisted
1111
---
1212

13-
1413
# Trusted service connectivity retirement (March 2026)
1514

1615
[!INCLUDE [api-management-availability-all-tiers](../../../includes/api-management-availability-all-tiers.md)]
@@ -60,6 +59,9 @@ APIs in workspaces aren't affect by this change, since they [do not support mana
6059

6160
Your API Management gateway should no longer rely on trusted service connectivity to Azure services. Instead, it should establish a networking line of sight.
6261

62+
> [!TIP]
63+
> You can get a detailed overview through "Diagnose and solve problems > Availability and Performance" in the Azure Portal on your API Management instance to learn about outbound requests, Entra ID tokens required and if further action is required.
64+
6365
To verify if your API Management gateway relies on trusted connectivity to Azure services, check the networking configuration of all Azure Storage, Key Vault, Key Vault Managed HSM, Service Bus, Event Hubs, and Container Registry resources that your API Management gateway connects to:
6466

6567
#### For Storage accounts

articles/app-service/app-service-web-tutorial-dotnet-sqldatabase.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ms.custom:
2323

2424
When you finish the tutorial, you have an ASP.NET app connected to an Azure SQL database running in Azure. The following example shows the app interface.
2525

26-
![Screenshot that shows a published ASP.NET application in Azure App Service.](./media/app-service-web-tutorial-dotnet-sqldatabase/azure-app-in-browser.png)
26+
![Screenshot that shows a published ASP.NET to-do list application running in Azure App Service.](./media/app-service-web-tutorial-dotnet-sqldatabase/azure-app-in-browser.png)
2727

2828
In this tutorial, you:
2929

@@ -58,7 +58,7 @@ The sample project contains a basic [ASP.NET MVC](https://www.asp.net/mvc) creat
5858
5959
1. In the app, select **Create New** and create a couple of *to-do* items.
6060

61-
![Screenshot that shows the ASP.NET web app.](media/app-service-web-tutorial-dotnet-sqldatabase/local-app-in-browser.png)
61+
![Screenshot that shows the ASP.NET to-do list web app running locally in development.](media/app-service-web-tutorial-dotnet-sqldatabase/local-app-in-browser.png)
6262

6363
1. Test the **Edit**, **Details**, and **Delete** links.
6464

@@ -86,7 +86,7 @@ To publish the app to Azure, you create and configure a Publish profile that has
8686

8787
1. On the **App Service (Windows)** screen, configure the App Service **Name**, **Resource group**, and **Hosting Plan**.
8888

89-
![Screenshot that shows creating an App Service plan.](./media/app-service-web-tutorial-dotnet-sqldatabase/new_rg2.png)
89+
![Screenshot that shows configuring the App Service (Windows) with name, resource group, and hosting plan settings.](./media/app-service-web-tutorial-dotnet-sqldatabase/new_rg2.png)
9090

9191
1. Under **Name**, you can keep the generated web app name, or change it to another name with characters `a-z`, `0-9`, and `-`. The web app name must be unique across all Azure apps.
9292

@@ -145,7 +145,7 @@ Before you can create a database, you need a [logical SQL server](/azure/azure-s
145145

146146
1. On the **Connect to Azure SQL Database** screen, select **Finish**.
147147

148-
![Screenshot of the screen with messagea about configuring managed identity for the connection to work.](./media/app-service-web-tutorial-dotnet-sqldatabase/connect-warning.png)
148+
![Screenshot of the screen with messages about configuring managed identity for the connection to work.](./media/app-service-web-tutorial-dotnet-sqldatabase/connect-warning.png)
149149

150150
> [!NOTE]
151151
> If you see **Local user secrets files** instead, make sure you used the **Publish** page, not the **Connected Services** page, to configure SQL Database.
@@ -218,7 +218,7 @@ The Entity Framework 6 provider replaces the built-in `System.Data.SqlClient` SQ
218218

219219
1. To test the app, add a few to-do items.
220220

221-
![Screenshot that shows the published ASP.NET application in Azure App Service.](./media/app-service-web-tutorial-dotnet-sqldatabase/azure-app-in-browser.png)
221+
![Screenshot that shows a published ASP.NET to-do list application running in Azure App Service.](./media/app-service-web-tutorial-dotnet-sqldatabase/azure-app-in-browser.png)
222222

223223
Congratulations! Your data-driven ASP.NET application is running live in Azure App Service.
224224

articles/app-testing/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ items:
158158
- name: Python
159159
href: /python/api/overview/azure/load-testing
160160
- name: REST API
161-
href: /rest/api/loadtesting/
161+
href: /rest/api/apptesting/loadtest
162162
- name: Resource Manager template
163163
displayName: ARM
164164
href: /azure/templates/microsoft.loadtestservice/allversions

articles/azure-netapp-files/snapshots-delete.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ You can delete snapshots that you no longer need.
2121

2222
* You can't delete a snapshot if it's part of an active file-restore operation or if it's in the process of being cloned.
2323
* You can't delete a replication generated snapshot that is used for volume baseline data replication.
24+
* You can't delete a snapshot in a data protection volume that is in an active replication relationship.
2425

2526
## Steps
2627

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
---
2+
title: Manage a Conditional Azure Credit Offer (CACO) resource
3+
description: Learn how to manage your Conditional Azure Credit Offer (CACO) resource, including moving it across resource groups or subscriptions.
4+
author: dekadays
5+
ms.reviewer: liuyizhu
6+
ms.service: cost-management-billing
7+
ms.subservice: billing
8+
ms.topic: how-to
9+
ms.date: 2/23/2026
10+
ms.author: liuyizhu
11+
#customer intent: As a Microsoft Customer Agreement billing owner, I want learn about managing a CACO so that I move it when needed.
12+
13+
service.tree.id: b69a7832-2929-4f60-bf9d-c6784a865ed8
14+
---
15+
16+
# Manage a Conditional Azure Credit Offer (CACO) resource under a subscription
17+
18+
When you accept a Conditional Azure Credit Offer (CACO) in a Microsoft Customer Agreement, it creates a CACO commitment and 1 or more provisional (not spendable) credit resources. The CACO commitment and provisional (not spendable) credit resources get placed in a subscription and resource group, and follow the same setup as the other credit resource as mentioned in [Manage a Microsoft Azure credit resource under a subscription](../credits/manage-azure-credits.md). The provisional credit resources turn into awarded credits if the spending target and other conditions in the CACO are met. Moving a CACO resource doesn't move any provisional or awarded credits. Those credit resources have to be moved separately as needed.
19+
20+
On Azure portal, you can view metadata related to the CACO. Including: status of the CACO, CACO start/end date, spend target, currency, target end date, award credit, award start date, award end date, and System ID. You can view the metadata under the Conditional Credit resource.
21+
22+
:::image type="content" source="../../manage/media/conditional-credit-offer/view-conditional-credit-offer.png" border="true" alt-text="Screenshot showing the CACO overview page." lightbox="../../manage/media/conditional-credit-offer/view-conditional-credit-offer.png" :::
23+
24+
## Move CACO across resource groups or subscriptions
25+
26+
You can move the CACO to another resource group or subscription just like other Azure resources. This move only changes metadata and doesn't impact the credit or commitment.
27+
28+
The new resource group or subscription must remain within the same billing profile as the original billing profile where the CACO is currently located.
29+
30+
Moving a CACO resource doesn't move any provisional or awarded credits. Those credit resources have to be moved separately as needed.
31+
32+
### To move a CACO
33+
34+
Here are the high-level steps to move a CACO resource. For more information about moving an Azure resource, see [Move Azure resources to a new resource group or subscription](../../../azure-resource-manager/management/move-resource-group-and-subscription.md).
35+
36+
1. In the [Azure portal](https://portal.azure.com), navigate to **Resource groups**.
37+
2. Select the resource group that contains the CACO resource.
38+
3. Select the CACO resource.
39+
4. At top of the page select **Move** and then select **Move to another subscription** or **Move to another resource group**.
40+
5. Follow the instructions to move the CACO resource.
41+
6. After the move is complete, verify that the CACO resource is in the new resource group or subscription.
42+
43+
Moving a CACO changes its resource URI.
44+
45+
### To view the CACO resource URI
46+
47+
1. In the [Azure portal](https://portal.azure.com), search for **Conditional Azure Credit Offer**.
48+
2. Select the CACO resource.
49+
3. On the Overview page, in the left navigation menu, expand **Settings**, and then select **Properties**.
50+
4. The CACO resource URI is the **ID** value.
51+
52+
Here's an example image:
53+
54+
:::image type="content" source="../../manage/media/conditional-credit-offer/conditional-credit-offer-uri.png" border="true" alt-text="Screenshot showing the CACO properties page URI." lightbox="../../manage/media/conditional-credit-offer/conditional-credit-offer-uri.png" :::
55+
56+
57+
## Rename CACO
58+
The CACO's resource name is a part of its Uniform Resource Identifier (URI) and can't be changed. However, you can use [tags](../../../azure-resource-manager/management/tag-resources.md) to help identify the CACO resource based on a nomenclature relevant to your organization.
59+
60+
## Delete CACO
61+
A CACO resource may only be deleted if its status is _failed_, _canceled_, or _expired_. Deletion of a CACO resource is a permanent action and can't be undone.
62+
63+
## Cancel CACO
64+
Contact your Microsoft account team if you have questions about canceling your CACO.
65+
66+
## Related content
67+
- [Move Azure resources to a new resource group or subscription](../../../azure-resource-manager/management/move-resource-group-and-subscription.md)
68+

0 commit comments

Comments
 (0)