Back to normal booleans on config models, pushing knowledge into the config providers

baronfel · baronfel · commit 35a0c6036501 · 2025-07-13T21:57:09.000-05:00
diff --git a/src/Microsoft.Extensions.Configuration.DotnetCli/Models/BuildConfiguration.cs b/src/Microsoft.Extensions.Configuration.DotnetCli/Models/BuildConfiguration.cs
@@ -12,13 +12,13 @@ public sealed class BuildConfiguration
     /// Gets or sets whether to run MSBuild out of process.
     /// Mapped from DOTNET_CLI_RUN_MSBUILD_OUTOFPROC environment variable.
     /// </summary>
-    public FlexibleBool RunMSBuildOutOfProc { get; set; } = false;
+    public bool RunMSBuildOutOfProc { get; set; } = false;
 
     /// <summary>
     /// Gets or sets whether to use the MSBuild server for builds.
     /// Mapped from DOTNET_CLI_USE_MSBUILD_SERVER environment variable.
     /// </summary>
-    public FlexibleBool UseMSBuildServer { get; set; } = false;
+    public bool UseMSBuildServer { get; set; } = false;
 
     /// <summary>
     /// Gets or sets the configuration for the MSBuild terminal logger.
@@ -30,11 +30,11 @@ public sealed class BuildConfiguration
     /// Gets or sets whether to disable publish and pack release configuration.
     /// Mapped from DOTNET_CLI_DISABLE_PUBLISH_AND_PACK_RELEASE environment variable.
     /// </summary>
-    public FlexibleBool DisablePublishAndPackRelease { get; set; } = false;
+    public bool DisablePublishAndPackRelease { get; set; } = false;
 
     /// <summary>
     /// Gets or sets whether to enable lazy publish and pack release for solutions.
     /// Mapped from DOTNET_CLI_LAZY_PUBLISH_AND_PACK_RELEASE_FOR_SOLUTIONS environment variable.
     /// </summary>
-    public FlexibleBool LazyPublishAndPackReleaseForSolutions { get; set; } = false;
+    public bool LazyPublishAndPackReleaseForSolutions { get; set; } = false;
 }
diff --git a/src/Microsoft.Extensions.Configuration.DotnetCli/Models/CliUserExperienceConfiguration.cs b/src/Microsoft.Extensions.Configuration.DotnetCli/Models/CliUserExperienceConfiguration.cs
@@ -14,19 +14,19 @@ public sealed class CliUserExperienceConfiguration
     /// Gets or sets whether telemetry collection is disabled.
     /// Mapped from DOTNET_CLI_TELEMETRY_OPTOUT environment variable.
     /// </summary>
-    public FlexibleBool TelemetryOptOut { get; set; } = CompileOptions.TelemetryOptOutDefault;
+    public bool TelemetryOptOut { get; set; } = CompileOptions.TelemetryOptOutDefault;
 
     /// <summary>
     /// Gets or sets whether to suppress the .NET logo on startup.
     /// Mapped from DOTNET_NOLOGO environment variable.
     /// </summary>
-    public FlexibleBool NoLogo { get; set; } = false;
+    public bool NoLogo { get; set; } = false;
 
     /// <summary>
     /// Gets or sets whether to force UTF-8 encoding for console output.
     /// Mapped from DOTNET_CLI_FORCE_UTF8_ENCODING environment variable.
     /// </summary>
-    public FlexibleBool ForceUtf8Encoding { get; set; } = false;
+    public bool ForceUtf8Encoding { get; set; } = false;
 
     /// <summary>
     /// Gets or sets the UI language for the CLI.
diff --git a/src/Microsoft.Extensions.Configuration.DotnetCli/Models/DevelopmentConfiguration.cs b/src/Microsoft.Extensions.Configuration.DotnetCli/Models/DevelopmentConfiguration.cs
@@ -12,7 +12,7 @@ public sealed class DevelopmentConfiguration
     /// Gets or sets whether performance logging is enabled.
     /// Mapped from DOTNET_CLI_PERF_LOG environment variable.
     /// </summary>
