Merge pull request #314483 from MicrosoftDocs/main

Auto Publish – main to live - 2026-04-08 22:00 UTC

Author: learn-build-service-prod[bot]

articles/artifact-signing/quickstart.md

@@ -245,7 +245,7 @@ To create an identity validation request for an Organization or a DBA:
     | **Organization Name**          | For public identity validation, provide the legal business entity to which the certificate is issued. For private identity validation, the value defaults to your Microsoft Entra tenant name. |
     | **(Private Identity Type only) Organizational Unit**          | Enter the relevant information. |
     | **Website url**          | Enter the website that belongs to the legal business entity. |
-    | **Primary Email**           | Enter the email address of an individual (distribution lists aren't accepted) associated with the legal business entity undergoing validation. Part of the Identity Validation process, a verification link is sent to this email address and the link expires in seven days. Ensure that the email address can receive emails(with links) from external email addresses.  |
+    | **Primary Email**           | Enter the email address associated with the legal business entity undergoing validation. Part of the Identity Validation process, a verification link is sent to this email address and the link expires in seven days. Ensure that the email address can receive emails(with links) from external email addresses.  |
     | **Secondary Email**          | This email address must be different from the primary email address (distribution lists are accepted). For organizations, the domain must match the email address that is provided in the primary email address. Ensure that the email address can receive emails from external email addresses that have links.|
     | **Business Identifier**           | Enter a business identifier for the legal business entity. |
     | **Seller ID**          | Applies only to Microsoft Store customers. Find your Seller ID in the Partner Center portal. |

articles/azure-functions/functions-bindings-mcp-resource-trigger.md

@@ -22,7 +22,7 @@ For information on setup and configuration details, see the [overview](functions
 > For C#, the Azure Functions MCP extension supports only the [isolated worker model](dotnet-isolated-process-guide.md). 
 ::: zone-end
 
-::: zone pivot="programming-language-csharp,programming-language-python,programming-language-typescript,programming-language-javascript"
+::: zone pivot="programming-language-csharp,programming-language-python,programming-language-typescript,programming-language-javascript, programming-language-java"
 
 This first example shows how to use resource to implement the UI element of MCP Apps. 
 ::: zone-end
@@ -127,12 +127,6 @@ For the complete code example, see the [Azure Functions MCP Extension repo](http
 
 ::: zone-end
 
-::: zone pivot="programming-language-java"
-
-> [!IMPORTANT]
-> The MCP extension in Java supports resource today. Documentation coming soon.
-
-::: zone-end
 
 ::: zone pivot="programming-language-javascript"  
 Example code for JavaScript isn't currently available. See the TypeScript example for general guidance.
@@ -286,6 +280,78 @@ For the complete code example, see [function_app.py](https://github.com/Azure-Sa
 
 ::: zone-end
 
+::: zone pivot="programming-language-java"
+The following code registers a resource named `Weather Widget` that serves an interactive weather display as bundled HTML content. The resource uses the `ui://` scheme to indicate it's an MCP App UI resource.
+
+```java
+private static final String RESOURCE_METADATA = """
+        {
+            "ui": {
+                "prefersBorder": true
+            }
+        }
+        """;
+
+@FunctionName("GetWeatherWidget")
+public String getWeatherWidget(
+        @McpResourceTrigger(
+                name = "context",
+                uri = "ui://weather/index.html",
+                resourceName = "Weather Widget",
+                title = "Weather Widget",
+                description = "Interactive weather display for MCP Apps",
+                mimeType = "text/html;profile=mcp-app")
+        @McpMetadata(
+                name = "context",
+                json = RESOURCE_METADATA)
+        String context,
+        final ExecutionContext executionContext) {
+
+    executionContext.getLogger().info("GetWeatherWidget: serving weather widget UI");
+
+    return java.nio.file.Files.readString(file.toPath(), StandardCharsets.UTF_8);
+}
+```
+
+A tool can reference this resource by declaring a `resourceUri` in its metadata, pointing to `ui://weather/index.html`. When the tool is invoked, the MCP host fetches the resource and renders it:
+
+```java
+private static final String TOOL_METADATA = """
+        {
+            "ui": {
+                "resourceUri": "ui://weather/index.html"
+            }
+        }
+        """;
+
+@FunctionName("GetWeather")
+public String getWeather(
+        @McpToolTrigger(
+                name = "GetWeather",
+                description = "Returns current weather for a location via Open-Meteo.")
+        @McpMetadata(
+                name = "GetWeather",
+                json = TOOL_METADATA)
+        String context,
+        @McpToolProperty(
+                name = "location",
+                propertyType = "string",
+                description = "City name to check weather for (e.g., Seattle, New York, Miami)")
+        String location,
+        final ExecutionContext executionContext) {
+
+    executionContext.getLogger().info("GetWeather: looking up weather for '" + location + "'");
+
+    Object result = weatherService.getCurrentWeather(location);
+
+    return MAPPER.writeValueAsString(result);
+}
+```
+
+For the complete code example, see [WeatherFunction.java](https://github.com/Azure-Samples/remote-mcp-functions-java/blob/main/samples/McpWeatherApp/src/main/java/com/function/weather/WeatherFunction.java).
+
+::: zone-end
+
 [!INCLUDE [functions-mcp-extension-powershell-note](../../includes/functions-mcp-extension-powershell-note.md)]  
 
 ::: zone pivot="programming-language-csharp"  
@@ -355,7 +421,52 @@ Define the trigger's binding options in your code. The trigger supports the foll
 
 ::: zone-end
 
-::: zone pivot="programming-language-csharp,programming-language-python,programming-language-typescript"
+::: zone pivot="programming-language-java"
+
+## Attributes
+
+Apply the `@McpResourceTrigger` annotation to a function parameter to define an MCP resource trigger.
+
+The `@McpResourceTrigger` annotation supports the following properties:
+
+| Property | Description |
+|---|---|
+| **`name`** | Required. The binding name for the resource invocation context parameter. |
+| **`uri`** | Required. The URI of the MCP resource (for example, `"file://readme.md"` or `"ui://weather/index.html"`). |
+| **`resourceName`** | Required. The display name of the MCP resource. |
+| **`title`** | Optional. A human-readable title for display purposes. Unlike `resourceName`, which is a programmatic identifier, this is a friendly label for UI presentation. |
+| **`description`** | Optional. A human-readable description of this resource. |
+| **`mimeType`** | Optional. The MIME type of the resource content (for example, `"text/plain"`, `"text/html"`, `"image/png"`, `"text/html;profile=mcp-app"`). |
+| **`size`** | Optional. The size of the resource in bytes. Defaults to `-1` (not specified). |
+| **`dataType`** | Optional. Defines how the Functions runtime should treat the parameter value. Possible values: `""` (default, deserialize to parameter type), `"string"`, `"binary"`. |
+
+## Metadata annotation
+
+You can optionally apply `@McpMetadata` on the same parameter as `@McpResourceTrigger` to attach arbitrary JSON metadata to the resource. This metadata is surfaced in the MCP protocol's `_meta` field when clients call `resources/list`.
+
+The `@McpMetadata` annotation supports the following properties:
+
+| Property | Description |
+|---|---|
+| **`name`** | Required. The binding parameter name. Should match the `name` value of the trigger annotation on the same parameter. |
+| **`json`** | Required. The metadata as a valid JSON string. Can include any arbitrary key-value pairs such as author information, version numbers, UI hints, or tags. |
+
+**Example:**
+
+```java 
+@McpResourceTrigger(
+        name = "context",
+        uri = "file://readme.md",
+        resourceName = "readme",
+        description = "Application readme file",
+        mimeType = "text/plain")
+@McpMetadata(
+        name = "context",
+        json = "{\"author\": \"John Doe\", \"version\": 1.0}")
+```
+::: zone-end
+
+::: zone pivot="programming-language-csharp,programming-language-java,programming-language-python,programming-language-typescript"
 
 See the [Example section](#example) for complete examples.
 
@@ -400,7 +511,13 @@ The resource handler function has two parameters:
 
 ::: zone-end
 
-::: zone pivot="programming-language-csharp,programming-language-python,programming-language-javascript,programming-language-typescript"
+::: zone pivot="programming-language-java"
+
+The MCP resource trigger binds the resource invocation context to a function parameter. The trigger can bind to the following types: `String`, or `byte[]` for binary content.
+
+::: zone-end
+
+::: zone pivot="programming-language-csharp,programming-language-java,programming-language-python,programming-language-javascript,programming-language-typescript"
 
 ### Resource URIs
 
@@ -428,7 +545,13 @@ Use the `metadata` option to provide extra metadata for resources. This metadata
 
 ::: zone-end
 
-::: zone pivot="programming-language-csharp,programming-language-python,programming-language-javascript,programming-language-typescript"
+::: zone pivot="programming-language-java"
+
+Use the `@McpMetadata` annotation to provide extra metadata for resources. This metadata is a JSON-serialized string included in the `meta` field of each resource when clients call `resources/list`. It can affect how the resource content is displayed or processed.
+
+::: zone-end
+
+::: zone pivot="programming-language-csharp,programming-language-java,programming-language-python,programming-language-javascript,programming-language-typescript"
 
 ### Return types
 
@@ -462,7 +585,18 @@ The function should return a `string` containing the resource content (for examp
 
 ::: zone-end
 
-::: zone pivot="programming-language-csharp,programming-language-python,programming-language-javascript,programming-language-typescript"
+::: zone pivot="programming-language-java"
+
+The MCP resource trigger supports the following return types:
+
+| Type | Description |
+| --- | --- |
+| `String` | Returned as text content in the MCP `ReadResourceResult`. |
+| `byte[]` | Returned as base64-encoded binary content in the MCP `ReadResourceResult`. Set `dataType = "binary"` on the annotation when returning binary content. |
+
+::: zone-end
+
+::: zone pivot="programming-language-csharp,programming-language-java,programming-language-python,programming-language-javascript,programming-language-typescript"
 
 ### Resource discovery
 

articles/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure.md

@@ -103,7 +103,9 @@ On-premises Nutanix environments require the Nutanix customer to support all the
 
 Microsoft manages the Azure BareMetal specialized compute hardware and its data and control plane platform for underlay network. Microsoft supports if the customers plan to bring their existing Azure Subscription, virtual network, vWAN, etc.
 
-Nutanix covers the life-cycle management of Nutanix software (MCM, Prism Central/Element, etc.) and their licenses.
+Nutanix covers the deployment of Nutanix software (Prism Central/Element, AHV, AOS,etc.) and their licenses.
+
+Customers are responsible for the lifecycle management of the Nutanix software after their deployment is successful.
 
 **Monitoring and remediation**
 

articles/communication-services/concepts/advanced-messaging/whatsapp/whatsapp-overview.md

@@ -29,6 +29,13 @@ The key features of Azure Communications Services Advanced Messaging for WhatsAp
 * Reply to user’s inquiries and trigger automation using Azure Event Grid notifications.
 * Receive delivery reports for messages sent, delivered, and read.
 
+## WhatsApp usernames and business-scoped user IDs
+
+WhatsApp is launching usernames in 2026, allowing users to display a username instead of their phone number. To support this change, Meta introduces a new identifier called the **business-scoped user ID (BSUID)**. BSUIDs begin appearing in webhook payloads and will be supported as recipient identifiers in send requests starting in June 2026.
+
+> [!WARNING]
+> **Breaking change:** The `from` and `to` fields in Advanced Messaging events may now be empty when a user hides their phone number. Update your event handlers to use the new `fromBSUID` and `toBSUID` fields. For more information, see [WhatsApp usernames and BSUIDs](./whatsapp-username-support-overview.md).
+
 ## Next steps
 
 To get started with Advanced Messaging for WhatsApp, see: