fix config provider file system lookups so that we're actually using data from them

Author: baronfel

src/Microsoft.Extensions.Configuration.DotnetCli/DotNetConfigurationFactory.cs

@@ -54,6 +54,7 @@ private static DotNetCliConfiguration CreateInternal(string? workingDirectory)
         workingDirectory ??= Directory.GetCurrentDirectory();
 
         var configurationBuilder = new ConfigurationBuilder();
+        configurationBuilder.SetBasePath(workingDirectory);
 
         // Configuration sources are added in reverse precedence order
         // Last added has highest precedence

src/Microsoft.Extensions.Configuration.DotnetCli/Providers/DotNetConfigurationSource.cs

@@ -12,8 +12,9 @@ public class DotNetConfigurationSource : IniConfigurationSource
 {
     public DotNetConfigurationSource(string workingDirectory)
     {
-        Path = FindDotNetConfigPath(workingDirectory);
+        Path = System.IO.Path.Combine(workingDirectory, "dotnet.config");
         Optional = true; // Make it optional since dotnet.config may not exist
+        ResolveFileProvider();
     }
     /// <summary>
     /// Builds the configuration provider for dotnet.config files.
@@ -25,21 +26,4 @@ public override IConfigurationProvider Build(IConfigurationBuilder builder)
         EnsureDefaults(builder);
         return new DotNetConfigurationProvider(this);
     }
-
-    private static string FindDotNetConfigPath(string? workingDirectory = null)
-    {
-        string? directory = workingDirectory ?? Directory.GetCurrentDirectory();
-        // Search for dotnet.config in the current directory and upwards
-        while (directory != null)
-        {
-            string dotnetConfigPath = System.IO.Path.Combine(directory, "dotnet.config");
-            if (File.Exists(dotnetConfigPath))
-            {
-                return dotnetConfigPath;
-            }
-
-            directory = System.IO.Path.GetDirectoryName(directory);
-        }
-        return "dotnet.config"; // Return default path even if not found
-    }
 }

src/Microsoft.Extensions.Configuration.DotnetCli/Providers/GlobalJsonConfigurationProvider.cs

@@ -1,17 +1,15 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Text.Json;
+using Microsoft.Extensions.Configuration.Json;
 
 namespace Microsoft.Extensions.Configuration.DotnetCli.Providers;
 
 /// <summary>
 /// Configuration provider that reads global.json files and maps keys to the canonical format.
 /// </summary>
-public class GlobalJsonConfigurationProvider : ConfigurationProvider
+public class GlobalJsonConfigurationProvider : JsonConfigurationProvider
 {
-    private readonly string? _path;
-
     private static readonly Dictionary<string, string> GlobalJsonKeyMappings = new()
     {
         ["sdk:version"] = "sdk:version",
@@ -21,54 +19,26 @@ public class GlobalJsonConfigurationProvider : ConfigurationProvider
         // Add more mappings as the global.json schema evolves
     };
 
-    public GlobalJsonConfigurationProvider(string workingDirectory)
+    public GlobalJsonConfigurationProvider(GlobalJsonConfigurationSource source) : base(source)
     {
-        _path = FindGlobalJson(workingDirectory);
     }
 
     public override void Load()
     {
-        Data.Clear();
-
-        if (_path == null || !File.Exists(_path))
-            return;
+        base.Load();
+        // Transform keys according to our mapping
+        var transformedData = new Dictionary<string, string?>(Data.Count, StringComparer.OrdinalIgnoreCase);
 
-        try
-        {
-            var json = File.ReadAllText(_path);
-            var document = JsonDocument.Parse(json);
-
-            LoadGlobalJsonData(document.RootElement, "");
-        }
-        catch (Exception ex)
+        foreach (var kvp in Data)
         {
-            throw new InvalidOperationException($"Error parsing global.json at {_path}", ex);
+            string key = kvp.Key;
+            string? value = kvp.Value;
+            var mappedKey = MapGlobalJsonKey(key);
+            transformedData[mappedKey] = value;
         }
-    }
 
-    private void LoadGlobalJsonData(JsonElement element, string prefix)
-    {
-        foreach (var property in element.EnumerateObject())
-        {
-            var rawKey = string.IsNullOrEmpty(prefix)
-                ? property.Name
-                : $"{prefix}:{property.Name}";
-
-            switch (property.Value.ValueKind)
-            {
-                case JsonValueKind.Object:
-                    LoadGlobalJsonData(property.Value, rawKey);
-                    break;
-                case JsonValueKind.String:
-                case JsonValueKind.Number:
-                case JsonValueKind.True:
-                case JsonValueKind.False:
-                    // Map to canonical key format
-                    var canonicalKey = MapGlobalJsonKey(rawKey);
-                    Data[canonicalKey] = GetValueAsString(property.Value);
-                    break;
-            }
-        }
+        // Replace the data with transformed keys
+        Data = transformedData;
     }
 
     private string MapGlobalJsonKey(string rawKey)
@@ -84,29 +54,4 @@ private string MapGlobalJsonKey(string rawKey)
         // Default: convert to lowercase and normalize separators
         return rawKey.ToLowerInvariant().Replace("-", ":");
     }
-
-    private string GetValueAsString(JsonElement element)
-    {
-        return element.ValueKind switch
-        {
-            JsonValueKind.String => element.GetString()!,
-            JsonValueKind.Number => element.GetRawText(),
-            JsonValueKind.True => "true",
-            JsonValueKind.False => "false",
-            _ => element.GetRawText()
-        };
-    }
-
-    private string? FindGlobalJson(string startDirectory)
-    {
-        var current = new DirectoryInfo(startDirectory);
-        while (current != null)
-        {
-            var globalJsonPath = Path.Combine(current.FullName, "global.json");
-            if (File.Exists(globalJsonPath))
-                return globalJsonPath;
-            current = current.Parent;
-        }
-        return null;
-    }
 }

src/Microsoft.Extensions.Configuration.DotnetCli/Providers/GlobalJsonConfigurationSource.cs

@@ -1,22 +1,26 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.Extensions.Configuration.Json;
+
 namespace Microsoft.Extensions.Configuration.DotnetCli.Providers;
 
 /// <summary>
 /// Configuration source for global.json files.
 /// </summary>
-public class GlobalJsonConfigurationSource : IConfigurationSource
+public class GlobalJsonConfigurationSource : JsonConfigurationSource
 {
-    private readonly string _workingDirectory;
 
     public GlobalJsonConfigurationSource(string workingDirectory)
     {
-        _workingDirectory = workingDirectory ?? throw new ArgumentNullException(nameof(workingDirectory));
+        Path = System.IO.Path.Combine(workingDirectory, "global.json");
+        Optional = true;
+        ResolveFileProvider();
     }
 
-    public IConfigurationProvider Build(IConfigurationBuilder builder)
+    public override IConfigurationProvider Build(IConfigurationBuilder builder)
     {
-        return new GlobalJsonConfigurationProvider(_workingDirectory);
+        EnsureDefaults(builder);
+        return new GlobalJsonConfigurationProvider(this);
     }
 }