-    public FlexibleBool PerfLogEnabled { get; set; } = false;
+    public bool PerfLogEnabled { get; set; } = false;
 
     /// <summary>
     /// Gets or sets the number of performance log entries to collect.
@@ -30,11 +30,11 @@ public sealed class DevelopmentConfiguration
     /// Gets or sets whether to enable verbose context logging.
     /// Mapped from DOTNET_CLI_CONTEXT_VERBOSE environment variable.
     /// </summary>
-    public FlexibleBool ContextVerbose { get; set; } = false;
+    public bool ContextVerbose { get; set; } = false;
 
     /// <summary>
     /// Gets or sets whether to allow targeting pack caching.
     /// Mapped from DOTNETSDK_ALLOW_TARGETING_PACK_CACHING environment variable.
     /// </summary>
-    public FlexibleBool AllowTargetingPackCaching { get; set; } = false;
+    public bool AllowTargetingPackCaching { get; set; } = false;
 }
diff --git a/src/Microsoft.Extensions.Configuration.DotnetCli/Models/FirstTimeUseConfiguration.cs b/src/Microsoft.Extensions.Configuration.DotnetCli/Models/FirstTimeUseConfiguration.cs
@@ -12,17 +12,17 @@ public sealed class FirstTimeUseConfiguration
     /// Gets or sets whether to generate ASP.NET Core HTTPS development certificates.
     /// Mapped from DOTNET_GENERATE_ASPNET_CERTIFICATE environment variable.
     /// </summary>
-    public FlexibleBool GenerateAspNetCertificate { get; set; } = true;
+    public bool GenerateAspNetCertificate { get; set; } = true;
 
     /// <summary>
     /// Gets or sets whether to add global tools to the PATH.
     /// Mapped from DOTNET_ADD_GLOBAL_TOOLS_TO_PATH environment variable.
     /// </summary>
-    public FlexibleBool AddGlobalToolsToPath { get; set; } = true;
+    public bool AddGlobalToolsToPath { get; set; } = true;
 
     /// <summary>
     /// Gets or sets whether to skip the first-time experience setup.
     /// Mapped from DOTNET_SKIP_FIRST_TIME_EXPERIENCE environment variable.
     /// </summary>
-    public FlexibleBool SkipFirstTimeExperience { get; set; } = false;
+    public bool SkipFirstTimeExperience { get; set; } = false;
 }
diff --git a/src/Microsoft.Extensions.Configuration.DotnetCli/Models/FlexibleBool.cs b/src/Microsoft.Extensions.Configuration.DotnetCli/Models/FlexibleBool.cs
diff --git a/src/Microsoft.Extensions.Configuration.DotnetCli/Models/NuGetConfiguration.cs b/src/Microsoft.Extensions.Configuration.DotnetCli/Models/NuGetConfiguration.cs
@@ -13,5 +13,5 @@ public sealed class NuGetConfiguration
     /// Mapped from DOTNET_NUGET_SIGNATURE_VERIFICATION environment variable.
     /// Defaults to true on Windows and Linux, false elsewhere.
     /// </summary>
-    public FlexibleBool SignatureVerificationEnabled { get; set; } = OperatingSystem.IsWindows() || OperatingSystem.IsLinux();
+    public bool SignatureVerificationEnabled { get; set; } = OperatingSystem.IsWindows() || OperatingSystem.IsLinux();
 }
diff --git a/src/Microsoft.Extensions.Configuration.DotnetCli/Models/RuntimeHostConfiguration.cs b/src/Microsoft.Extensions.Configuration.DotnetCli/Models/RuntimeHostConfiguration.cs
@@ -18,7 +18,7 @@ public sealed class RuntimeHostConfiguration
     /// Gets or sets whether to enable multilevel lookup for shared frameworks.
     /// Mapped from DOTNET_MULTILEVEL_LOOKUP environment variable.
     /// </summary>
