Fix all Microsoft.Mcp.Core.Server namespaces in Microsoft.Mcp.Core#1763
Open
alzimmermsft wants to merge 6 commits intomicrosoft:mainfrom
Open
Fix all Microsoft.Mcp.Core.Server namespaces in Microsoft.Mcp.Core#1763alzimmermsft wants to merge 6 commits intomicrosoft:mainfrom
alzimmermsft wants to merge 6 commits intomicrosoft:mainfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR standardizes the Server area types in Microsoft.Mcp.Core by moving them from Azure.Mcp.Core.Areas.Server.* to Microsoft.Mcp.Core.Areas.Server.*, and updates downstream tools/servers/tests to reference the new namespaces.
Changes:
- Renames
Areas.Servernamespaces (Commands/Discovery/ToolLoading/Models/Options) toMicrosoft.Mcp.Core.Areas.Server.*. - Updates Azure/Fabric/Template server entrypoints plus tool/test projects to use the new namespaces.
- Splits
IMcpServerProviderinto its own file and applies small modernizations (collection expressions, etc.).
Reviewed changes
Copilot reviewed 93 out of 93 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| tools/Fabric.Mcp.Tools.OneLake/tests/Commands/Table/TableNamespaceListCommandTests.cs | Update Server options namespace import in tests. |
| tools/Fabric.Mcp.Tools.OneLake/tests/Commands/Table/TableNamespaceGetCommandTests.cs | Update Server options namespace import in tests. |
| tools/Fabric.Mcp.Tools.OneLake/tests/Commands/Table/TableListCommandTests.cs | Update Server options namespace import in tests. |
| tools/Fabric.Mcp.Tools.OneLake/tests/Commands/Table/TableGetCommandTests.cs | Update Server options namespace import in tests. |
| tools/Fabric.Mcp.Tools.OneLake/tests/Commands/Table/TableConfigGetCommandTests.cs | Update Server options namespace import in tests. |
| tools/Fabric.Mcp.Tools.OneLake/tests/Commands/FileReadCommandTests.cs | Update Server options namespace import in tests. |
| tools/Fabric.Mcp.Tools.OneLake/tests/Commands/BlobGetCommandTests.cs | Update Server options namespace import in tests. |
| tools/Fabric.Mcp.Tools.OneLake/src/Commands/File/FileReadCommand.cs | Update Server options namespace import in OneLake command. |
| tools/Fabric.Mcp.Tools.OneLake/src/Commands/File/BlobGetCommand.cs | Update Server options namespace import in OneLake command. |
| tools/Azure.Mcp.Tools.Deploy/src/Options/DeployOptionDefinitions.cs | Update ToolLoading namespace import for CommandFactoryToolLoader. |
| tools/Azure.Mcp.Tools.Deploy/src/Options/Architecture/DiagramGenerateOptions.cs | Update ToolLoading namespace import for CommandFactoryToolLoader. |
| servers/Template.Mcp.Server/src/Program.cs | Switch to Microsoft.Mcp.Core.Areas.Server.ServerSetup. |
| servers/Fabric.Mcp.Server/src/Program.cs | Switch to Microsoft.Mcp.Core.Areas.Server.ServerSetup and update Server Commands imports. |
| servers/Azure.Mcp.Server/src/Program.cs | Switch to Microsoft.Mcp.Core.Areas.Server.ServerSetup and update Server Commands imports. |
| core/Microsoft.Mcp.Core/tests/Microsoft.Mcp.Core.UnitTests/Services/Telemetry/TelemetryServiceTests.cs | Update Server options namespace import for telemetry tests. |
| core/Microsoft.Mcp.Core/tests/Microsoft.Mcp.Core.UnitTests/Areas/Server/Commands/ToolLoading/ToolLoaderTelemetryTests.cs | Update ToolLoading/Runtime/Options namespace imports for telemetry tests. |
| core/Microsoft.Mcp.Core/src/Services/Telemetry/TelemetryService.cs | Update Server options namespace import. |
| core/Microsoft.Mcp.Core/src/Services/Http/HttpClientFactoryConfigurator.cs | Update Server options namespace import used for UA/transport selection. |
| core/Microsoft.Mcp.Core/src/Services/Azure/Authentication/AzureCloudConfiguration.cs | Update Server options namespace import. |
| core/Microsoft.Mcp.Core/src/Helpers/RegistryServerHelper.cs | Update Server/Discovery/Models namespace imports to Microsoft.*. |
| core/Microsoft.Mcp.Core/src/Commands/CommandFactory.cs | Use ServiceStartCommand from new namespace. |
| core/Microsoft.Mcp.Core/src/Areas/Server/ServerSetup.cs | Move ServerSetup to Microsoft.Mcp.Core.Areas.Server and update imports. |
| core/Microsoft.Mcp.Core/src/Areas/Server/ServerJsonContext.cs | Move JSON source-gen context to Microsoft.Mcp.Core.Areas.Server and update model imports. |
| core/Microsoft.Mcp.Core/src/Areas/Server/RegistryServerServiceCollectionExtensions.cs | Move extension class to Microsoft.Mcp.Core.Areas.Server and update model imports. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Options/TransportTypes.cs | Move Options namespace to Microsoft.Mcp.Core.Areas.Server.Options. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Options/ServiceStartOptions.cs | Move Options namespace to Microsoft.Mcp.Core.Areas.Server.Options and update text. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Options/ServiceOptionDefinitions.cs | Move Options namespace + update option descriptions. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Options/OutgoingAuthStrategy.cs | Move Options namespace to Microsoft.Mcp.Core.Areas.Server.Options. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Options/ModeTypes.cs | Move Options namespace + update text. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Models/ToolPropertySchema.cs | Move Models namespace to Microsoft.Mcp.Core.Areas.Server.Models. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Models/ToolInputSchema.cs | Move Models namespace to Microsoft.Mcp.Core.Areas.Server.Models. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Models/RegistryServerInfo.cs | Move Models namespace to Microsoft.Mcp.Core.Areas.Server.Models. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Models/RegistryRoot.cs | Move Models namespace to Microsoft.Mcp.Core.Areas.Server.Models. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Models/OAuthProtectedResourceMetadata.cs | Move Models namespace to Microsoft.Mcp.Core.Areas.Server.Models. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Models/IRegistryRoot.cs | Move Models namespace + remove redundant interface member accessibility. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Models/ConsolidatedToolDefinition.cs | Move Models namespace + update wording. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/TypeToJsonTypeMapper.cs | Move Commands namespace + update model import. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ToolLoading/ToolLoaderOptions.cs | Move ToolLoading namespace to Microsoft.*. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ToolLoading/SingleProxyToolLoader.cs | Move ToolLoading namespace + update Discovery import. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ToolLoading/ServerToolLoader.cs | Move ToolLoading namespace + update Discovery import. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ToolLoading/RegistryToolLoader.cs | Move ToolLoading namespace + update Discovery import. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ToolLoading/NamespaceToolLoader.cs | Move ToolLoading namespace + update Discovery/Models/Options imports; small collection expression update. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ToolLoading/IToolLoader.cs | Move ToolLoading namespace to Microsoft.*. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ToolLoading/CompositeToolLoader.cs | Move ToolLoading namespace + collection expression init. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ToolLoading/CommandFactoryToolLoader.cs | Move ToolLoading namespace + update Models import. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ToolLoading/BaseToolLoader.cs | Move ToolLoading namespace to Microsoft.*. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ServiceStartCommand.cs | Move command namespace + update Models/Options imports. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ServiceInfoJsonContext.cs | Move command namespace to Microsoft.*. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ServiceInfoCommand.cs | Move command namespace to Microsoft.*. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/ServiceCollectionExtensions.cs | Move command namespace + update Discovery/Runtime/ToolLoading/Options imports and conflict note. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/Runtime/McpRuntime.cs | Move Runtime namespace + update ToolLoading/Options imports. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/Runtime/IMcpRuntime.cs | Move Runtime namespace to Microsoft.*. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/Discovery/RegistryServerProvider.cs | Move Discovery namespace + update Models import. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/Discovery/RegistryDiscoveryStrategy.cs | Move Discovery namespace + update Models/Options imports. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/Discovery/McpServerMetadata.cs | Move Discovery namespace; remove embedded IMcpServerProvider definition. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/Discovery/IMcpServerProvider.cs | New file: extracted IMcpServerProvider into its own type file. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/Discovery/IDiscoveryStrategy.cs | Move Discovery namespace to Microsoft.*. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/Discovery/DiscoveryConstants.cs | Move Discovery namespace to Microsoft.*. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/Discovery/ConsolidatedToolServerProvider.cs | Move Discovery namespace + update Options import. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/Discovery/ConsolidatedToolDiscoveryStrategy.cs | Move Discovery namespace + update Models/Options imports and formatting. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/Discovery/CompositeDiscoveryStrategy.cs | Move Discovery namespace to Microsoft.*. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/Discovery/CommandGroupServerProvider.cs | Move Discovery namespace + update Options import. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/Discovery/CommandGroupDiscoveryStrategy.cs | Move Discovery namespace + update Options import. |
| core/Microsoft.Mcp.Core/src/Areas/Server/Commands/Discovery/BaseDiscoveryStrategy.cs | Move Discovery namespace to Microsoft.*. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Tests/Helpers/TestHttpClientFactoryProvider.cs | Update Server options namespace import in test helper. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Services/Azure/BaseAzureServiceTests.cs | Update Server options namespace import in unit tests. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Services/Azure/Authentication/AzureCloudConfigurationTests.cs | Update Server options namespace import in unit tests. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/RegistryDiscoveryStrategyHelper.cs | Update Discovery/Options namespace imports in helper. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/TypeToJsonTypeMapperTests.cs | Update Commands namespace import in unit tests. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/ServiceStartCommandTests.cs | Update Commands/Options namespace imports; minor reference update. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/OptionTypeTests.cs | Update Commands namespace import in unit tests. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Models/RegistryRootTests.cs | Update Server/Models namespace imports in unit tests. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Helpers/MockMcpDiscoveryStrategyBuilder.cs | Update Discovery namespace import; collection expression init. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Helpers/MockMcpClientBuilder.cs | Update Server namespace import in unit tests. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/ToolLoading/SingleProxyToolLoaderTests.cs | Update Discovery/ToolLoading/Options imports; collection expression tweak. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/ToolLoading/ServerToolLoaderTests.cs | Update Discovery/ToolLoading/Options imports. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/ToolLoading/RegistryToolLoaderTests.cs | Update Discovery/ToolLoading imports. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/ToolLoading/NamespaceToolLoaderTests.cs | Update Discovery/ToolLoading/Options imports; simplify DiscoveryConstants reference. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/ToolLoading/CompositeToolLoaderTests.cs | Update ToolLoading namespace import. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/ToolLoading/CommandFactoryToolLoaderTests.cs | Update ToolLoading namespace import. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/ToolLoading/BaseToolLoaderTests.cs | Update ToolLoading namespace import. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/ServiceInfoCommandTests.cs | Update Server Commands namespace import. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/ServiceCollectionExtensionsTests.cs | Update Server/Commands/Discovery/Runtime/ToolLoading/Options namespace imports. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/ServiceCollectionExtensionsSerializedTests.cs | Update Commands/Options namespace imports. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/Runtime/McpRuntimeTests.cs | Update Runtime/ToolLoading/Options namespace imports; assertion tweak. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/Discovery/RegistryServerProviderTests.cs | Update Discovery/Models namespace imports. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/Discovery/RegistryDiscoveryStrategyTests.cs | Update Discovery/Options namespace imports. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/Discovery/ConsolidatedToolDiscoveryStrategyTests.cs | Update Discovery/Options namespace imports. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/Discovery/CompositeDiscoveryStrategyTests.cs | Update Discovery namespace import; collection expression usage. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/Discovery/CommandGroupServerProviderTests.cs | Update Discovery namespace import. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/Discovery/CommandGroupDiscoveryStrategyTests.cs | Update Discovery/Options namespace imports. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/Commands/Discovery/BaseDiscoveryStrategyTests.cs | Update Discovery namespace import. |
| core/Azure.Mcp.Core/tests/Azure.Mcp.Core.UnitTests/Areas/Server/ArrayOrCollectionElementTypeTests.cs | Update Commands namespace import in unit tests. |
.../Microsoft.Mcp.Core/src/Areas/Server/Commands/Discovery/ConsolidatedToolDiscoveryStrategy.cs
Show resolved
Hide resolved
core/Microsoft.Mcp.Core/src/Areas/Server/RegistryServerServiceCollectionExtensions.cs
Show resolved
Hide resolved
joshfree
approved these changes
Feb 19, 2026
Member
|
please FYI the fabric team too |
Contributor
Author
|
@microsoft/fabric-mcp could you review this change |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Fixes all
Microsoft.Mcp.Core.Servernamespaces to beMicrosoftinstead ofAzure.GitHub issue number?
[Link to the GitHub issue this PR addresses]Pre-merge Checklist
servers/Azure.Mcp.Server/CHANGELOG.mdand/orservers/Fabric.Mcp.Server/CHANGELOG.mdfor product changes (features, bug fixes, UI/UX, updated dependencies)servers/Azure.Mcp.Server/README.mdand/orservers/Fabric.Mcp.Server/README.mddocumentationeng/scripts/Process-PackageReadMe.ps1. See Package README/servers/Azure.Mcp.Server/docs/azmcp-commands.mdand/or/docs/fabric-commands.md.\eng\scripts\Update-AzCommandsMetadata.ps1to update tool metadata in azmcp-commands.md (required for CI)ToolDescriptionEvaluatorand obtained a score of0.4or more and a top 3 ranking for all related test promptsconsolidated-tools.json/servers/Azure.Mcp.Server/docs/e2eTestPrompts.mdcrypto mining, spam, data exfiltration, etc.)/azp run mcp - pullrequest - liveto run Live Test Pipeline