Don't use backing field

Author: WilliamBZA

src/ServiceControl.AcceptanceTests/Mcp/When_mcp_server_write_mode_is_disabled.cs

@@ -1,10 +1,10 @@
 namespace ServiceControl.AcceptanceTests.Mcp;
 
 using System.Linq;
-using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
 using NServiceBus.AcceptanceTesting;
+using ServiceControl.AcceptanceTesting;
 using NUnit.Framework;
 using ServiceControl.AcceptanceTesting.Mcp;
 

src/ServiceControl.AcceptanceTests/TestSupport/ServiceControlComponentRunner.cs

@@ -135,7 +135,7 @@ async Task InitializeServiceControl(ScenarioContext context)
 
                 host.UseTestRemoteIp();
                 host.UseServiceControlAuthentication(settings.OpenIdConnectSettings.Enabled);
-                host.UseServiceControl(settings.ForwardedHeadersSettings, settings.HttpsSettings, settings.EnableMcpServer);
+                host.UseServiceControl(settings.ForwardedHeadersSettings, settings.HttpsSettings, settings.EnableMcpServer || settings.EnableMcpServerWriteMode);
                 await host.StartAsync();
                 DomainEvents = host.Services.GetRequiredService<IDomainEvents>();
                 // Bring this back and look into the base address of the client

src/ServiceControl.Audit/Infrastructure/Settings/Settings.cs

@@ -55,7 +55,7 @@ public Settings(string transportType = null, string persisterType = null, Loggin
             TimeToRestartAuditIngestionAfterFailure = GetTimeToRestartAuditIngestionAfterFailure();
             EnableFullTextSearchOnBodies = SettingsReader.Read(SettingsRootNamespace, "EnableFullTextSearchOnBodies", true);
             EnableMcpServerWriteMode = SettingsReader.Read(SettingsRootNamespace, "EnableMcpServerWriteMode", false);
-            EnableMcpServer = SettingsReader.Read(SettingsRootNamespace, "EnableMcpServer", false);
+            EnableMcpServer = SettingsReader.Read(SettingsRootNamespace, "EnableMcpServer", false) || EnableMcpServerWriteMode;
             ShutdownTimeout = SettingsReader.Read(SettingsRootNamespace, "ShutdownTimeout", ShutdownTimeout);
 
             AssemblyLoadContextResolver = static assemblyPath => new PluginAssemblyLoadContext(assemblyPath);
@@ -189,12 +189,7 @@ public int MaxBodySizeToStore
 
         public bool EnableFullTextSearchOnBodies { get; set; }
 
-        bool enableMcpServer;
-        public bool EnableMcpServer
-        {
-            get => enableMcpServer || EnableMcpServerWriteMode;
-            set => enableMcpServer = value;
-        }
+        public bool EnableMcpServer { get; set; }
 
         public bool EnableMcpServerWriteMode { get; set; }
 

src/ServiceControl/Hosting/Commands/RunCommand.cs

@@ -30,7 +30,7 @@ public override async Task Execute(HostArguments args, Settings settings)
             hostBuilder.AddServiceControlApi(settings);
 
             var app = hostBuilder.Build();
-            app.UseServiceControl(settings.ForwardedHeadersSettings, settings.HttpsSettings, settings.EnableMcpServer);
+            app.UseServiceControl(settings.ForwardedHeadersSettings, settings.HttpsSettings, settings.EnableMcpServer || settings.EnableMcpServerWriteMode);
             if (settings.EnableIntegratedServicePulse)
             {
                 app.UseServicePulse(settings.ServicePulseSettings);

src/ServiceControl/Infrastructure/Settings/Settings.cs

@@ -82,7 +82,7 @@ public Settings(
             TrackInstancesInitialValue = SettingsReader.Read(SettingsRootNamespace, "TrackInstancesInitialValue", true);
             ShutdownTimeout = SettingsReader.Read(SettingsRootNamespace, "ShutdownTimeout", ShutdownTimeout);
             EnableMcpServerWriteMode = SettingsReader.Read(SettingsRootNamespace, "EnableMcpServerWriteMode", false);
-            EnableMcpServer = SettingsReader.Read(SettingsRootNamespace, "EnableMcpServer", false);
+            EnableMcpServer = SettingsReader.Read(SettingsRootNamespace, "EnableMcpServer", false) || EnableMcpServerWriteMode;
             AssemblyLoadContextResolver = static assemblyPath => new PluginAssemblyLoadContext(assemblyPath);
         }
 
@@ -115,12 +115,7 @@ public Settings(
 
         public bool AllowMessageEditing { get; set; }
 
-        bool enableMcpServer;
-        public bool EnableMcpServer
-        {
-            get => enableMcpServer || EnableMcpServerWriteMode;
-            set => enableMcpServer = value;
-        }
+        public bool EnableMcpServer { get; set; }
 
         public bool EnableMcpServerWriteMode { get; set; }
 

src/ServiceControl/Infrastructure/WebApi/HostApplicationBuilderExtensions.cs

@@ -21,7 +21,7 @@ public static void AddServiceControlApi(this IHostApplicationBuilder builder, Se
 
             builder.AddServiceControlApis();
 
-            if (settings.EnableMcpServer)
+            if (settings.EnableMcpServer || settings.EnableMcpServerWriteMode)
             {
                 builder.Services.AddTransient<ServiceControl.Mcp.FailedMessageTools>();
                 builder.Services.AddTransient<ServiceControl.Mcp.FailureGroupTools>();