-    public FlexibleBool MultilevelLookup { get; set; } = false;
+    public bool MultilevelLookup { get; set; } = false;
 
     /// <summary>
     /// Gets or sets the roll-forward policy for framework version selection.
diff --git a/src/Microsoft.Extensions.Configuration.DotnetCli/Models/SdkResolverConfiguration.cs b/src/Microsoft.Extensions.Configuration.DotnetCli/Models/SdkResolverConfiguration.cs
@@ -12,7 +12,7 @@ public sealed class SdkResolverConfiguration
     /// Gets or sets whether to enable SDK resolver logging.
     /// Mapped from DOTNET_MSBUILD_SDK_RESOLVER_ENABLE_LOG environment variable.
     /// </summary>
-    public FlexibleBool EnableLog { get; set; } = false;
+    public bool EnableLog { get; set; } = false;
 
     /// <summary>
     /// Gets or sets the directory containing SDKs.
diff --git a/src/Microsoft.Extensions.Configuration.DotnetCli/Models/ToolConfiguration.cs b/src/Microsoft.Extensions.Configuration.DotnetCli/Models/ToolConfiguration.cs
@@ -12,5 +12,5 @@ public sealed class ToolConfiguration
     /// Gets or sets whether to allow tool manifests in the repository root.
     /// Mapped from DOTNET_TOOLS_ALLOW_MANIFEST_IN_ROOT environment variable.
     /// </summary>
-    public FlexibleBool AllowManifestInRoot { get; set; } = false;
+    public bool AllowManifestInRoot { get; set; } = false;
 }
diff --git a/src/Microsoft.Extensions.Configuration.DotnetCli/Models/WorkloadConfiguration.cs b/src/Microsoft.Extensions.Configuration.DotnetCli/Models/WorkloadConfiguration.cs
@@ -12,7 +12,7 @@ public sealed class WorkloadConfiguration
     /// Gets or sets whether to disable workload update notifications.
     /// Mapped from DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE environment variable.
     /// </summary>
-    public FlexibleBool UpdateNotifyDisable { get; set; } = false;
+    public bool UpdateNotifyDisable { get; set; } = false;
 
     /// <summary>
     /// Gets or sets the interval in hours between workload update notifications.
@@ -24,13 +24,13 @@ public sealed class WorkloadConfiguration
     /// Gets or sets whether to disable workload pack groups.
     /// Mapped from DOTNET_CLI_WORKLOAD_DISABLE_PACK_GROUPS environment variable.
     /// </summary>
-    public FlexibleBool DisablePackGroups { get; set; } = false;
+    public bool DisablePackGroups { get; set; } = false;
 
     /// <summary>
     /// Gets or sets whether to skip workload integrity checks.
     /// Mapped from DOTNET_SKIP_WORKLOAD_INTEGRITY_CHECK environment variable.
     /// </summary>
-    public FlexibleBool SkipIntegrityCheck { get; set; } = false;
+    public bool SkipIntegrityCheck { get; set; } = false;
 
     /// <summary>
     /// Gets or sets the manifest root directories for workloads.
@@ -48,5 +48,5 @@ public sealed class WorkloadConfiguration
     /// Gets or sets whether to ignore default manifest roots.
     /// Mapped from DOTNETSDK_WORKLOAD_MANIFEST_IGNORE_DEFAULT_ROOTS environment variable.
     /// </summary>
-    public FlexibleBool ManifestIgnoreDefaultRoots { get; set; } = false;
+    public bool ManifestIgnoreDefaultRoots { get; set; } = false;
 }
diff --git a/src/Microsoft.Extensions.Configuration.DotnetCli/Providers/DotNetEnvironmentConfigurationProvider.cs b/src/Microsoft.Extensions.Configuration.DotnetCli/Providers/DotNetEnvironmentConfigurationProvider.cs
@@ -48,6 +48,29 @@ public class DotNetEnvironmentConfigurationProvider : ConfigurationProvider
         ["DOTNET_TOOLS_ALLOW_MANIFEST_IN_ROOT"] = "Tool:AllowManifestInRoot",
         ["DOTNET_NUGET_SIGNATURE_VERIFICATION"] = "NuGet:SignatureVerificationEnabled",
     };
