Skip to content

Commit d08b719

Browse files
connieyconniey
committed
Fix build breaks.
1 parent 71b2ed2 commit d08b719

File tree

5 files changed

+26
-21
lines changed

5 files changed

+26
-21
lines changed

‎core/Azure.Mcp.Core/src/Areas/Server/Commands/ServiceStartCommand.cs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
using Microsoft.AspNetCore.Builder;
1515
using Microsoft.AspNetCore.Hosting;
1616
using Microsoft.AspNetCore.Http;
17+
using Microsoft.Extensions.Configuration;
1718
using Microsoft.Extensions.DependencyInjection;
1819
using Microsoft.Extensions.Hosting;
1920
using Microsoft.Extensions.Logging;
@@ -56,7 +57,7 @@ public sealed class ServiceStartCommand : BaseCommand<ServiceStartOptions>
5657
/// </summary>
5758
public override ToolMetadata Metadata => new() { Destructive = false, ReadOnly = true };
5859

59-
public static Action<IServiceCollection, IHostEnvironment> ConfigureServices { get; set; } = (_,__) => { };
60+
public static Action<IHostApplicationBuilder> ConfigureServices { get; set; } = (_) => { };
6061

6162
public static Func<IServiceProvider, Task> InitializeServicesAsync { get; set; } = _ => Task.CompletedTask;
6263

@@ -340,7 +341,7 @@ private IHost CreateStdioHost(ServiceStartOptions serverOptions)
340341
logging.ClearProviders();
341342
logging.AddEventSourceLogger();
342343

343-
if (builder.Environment.IsDevelopment() && serverOptions.Debug)
344+
if (serverOptions.Debug)
344345
{
345346
// Configure console logger to emit Debug+ to stderr so tests can capture logs from StandardError
346347
logging.AddConsole(options =>
@@ -359,13 +360,11 @@ private IHost CreateStdioHost(ServiceStartOptions serverOptions)
359360
logging.SetMinimumLevel(LogLevel.Debug);
360361
}
361362

362-
var services = builder.Services;
363-
364363
// Configure the outgoing authentication strategy.
365-
services.AddSingleIdentityTokenCredentialProvider();
364+
builder.Services.AddSingleIdentityTokenCredentialProvider();
366365

367-
ConfigureServices(services, builder.Environment);
368-
ConfigureMcpServer(services, serverOptions);
366+
ConfigureServices(builder);
367+
ConfigureMcpServer(builder.Services, serverOptions);
369368

370369
return builder.Build();
371370
}
@@ -465,7 +464,7 @@ private IHost CreateHttpHost(ServiceStartOptions serverOptions)
465464
});
466465

467466
// Configure services
468-
ConfigureServices(services, builder.Environment); // Our static callback hook
467+
ConfigureServices(builder); // Our static callback hook
469468
ConfigureMcpServer(services, serverOptions);
470469

471470
WebApplication app = builder.Build();
@@ -578,7 +577,7 @@ private IHost CreateIncomingAuthDisabledHttpHost(ServiceStartOptions serverOptio
578577
});
579578

580579
// Configure services
581-
ConfigureServices(services, builder.Environment); // Our static callback hook
580+
ConfigureServices(builder); // Our static callback hook
582581
ConfigureMcpServer(services, serverOptions);
583582

584583
// We still use the multi-user, HTTP context-aware caching strategy here

‎servers/Azure.Mcp.Server/src/Program.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@ private static async Task<int> Main(string[] args)
3131
ServiceStartCommand.InitializeServicesAsync = InitializeServicesAsync;
3232

3333
var builder = Host.CreateApplicationBuilder(args);
34-
ConfigureServices(builder.Services, builder.Environment);
3534

3635
builder.Configuration.AddJsonFile("appsettings.Release.json", optional: true);
3736

3837
builder.Services.AddLogging(builder =>
3938
{
40-
builder.ConfigureOpenTelemetryLogger();
4139
builder.AddConsole();
4240
builder.SetMinimumLevel(LogLevel.Information);
4341
});
4442

43+
ConfigureServices(builder);
44+
4545
using var host = builder.Build();
4646

