Merge main into java-mcp-resource-ref; resolve conflict

Author: lilyjma

articles/api-center/media/register-discover-mcp-server/mcp-server-portal-small.png

@@ -4,7 +4,7 @@ description: Learn about how Azure API Center can be a centralized registry for
 
 ms.service: azure-api-center
 ms.topic: concept-article
-ms.date: 02/20/2026
+ms.date: 04/02/2026
 
 ms.collection: ce-skilling-ai-copilot
 ms.update-cycle: 180-days
@@ -126,6 +126,7 @@ To build MCP servers by using Azure compute services and register them in your A
 Set up your [API Center portal](set-up-api-center-portal.md) so that developers and other stakeholders in your organization can discover MCP servers in your API inventory. From the API Center portal, users can do the following:
 - Browse and filter MCP servers in the inventory.
 - For remote MCP servers, view details such as the URL endpoint of the MCP server and API definition, and install the MCP server in their Visual Studio Code environment.
+- A built-in MCP Inspector tool allows users to test MCP server endpoints and view the responses directly in the portal. On the **Options** tab of an MCP server details page, select **View documentation** to access the MCP Inspector.
 
 :::image type="content" source="media/register-discover-mcp-server/mcp-server-portal-small.png" lightbox="media/register-discover-mcp-server/mcp-server-portal.png" alt-text="Screenshot of MCP server in API Center portal.":::
 

articles/api-center/media/register-discover-mcp-server/mcp-server-portal.png

@@ -4,7 +4,7 @@ description: How to set up the API Center portal, a managed website that enables
 
 ms.service: azure-api-center
 ms.topic: how-to
-ms.date: 02/25/2026
+ms.date: 04/02/2026
 ms.update-cycle: 180-days
 
 ms.custom: 