+    private static readonly HashSet<string> ConfigKeysToTreatAsBooleans = [
+        "CliUserExperience:TelemetryOptOut",
+        "CliUserExperience:NoLogo",
+        "CliUserExperience:ForceUtf8Encoding",
+        "Development:PerfLogEnabled",
+        "Development:ContextVerbose",
+        "Development:AllowTargetingPackCaching",
+        "RuntimeHost:MultilevelLookup",
+        "Build:RunMSBuildOutOfProc",
+        "Build:UseMSBuildServer",
+        "Build:DisablePublishAndPackRelease",
+        "Build:LazyPublishAndPackReleaseForSolutions",
+        "SdkResolver:EnableLog",
+        "Workload:UpdateNotifyDisable",
+        "Workload:DisablePackGroups",
+        "Workload:SkipIntegrityCheck",
+        "Workload:ManifestIgnoreDefaultRoots",
+        "FirstTimeUse:GenerateAspNetCertificate",
+        "FirstTimeUse:AddGlobalToolsToPath",
+        "FirstTimeUse:SkipFirstTimeExperience",
+        "Tool:AllowManifestInRoot",
+        "NuGet:SignatureVerificationEnabled"
+    ];
 
     public override void Load()
     {
@@ -58,7 +81,7 @@ public override void Load()
             var value = Environment.GetEnvironmentVariable(mapping.Key);
             if (!string.IsNullOrEmpty(value))
             {
-                Data[mapping.Value] = value;
+                Data[mapping.Value] = CoerceValueIfNecessary(mapping.Value, value);
             }
         }
 
@@ -67,6 +90,21 @@ public override void Load()
         HandleArrayEnvironmentVariable("DOTNETSDK_WORKLOAD_PACK_ROOTS", "Workload:PackRoots");
     }
 
+    private string CoerceValueIfNecessary(string configKey, string envValue) => ConfigKeysToTreatAsBooleans.Contains(configKey)
+        ? GetFlexibleBool(envValue).ToString()
+        : envValue;
+
+    private bool GetFlexibleBool(string envValue) =>
+        bool.TryParse(envValue, out var boolValue)
+        ? boolValue
+        : int.TryParse(envValue, out var intValue) ? intValue > 0
+        : envValue switch
+        {
+            "yes" or "y" => true,
+            "no" or "n" => false,
+            _ => throw new FormatException($"Invalid boolean value: {envValue}")
+        };
+
     private void HandleArrayEnvironmentVariable(string envVar, string configKey)
     {
         var value = Environment.GetEnvironmentVariable(envVar);

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ public sealed class NuGetConfiguration`
`13`	`13`	`/// Mapped from DOTNET_NUGET_SIGNATURE_VERIFICATION environment variable.`
`14`	`14`	`/// Defaults to true on Windows and Linux, false elsewhere.`
`15`	`15`	`/// </summary>`
`16`		`- public FlexibleBool SignatureVerificationEnabled { get; set; } = OperatingSystem.IsWindows() \|\| OperatingSystem.IsLinux();`
	`16`	`+ public bool SignatureVerificationEnabled { get; set; } = OperatingSystem.IsWindows() \|\| OperatingSystem.IsLinux();`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@ public sealed class ToolConfiguration`
`12`	`12`	`/// Gets or sets whether to allow tool manifests in the repository root.`
`13`	`13`	`/// Mapped from DOTNET_TOOLS_ALLOW_MANIFEST_IN_ROOT environment variable.`
`14`	`14`	`/// </summary>`
`15`		`- public FlexibleBool AllowManifestInRoot { get; set; } = false;`
	`15`	`+ public bool AllowManifestInRoot { get; set; } = false;`
`16`	`16`	`}`