4747
await InitializeServicesAsync(host.Services);
@@ -185,9 +185,10 @@ private static void WriteResponse(CommandResponse response)
185185
/// </list>
186186
/// </summary>
187187
/// <param name="services">A service collection.</param>
188-
internal static void ConfigureServices(IServiceCollection services, IHostEnvironment hostEnvironment)
188+
internal static void ConfigureServices(IHostApplicationBuilder builder)
189189
{
190-
services.ConfigureOpenTelemetry(hostEnvironment);
190+
var services = builder.Services;
191+
services.ConfigureTelemetryServices(builder.Environment, builder.Configuration);
191192
services.ConfigureMcpServerOptions();
192193

193194
services.AddMemoryCache();

‎servers/Fabric.Mcp.Server/src/Program.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
using Azure.Mcp.Core.Services.ProcessExecution;
1616
using Azure.Mcp.Core.Services.Telemetry;
1717
using Azure.Mcp.Core.Services.Time;
18+
using Microsoft.Extensions.Configuration;
1819
using Microsoft.Extensions.DependencyInjection;
1920
using Microsoft.Extensions.Hosting;
2021
using Microsoft.Extensions.Logging;
@@ -33,11 +34,10 @@ private static async Task<int> Main(string[] args)
3334
ServiceStartCommand.InitializeServicesAsync = InitializeServicesAsync;
3435

3536
var builder = Host.CreateApplicationBuilder();
36-
ConfigureServices(builder.Services, builder.Environment);
37+
ConfigureServices(builder);
3738

3839
builder.Services.AddLogging(builder =>
3940
{
40-
builder.ConfigureOpenTelemetryLogger();
4141
builder.AddConsole();
4242
builder.SetMinimumLevel(LogLevel.Information);
4343
});
@@ -133,9 +133,11 @@ private static void WriteResponse(CommandResponse response)
133133
/// </list>
134134
/// </summary>
135135
/// <param name="services">A service collection.</param>
136-
internal static void ConfigureServices(IServiceCollection services, IHostEnvironment hostEnvironment)
136+
internal static void ConfigureServices(IHostApplicationBuilder builder)
137137
{
138-
services.ConfigureOpenTelemetry(hostEnvironment);
138+
var services = builder.Services;
139+
140+
services.ConfigureTelemetryServices(builder.Environment, builder.Configuration);
139141

140142
services.AddMemoryCache();
141143
services.AddSingleton<IExternalProcessService, ExternalProcessService>();

‎servers/Template.Mcp.Server/src/Program.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Azure.Mcp.Core.Services.ProcessExecution;
1313
using Azure.Mcp.Core.Services.Telemetry;
1414
using Azure.Mcp.Core.Services.Time;
15+
using Microsoft.Extensions.Configuration;
1516
using Microsoft.Extensions.DependencyInjection;
1617
using Microsoft.Extensions.Hosting;
1718
using Microsoft.Extensions.Logging;
@@ -30,11 +31,10 @@ private static async Task<int> Main(string[] args)
3031
ServiceStartCommand.InitializeServicesAsync = InitializeServicesAsync;
3132

3233
var builder = Host.CreateApplicationBuilder();
33-
ConfigureServices(builder.Services, builder.Environment);
34+
ConfigureServices(builder);
3435

3536
builder.Services.AddLogging(builder =>
3637
{
37-
builder.ConfigureOpenTelemetryLogger();
3838
builder.AddConsole();
3939
builder.SetMinimumLevel(LogLevel.Information);
4040
});
@@ -127,9 +127,10 @@ private static void WriteResponse(CommandResponse response)
127127
/// </list>
128128
/// </summary>
129129
/// <param name="services">A service collection.</param>
130-
internal static void ConfigureServices(IServiceCollection services, IHostEnvironment hostEnvironment)
130+
internal static void ConfigureServices(IHostApplicationBuilder builder)
131131
{
132-
services.ConfigureOpenTelemetry(hostEnvironment);
132+
var services = builder.Services;
133+
services.ConfigureTelemetryServices(builder.Environment, builder.Configuration);
133134

134135
services.AddMemoryCache();
135136
services.AddSingleton<IExternalProcessService, ExternalProcessService>();

‎tools/Azure.Mcp.Tools.MySql/src/Azure.Mcp.Tools.MySql.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3+
<!-- Enable strongly typed binding for IConfiguration to support AOT and trimming. -->
4+
<EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
35
<IsAotCompatible>true</IsAotCompatible>
46
</PropertyGroup>
57
<ItemGroup>

0 commit comments

Comments
 (0)