From 2213193f8ecc0db365ac68543222096484081774 Mon Sep 17 00:00:00 2001
From: Abhitej John <aajohn@microsoft.com>
Date: Mon, 29 Jun 2026 15:26:20 -0700
Subject: [PATCH] fix: add .claude-plugin manifest for dotnet-msbuild binlog
 MCP server

Claude Code discovers MCP servers via .claude-plugin/plugin.json inside
each plugin directory. The existing .codex-plugin/ manifest only works
for Codex CLI. Add the Claude Code-specific manifest with inline
mcpServers config, and also declare mcpServers in the root marketplace
manifest entry for belt-and-suspenders coverage.

Fixes #840

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .claude-plugin/marketplace.json               | 14 ++++++++++-
 .../dotnet-msbuild/.claude-plugin/plugin.json | 23 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 plugins/dotnet-msbuild/.claude-plugin/plugin.json

diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index eba57f2352..c87fe9f398 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -22,7 +22,19 @@
     {
       "name": "dotnet-msbuild",
       "source": "./plugins/dotnet-msbuild",
-      "description": "Comprehensive MSBuild and .NET build skills: failure diagnosis, performance optimization, code quality, and modernization."
+      "description": "Comprehensive MSBuild and .NET build skills: failure diagnosis, performance optimization, code quality, and modernization.",
+      "mcpServers": {
+        "binlog": {
+          "type": "stdio",
+          "command": "dotnet",
+          "args": [
+            "dnx",
+            "Microsoft.AITools.BinlogMcp",
+            "--yes"
+          ],
+          "tools": ["*"]
+        }
+      }
     },
     {
       "name": "dotnet-nuget",
diff --git a/plugins/dotnet-msbuild/.claude-plugin/plugin.json b/plugins/dotnet-msbuild/.claude-plugin/plugin.json
new file mode 100644
index 0000000000..037e50426f
--- /dev/null
+++ b/plugins/dotnet-msbuild/.claude-plugin/plugin.json
@@ -0,0 +1,23 @@
+{
+  "name": "dotnet-msbuild",
+  "version": "0.1.0",
+  "description": "Comprehensive MSBuild and .NET build skills: failure diagnosis, performance optimization, code quality, and modernization.",
+  "skills": ["./skills/"],
+  "agents": [
+    "./agents/build-perf.agent.md",
+    "./agents/msbuild-code-review.agent.md",
+    "./agents/msbuild.agent.md"
+  ],
+  "mcpServers": {
+    "binlog": {
+      "type": "stdio",
+      "command": "dotnet",
+      "args": [
+        "dnx",
+        "Microsoft.AITools.BinlogMcp",
+        "--yes"
+      ],
+      "tools": ["*"]
+    }
+  }
+}