From 53edd12f01f7e724f769c91a6db82d296893a6ca Mon Sep 17 00:00:00 2001
From: Peter Ibekwe <peibekwe@microsoft.com>
Date: Thu, 21 May 2026 09:33:48 -0700
Subject: [PATCH] Removed experimentation tag from MCP alpha project.

---
 dotnet/src/Microsoft.Agents.AI.Mcp/McpClientTaskExtensions.cs | 3 ---
 dotnet/src/Microsoft.Agents.AI.Mcp/McpTaskOptions.cs          | 3 ---
 .../Microsoft.Agents.AI.Mcp/Microsoft.Agents.AI.Mcp.csproj    | 4 +---
 .../Microsoft.Agents.AI.Mcp/TaskAwareMcpClientAIFunction.cs   | 3 ---
 4 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/dotnet/src/Microsoft.Agents.AI.Mcp/McpClientTaskExtensions.cs b/dotnet/src/Microsoft.Agents.AI.Mcp/McpClientTaskExtensions.cs
index 162d80c77c..f091fe7d79 100644
--- a/dotnet/src/Microsoft.Agents.AI.Mcp/McpClientTaskExtensions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Mcp/McpClientTaskExtensions.cs
@@ -1,11 +1,9 @@
 // Copyright (c) Microsoft. All rights reserved.
 
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.AI;
-using Microsoft.Shared.DiagnosticIds;
 using Microsoft.Shared.Diagnostics;
 using ModelContextProtocol.Client;
 using ModelContextProtocol.Protocol;
@@ -16,7 +14,6 @@ namespace Microsoft.Agents.AI.Mcp;
 /// Extension methods on <see cref="McpClient"/> that expose MCP server tools to a Microsoft
 /// Agent Framework agent with optional long-running task (SEP-2663) handling.
 /// </summary>
-[Experimental(DiagnosticIds.Experiments.AgentsAIExperiments)]
 public static class McpClientTaskExtensions
 {
     /// <summary>
diff --git a/dotnet/src/Microsoft.Agents.AI.Mcp/McpTaskOptions.cs b/dotnet/src/Microsoft.Agents.AI.Mcp/McpTaskOptions.cs
index 4239d7322c..930cf64277 100644
--- a/dotnet/src/Microsoft.Agents.AI.Mcp/McpTaskOptions.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Mcp/McpTaskOptions.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 
 using System;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.Shared.DiagnosticIds;
 
 namespace Microsoft.Agents.AI.Mcp;
 
@@ -17,7 +15,6 @@ namespace Microsoft.Agents.AI.Mcp;
 /// and tracks the in-flight specification.
 /// </para>
 /// </remarks>
-[Experimental(DiagnosticIds.Experiments.AgentsAIExperiments)]
 public sealed class McpTaskOptions
 {
     /// <summary>
diff --git a/dotnet/src/Microsoft.Agents.AI.Mcp/Microsoft.Agents.AI.Mcp.csproj b/dotnet/src/Microsoft.Agents.AI.Mcp/Microsoft.Agents.AI.Mcp.csproj
index 4b2605da7f..56bc25481a 100644
--- a/dotnet/src/Microsoft.Agents.AI.Mcp/Microsoft.Agents.AI.Mcp.csproj
+++ b/dotnet/src/Microsoft.Agents.AI.Mcp/Microsoft.Agents.AI.Mcp.csproj
@@ -4,15 +4,13 @@
     <TargetFrameworks>$(TargetFrameworksCore)</TargetFrameworks>
     <RootNamespace>Microsoft.Agents.AI.Mcp</RootNamespace>
     <VersionSuffix>alpha</VersionSuffix>
-    <NoWarn>$(NoWarn);MEAI001;MAAI001;MCPEXP001</NoWarn>
+    <NoWarn>$(NoWarn);MEAI001;MCPEXP001</NoWarn>
   </PropertyGroup>
 
   <Import Project="$(RepoRoot)/dotnet/nuget/nuget-package.props" />
 
   <PropertyGroup>
     <InjectSharedThrow>true</InjectSharedThrow>
-    <InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
-    <InjectExperimentalAttributeOnLegacy>true</InjectExperimentalAttributeOnLegacy>
     <InjectTrimAttributesOnLegacy>true</InjectTrimAttributesOnLegacy>
   </PropertyGroup>
 
diff --git a/dotnet/src/Microsoft.Agents.AI.Mcp/TaskAwareMcpClientAIFunction.cs b/dotnet/src/Microsoft.Agents.AI.Mcp/TaskAwareMcpClientAIFunction.cs
index d1a93ab69a..26091b2b60 100644
--- a/dotnet/src/Microsoft.Agents.AI.Mcp/TaskAwareMcpClientAIFunction.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Mcp/TaskAwareMcpClientAIFunction.cs
@@ -1,12 +1,10 @@
 // Copyright (c) Microsoft. All rights reserved.
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.AI;
-using Microsoft.Shared.DiagnosticIds;
 using Microsoft.Shared.Diagnostics;
 using ModelContextProtocol;
 using ModelContextProtocol.Client;
@@ -42,7 +40,6 @@ namespace Microsoft.Agents.AI.Mcp;
 /// inner <see cref="McpClientTool"/>.
 /// </para>
 /// </remarks>
-[Experimental(DiagnosticIds.Experiments.AgentsAIExperiments)]
 internal sealed class TaskAwareMcpClientAIFunction : AIFunction
 {
     private readonly McpClient _client;