@@ -19,7 +19,7 @@ This article shows you how to set up and customize the *API Center portal* (prev
 The API Center portal supports and streamlines the work of developers who use and create APIs within your organization. Users with access can:
 
 * **Search for APIs** by name or use AI-assisted semantic search.
-* **Filter APIs** by type or lifecycle stage.
+* **Filter APIs** by type, lifecycle stage, and other properties.
 * **View API details and definitions** including endpoints, methods, parameters, and response formats.
 * **Download API definitions** to their computer or open in Visual Studio Code.
 * **Try out APIs** with API key or OAuth 2.0 authentication.
@@ -66,6 +66,9 @@ After configuring access, open the API Center portal by selecting **View API Cen
 
 By default, the portal home page is publicly reachable. If Microsoft Entra ID is configured for access, users must select **Sign-in** to access APIs. See [Enable sign-in to portal by Microsoft Entra users and groups](#enable-sign-in) for details on configuring user access.
 
+* Add filters on the home page to display assets of certain types or that match certain metadata values.
+* Select an API or other registered asset to view its details, such as endpoints, methods, parameters, and response formats. You can also download API definitions or open them in Visual Studio Code.
+
 <a id="enable-sign-in"></a>
 ## Enable sign-in to portal by Microsoft Entra users and groups 
 

articles/api-center/media/self-host-api-center-portal/api-center-portal-signed-in.png

@@ -277,7 +277,7 @@ To create an identity validation request for an Organization or a DBA:
 | Accuracy             | Ensure that you provide the correct information for public identity validation. If you need to make any changes after it's created, you must complete a new identity validation request. This change affects the associated certificates that are being used for signing. |
 | Failed email verification            | If email verification fails, you must initiate a new identity validation request. |
 | Identity validation status            | You're notified through email when there's an update to the identity validation status. You can also check the status in the Azure portal at any time. |
-| Processing time            | Processing your identity validation request takes from 1 to 15 business days (possibly longer if we need to request more documentation from you). |
+| Processing time            | Processing your identity validation request takes from 1 to 30 business days (possibly longer if we need to request more documentation from you). |
 | More documentation            | If we need more documentation to process the identity validation request, you're notified through email. You can upload the documents in the Azure portal. For documentation upload, there are three attempts. The documentation request email contains information about file size requirements. Ensure that any documents you provide are the most current. <br> - All documents submitted must be issued within the previous 12 months and where the expiration date is a future date that is at least two months away. <br>  - If it isn't possible to provide additional documentation, update your account information to match any legal documents already provided or your official Company registration details. <br>  - When providing official business document, such as business registration form, business charter, or articles of incorporation that list the company name and address as it is provided at the time of Identity Validation request creation. <br>  - Ensure the domain registration or domain invoice from registration or renewal that lists the entity and contact name and all the domains that are included/mentioned in the request.|
 
 # [Identity Validation - Individual Developer](#tab/indiedevvalidation)

articles/api-center/register-discover-mcp-server.md

@@ -9,7 +9,7 @@
   - name: AI-enabled functions
     displayName: OpenAI, AI, MCP server, agent, agentic, Foundry
     href: functions-create-ai-enabled-apps.md
-  - name: Getting started
+  - name: Get started
     href: functions-get-started.md
   - name: Durable Functions
     href: durable-functions/durable-functions-overview.md

articles/api-center/set-up-api-center-portal.md

@@ -210,15 +210,7 @@ app.mcpTool("getWeather", {
 For the complete code example, see [weatherMcpApp.ts](https://github.com/Azure-Samples/remote-mcp-functions-typescript/blob/McpAppDemo/src/functions/weatherMcpApp.ts).
 
 > [!IMPORTANT]
-> The MCP resource trigger for TypeScript currently requires version `4.12.0-preview.2` or later of the [`@azure/functions`](https://www.npmjs.com/package/@azure/functions/v/4.12.0-preview.2) package.
-> It also requires version `[4.32.0, 5.0.0)` of the preview exetnsion bundle. Make sure to update your `host.json` to use this preview bundle and version:
->
-> ```json
-> "extensionBundle": {
->   "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
->   "version": "[4.32.0, 5.0.0)"
-> }
-> ```
+> The MCP resource trigger for TypeScript requires version `4.12.0` or later of the [`@azure/functions`](https://www.npmjs.com/package/@azure/functions/v/4.12.0) package.
 
 ::: zone-end  
 
@@ -284,17 +276,7 @@ def get_weather(location: str) -> Dict[str, Any]:
 For the complete code example, see [function_app.py](https://github.com/Azure-Samples/remote-mcp-functions-python/blob/main/src).
 
 > [!NOTE]
-> The MCP resource trigger for Python requires version `1.25.0b3` or later of the [`azure-functions`](https://pypi.org/project/azure-functions/1.25.0b3/) package. 
-> It also requires version `[4.32.0, 5.0.0)` of the preview exetnsion bundle. Make sure to update your `host.json` to use this preview bundle and version:
->
-> ```json
-> "extensionBundle": {
->   "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview"
->   "version": "[4.32.0, 5.0.0)"
-> }
-> ```
->
-> If the app is using Python 3.9-3.12, add the `PYTHON_ISOLATE_WORKER_DEPENDENCIES: 1` app setting to `local.settings.json` and to app settings when running in Azure.
+> The MCP resource trigger for Python requires version `2.0.0` or later of the [`azure-functions`](https://pypi.org/project/azure-functions/) package and using **Python 3.13** or above. 
 
 ::: zone-end
 

articles/artifact-signing/quickstart.md

@@ -1,8 +1,8 @@
 ---
-title: Integration and automation platform options in Azure
+title: Integration and Automation Platform Options in Azure
 description: "Compare Microsoft cloud services that are optimized for integration tasks: Power Automate, Logic Apps, Functions, and WebJobs."
 ms.topic: overview
-ms.date: 02/07/2025
+ms.date: 03/23/2026
 ms.custom: mvc
 #Customer intent: As a developer, I want to understand the choices that Azure offers for hosting and executing my business logic so that I can choose the right set of Azure services.
 ---
@@ -21,23 +21,23 @@ All of these services can solve integration problems and automate business proce
 >
 > If you're looking for a more general comparison between Azure Functions and other Azure compute options, see the following articles:
 >
-> - [Criteria for choosing an Azure compute service](/azure/architecture/guide/technology-choices/compute-comparison) 
+> - [Choose an Azure compute service](/azure/architecture/guide/technology-choices/compute-comparison) 
 > - [Choosing an Azure compute option for microservices](/azure/architecture/microservices/design/compute-options)
 >
 > For a summary and comparison of automation service options in Azure, 
 > see [Choose the Automation services in Azure](../automation/automation-services.md).
 
 ## Compare Azure Logic Apps and Microsoft Power Automate
 
-These services are both *designer-first* integration platforms where you can build and run automated workflows. Both platforms integrate with various Software-as-a-Service (SaaS) and enterprise applications. Both provide similar workflow designers, and while [their connectors share some overlap](/connectors/connector-reference/), each platform also offers their own unique connectors.
+These services are both *designer-first* integration platforms where you can build and run automated workflows. Both platforms integrate with various software-as-a-service (SaaS) and enterprise applications. Both provide similar workflow designers, and while [their connectors share some overlap](/connectors/connector-reference/), each platform also offers their own unique connectors.
 
 Power Automate empowers business users, office workers, and citizen developers to build simple integrations without having to work with IT or developers or to write code. One example might be an approval workflow for a SharePoint document library. Azure Logic Apps supports integrations ranging from little-to-no-code scenarios to more advanced, codeful, and complex workflows. Examples include B2B processes or scenarios that require enterprise-level interactions with Azure DevOps. A business workflow can also grow from simple to complete over time.
 
 To help you determine whether you want to use Azure Logic Apps or Power Automate for a specific integration, see the [Capability comparison table](/azure/logic-apps/power-automate-migration#compare-capability-details).
 
 ## Compare Azure Functions and Azure Logic Apps
 
-These Azure services enable you to build and run serverless workloads. Azure Functions is a serverless compute service, while Azure Logic Apps is a serverless workflow integration platform. Both can create complex *orchestrations*. An orchestration is a collection of functions, which are called *actions* in Azure Logic Apps, that you can run to complete a complex task. For example, to process a batch of orders, you might execute many instances of a function in parallel, wait for all instances to finish, and then execute a function that computes a result on the aggregate.
+These Azure services allow you to build and run serverless workloads. Azure Functions is a serverless compute service, while Azure Logic Apps is a serverless workflow integration platform. Both can create complex *orchestrations*. An orchestration is a collection of functions, which are called *actions* in Azure Logic Apps, that you can run to complete a complex task. For example, to process a batch of orders, you might execute many instances of a function in parallel, wait for all instances to finish, and then execute a function that computes a result on the aggregate.
 
 For Azure Functions, you develop orchestrations by writing code and using the [Durable Functions extension](../durable-task/common/what-is-durable-task.md). For Azure Logic Apps, you create orchestrations by using a visual designer or by editing Azure Resource Manager templates.
 
@@ -50,7 +50,7 @@ You can mix and match services when you build an orchestration. For example, you
 | **Actions** | Each activity is an Azure function; write code for activity functions | [1,400+ prebuilt connectors with triggers and actions](/connectors/connector-reference/connector-reference-logicapps-connectors) |
 | **Monitoring** | [Azure Application Insights](/azure/azure-monitor/app/app-insights-overview) | - [Azure portal](../logic-apps/view-workflow-status-run-history.md) <br>- [Azure Monitor Logs](../logic-apps/monitor-workflows-collect-diagnostic-data.md) <br>- [Microsoft Defender for Cloud](../logic-apps/healthy-unhealthy-resource.md) <br>- [Azure Application Insights for Standard workflows](/azure/logic-apps/create-single-tenant-workflows-azure-portal#enable-or-open-application-insights-after-deployment) <br>- [Health Check for Standard workflows](/azure/logic-apps/monitor-health-standard-workflows) <br><br>For more information, see [Monitor workflows in Azure Logic Apps](/azure/logic-apps/monitor-logic-apps-overview). |
 | **Management** | - [REST API](durable-functions/durable-functions-http-api.md) <br>- [Visual Studio](/visualstudio/azure/vs-azure-tools-resources-managing-with-cloud-explorer) | - [Azure portal](../logic-apps/quickstart-create-example-consumption-workflow.md) <br>- [Visual Studio Code]() <br>- [REST API](/rest/api/logic/) <br>- [PowerShell](/powershell/module/az.logicapp) <br>- [Azure CLI (Standard workflows)](/cli/azure/logicapp) <br>- [Azure CLI (Consumption workflows)](/cli/azure/logic) |
-| **Execution context** | Can run [locally](./functions-kubernetes-keda.md) or in the cloud | Can run in Azure, locally in Visual Studio Code, or in partially connected environments. For more information, see [What is Azure Logic Apps](../logic-apps/logic-apps-overview.md#resource-environment-differences)? |
+| **Execution context** | Can run [locally](./functions-kubernetes-keda.md) or in the cloud | Can run in Azure, locally in Visual Studio Code, or in partially connected environments. For more information, see [What is Azure Logic Apps?](../logic-apps/logic-apps-overview.md#resource-environment-differences) |
 
 <a name="function"></a>
 
@@ -72,9 +72,9 @@ Azure Functions is built on the WebJobs SDK, so it shares many of the same event
 | --- | --- | --- |
 |**[Serverless app model](https://azure.microsoft.com/solutions/serverless/) with [automatic scaling](event-driven-scaling.md)**|✔||
 |**[Develop and test in browser](./functions-get-started.md)** |✔||
-|**[Pay-per-use pricing](consumption-plan.md)**|✔||
+|**[Pay-per-use pricing](flex-consumption-plan.md)**|✔||
 |**[Integration with Logic Apps](functions-twitter-email.md)**|✔||
-| **Trigger events** |[Timer](functions-bindings-timer.md)<br>[Azure Storage queues and blobs](functions-bindings-storage-blob.md)<br>[Azure Service Bus queues and topics](functions-bindings-service-bus.md)<br>[Azure Cosmos DB](functions-bindings-cosmosdb.md)<br>[Azure Event Hubs](functions-bindings-event-hubs.md)<br>[HTTP/WebHook (GitHub, Slack)](functions-bindings-http-webhook.md)<br>[Azure Event Grid](functions-bindings-event-grid.md)|[Timer](functions-bindings-timer.md)<br>[Azure Storage queues and blobs](functions-bindings-storage-blob.md)<br>[Azure Service Bus queues and topics](functions-bindings-service-bus.md)<br>[Azure Cosmos DB](functions-bindings-cosmosdb.md)<br>[Azure Event Hubs](functions-bindings-event-hubs.md)<br>[File system](https://github.com/Azure/azure-webjobs-sdk-extensions/blob/master/src/WebJobs.Extensions/Extensions/Files/FileTriggerAttribute.cs)|
+| **Trigger events** |[Timer](functions-bindings-timer.md)<br>[Azure Storage](functions-bindings-storage-blob.md)<br>[Azure Service Bus](functions-bindings-service-bus.md)<br>[Azure Cosmos DB](functions-bindings-cosmosdb.md)<br>[Azure Event Hubs](functions-bindings-event-hubs.md)<br>[HTTP/WebHook (GitHub, Slack)](functions-bindings-http-webhook.md)<br>[Azure Event Grid](functions-bindings-event-grid.md)|[Timer](functions-bindings-timer.md)<br>[Azure Storage](functions-bindings-storage-blob.md)<br>[Azure Service Bus](functions-bindings-service-bus.md)<br>[Azure Cosmos DB](functions-bindings-cosmosdb.md)<br>[Azure Event Hubs](functions-bindings-event-hubs.md)<br>[File system](https://github.com/Azure/azure-webjobs-sdk-extensions/blob/master/src/WebJobs.Extensions/Extensions/Files/FileTriggerAttribute.cs)|
 | **Supported languages**  |C#<br>F#<br>JavaScript<br>Java<br>Python<br>PowerShell |C#<sup>1</sup>|
 |**Package managers**|npm and NuGet|NuGet<sup>2</sup>|
 
@@ -84,7 +84,7 @@ Azure Functions is built on the WebJobs SDK, so it shares many of the same event
 
 ### Summary
 
-Azure Functions offers more developer productivity than Azure App Service WebJobs does. It also offers more options for programming languages, development environments, Azure service integration, and pricing. For most scenarios, it's the best choice.
+Azure Functions offers more developer productivity than Azure App Service WebJobs does. Azure Functions also offers more options for programming languages, development environments, Azure service integration, and pricing. For most scenarios, it's the best choice.
 
 Here are two scenarios for which WebJobs might be the best choice:
 
@@ -103,17 +103,10 @@ A Power Automate flow can call an Azure Logic Apps workflow. An Azure Logic Apps
 
 Between Power Automate, Azure Logic Apps, and Functions, the integration experience between these services continues to improve over time. You can build a component in one service and use that component in the other services.
 
-For more information about integration services, see the following articles:
+For more information about integration services, see [Power Automate frequently asked questions](/power-automate/frequently-asked-questions).
 
-* [Leveraging Azure Functions & Azure App Service for integration scenarios by Christopher Anderson](https://www.biztalk360.com/integrate-2016-resources/leveraging-azure-functions-azure-app-service-integration-scenarios/)
-* [Integrations Made Simple by Charles Lamanna](https://www.biztalk360.com/integrate-2016-resources/integrations-made-simple/)
-* [Azure Logic Apps Live webcast](https://aka.ms/logicappslive)
-* [Power Automate frequently asked questions](/power-automate/frequently-asked-questions)
-
-## Next steps
-
-Get started by creating your first flow, logic app workflow, or function app. Select any of the following links:
+## Related content
 
 * [Get started with Power Automate](/power-automate/getting-started)
 * [Create an example Consumption logic app workflow](../logic-apps/quickstart-create-example-consumption-workflow.md)
-* [Create your first Azure function](./functions-get-started.md)
+* [Get started with Azure Functions](./functions-get-started.md)