Standardize ToolingManifest file name usage

sellakumaran · sellakumaran · commit d8fdb17f497e · 2026-02-10T17:23:54.000-08:00
Replaced all hardcoded references to "toolingManifest.json" and "ToolingManifest.json" with McpConstants.ToolingManifestFileName. Updated command classes, helpers, validation, and tests for consistent manifest file handling and improved error/log messages.
diff --git a/src/Microsoft.Agents.A365.DevTools.Cli/Commands/CreateInstanceCommand.cs b/src/Microsoft.Agents.A365.DevTools.Cli/Commands/CreateInstanceCommand.cs
@@ -126,7 +126,7 @@ public static Command CreateCommand(ILogger<CreateInstanceCommand> logger, IConf
                 // Admin consent for MCP scopes (oauth2PermissionGrants)
                 logger.LogInformation("Granting MCP scopes to Agent Identity via oauth2PermissionGrants");
 
-                var manifestPath = Path.Combine(instanceConfig.DeploymentProjectPath ?? string.Empty, "ToolingManifest.json");
+                var manifestPath = Path.Combine(instanceConfig.DeploymentProjectPath ?? string.Empty, McpConstants.ToolingManifestFileName);
                 var scopesForAgent = await ManifestHelper.GetRequiredScopesAsync(manifestPath);
 
                 // clientId must be the *service principal objectId* of the agentic app
diff --git a/src/Microsoft.Agents.A365.DevTools.Cli/Commands/DeployCommand.cs b/src/Microsoft.Agents.A365.DevTools.Cli/Commands/DeployCommand.cs
@@ -337,8 +337,8 @@ private static async Task DeployMcpToolPermissionsAsync(
         GraphApiService graphApiService,
         AgentBlueprintService blueprintService)
     {
-        // Read scopes from toolingManifest.json (at deploymentProjectPath)
-        var manifestPath = Path.Combine(config.DeploymentProjectPath ?? string.Empty, "toolingManifest.json");
+        // Read scopes from ToolingManifest.json (at deploymentProjectPath)
+        var manifestPath = Path.Combine(config.DeploymentProjectPath ?? string.Empty, McpConstants.ToolingManifestFileName);
         var toolingScopes = await ManifestHelper.GetRequiredScopesAsync(manifestPath);
 
         // 1. Apply MCP OAuth2 permission grants
diff --git a/src/Microsoft.Agents.A365.DevTools.Cli/Commands/DevelopSubcommands/AddPermissionsSubcommand.cs b/src/Microsoft.Agents.A365.DevTools.Cli/Commands/DevelopSubcommands/AddPermissionsSubcommand.cs
@@ -110,7 +110,7 @@ public static Command CreateCommand(
 
                 // Determine manifest path
                 var manifestPath = manifest?.FullName 
-                    ?? Path.Combine(setupConfig?.DeploymentProjectPath ?? Environment.CurrentDirectory, "ToolingManifest.json");
+                    ?? Path.Combine(setupConfig?.DeploymentProjectPath ?? Environment.CurrentDirectory, McpConstants.ToolingManifestFileName);
 
                 // Determine which scopes to add
                 string[] requestedScopes;
diff --git a/src/Microsoft.Agents.A365.DevTools.Cli/Commands/DevelopSubcommands/GetTokenSubcommand.cs b/src/Microsoft.Agents.A365.DevTools.Cli/Commands/DevelopSubcommands/GetTokenSubcommand.cs
@@ -101,7 +101,7 @@ public static Command CreateCommand(
 
                 // Determine manifest path
                 var manifestPath = manifest?.FullName 
-                    ?? Path.Combine(setupConfig?.DeploymentProjectPath ?? Environment.CurrentDirectory, "ToolingManifest.json");
+                    ?? Path.Combine(setupConfig?.DeploymentProjectPath ?? Environment.CurrentDirectory, McpConstants.ToolingManifestFileName);
 
                 // Determine which scopes to request
                 string[] requestedScopes;
diff --git a/src/Microsoft.Agents.A365.DevTools.Cli/Commands/SetupSubcommands/PermissionsSubcommand.cs b/src/Microsoft.Agents.A365.DevTools.Cli/Commands/SetupSubcommands/PermissionsSubcommand.cs
@@ -34,14 +34,14 @@ public static Task<List<string>> ValidateMcpAsync(
 
         if (string.IsNullOrWhiteSpace(config.DeploymentProjectPath))
         {
-            errors.Add("deploymentProjectPath is required to read toolingManifest.json");
+            errors.Add("deploymentProjectPath is required to read ToolingManifest.json");
             return Task.FromResult(errors);
         }
 
-        var manifestPath = Path.Combine(config.DeploymentProjectPath, "toolingManifest.json");
+        var manifestPath = Path.Combine(config.DeploymentProjectPath, McpConstants.ToolingManifestFileName);
         if (!File.Exists(manifestPath))
         {
-            errors.Add($"toolingManifest.json not found at {manifestPath}");
+            errors.Add($"ToolingManifest.json not found at {manifestPath}");
         }
 
         return Task.FromResult(errors);
@@ -130,8 +130,8 @@ private static Command CreateMcpSubcommand(
 
             if (dryRun)
             {
-                // Read scopes from toolingManifest.json
-                var manifestPath = Path.Combine(setupConfig.DeploymentProjectPath ?? string.Empty, "toolingManifest.json");
+                // Read scopes from ToolingManifest.json
+                var manifestPath = Path.Combine(setupConfig.DeploymentProjectPath ?? string.Empty, McpConstants.ToolingManifestFileName);
                 var toolingScopes = await ManifestHelper.GetRequiredScopesAsync(manifestPath);
 
                 logger.LogInformation("DRY RUN: Configure MCP Permissions");
@@ -252,8 +252,8 @@ public static async Task<bool> ConfigureMcpPermissionsAsync(
 
         try
         {
-            // Read scopes from toolingManifest.json
-            var manifestPath = Path.Combine(setupConfig.DeploymentProjectPath ?? string.Empty, "toolingManifest.json");
+            // Read scopes from ToolingManifest.json
+            var manifestPath = Path.Combine(setupConfig.DeploymentProjectPath ?? string.Empty, McpConstants.ToolingManifestFileName);
             var toolingScopes = await ManifestHelper.GetRequiredScopesAsync(manifestPath);
 
             var resourceAppId = ConfigConstants.GetAgent365ToolsResourceAppId(setupConfig.Environment);
diff --git a/src/Microsoft.Agents.A365.DevTools.Cli/Helpers/ManifestHelper.cs b/src/Microsoft.Agents.A365.DevTools.Cli/Helpers/ManifestHelper.cs
@@ -205,7 +205,7 @@ public static List<object> ConvertToServerObjects(IEnumerable<JsonElement> jsonE
     }
 
     /// <summary>
-    /// Reads toolingManifest.json and returns the unique list of scopes required by all MCP servers.
+    /// Reads ToolingManifest.json and returns the unique list of scopes required by all MCP servers.
     /// Strategy:
     ///  1) If a server entry has an explicit "scope" property, use it.
     ///  2) Otherwise, use McpConstants.ServerScopeMappings.GetScopeAndAudience(serverName).
diff --git a/src/Microsoft.Agents.A365.DevTools.Cli/Services/AuthenticationService.cs b/src/Microsoft.Agents.A365.DevTools.Cli/Services/AuthenticationService.cs
@@ -395,7 +395,7 @@ public string[] ResolveScopesForResource(string resourceUrl, string? manifestPat
         if (string.IsNullOrWhiteSpace(manifestPath))
         {
             var currentDir = Environment.CurrentDirectory;
-            manifestPath = Path.Combine(currentDir, "ToolingManifest.json");
+            manifestPath = Path.Combine(currentDir, McpConstants.ToolingManifestFileName);
 
             if (!File.Exists(manifestPath))
             {
diff --git a/src/Microsoft.Agents.A365.DevTools.Cli/Services/NodeBuilder.cs b/src/Microsoft.Agents.A365.DevTools.Cli/Services/NodeBuilder.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System.Text.Json;
+using Microsoft.Agents.A365.DevTools.Cli.Constants;
 using Microsoft.Agents.A365.DevTools.Cli.Exceptions;
 using Microsoft.Agents.A365.DevTools.Cli.Models;
 using Microsoft.Agents.A365.DevTools.Cli.Services.Helpers;
@@ -133,10 +134,10 @@ public async Task<string> BuildAsync(string projectDir, string outputPath, bool
         }
 
         // Copy ToolingManifest if exists
-        var toolingManifestPath = Path.Combine(projectDir, "ToolingManifest.json");
+        var toolingManifestPath = Path.Combine(projectDir, McpConstants.ToolingManifestFileName);
         if (File.Exists(toolingManifestPath))
         {
-            File.Copy(toolingManifestPath, Path.Combine(publishPath, "ToolingManifest.json"));
+            File.Copy(toolingManifestPath, Path.Combine(publishPath, McpConstants.ToolingManifestFileName));
         }
 
         // Copy source files (src, lib, etc.)
diff --git a/src/Tests/Microsoft.Agents.A365.DevTools.Cli.Tests/Commands/SubcommandValidationTests.cs b/src/Tests/Microsoft.Agents.A365.DevTools.Cli.Tests/Commands/SubcommandValidationTests.cs
@@ -3,6 +3,7 @@
 
 using FluentAssertions;
 using Microsoft.Agents.A365.DevTools.Cli.Commands.SetupSubcommands;
+using Microsoft.Agents.A365.DevTools.Cli.Constants;
 using Microsoft.Agents.A365.DevTools.Cli.Models;
 using Microsoft.Agents.A365.DevTools.Cli.Services;
 using Microsoft.Agents.A365.DevTools.Cli.Services.Requirements;
@@ -265,7 +266,7 @@ public async Task PermissionsSubcommand_ValidateMcp_WithValidConfig_PassesValida
         // Arrange
         var tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
         Directory.CreateDirectory(tempDir);
-        var manifestPath = Path.Combine(tempDir, "toolingManifest.json");
+        var manifestPath = Path.Combine(tempDir, McpConstants.ToolingManifestFileName);
         await File.WriteAllTextAsync(manifestPath, "{}");
 
         try
@@ -295,7 +296,7 @@ public async Task PermissionsSubcommand_ValidateMcp_WithMissingBlueprintId_Fails
         // Arrange
         var tempDir = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
         Directory.CreateDirectory(tempDir);
-        var manifestPath = Path.Combine(tempDir, "toolingManifest.json");
+        var manifestPath = Path.Combine(tempDir, McpConstants.ToolingManifestFileName);
         await File.WriteAllTextAsync(manifestPath, "{}");
 
         try
@@ -340,7 +341,7 @@ public async Task PermissionsSubcommand_ValidateMcp_WithMissingManifest_FailsVal
 
             // Assert
             errors.Should().ContainSingle()
-                .Which.Should().Contain("toolingManifest.json");
+                .Which.Should().Contain("ToolingManifest.json");
         }
         finally
         {
diff --git a/src/Tests/Microsoft.Agents.A365.DevTools.Cli.Tests/Services/AuthenticationServiceTests.cs b/src/Tests/Microsoft.Agents.A365.DevTools.Cli.Tests/Services/AuthenticationServiceTests.cs
@@ -464,7 +464,7 @@ public void ResolveScopesForResource_WithNoManifestPath_ShouldLookForLocalManife
     {
         // Arrange
         var currentDir = Environment.CurrentDirectory;
-        var localManifestPath = Path.Combine(currentDir, "ToolingManifest.json");
+        var localManifestPath = Path.Combine(currentDir, McpConstants.ToolingManifestFileName);
         var manifestCreated = false;
 
         try

Original file line number	Diff line number	Diff line change
`@@ -34,14 +34,14 @@ public static Task<List<string>> ValidateMcpAsync(`
`34`	`34`
`35`	`35`	`if (string.IsNullOrWhiteSpace(config.DeploymentProjectPath))`
`36`	`36`	`{`
`37`		`- errors.Add("deploymentProjectPath is required to read toolingManifest.json");`
	`37`	`+ errors.Add("deploymentProjectPath is required to read ToolingManifest.json");`
`38`	`38`	`return Task.FromResult(errors);`
`39`	`39`	`}`
`40`	`40`
`41`		`- var manifestPath = Path.Combine(config.DeploymentProjectPath, "toolingManifest.json");`
	`41`	`+ var manifestPath = Path.Combine(config.DeploymentProjectPath, McpConstants.ToolingManifestFileName);`
`42`	`42`	`if (!File.Exists(manifestPath))`
`43`	`43`	`{`
`44`		`- errors.Add($"toolingManifest.json not found at {manifestPath}");`
	`44`	`+ errors.Add($"ToolingManifest.json not found at {manifestPath}");`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`return Task.FromResult(errors);`
`@@ -130,8 +130,8 @@ private static Command CreateMcpSubcommand(`
`130`	`130`
`131`	`131`	`if (dryRun)`
`132`	`132`	`{`
`133`		`- // Read scopes from toolingManifest.json`
`134`		`- var manifestPath = Path.Combine(setupConfig.DeploymentProjectPath ?? string.Empty, "toolingManifest.json");`
	`133`	`+ // Read scopes from ToolingManifest.json`
	`134`	`+ var manifestPath = Path.Combine(setupConfig.DeploymentProjectPath ?? string.Empty, McpConstants.ToolingManifestFileName);`
`135`	`135`	`var toolingScopes = await ManifestHelper.GetRequiredScopesAsync(manifestPath);`
`136`	`136`
`137`	`137`	`logger.LogInformation("DRY RUN: Configure MCP Permissions");`
`@@ -252,8 +252,8 @@ public static async Task<bool> ConfigureMcpPermissionsAsync(`
`252`	`252`
`253`	`253`	`try`
`254`	`254`	`{`
`255`		`- // Read scopes from toolingManifest.json`
`256`		`- var manifestPath = Path.Combine(setupConfig.DeploymentProjectPath ?? string.Empty, "toolingManifest.json");`
	`255`	`+ // Read scopes from ToolingManifest.json`
	`256`	`+ var manifestPath = Path.Combine(setupConfig.DeploymentProjectPath ?? string.Empty, McpConstants.ToolingManifestFileName);`
`257`	`257`	`var toolingScopes = await ManifestHelper.GetRequiredScopesAsync(manifestPath);`
`258`	`258`
`259`	`259`	`var resourceAppId = ConfigConstants.GetAgent365ToolsResourceAppId(setupConfig.Environment);`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public static List<object> ConvertToServerObjects(IEnumerable<JsonElement> jsonE`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`/// <summary>`
`208`		`- /// Reads toolingManifest.json and returns the unique list of scopes required by all MCP servers.`
	`208`	`+ /// Reads ToolingManifest.json and returns the unique list of scopes required by all MCP servers.`
`209`	`209`	`/// Strategy:`
`210`	`210`	`/// 1) If a server entry has an explicit "scope" property, use it.`
`211`	`211`	`/// 2) Otherwise, use McpConstants.ServerScopeMappings.GetScopeAndAudience(serverName).`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ public string[] ResolveScopesForResource(string resourceUrl, string? manifestPat`
`395`	`395`	`if (string.IsNullOrWhiteSpace(manifestPath))`
`396`	`396`	`{`
`397`	`397`	`var currentDir = Environment.CurrentDirectory;`
`398`		`- manifestPath = Path.Combine(currentDir, "ToolingManifest.json");`
	`398`	`+ manifestPath = Path.Combine(currentDir, McpConstants.ToolingManifestFileName);`
`399`	`399`
`400`	`400`	`if (!File.Exists(manifestPath))`
`401`	`401`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`	`4`	`using System.Text.Json;`
	`5`	`+using Microsoft.Agents.A365.DevTools.Cli.Constants;`
`5`	`6`	`using Microsoft.Agents.A365.DevTools.Cli.Exceptions;`
`6`	`7`	`using Microsoft.Agents.A365.DevTools.Cli.Models;`
`7`	`8`	`using Microsoft.Agents.A365.DevTools.Cli.Services.Helpers;`
`@@ -133,10 +134,10 @@ public async Task<string> BuildAsync(string projectDir, string outputPath, bool`
`133`	`134`	`}`
`134`	`135`
`135`	`136`	`// Copy ToolingManifest if exists`
`136`		`- var toolingManifestPath = Path.Combine(projectDir, "ToolingManifest.json");`
	`137`	`+ var toolingManifestPath = Path.Combine(projectDir, McpConstants.ToolingManifestFileName);`
`137`	`138`	`if (File.Exists(toolingManifestPath))`
`138`	`139`	`{`
`139`		`- File.Copy(toolingManifestPath, Path.Combine(publishPath, "ToolingManifest.json"));`
	`140`	`+ File.Copy(toolingManifestPath, Path.Combine(publishPath, McpConstants.ToolingManifestFileName));`
`140`	`141`	`}`
`141`	`142`
`142`	`143`	`// Copy source files (src, lib, etc.)`
Original file line number	Diff line number	Diff line change
`@@ -464,7 +464,7 @@ public void ResolveScopesForResource_WithNoManifestPath_ShouldLookForLocalManife`
`464`	`464`	`{`
`465`	`465`	`// Arrange`
`466`	`466`	`var currentDir = Environment.CurrentDirectory;`
`467`		`- var localManifestPath = Path.Combine(currentDir, "ToolingManifest.json");`
	`467`	`+ var localManifestPath = Path.Combine(currentDir, McpConstants.ToolingManifestFileName);`
`468`	`468`	`var manifestCreated = false;`
`469`	`469`
`470`	`470`	`try`